From: sos22@douglas.cl.cam.ac.uk Date: Fri, 27 Jan 2006 20:57:07 +0000 (+0100) Subject: Turn down debug a bit, and generally tidy hings up a little. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16521 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f674d6427fed3d070d01120a3ab65caaef4aa5c7;p=xen.git Turn down debug a bit, and generally tidy hings up a little. Signed-off-by: Steven Smith, sos22@cam.ac.uk --- diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c index 7248d447e9..df8c72221f 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c @@ -1605,7 +1605,6 @@ void __init setup_arch(char **cmdline_p) copy_edd(); - /* Make the PFNs in the Xen hole reserved. */ if (!MOUNT_ROOT_RDONLY) root_mountflags &= ~MS_RDONLY; init_mm.start_code = (unsigned long) _text; @@ -1768,8 +1767,6 @@ void __init setup_arch(char **cmdline_p) console_use_vt = 0; #endif } - - } static int diff --git a/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c b/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c index 79ba906e7c..7989992b1e 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c @@ -597,6 +597,7 @@ void __init mem_init(void) int tmp; int bad_ppro; unsigned long pfn; + unsigned long hole_start, hole_size; contiguous_bitmap = alloc_bootmem_low_pages( (max_low_pfn + 2*BITS_PER_LONG) >> 3); @@ -645,15 +646,10 @@ void __init mem_init(void) } /* Make the Xen hole reserved. */ - unsigned long hole_start, hole_size; hole_size = xen_pfn_hole_size(); hole_start = xen_pfn_hole_start(); - for (pfn = hole_start; pfn < hole_start + hole_size; pfn++) { - printk("<0>Reserve %lx for hole.\n", - pfn); + for (pfn = hole_start; pfn < hole_start + hole_size; pfn++) SetPageReserved(pfn_to_page(pfn)); - BUG_ON(!PageReserved(pfn_to_page(pfn))); - } reservedpages = 0; for (tmp = 0; tmp < max_low_pfn; tmp++) diff --git a/linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c b/linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c index 5de23b700c..b4fa05eef8 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c @@ -317,7 +317,6 @@ pgd_t *pgd_alloc(struct mm_struct *mm) pgd_test_and_unpin(pgd); - memset(pgd, 0, 10); if (PTRS_PER_PMD == 1 || !pgd) return pgd; diff --git a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c index 4741892722..7702db0d4d 100644 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c @@ -113,8 +113,6 @@ static int page_is_xen_hole(unsigned long pfn) if (hole_len == -1) { hole_start = xen_pfn_hole_start(); hole_len = xen_pfn_hole_size(); - printk("<0>Xen hole at [%lx,%lx).\n", hole_start, - hole_start + hole_len); } return pfn >= hole_start && pfn < hole_start + hole_len; } @@ -122,12 +120,9 @@ static int page_is_xen_hole(unsigned long pfn) /* balloon_append: add the given page to the balloon. */ static void balloon_append(struct page *page) { - BUG_ON(PageReserved(page)); - if (page_is_xen_hole(page_to_pfn(page))) { - printk("<0>Attempt to add reserved pfn %lx to balloon.\n", + if (page_is_xen_hole(page_to_pfn(page))) + panic("Attempt to add Xen-reserved pfn %lx to balloon.\n", page_to_pfn(page)); - BUG(); - } /* Lowmem is re-populated first, so highmem pages go at list tail. */ if (PageHighMem(page)) { list_add_tail(PAGE_TO_LIST(page), &ballooned_pages); @@ -243,25 +238,14 @@ static int increase_reservation(unsigned long nr_pages) xen_machphys_update(frame_list[i], pfn); #endif - printk("<0>Balloon allocated %lx.\n", pfn); /* Link back into the page tables if not highmem. */ if (pfn < max_low_pfn) { int ret; - pgd_t *pgd = pgd_offset_k((unsigned long)__va(pfn << PAGE_SHIFT)); - printk("pgd is %lx.\n", *(unsigned long *)pgd); - (void)copy_from_user(&ret, - (unsigned long *)__va(pfn << PAGE_SHIFT), - 4); ret = HYPERVISOR_update_va_mapping( (unsigned long)__va(pfn << PAGE_SHIFT), pfn_pte_ma(frame_list[i], PAGE_KERNEL), 0); BUG_ON(ret); - printk("<0>Rehooked va; pte now %lx.\n", - *(unsigned long *)virt_to_ptep(__va(pfn << PAGE_SHIFT))); - *(unsigned long *)__va(pfn << PAGE_SHIFT) = - 0xf001; - printk("<0>Touched va.\n"); } /* Relinquish the page back to the allocator. */ diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index 333dd3ad3f..5847509073 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -614,7 +614,7 @@ static void network_alloc_rx_buffers(struct net_device *dev) reservation.domid = DOMID_SELF; /* Tell the ballon driver what is going on. */ -//SOS22 balloon_update_driver_allowance(i); + balloon_update_driver_allowance(i); /* Zap PTEs and give away pages in one big multicall. */ (void)HYPERVISOR_multicall(rx_mcl, i+1); @@ -818,7 +818,7 @@ static int netif_poll(struct net_device *dev, int *pbudget) } /* Some pages are no longer absent... */ -//SOS22 balloon_update_driver_allowance(-work_done); + balloon_update_driver_allowance(-work_done); /* Do all the remapping work, and M2P updates, in one big hypercall. */ if (likely((mcl - rx_mcl) != 0)) { diff --git a/linux-2.6-xen-sparse/mm/memory.c b/linux-2.6-xen-sparse/mm/memory.c index 862ea5c6a9..e3e1451ea0 100644 --- a/linux-2.6-xen-sparse/mm/memory.c +++ b/linux-2.6-xen-sparse/mm/memory.c @@ -291,7 +291,6 @@ pte_t fastcall *pte_alloc_map(struct mm_struct *mm, pmd_t *pmd, spin_lock(&mm->page_table_lock); if (!new) return NULL; - /* * Because we dropped the lock, we should re-check the * entry, as somebody else could have populated it.. diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index 30e7abd5ac..9ad93e27bd 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -33,8 +33,6 @@ #define L4_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_USER) #endif -#define NR_GRANT_FRAMES 4 - #ifdef __ia64__ #define get_tot_pages xc_get_max_pages #else diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e9e49192dd..ad89d5fdec 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1041,7 +1041,7 @@ static inline int update_l1e(l1_pgentry_t *pl1e, if ( unlikely(cmpxchg_user(pl1e, o, n) != 0) || unlikely(o != l1e_get_intpte(ol1e)) ) { - printf("Failed to update %" PRIpte " -> %" PRIpte + MEM_LOG("Failed to update %" PRIpte " -> %" PRIpte ": saw %" PRIpte, l1e_get_intpte(ol1e), l1e_get_intpte(nl1e), @@ -1058,16 +1058,11 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e) l1_pgentry_t ol1e; struct domain *d = current->domain; - shadow_sync_all(d); - if ( unlikely(__copy_from_user(&ol1e, pl1e, sizeof(ol1e)) != 0) ) { - printf("copy_from_user1 failed %p, l2 %lx.\n", pl1e, - *(unsigned long *)&__linear_l2_table[l2_table_offset((unsigned long)pl1e)]); + if ( unlikely(__copy_from_user(&ol1e, pl1e, sizeof(ol1e)) != 0) ) return 0; - } - if ( unlikely(shadow_mode_refcounts(d)) ) { + if ( unlikely(shadow_mode_refcounts(d)) ) return update_l1e(pl1e, ol1e, nl1e); - } if ( l1e_get_flags(nl1e) & _PAGE_PRESENT ) { @@ -2545,10 +2540,8 @@ int do_update_va_mapping(unsigned long va, u64 val64, perfc_incrc(calls_to_update_va); - if ( unlikely(!__addr_ok(va) && !shadow_mode_external(d)) ) { - printf("Bad update_va_mapping.\n"); + if ( unlikely(!__addr_ok(va) && !shadow_mode_external(d)) ) return -EINVAL; - } LOCK_BIGLOCK(d); @@ -2557,13 +2550,9 @@ int do_update_va_mapping(unsigned long va, u64 val64, if ( unlikely(shadow_mode_enabled(d)) ) check_pagetable(v, "pre-va"); /* debug */ - shadow_sync_all(d); - if ( unlikely(!mod_l1_entry(&linear_pg_table[l1_linear_offset(va)], - val)) ) { - printf("mod_l1_entry failed.\n"); + val)) ) rc = -EINVAL; - } if ( likely(rc == 0) && unlikely(shadow_mode_enabled(d)) ) { @@ -2580,8 +2569,7 @@ int do_update_va_mapping(unsigned long va, u64 val64, } rc = shadow_do_update_va_mapping(va, val, v); - if (rc) - printf("shadow_do_update_va_mapping says %d.\n", rc); + check_pagetable(v, "post-va"); /* debug */ } diff --git a/xen/arch/x86/shadow32.c b/xen/arch/x86/shadow32.c index 352e93b270..547cd83b26 100644 --- a/xen/arch/x86/shadow32.c +++ b/xen/arch/x86/shadow32.c @@ -2502,8 +2502,6 @@ static int resync_all(struct domain *d, u32 stype) l2_pgentry_t *snapshot2 = snapshot; l1_pgentry_t *shadow2 = shadow; - printf("Update hl2 shadow.\n"); - ASSERT(shadow_mode_write_all(d) || shadow_mode_wr_pt_pte(d)); BUG_ON(!shadow_mode_refcounts(d)); // not yet implemented diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 6bdbca6269..30ac6a5f0c 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -522,9 +522,7 @@ gnttab_setup_table( ASSERT(d->grant_table != NULL); (void)put_user(GNTST_okay, &uop->status); for ( i = 0; i < op.nr_frames; i++ ) { - mfn = gnttab_shared_mfn(d, d->grant_table, i); - if (shadow_mode_translate(d)) - mfn = __mfn_to_gpfn(d, mfn); + mfn = __mfn_to_gpfn(d, gnttab_shared_mfn(d, d->grant_table, i)); (void)put_user(mfn, &op.frame_list[i]); } } diff --git a/xen/common/memory.c b/xen/common/memory.c index bb5f49374c..b4ab57593f 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -115,8 +115,6 @@ populate_physmap( goto out; for ( j = 0; j < (1 << extent_order); j++ ) { - printf("Populating %lx with %lx.\n", - pfn + j, mfn + j); if (shadow_mode_translate(d)) set_p2m_entry(d, pfn + j, mfn + j, &cache1, &cache2); set_pfn_from_mfn(mfn + j, pfn + j); diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index bdb6d8e57e..6d36d11117 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -326,7 +326,7 @@ struct out_of_sync_entry { #define SHADOW_SNAPSHOT_ELSEWHERE (-1L) /************************************************************************/ -#define SHADOW_DEBUG 1 +#define SHADOW_DEBUG 0 #define SHADOW_VERBOSE_DEBUG 0 #define SHADOW_VVERBOSE_DEBUG 0 #define SHADOW_VVVERBOSE_DEBUG 0 diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h index 6e99efcd10..4a70a77e49 100644 --- a/xen/include/public/dom0_ops.h +++ b/xen/include/public/dom0_ops.h @@ -430,7 +430,7 @@ typedef struct { domid_t domain; /* domain to be affected */ unsigned long mfn; /* machine frame to be initialised */ } dom0_hypercall_init_t; - + typedef struct { uint32_t cmd; uint32_t interface_version; /* DOM0_INTERFACE_VERSION */