kvm/x86/mmu: Pass gfn and level to rmapp callback.

Callbacks don't have to do extra computation to learn what the caller
(lvm_handle_hva_range()) knows very well. Useful for
debugging/tracing/printk/future.

Signed-off-by: Andres Lagar-Cavilla <andreslc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index ab679c395042..6edf1f2028cd 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -225,24 +225,26 @@ TRACE_EVENT(kvm_fpu,
 );
 
 TRACE_EVENT(kvm_age_page,
-        TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref),
-        TP_ARGS(hva, slot, ref),
+        TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref),
+        TP_ARGS(gfn, level, slot, ref),
 
         TP_STRUCT__entry(
                 __field(        u64,    hva             )
                 __field(        u64,    gfn             )
+                __field(        u8,     level           )
                 __field(        u8,     referenced      )
         ),
 
         TP_fast_assign(
-                __entry->hva            = hva;
-                __entry->gfn            =
-                  slot->base_gfn + ((hva - slot->userspace_addr) >> PAGE_SHIFT);
+                __entry->gfn            = gfn;
+                __entry->level          = level;
+                __entry->hva            = ((gfn - slot->base_gfn) <<
+                                            PAGE_SHIFT) + slot->userspace_addr;
                 __entry->referenced     = ref;
         ),
 
-        TP_printk("hva %llx gfn %llx %s",
-                  __entry->hva, __entry->gfn,
+        TP_printk("hva %llx gfn %llx level %u %s",
+                  __entry->hva, __entry->gfn, __entry->level,
                   __entry->referenced ? "YOUNG" : "OLD")
 );