Skip to content
Snippets Groups Projects
Commit 376426b1 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Fix address truncation in traces


Owing to their ARMv7 origins, the trace events are truncating most
address values to 32bits. That's not really helpful.

Expand the printing of such values to their full glory.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 3fb884ff
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ TRACE_EVENT(kvm_entry, ...@@ -23,7 +23,7 @@ TRACE_EVENT(kvm_entry,
__entry->vcpu_pc = vcpu_pc; __entry->vcpu_pc = vcpu_pc;
), ),
TP_printk("PC: 0x%08lx", __entry->vcpu_pc) TP_printk("PC: 0x%016lx", __entry->vcpu_pc)
); );
TRACE_EVENT(kvm_exit, TRACE_EVENT(kvm_exit,
...@@ -42,7 +42,7 @@ TRACE_EVENT(kvm_exit, ...@@ -42,7 +42,7 @@ TRACE_EVENT(kvm_exit,
__entry->vcpu_pc = vcpu_pc; __entry->vcpu_pc = vcpu_pc;
), ),
TP_printk("%s: HSR_EC: 0x%04x (%s), PC: 0x%08lx", TP_printk("%s: HSR_EC: 0x%04x (%s), PC: 0x%016lx",
__print_symbolic(__entry->ret, kvm_arm_exception_type), __print_symbolic(__entry->ret, kvm_arm_exception_type),
__entry->esr_ec, __entry->esr_ec,
__print_symbolic(__entry->esr_ec, kvm_arm_exception_class), __print_symbolic(__entry->esr_ec, kvm_arm_exception_class),
...@@ -69,7 +69,7 @@ TRACE_EVENT(kvm_guest_fault, ...@@ -69,7 +69,7 @@ TRACE_EVENT(kvm_guest_fault,
__entry->ipa = ipa; __entry->ipa = ipa;
), ),
TP_printk("ipa %#llx, hsr %#08lx, hxfar %#08lx, pc %#08lx", TP_printk("ipa %#llx, hsr %#08lx, hxfar %#08lx, pc %#016lx",
__entry->ipa, __entry->hsr, __entry->ipa, __entry->hsr,
__entry->hxfar, __entry->vcpu_pc) __entry->hxfar, __entry->vcpu_pc)
); );
...@@ -131,7 +131,7 @@ TRACE_EVENT(kvm_mmio_emulate, ...@@ -131,7 +131,7 @@ TRACE_EVENT(kvm_mmio_emulate,
__entry->cpsr = cpsr; __entry->cpsr = cpsr;
), ),
TP_printk("Emulate MMIO at: 0x%08lx (instr: %08lx, cpsr: %08lx)", TP_printk("Emulate MMIO at: 0x%016lx (instr: %08lx, cpsr: %08lx)",
__entry->vcpu_pc, __entry->instr, __entry->cpsr) __entry->vcpu_pc, __entry->instr, __entry->cpsr)
); );
...@@ -149,7 +149,7 @@ TRACE_EVENT(kvm_unmap_hva_range, ...@@ -149,7 +149,7 @@ TRACE_EVENT(kvm_unmap_hva_range,
__entry->end = end; __entry->end = end;
), ),
TP_printk("mmu notifier unmap range: %#08lx -- %#08lx", TP_printk("mmu notifier unmap range: %#016lx -- %#016lx",
__entry->start, __entry->end) __entry->start, __entry->end)
); );
...@@ -165,7 +165,7 @@ TRACE_EVENT(kvm_set_spte_hva, ...@@ -165,7 +165,7 @@ TRACE_EVENT(kvm_set_spte_hva,
__entry->hva = hva; __entry->hva = hva;
), ),
TP_printk("mmu notifier set pte hva: %#08lx", __entry->hva) TP_printk("mmu notifier set pte hva: %#016lx", __entry->hva)
); );
TRACE_EVENT(kvm_age_hva, TRACE_EVENT(kvm_age_hva,
...@@ -182,7 +182,7 @@ TRACE_EVENT(kvm_age_hva, ...@@ -182,7 +182,7 @@ TRACE_EVENT(kvm_age_hva,
__entry->end = end; __entry->end = end;
), ),
TP_printk("mmu notifier age hva: %#08lx -- %#08lx", TP_printk("mmu notifier age hva: %#016lx -- %#016lx",
__entry->start, __entry->end) __entry->start, __entry->end)
); );
...@@ -198,7 +198,7 @@ TRACE_EVENT(kvm_test_age_hva, ...@@ -198,7 +198,7 @@ TRACE_EVENT(kvm_test_age_hva,
__entry->hva = hva; __entry->hva = hva;
), ),
TP_printk("mmu notifier test age hva: %#08lx", __entry->hva) TP_printk("mmu notifier test age hva: %#016lx", __entry->hva)
); );
TRACE_EVENT(kvm_set_way_flush, TRACE_EVENT(kvm_set_way_flush,
......
...@@ -22,7 +22,7 @@ TRACE_EVENT(kvm_wfx_arm64, ...@@ -22,7 +22,7 @@ TRACE_EVENT(kvm_wfx_arm64,
__entry->is_wfe = is_wfe; __entry->is_wfe = is_wfe;
), ),
TP_printk("guest executed wf%c at: 0x%08lx", TP_printk("guest executed wf%c at: 0x%016lx",
__entry->is_wfe ? 'e' : 'i', __entry->vcpu_pc) __entry->is_wfe ? 'e' : 'i', __entry->vcpu_pc)
); );
...@@ -42,7 +42,7 @@ TRACE_EVENT(kvm_hvc_arm64, ...@@ -42,7 +42,7 @@ TRACE_EVENT(kvm_hvc_arm64,
__entry->imm = imm; __entry->imm = imm;
), ),
TP_printk("HVC at 0x%08lx (r0: 0x%08lx, imm: 0x%lx)", TP_printk("HVC at 0x%016lx (r0: 0x%016lx, imm: 0x%lx)",
__entry->vcpu_pc, __entry->r0, __entry->imm) __entry->vcpu_pc, __entry->r0, __entry->imm)
); );
...@@ -135,7 +135,7 @@ TRACE_EVENT(trap_reg, ...@@ -135,7 +135,7 @@ TRACE_EVENT(trap_reg,
__entry->write_value = write_value; __entry->write_value = write_value;
), ),
TP_printk("%s %s reg %d (0x%08llx)", __entry->fn, __entry->is_write?"write to":"read from", __entry->reg, __entry->write_value) TP_printk("%s %s reg %d (0x%016llx)", __entry->fn, __entry->is_write?"write to":"read from", __entry->reg, __entry->write_value)
); );
TRACE_EVENT(kvm_handle_sys_reg, TRACE_EVENT(kvm_handle_sys_reg,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment