arch/powerpc/include/asm/kvm_book3s_64.h | 4 ++-- arch/powerpc/kvm/book3s_hv.c | 4 ++-- arch/powerpc/kvm/trace_hv.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
Fix typo in the following kvm function names from:
kmvhv_counters_tracepoint_regfunc -> kvmhv_counters_tracepoint_regfunc
kmvhv_counters_tracepoint_unregfunc -> kvmhv_counters_tracepoint_unregfunc
Fixes: e1f288d2f9c6 ("KVM: PPC: Book3S HV nestedv2: Add support for reading VPA counters for pseries guests")
Reported-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
---
arch/powerpc/include/asm/kvm_book3s_64.h | 4 ++--
arch/powerpc/kvm/book3s_hv.c | 4 ++--
arch/powerpc/kvm/trace_hv.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h
index 2ef9a5f4e5d1..11065313d4c1 100644
--- a/arch/powerpc/include/asm/kvm_book3s_64.h
+++ b/arch/powerpc/include/asm/kvm_book3s_64.h
@@ -684,8 +684,8 @@ int kvmhv_nestedv2_set_ptbl_entry(unsigned long lpid, u64 dw0, u64 dw1);
int kvmhv_nestedv2_parse_output(struct kvm_vcpu *vcpu);
int kvmhv_nestedv2_set_vpa(struct kvm_vcpu *vcpu, unsigned long vpa);
-int kmvhv_counters_tracepoint_regfunc(void);
-void kmvhv_counters_tracepoint_unregfunc(void);
+int kvmhv_counters_tracepoint_regfunc(void);
+void kvmhv_counters_tracepoint_unregfunc(void);
int kvmhv_get_l2_counters_status(void);
void kvmhv_set_l2_counters_status(int cpu, bool status);
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index ba0492f9de65..c36d036d7155 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -4154,7 +4154,7 @@ void kvmhv_set_l2_counters_status(int cpu, bool status)
lppaca_of(cpu).l2_counters_enable = 0;
}
-int kmvhv_counters_tracepoint_regfunc(void)
+int kvmhv_counters_tracepoint_regfunc(void)
{
int cpu;
@@ -4164,7 +4164,7 @@ int kmvhv_counters_tracepoint_regfunc(void)
return 0;
}
-void kmvhv_counters_tracepoint_unregfunc(void)
+void kvmhv_counters_tracepoint_unregfunc(void)
{
int cpu;
diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h
index 77ebc724e6cd..35fccaa575cc 100644
--- a/arch/powerpc/kvm/trace_hv.h
+++ b/arch/powerpc/kvm/trace_hv.h
@@ -538,7 +538,7 @@ TRACE_EVENT_FN_COND(kvmppc_vcpu_stats,
TP_printk("VCPU %d: l1_to_l2_cs_time=%llu ns l2_to_l1_cs_time=%llu ns l2_runtime=%llu ns",
__entry->vcpu_id, __entry->l1_to_l2_cs,
__entry->l2_to_l1_cs, __entry->l2_runtime),
- kmvhv_counters_tracepoint_regfunc, kmvhv_counters_tracepoint_unregfunc
+ kvmhv_counters_tracepoint_regfunc, kvmhv_counters_tracepoint_unregfunc
);
#endif
#endif /* _TRACE_KVM_HV_H */
--
2.43.5
On 2024/09/20 05:08 PM, Kajol Jain wrote: > Fix typo in the following kvm function names from: > > kmvhv_counters_tracepoint_regfunc -> kvmhv_counters_tracepoint_regfunc > kmvhv_counters_tracepoint_unregfunc -> kvmhv_counters_tracepoint_unregfunc > Nice catch! Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com> > Fixes: e1f288d2f9c6 ("KVM: PPC: Book3S HV nestedv2: Add support for reading VPA counters for pseries guests") > Reported-by: Madhavan Srinivasan <maddy@linux.ibm.com> > Signed-off-by: Kajol Jain <kjain@linux.ibm.com> > --- > arch/powerpc/include/asm/kvm_book3s_64.h | 4 ++-- > arch/powerpc/kvm/book3s_hv.c | 4 ++-- > arch/powerpc/kvm/trace_hv.h | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h > index 2ef9a5f4e5d1..11065313d4c1 100644 > --- a/arch/powerpc/include/asm/kvm_book3s_64.h > +++ b/arch/powerpc/include/asm/kvm_book3s_64.h > @@ -684,8 +684,8 @@ int kvmhv_nestedv2_set_ptbl_entry(unsigned long lpid, u64 dw0, u64 dw1); > int kvmhv_nestedv2_parse_output(struct kvm_vcpu *vcpu); > int kvmhv_nestedv2_set_vpa(struct kvm_vcpu *vcpu, unsigned long vpa); > > -int kmvhv_counters_tracepoint_regfunc(void); > -void kmvhv_counters_tracepoint_unregfunc(void); > +int kvmhv_counters_tracepoint_regfunc(void); > +void kvmhv_counters_tracepoint_unregfunc(void); > int kvmhv_get_l2_counters_status(void); > void kvmhv_set_l2_counters_status(int cpu, bool status); > > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index ba0492f9de65..c36d036d7155 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -4154,7 +4154,7 @@ void kvmhv_set_l2_counters_status(int cpu, bool status) > lppaca_of(cpu).l2_counters_enable = 0; > } > > -int kmvhv_counters_tracepoint_regfunc(void) > +int kvmhv_counters_tracepoint_regfunc(void) > { > int cpu; > > @@ -4164,7 +4164,7 @@ int kmvhv_counters_tracepoint_regfunc(void) > return 0; > } > > -void kmvhv_counters_tracepoint_unregfunc(void) > +void kvmhv_counters_tracepoint_unregfunc(void) > { > int cpu; > > diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h > index 77ebc724e6cd..35fccaa575cc 100644 > --- a/arch/powerpc/kvm/trace_hv.h > +++ b/arch/powerpc/kvm/trace_hv.h > @@ -538,7 +538,7 @@ TRACE_EVENT_FN_COND(kvmppc_vcpu_stats, > TP_printk("VCPU %d: l1_to_l2_cs_time=%llu ns l2_to_l1_cs_time=%llu ns l2_runtime=%llu ns", > __entry->vcpu_id, __entry->l1_to_l2_cs, > __entry->l2_to_l1_cs, __entry->l2_runtime), > - kmvhv_counters_tracepoint_regfunc, kmvhv_counters_tracepoint_unregfunc > + kvmhv_counters_tracepoint_regfunc, kvmhv_counters_tracepoint_unregfunc > ); > #endif > #endif /* _TRACE_KVM_HV_H */ > -- > 2.43.5 > >
Kajol Jain <kjain@linux.ibm.com> writes: > Fix typo in the following kvm function names from: > > kmvhv_counters_tracepoint_regfunc -> kvmhv_counters_tracepoint_regfunc > kmvhv_counters_tracepoint_unregfunc -> kvmhv_counters_tracepoint_unregfunc Gr8 spotting! It took sometime to realize k[mv] and k[vm] is the change :) > > Fixes: e1f288d2f9c6 ("KVM: PPC: Book3S HV nestedv2: Add support for reading VPA counters for pseries guests") Right. This commit added the registration and unregistration helpers for TRACE_EVEN_FN_COND tracepoint which mainly collects the observability stats for nested guest on pseries. > Reported-by: Madhavan Srinivasan <maddy@linux.ibm.com> > Signed-off-by: Kajol Jain <kjain@linux.ibm.com> > --- > arch/powerpc/include/asm/kvm_book3s_64.h | 4 ++-- > arch/powerpc/kvm/book3s_hv.c | 4 ++-- > arch/powerpc/kvm/trace_hv.h | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) Not an expert in kvm area. But the change looks very straight forward to me. Searching for "kmv" string in arch/powerpc/ after applying this patch indeed resulted in zero hits. Please feel free to add - Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
© 2016 - 2024 Red Hat, Inc.