| Message ID | 20220325223316.276494-1-farosas@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: Improve KVM hypercall trace | expand |
On 3/25/22 16:33, Fabiano Rosas wrote: > 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 > > Signed-off-by: Fabiano Rosas<farosas@linux.ibm.com> > --- > target/ppc/kvm.c | 2 +- > target/ppc/trace-events | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 3/25/22 19:33, Fabiano Rosas wrote: > 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 > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > --- Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> I believe this is benign enough to be taken in the next PR and it will help in the debugging right away. Daniel > target/ppc/kvm.c | 2 +- > target/ppc/trace-events | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index dc93b99189..a490e886ea 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -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); > diff --git a/target/ppc/trace-events b/target/ppc/trace-events > index 53b107f56e..a79f1b4370 100644 > --- a/target/ppc/trace-events > +++ b/target/ppc/trace-events > @@ -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"
Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks, Daniel On 3/25/22 19:33, Fabiano Rosas wrote: > 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 > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> > --- > target/ppc/kvm.c | 2 +- > target/ppc/trace-events | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index dc93b99189..a490e886ea 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -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); > diff --git a/target/ppc/trace-events b/target/ppc/trace-events > index 53b107f56e..a79f1b4370 100644 > --- a/target/ppc/trace-events > +++ b/target/ppc/trace-events > @@ -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"
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index dc93b99189..a490e886ea 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -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); diff --git a/target/ppc/trace-events b/target/ppc/trace-events index 53b107f56e..a79f1b4370 100644 --- a/target/ppc/trace-events +++ b/target/ppc/trace-events @@ -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"
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 Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- target/ppc/kvm.c | 2 +- target/ppc/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)