Skip to contentSkip to conversation

target/ppc: Improve KVM hypercall trace

PATCH Applied Fabiano Rosas 3 participants 4 messages Mar 25, 2022 – Apr 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/ppc: Improve KVM hypercall trace

Before:

kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall

After:

kvm_handle_papr_hcall 0x3a8
kvm_handle_papr_hcall 0x3ac
kvm_handle_papr_hcall 0x108
kvm_handle_papr_hcall 0x104
kvm_handle_papr_hcall 0x104
kvm_handle_papr_hcall 0x108

---
 target/ppc/kvm.c        | 2 +-
 target/ppc/trace-events | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
target/ppc/kvm.c +1 -1
index dc93b99189..a490e886ea 100644
@@ -1681,7 +1681,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
         break;
 #if defined(TARGET_PPC64)
     case KVM_EXIT_PAPR_HCALL:
-        trace_kvm_handle_papr_hcall();
+        trace_kvm_handle_papr_hcall(run->papr_hcall.nr);
         run->papr_hcall.ret = spapr_hypercall(cpu,
                                               run->papr_hcall.nr,
                                               run->papr_hcall.args);
target/ppc/trace-events +1 -1
index 53b107f56e..a79f1b4370 100644
@@ -23,7 +23,7 @@ kvm_failed_get_vpa(void) "Warning: Unable to get VPA information from KVM"
 kvm_handle_dcr_write(void) "handle dcr write"
 kvm_handle_dcr_read(void) "handle dcr read"
 kvm_handle_halt(void) "handle halt"
-kvm_handle_papr_hcall(void) "handle PAPR hypercall"
+kvm_handle_papr_hcall(uint64_t hcall) "0x%" PRIx64
 kvm_handle_epr(void) "handle epr"
 kvm_handle_watchdog_expiry(void) "handle watchdog expiry"
 kvm_handle_debug_exception(void) "handle debug exception"
Signature · 1 line
2.35.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Fabiano Rosas

Before:

kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall

After:

   kvm_handle_papr_hcall 0x3a8
   kvm_handle_papr_hcall 0x3ac
   kvm_handle_papr_hcall 0x108
   kvm_handle_papr_hcall 0x104
   kvm_handle_papr_hcall 0x104
   kvm_handle_papr_hcall 0x108
Quoted 5 lines
---
  target/ppc/kvm.c        | 2 +-
  target/ppc/trace-events | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

r~

Reviewed-by on v1 1/1
#2 lore raw
In reply to Fabiano Rosas
Quoted 18 lines · Fabiano Rosas

Before:

kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall

After:

   kvm_handle_papr_hcall 0x3a8
   kvm_handle_papr_hcall 0x3ac
   kvm_handle_papr_hcall 0x108
   kvm_handle_papr_hcall 0x104
   kvm_handle_papr_hcall 0x104
   kvm_handle_papr_hcall 0x108
Quoted 2 lines

---

I believe this is benign enough to be taken in the next PR and it will help in the debugging right away.

Daniel

Quoted 30 lines
  target/ppc/kvm.c        | 2 +-
  target/ppc/trace-events | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
target/ppc/kvm.c +1 -1
index dc93b99189..a490e886ea 100644
@@ -1681,7 +1681,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
          break;
  #if defined(TARGET_PPC64)
      case KVM_EXIT_PAPR_HCALL:
-        trace_kvm_handle_papr_hcall();
+        trace_kvm_handle_papr_hcall(run->papr_hcall.nr);
          run->papr_hcall.ret = spapr_hypercall(cpu,
                                                run->papr_hcall.nr,
                                                run->papr_hcall.args);
target/ppc/trace-events +1 -1
index 53b107f56e..a79f1b4370 100644
@@ -23,7 +23,7 @@ kvm_failed_get_vpa(void) "Warning: Unable to get VPA information from KVM"
  kvm_handle_dcr_write(void) "handle dcr write"
  kvm_handle_dcr_read(void) "handle dcr read"
  kvm_handle_halt(void) "handle halt"
-kvm_handle_papr_hcall(void) "handle PAPR hypercall"
+kvm_handle_papr_hcall(uint64_t hcall) "0x%" PRIx64
  kvm_handle_epr(void) "handle epr"
  kvm_handle_watchdog_expiry(void) "handle watchdog expiry"
  kvm_handle_debug_exception(void) "handle debug exception"
#3 lore raw
In reply to Fabiano Rosas

Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,

Daniel

Quoted 50 lines · Fabiano Rosas

Before:

kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall
kvm_handle_papr_hcall handle PAPR hypercall

After:

   kvm_handle_papr_hcall 0x3a8
   kvm_handle_papr_hcall 0x3ac
   kvm_handle_papr_hcall 0x108
   kvm_handle_papr_hcall 0x104
   kvm_handle_papr_hcall 0x104
   kvm_handle_papr_hcall 0x108
---
  target/ppc/kvm.c        | 2 +-
  target/ppc/trace-events | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
target/ppc/kvm.c +1 -1
index dc93b99189..a490e886ea 100644
@@ -1681,7 +1681,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
          break;
  #if defined(TARGET_PPC64)
      case KVM_EXIT_PAPR_HCALL:
-        trace_kvm_handle_papr_hcall();
+        trace_kvm_handle_papr_hcall(run->papr_hcall.nr);
          run->papr_hcall.ret = spapr_hypercall(cpu,
                                                run->papr_hcall.nr,
                                                run->papr_hcall.args);
target/ppc/trace-events +1 -1
index 53b107f56e..a79f1b4370 100644
@@ -23,7 +23,7 @@ kvm_failed_get_vpa(void) "Warning: Unable to get VPA information from KVM"
  kvm_handle_dcr_write(void) "handle dcr write"
  kvm_handle_dcr_read(void) "handle dcr read"
  kvm_handle_halt(void) "handle halt"
-kvm_handle_papr_hcall(void) "handle PAPR hypercall"
+kvm_handle_papr_hcall(uint64_t hcall) "0x%" PRIx64
  kvm_handle_epr(void) "handle epr"
  kvm_handle_watchdog_expiry(void) "handle watchdog expiry"
  kvm_handle_debug_exception(void) "handle debug exception"