Attachment 332450 Details for Bug 559047

[patch] debugging patch (kernel, v5)

553690.patch (text/plain), 11.24 KB, created by Jan Beulich on 2009-12-14 15:36:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beulich

Created: 2009-12-14 15:36:21 UTC

Size: 11.24 KB

patch

obsolete

>--- 11.2-2009-11-12.orig/arch/x86/include/asm/scatterlist.h	2009-09-02 11:51:59.000000000 +0200
>+++ 11.2-2009-11-12/arch/x86/include/asm/scatterlist.h	2009-12-14 15:09:06.000000000 +0100
>@@ -12,6 +12,9 @@ struct scatterlist {
> 	unsigned int	length;
> 	dma_addr_t	dma_address;
> 	unsigned int	dma_length;
>+#ifdef CONFIG_XEN//temp
>+ unsigned int caller;
>+#endif
> };
> 
> #define ARCH_HAS_SG_CHAIN
>--- 11.2-2009-11-12.orig/drivers/xen/balloon/balloon.c	2009-06-26 14:48:31.000000000 +0200
>+++ 11.2-2009-11-12/drivers/xen/balloon/balloon.c	2009-12-14 10:54:19.000000000 +0100
>@@ -616,13 +616,14 @@ static int dealloc_pte_fn(
> 	set_pte_at(&init_mm, addr, pte, __pte_ma(0));
> 	pfn = __pa(addr) >> PAGE_SHIFT;
> 	set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
>-	SetPageReserved(pfn_to_page(pfn));
>+//temp	SetPageReserved(pfn_to_page(pfn));
> 	ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
> 	BUG_ON(ret != 1);
> 	return 0;
> }
> #endif
> 
>+#include <linux/kallsyms.h>//temp
> struct page **alloc_empty_pages_and_pagevec(int nr_pages)
> {
> 	unsigned long flags;
>@@ -630,6 +631,7 @@ struct page **alloc_empty_pages_and_page
> 	struct page *page, **pagevec;
> 	int i, ret;
> 
>+print_symbol("aep&p: %s\n", _RET_IP_);//temp
> 	pagevec = kmalloc(sizeof(page) * nr_pages, GFP_KERNEL);
> 	if (pagevec == NULL)
> 		return NULL;
>@@ -642,6 +644,7 @@ struct page **alloc_empty_pages_and_page
> 		v = page_address(page);
> 		scrub_pages(v, 1);
> 
>+printk("aep&p: %lx(%lx)\n", page_to_pfn(page), page->flags);//temp
> 		balloon_lock(flags);
> 
> 		if (xen_feature(XENFEAT_auto_translated_physmap)) {
>@@ -707,6 +710,9 @@ static void _free_empty_pages_and_pageve
> 	if (pagevec == NULL)
> 		return;
> 
>+print_symbol("fep&p: %s\n", _RET_IP_);//temp
>+for(i = 0; i < nr_pages; ++i)//temp
>+ printk("fep&p: %lx(%lx)\n", page_to_pfn(pagevec[i]), pagevec[i]->flags);//temp
> 	balloon_lock(flags);
> 	for (i = 0; i < nr_pages; i++) {
> 		BUG_ON(page_count(pagevec[i]) != 1);
>@@ -736,6 +742,8 @@ void balloon_release_driver_page(struct 
> {
> 	unsigned long flags;
> 
>+print_symbol("brdp: %s\n", _RET_IP_);//temp
>+printk("brdp: %lx(%lx)\n", page_to_pfn(page), page->flags);//temp
> 	balloon_lock(flags);
> 	balloon_append(page, 1);
> 	bs.driver_pages--;
>--- 11.2-2009-11-12.orig/drivers/xen/core/gnttab.c	2009-07-13 15:19:23.000000000 +0200
>+++ 11.2-2009-11-12/drivers/xen/core/gnttab.c	2009-12-10 09:17:05.000000000 +0100
>@@ -511,6 +511,7 @@ static int gnttab_map(unsigned int start
> static void gnttab_page_free(struct page *page, unsigned int order)
> {
> 	BUG_ON(order);
>+printk("gpf: %lx(%lx)\n", page_to_pfn(page), page->flags);//temp
> 	ClearPageForeign(page);
> 	gnttab_reset_grant_page(page);
> 	put_page(page);
>@@ -577,6 +578,9 @@ int gnttab_copy_grant_page(grant_ref_t r
> 	BUG_ON(unmap.status);
> 
> 	write_sequnlock(&gnttab_dma_lock);
>+printk("gcgp: %lx/%lx(%lx) -> %lx/%lx\n",
>+       (unsigned long)pfn, (unsigned long)mfn, page->flags,
>+       page_to_pfn(new_page), (unsigned long)new_mfn);//temp
> 
> 	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
> 		set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY);
>--- 11.2-2009-11-12.orig/lib/swiotlb-xen.c	2009-10-20 16:44:56.000000000 +0200
>+++ 11.2-2009-11-12/lib/swiotlb-xen.c	2009-12-14 15:56:34.000000000 +0100
>@@ -284,9 +284,16 @@ static inline int range_needs_mapping(ph
> 	return range_straddles_page_boundary(pa, size);
> }
> 
>-static int is_swiotlb_buffer(char *addr)
>+static int is_swiotlb_buffer(dma_addr_t addr)
> {
>-	return addr >= io_tlb_start && addr < io_tlb_end;
>+	unsigned long pfn = mfn_to_local_pfn(PFN_DOWN(addr));
>+	char *va = pfn_valid(pfn) ? __va(pfn << PAGE_SHIFT) : NULL;
>+
>+#ifdef CONFIG_HIGHMEM
>+	if (pfn >= highstart_pfn)
>+		return 0;
>+#endif
>+	return va >= io_tlb_start && va < io_tlb_end;
> }
> 
> /*
>@@ -331,8 +338,9 @@ static void swiotlb_bounce(phys_addr_t p
> 	} else {
> 		if (dir == DMA_TO_DEVICE)
> 			memcpy(dma_addr, phys_to_virt(phys), size);
>-		else
>-			memcpy(phys_to_virt(phys), dma_addr, size);
>+		else if (__copy_to_user_inatomic(phys_to_virt(phys),
>+						 dma_addr, size))
>+			/* inaccessible */;
> 	}
> }
> 
>@@ -431,6 +439,9 @@ found:
> 	 * This is needed when we sync the memory.  Then we sync the buffer if
> 	 * needed.
> 	 */
>+WARN_ON(!phys);//temp
>+mask = (phys + (nslots << IO_TLB_SHIFT) - 1) >> PAGE_SHIFT;//temp
>+WARN(!pfn_valid(mask), "ms: %Lx:%d ?\n", (unsigned long long)phys, nslots);//temp
> 	for (i = 0; i < nslots; i++)
> 		io_tlb_orig_addr[index+i] = phys + (i << IO_TLB_SHIFT);
> 	if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)
>@@ -443,13 +454,25 @@ found:
>  * dma_addr is the kernel virtual address of the bounce buffer to unmap.
>  */
> static void
>-do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
>+//temp do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
>+do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir, unsigned mapper)//temp
> {
> 	unsigned long flags;
> 	int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
> 	int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
> 	phys_addr_t phys = io_tlb_orig_addr[index];
> 
>+flags = (phys + (nslots << IO_TLB_SHIFT) - 1) >> PAGE_SHIFT;//temp
>+WARN(!pfn_valid(flags), "dus: %Lx:%d ?\n", (unsigned long long)phys, nslots);//temp
>+for(i = 1, count = 0; i < nslots; ++i) {//temp
>+ if((phys + (i << IO_TLB_SHIFT)) != io_tlb_orig_addr[index + i]) {
>+  printk("dus[%x+%x]: %Lx %Lx %x (%x)\n", index, i,
>+         (unsigned long long)io_tlb_orig_addr[index + i], (unsigned long long)phys + (i << IO_TLB_SHIFT),
>+         io_tlb_list[index + i], mapper);
>+  ++count;
>+ }
>+}
>+WARN_ON(phys && count);//temp
> 	/*
> 	 * First, sync the memory before unmapping the entry
> 	 */
>@@ -543,7 +566,18 @@ dma_addr_t swiotlb_map_page(struct devic
> 	 */
> 	if (!address_needs_mapping(dev, dev_addr, size) &&
> 	    !range_needs_mapping(phys, size))
>+{//temp
>+ int f = 0;
>+ for(size += offset; size > PAGE_SIZE; size -= PAGE_SIZE) {
>+  ++page;
>+  if(PageForeign(page)) {
>+   printk("smp: %lx(%lx)\n", page_to_pfn(page), page->flags);//temp
>+   ++f;
>+  }
>+ }
>+ WARN_ON(f);
> 		return dev_addr;
>+}
> 
> 	/*
> 	 * Oh well, have to allocate and map a bounce buffer.
>@@ -569,14 +603,16 @@ EXPORT_SYMBOL_GPL(swiotlb_map_page);
>  * whatever the device wrote there.
>  */
> static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,
>-			 size_t size, int dir)
>+//temp			 size_t size, int dir)
>+size_t size, int dir, unsigned mapper)//temp
> {
> 	char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);
> 
> 	BUG_ON(dir == DMA_NONE);
> 
>-	if (is_swiotlb_buffer(dma_addr)) {
>-		do_unmap_single(hwdev, dma_addr, size, dir);
>+	if (is_swiotlb_buffer(dev_addr)) {
>+//temp		do_unmap_single(hwdev, dma_addr, size, dir);
>+do_unmap_single(hwdev, dma_addr, size, dir, mapper);//temp
> 		return;
> 	}
> 
>@@ -587,7 +623,8 @@ void swiotlb_unmap_page(struct device *h
> 			size_t size, enum dma_data_direction dir,
> 			struct dma_attrs *attrs)
> {
>-	unmap_single(hwdev, dev_addr, size, dir);
>+//temp	unmap_single(hwdev, dev_addr, size, dir);
>+unmap_single(hwdev, dev_addr, size, dir, 0);//temp
> }
> EXPORT_SYMBOL_GPL(swiotlb_unmap_page);
> 
>@@ -609,7 +646,7 @@ swiotlb_sync_single_for_cpu(struct devic
> 
> 	BUG_ON(dir == DMA_NONE);
> 
>-	if (is_swiotlb_buffer(dma_addr))
>+	if (is_swiotlb_buffer(dev_addr))
> 		sync_single(hwdev, dma_addr, size, dir);
> }
> EXPORT_SYMBOL(swiotlb_sync_single_for_cpu);
>@@ -622,7 +659,7 @@ swiotlb_sync_single_for_device(struct de
> 
> 	BUG_ON(dir == DMA_NONE);
> 
>-	if (is_swiotlb_buffer(dma_addr))
>+	if (is_swiotlb_buffer(dev_addr))
> 		sync_single(hwdev, dma_addr, size, dir);
> }
> EXPORT_SYMBOL(swiotlb_sync_single_for_device);
>@@ -676,6 +713,18 @@ swiotlb_map_sg_attrs(struct device *hwde
> 		phys_addr_t paddr = page_to_pseudophys(sg_page(sg))
> 				   + sg->offset;
> 
>+if(dir != DMA_TO_DEVICE && sg->offset + sg->length > PAGE_SIZE) {//temp
>+ u8*p = page_address(sg_page(sg));
>+ long offs = sg->offset + sg->length - 1;
>+ WARN((sg->offset | sg->length) & 0x1ff,
>+      "sg%d@%p[%d/%d] v=%p+%x:%x\n", dir, sgl, i, nelems, p, sg->offset, sg->length);
>+#ifndef CONFIG_HIGHMEM
>+ do {
>+  __asm__ __volatile__("lock orb $0, %0" : : "m" (p[offs]));
>+  offs -= PAGE_SIZE;
>+ } while(offs >= (long)sg->offset);
>+#endif
>+}
> 		if (range_needs_mapping(paddr, sg->length)
> 		    || address_needs_mapping(hwdev, dev_addr, sg->length)) {
> 			void *map;
>@@ -694,8 +743,22 @@ swiotlb_map_sg_attrs(struct device *hwde
> 			}
> 			sg->dma_address = swiotlb_virt_to_bus(hwdev, map);
> 		} else
>+{//temp
>+ int f = 0;
>+ size_t size = sg->offset + sg->length;
>+ struct page *page = sg_page(sg);
>+ for(; size > PAGE_SIZE; size -= PAGE_SIZE) {
>+  ++page;
>+  if(PageForeign(page)) {
>+   printk("smsa: %lx(%lx)\n", page_to_pfn(page), page->flags);//temp
>+   ++f;
>+  }
>+ }
>+ WARN_ON(f);
> 			sg->dma_address = dev_addr;
>+}
> 		sg->dma_length = sg->length;
>+sg->caller = _RET_IP_;//temp
> 	}
> 	return nelems;
> }
>@@ -723,7 +786,14 @@ swiotlb_unmap_sg_attrs(struct device *hw
> 	BUG_ON(dir == DMA_NONE);
> 
> 	for_each_sg(sgl, sg, nelems, i)
>-		unmap_single(hwdev, sg->dma_address, sg->dma_length, dir);
>+{//temp
>+ unsigned mapper = sg->caller;
>+ sg->caller = _RET_IP_;//temp
>+ WARN(sg->dma_length != sg->length, "susa: %lx %Lx %x %x %x (%x)\n",
>+      page_to_pfn(sg_page(sg)), sg->dma_address, sg->dma_length, sg->length, sg->offset, mapper);//temp
>+//temp		unmap_single(hwdev, sg->dma_address, sg->dma_length, dir);
>+ unmap_single(hwdev, sg->dma_address, sg->dma_length, dir, mapper);//temp
>+}
> 
> }
> EXPORT_SYMBOL(swiotlb_unmap_sg_attrs);
>--- 11.2-2009-11-12.orig/mm/page_alloc.c	2009-10-20 16:33:40.000000000 +0200
>+++ 11.2-2009-11-12/mm/page_alloc.c	2009-12-10 10:17:14.000000000 +0100
>@@ -256,6 +256,12 @@ static void bad_page(struct page *page)
> 
> 	printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",
> 		current->comm, page_to_pfn(page));
>+#ifdef CONFIG_XEN//temp
>+{
>+ unsigned long mfn = pfn_to_mfn(page_to_pfn(page));
>+ printk(KERN_ALERT "mfn:%lx pfn:%lx/%lx\n", mfn, mfn_to_pfn(mfn), mfn_to_local_pfn(mfn));
>+}
>+#endif
> 	printk(KERN_ALERT
> 		"page:%p flags:%p count:%d mapcount:%d mapping:%p index:%lx\n",
> 		page, (void *)page->flags, page_count(page),
>@@ -311,6 +317,17 @@ static int destroy_compound_page(struct 
> 	int bad = 0;
> 
> 	if (unlikely(compound_order(page) != order) ||
>+#ifdef CONFIG_XEN//temp
>+({//temp
>+ int f = 0, x = 0;
>+ unsigned long pfn = page_to_pfn(page);
>+ for(i = 0; i < nr_pages; ++i, ++pfn) {
>+  f += WARN(PageForeign(page + i), "dcp: %lx(%lx)\n", pfn, page[i].flags);
>+  x += (pfn != mfn_to_pfn(pfn_to_mfn(pfn)) || pfn != mfn_to_local_pfn(pfn_to_mfn(pfn)));
>+ }
>+ f | x;
>+}) ||
>+#endif
> 	    unlikely(!PageHead(page))) {
> 		bad_page(page);
> 		bad++;
>@@ -500,6 +517,13 @@ static inline int free_pages_check(struc
> 	if (unlikely(page_mapcount(page) |
> 		(page->mapping != NULL)  |
> 		(atomic_read(&page->_count) != 0) |
>+#ifdef CONFIG_XEN//temp
>+({
>+  unsigned long pfn = page_to_pfn(page);
>+  unsigned long mfn = pfn_to_mfn(pfn);
>+  (pfn ^ mfn_to_pfn(mfn)) | (pfn ^ mfn_to_local_pfn(mfn));
>+}) |
>+#endif
> 		(page->flags & PAGE_FLAGS_CHECK_AT_FREE))) {
> 		bad_page(page);
> 		return 1;
>@@ -659,6 +683,13 @@ static int prep_new_page(struct page *pa
> 	if (unlikely(page_mapcount(page) |
> 		(page->mapping != NULL)  |
> 		(atomic_read(&page->_count) != 0)  |
>+#ifdef CONFIG_XEN//temp
>+({
>+  unsigned long pfn = page_to_pfn(page);
>+  unsigned long mfn = pfn_to_mfn(pfn);
>+  (pfn ^ mfn_to_pfn(mfn)) | (pfn ^ mfn_to_local_pfn(mfn));
>+}) |
>+#endif
> 		(page->flags & PAGE_FLAGS_CHECK_AT_PREP))) {
> 		bad_page(page);
> 		return 1;

Actions: View | Diff

Attachments on bug 559047: 329906 | 329913 | 329916 | 330154 | 331234 | 331975 | 332116 | 332174 | 332189 | 332248 | 332341 | 332342 | 332343 | 332450