Skip to content

Commit e1f288d

Browse files
Gautam Menghanimpe
authored andcommitted
KVM: PPC: Book3S HV nestedv2: Add support for reading VPA counters for pseries guests
PAPR hypervisor has introduced three new counters in the VPA area of LPAR CPUs for KVM L2 guest (see [1] for terminology) observability - two for context switches from host to guest and vice versa, and one counter for getting the total time spent inside the KVM guest. Add a tracepoint that enables reading the counters for use by ftrace/perf. Note that this tracepoint is only available for nestedv2 API (i.e, KVM on PowerVM). [1] Terminology: a. L1 refers to the VM (LPAR) booted on top of PAPR hypervisor b. L2 refers to the KVM guest booted on top of L1. Reviewed-by: Nicholas Piggin <[email protected]> Acked-by: Naveen N Rao <[email protected]> Signed-off-by: Vaibhav Jain <[email protected]> Signed-off-by: Gautam Menghani <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://msgid.link/[email protected]
1 parent c3f38fa commit e1f288d

File tree

4 files changed

+117
-3
lines changed

4 files changed

+117
-3
lines changed

arch/powerpc/include/asm/kvm_book3s_64.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,11 @@ int kvmhv_nestedv2_set_ptbl_entry(unsigned long lpid, u64 dw0, u64 dw1);
684684
int kvmhv_nestedv2_parse_output(struct kvm_vcpu *vcpu);
685685
int kvmhv_nestedv2_set_vpa(struct kvm_vcpu *vcpu, unsigned long vpa);
686686

687+
int kmvhv_counters_tracepoint_regfunc(void);
688+
void kmvhv_counters_tracepoint_unregfunc(void);
689+
int kvmhv_get_l2_counters_status(void);
690+
void kvmhv_set_l2_counters_status(int cpu, bool status);
691+
687692
#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */
688693

689694
#endif /* __ASM_KVM_BOOK3S_64_H__ */

arch/powerpc/include/asm/lppaca.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ struct lppaca {
6262
u8 donate_dedicated_cpu; /* Donate dedicated CPU cycles */
6363
u8 fpregs_in_use;
6464
u8 pmcregs_in_use;
65-
u8 reserved8[28];
65+
u8 l2_counters_enable; /* Enable usage of counters for KVM guest */
66+
u8 reserved8[27];
6667
__be64 wait_state_cycles; /* Wait cycles for this proc */
6768
u8 reserved9[28];
6869
__be16 slb_count; /* # of SLBs to maintain */
@@ -92,9 +93,13 @@ struct lppaca {
9293
/* cacheline 4-5 */
9394

9495
__be32 page_ins; /* CMO Hint - # page ins by OS */
95-
u8 reserved12[148];
96+
u8 reserved12[28];
97+
volatile __be64 l1_to_l2_cs_tb;
98+
volatile __be64 l2_to_l1_cs_tb;
99+
volatile __be64 l2_runtime_tb;
100+
u8 reserved13[96];
96101
volatile __be64 dtl_idx; /* Dispatch Trace Log head index */
97-
u8 reserved13[96];
102+
u8 reserved14[96];
98103
} ____cacheline_aligned;
99104

100105
#define lppaca_of(cpu) (*paca_ptrs[cpu]->lppaca_ptr)

arch/powerpc/kvm/book3s_hv.c

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4108,6 +4108,77 @@ static void vcpu_vpa_increment_dispatch(struct kvm_vcpu *vcpu)
41084108
}
41094109
}
41104110

