diff -r cba56c13ca3e xen/arch/x86/hvm/svm/svm.c --- a/xen/arch/x86/hvm/svm/svm.c Wed Jan 06 12:45:23 2010 +0000 +++ b/xen/arch/x86/hvm/svm/svm.c Thu Jan 07 17:42:08 2010 +0000 @@ -886,6 +886,22 @@ mfn_t mfn; p2m_type_t p2mt; + if ( tb_init_done ) + { + struct { + uint64_t gpa; + uint64_t mfn; + u32 qualification; + u32 p2mt; + } _d; + + _d.gpa = gpa; + _d.qualification = 0; + _d.mfn = mfn_x(gfn_to_mfn_query(current->domain, gfn, &_d.p2mt)); + + __trace_var(TRC_HVM_NPF, 0, sizeof(_d), (unsigned char *)&_d); + } + if ( hvm_hap_nested_page_fault(gfn) ) return; diff -r cba56c13ca3e xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Wed Jan 06 12:45:23 2010 +0000 +++ b/xen/arch/x86/hvm/vmx/vmx.c Thu Jan 07 17:42:08 2010 +0000 @@ -2099,6 +2099,22 @@ mfn_t mfn; p2m_type_t p2mt; + if ( tb_init_done ) + { + struct { + uint64_t gpa; + uint64_t mfn; + u32 qualification; + u32 p2mt; + } _d; + + _d.gpa = gpa; + _d.qualification = qualification; + _d.mfn = mfn_x(gfn_to_mfn_query(current->domain, gfn, &_d.p2mt)); + + __trace_var(TRC_HVM_NPF, 0, sizeof(_d), (unsigned char *)&_d); + } + if ( (qualification & EPT_GLA_VALID) && hvm_hap_nested_page_fault(gfn) ) return; diff -r cba56c13ca3e xen/arch/x86/mm/p2m.c --- a/xen/arch/x86/mm/p2m.c Wed Jan 06 12:45:23 2010 +0000 +++ b/xen/arch/x86/mm/p2m.c Thu Jan 07 17:42:08 2010 +0000 @@ -829,6 +829,21 @@ goto out_reset; } + if ( tb_init_done ) + { + struct { + u64 gfn, mfn; + int d:16,order:16; + } t; + + t.gfn = gfn; + t.mfn = mfn_x(mfn); + t.d = d->domain_id; + t.order = 9; + + __trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), (unsigned char *)&t); + } + /* Finally! We've passed all the checks, and can add the mfn superpage * back on the PoD cache, and account for the new p2m PoD entries */ p2m_pod_cache_add(d, mfn_to_page(mfn0), 9); @@ -928,6 +943,21 @@ } else { + if ( tb_init_done ) + { + struct { + u64 gfn, mfn; + int d:16,order:16; + } t; + + t.gfn = gfns[i]; + t.mfn = mfn_x(mfns[i]); + t.d = d->domain_id; + t.order = 0; + + __trace_var(TRC_MEM_POD_ZERO_RECLAIM, 0, sizeof(t), (unsigned char *)&t); + } + /* Add to cache, and account for the new p2m PoD entry */ p2m_pod_cache_add(d, mfn_to_page(mfns[i]), 0); d->arch.p2m->pod.entry_count++; @@ -1073,6 +1103,21 @@ p2md->pod.entry_count -= (1 << order); /* Lock: p2m */ BUG_ON(p2md->pod.entry_count < 0); + if ( tb_init_done ) + { + struct { + u64 gfn, mfn; + int d:16,order:16; + } t; + + t.gfn = gfn; + t.mfn = mfn_x(mfn); + t.d = d->domain_id; + t.order = order; + + __trace_var(TRC_MEM_POD_POPULATE, 0, sizeof(t), (unsigned char *)&t); + } + return 0; out_of_memory: spin_unlock(&d->page_alloc_lock); @@ -1091,6 +1136,18 @@ for(i=0; i<(1<domain_id; + + __trace_var(TRC_MEM_POD_SUPERPAGE_SPLINTER, 0, sizeof(t), (unsigned char *)&t); + } return 0; } @@ -1141,6 +1198,23 @@ l2_pgentry_t l2e_content; int rv=0; + if ( tb_init_done ) + { + struct { + u64 gfn, mfn; + int p2mt; + int d:16,order:16; + } t; + + t.gfn = gfn; + t.mfn = mfn_x(mfn); + t.p2mt = p2mt; + t.d = d->domain_id; + t.order = page_order; + + __trace_var(TRC_MEM_SET_P2M_ENTRY, 0, sizeof(t), (unsigned char *)&t); + } + #if CONFIG_PAGING_LEVELS >= 4 if ( !p2m_next_level(d, &table_mfn, &table, &gfn_remainder, gfn, L4_PAGETABLE_SHIFT - PAGE_SHIFT, @@ -1225,7 +1299,7 @@ /* Success */ rv = 1; - out: +out: unmap_domain_page(table); return rv; } diff -r cba56c13ca3e xen/common/memory.c --- a/xen/common/memory.c Wed Jan 06 12:45:23 2010 +0000 +++ b/xen/common/memory.c Thu Jan 07 17:42:08 2010 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include struct memop_args { /* INPUT */ @@ -222,6 +223,20 @@ if ( unlikely(__copy_from_guest_offset(&gmfn, a->extent_list, i, 1)) ) goto out; + if ( tb_init_done ) + { + struct { + u64 gfn; + int d:16,order:16; + } t; + + t.gfn = gmfn; + t.d = a->domain->domain_id; + t.order = a->extent_order; + + __trace_var(TRC_MEM_DECREASE_RESERVATION, 0, sizeof(t), (unsigned char *)&t); + } + /* See if populate-on-demand wants to handle this */ if ( is_hvm_domain(a->domain) && p2m_pod_decrease_reservation(a->domain, gmfn, a->extent_order) ) diff -r cba56c13ca3e xen/include/public/trace.h --- a/xen/include/public/trace.h Wed Jan 06 12:45:23 2010 +0000 +++ b/xen/include/public/trace.h Thu Jan 07 17:42:08 2010 +0000 @@ -82,6 +82,12 @@ #define TRC_MEM_PAGE_GRANT_MAP (TRC_MEM + 1) #define TRC_MEM_PAGE_GRANT_UNMAP (TRC_MEM + 2) #define TRC_MEM_PAGE_GRANT_TRANSFER (TRC_MEM + 3) +#define TRC_MEM_SET_P2M_ENTRY (TRC_MEM + 4) +#define TRC_MEM_DECREASE_RESERVATION (TRC_MEM + 5) +#define TRC_MEM_POD_POPULATE (TRC_MEM + 16) +#define TRC_MEM_POD_ZERO_RECLAIM (TRC_MEM + 17) +#define TRC_MEM_POD_SUPERPAGE_SPLINTER (TRC_MEM + 18) + #define TRC_PV_HYPERCALL (TRC_PV + 1) #define TRC_PV_TRAP (TRC_PV + 3) @@ -149,6 +155,8 @@ #define TRC_HVM_LMSW (TRC_HVM_HANDLER + 0x19) #define TRC_HVM_LMSW64 (TRC_HVM_HANDLER + TRC_64_FLAG + 0x19) #define TRC_HVM_INTR_WINDOW (TRC_HVM_HANDLER + 0x20) +#define TRC_HVM_NPF (TRC_HVM_HANDLER + 0x21) + #define TRC_HVM_IOPORT_WRITE (TRC_HVM_HANDLER + 0x216) #define TRC_HVM_IOMEM_WRITE (TRC_HVM_HANDLER + 0x217)