lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: MMU: Add tracepoint for guest page aging

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity
2009-12-31 12:10:16 +02:00
committed by Marcelo Tosatti
parent 43db669730
commit 90bb6fc556
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kvm/mmu.c
View File

@@ -151,6 +151,9 @@ module_param(oos_shadow, bool, 0644);
#define ACC_USER_MASK PT_USER_MASK #define ACC_USER_MASK PT_USER_MASK
#define ACC_ALL (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK) #define ACC_ALL (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
#include <trace/events/kvm.h>
#undef TRACE_INCLUDE_FILE
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include "mmutrace.h" #include "mmutrace.h"
@@ -792,6 +795,7 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,
unsigned long data)) unsigned long data))
{ {
int i, j; int i, j;
int ret;
int retval = 0; int retval = 0;
struct kvm_memslots *slots; struct kvm_memslots *slots;
@@ -806,16 +810,17 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,
if (hva >= start && hva < end) { if (hva >= start && hva < end) {
gfn_t gfn_offset = (hva - start) >> PAGE_SHIFT; gfn_t gfn_offset = (hva - start) >> PAGE_SHIFT;
retval |= handler(kvm, &memslot->rmap[gfn_offset], ret = handler(kvm, &memslot->rmap[gfn_offset], data);
data);
for (j = 0; j < KVM_NR_PAGE_SIZES - 1; ++j) { for (j = 0; j < KVM_NR_PAGE_SIZES - 1; ++j) {
int idx = gfn_offset; int idx = gfn_offset;
idx /= KVM_PAGES_PER_HPAGE(PT_DIRECTORY_LEVEL + j); idx /= KVM_PAGES_PER_HPAGE(PT_DIRECTORY_LEVEL + j);
retval |= handler(kvm, ret |= handler(kvm,
&memslot->lpage_info[j][idx].rmap_pde, &memslot->lpage_info[j][idx].rmap_pde,
data); data);
} }
trace_kvm_age_page(hva, memslot, ret);
retval |= ret;
} }
} }

22
include/trace/events/kvm.h
View File

@@ -164,6 +164,28 @@ TRACE_EVENT(kvm_fpu,
TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol)) TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol))
); );
TRACE_EVENT(kvm_age_page,
TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref),
TP_ARGS(hva, slot, ref),
TP_STRUCT__entry(
__field( u64, hva )
__field( u64, gfn )
__field( u8, referenced )
),
TP_fast_assign(
__entry->hva = hva;
__entry->gfn =
slot->base_gfn + ((hva - slot->userspace_addr) >> PAGE_SHIFT);
__entry->referenced = ref;
),
TP_printk("hva %llx gfn %llx %s",
__entry->hva, __entry->gfn,
__entry->referenced ? "YOUNG" : "OLD")
);
#endif /* _TRACE_KVM_MAIN_H */ #endif /* _TRACE_KVM_MAIN_H */
/* This part must be outside protection */ /* This part must be outside protection */