4111+
/* Helper functions for reading L2's stats from L1's VPA */
4112+
#ifdef CONFIG_PPC_PSERIES
4113+
static DEFINE_PER_CPU(u64, l1_to_l2_cs);
4114+
static DEFINE_PER_CPU(u64, l2_to_l1_cs);
4115+
static DEFINE_PER_CPU(u64, l2_runtime_agg);
4116+
4117+
int kvmhv_get_l2_counters_status(void)
4118+
{
4119+
return firmware_has_feature(FW_FEATURE_LPAR) &&
4120+
get_lppaca()->l2_counters_enable;
4121+
}
4122+
4123+
void kvmhv_set_l2_counters_status(int cpu, bool status)
4124+
{
4125+
if (!firmware_has_feature(FW_FEATURE_LPAR))
4126+
return;
4127+
if (status)
4128+
lppaca_of(cpu).l2_counters_enable = 1;
4129+
else
4130+
lppaca_of(cpu).l2_counters_enable = 0;
4131+
}
4132+
4133+
int kmvhv_counters_tracepoint_regfunc(void)
4134+
{
4135+
int cpu;
4136+
4137+
for_each_present_cpu(cpu) {
4138+
kvmhv_set_l2_counters_status(cpu, true);
4139+
}
4140+
return 0;
4141+
}
4142+
4143+
void kmvhv_counters_tracepoint_unregfunc(void)
4144+
{
4145+
int cpu;
4146+
4147+
for_each_present_cpu(cpu) {
4148+
kvmhv_set_l2_counters_status(cpu, false);
4149+
}
4150+
}
4151+
4152+
static void do_trace_nested_cs_time(struct kvm_vcpu *vcpu)
4153+
{
4154+
struct lppaca *lp = get_lppaca();
4155+
u64 l1_to_l2_ns, l2_to_l1_ns, l2_runtime_ns;
4156+
u64 *l1_to_l2_cs_ptr = this_cpu_ptr(&l1_to_l2_cs);
4157+
u64 *l2_to_l1_cs_ptr = this_cpu_ptr(&l2_to_l1_cs);
4158+
u64 *l2_runtime_agg_ptr = this_cpu_ptr(&l2_runtime_agg);
4159+
4160+
l1_to_l2_ns = tb_to_ns(be64_to_cpu(lp->l1_to_l2_cs_tb));
4161+
l2_to_l1_ns = tb_to_ns(be64_to_cpu(lp->l2_to_l1_cs_tb));
4162+
l2_runtime_ns = tb_to_ns(be64_to_cpu(lp->l2_runtime_tb));
4163+
trace_kvmppc_vcpu_stats(vcpu, l1_to_l2_ns - *l1_to_l2_cs_ptr,
4164+
l2_to_l1_ns - *l2_to_l1_cs_ptr,
4165+
l2_runtime_ns - *l2_runtime_agg_ptr);
4166+
*l1_to_l2_cs_ptr = l1_to_l2_ns;
4167+
*l2_to_l1_cs_ptr = l2_to_l1_ns;
4168+
*l2_runtime_agg_ptr = l2_runtime_ns;
4169+
}
4170+
4171+
#else
4172+
int kvmhv_get_l2_counters_status(void)
4173+
{
4174+
return 0;
4175+
}
4176+
4177+
static void do_trace_nested_cs_time(struct kvm_vcpu *vcpu)
4178+
{
4179+
}
4180+
#endif
4181+
41114182
static int kvmhv_vcpu_entry_nestedv2(struct kvm_vcpu *vcpu, u64 time_limit,
41124183
unsigned long lpcr, u64 *tb)
41134184
{
@@ -4156,6 +4227,10 @@ static int kvmhv_vcpu_entry_nestedv2(struct kvm_vcpu *vcpu, u64 time_limit,
41564227

41574228
timer_rearm_host_dec(*tb);
41584229

4230+
/* Record context switch and guest_run_time data */
4231+
if (kvmhv_get_l2_counters_status())
4232+
do_trace_nested_cs_time(vcpu);
4233+
41594234
return trap;
41604235
}
41614236

arch/powerpc/kvm/trace_hv.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,35 @@ TRACE_EVENT(kvmppc_run_vcpu_exit,
512512
__entry->vcpu_id, __entry->exit, __entry->ret)
513513
);
514514

515+
#ifdef CONFIG_PPC_PSERIES
516+
517+
TRACE_EVENT_FN_COND(kvmppc_vcpu_stats,
518+
TP_PROTO(struct kvm_vcpu *vcpu, u64 l1_to_l2_cs, u64 l2_to_l1_cs, u64 l2_runtime),
519+
520+
TP_ARGS(vcpu, l1_to_l2_cs, l2_to_l1_cs, l2_runtime),
521+
522+
TP_CONDITION(l1_to_l2_cs || l2_to_l1_cs || l2_runtime),
523+
524+
TP_STRUCT__entry(
525+
__field(int, vcpu_id)
526+
__field(u64, l1_to_l2_cs)
527+
__field(u64, l2_to_l1_cs)
528+
__field(u64, l2_runtime)
529+
),
530+
531+
TP_fast_assign(
532+
__entry->vcpu_id = vcpu->vcpu_id;
533+
__entry->l1_to_l2_cs = l1_to_l2_cs;
534+
__entry->l2_to_l1_cs = l2_to_l1_cs;
535+
__entry->l2_runtime = l2_runtime;
536+
),
537+
538+
TP_printk("VCPU %d: l1_to_l2_cs_time=%llu ns l2_to_l1_cs_time=%llu ns l2_runtime=%llu ns",
539+
__entry->vcpu_id, __entry->l1_to_l2_cs,
540+
__entry->l2_to_l1_cs, __entry->l2_runtime),
541+
kmvhv_counters_tracepoint_regfunc, kmvhv_counters_tracepoint_unregfunc
542+
);
543+
#endif
515544
#endif /* _TRACE_KVM_HV_H */
516545

517546
/* This part must be outside protection */

0 commit comments

Comments
 (0)