| Message ID | 20220408084052.3310931-3-tabba@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm64: Do not communicate host pmu event changes by accessing hyp data | expand |
On Fri, 08 Apr 2022 09:40:51 +0100, Fuad Tabba <tabba@google.com> wrote: > > Instead of accessing hyp data, pass the pmu events of the current > cpu to hyp via the loaded vcpu. This really deserves a more thorough explanation. What this is doing is moving the part of the shared memory between EL1 and EL2 into each vcpu, effectively multiplying the memory usage by the number of vcpus in the system. It isn't a big deal (what are 64 bits between friends?), but this is definitely worth calling out. > > No functional change intended. > > Signed-off-by: Fuad Tabba <tabba@google.com> > --- > arch/arm64/include/asm/kvm_host.h | 8 ++------ > arch/arm64/kvm/arm.c | 2 +- > arch/arm64/kvm/hyp/nvhe/switch.c | 20 ++++++-------------- > arch/arm64/kvm/pmu.c | 22 +++++++++++++--------- > include/kvm/arm_pmu.h | 6 ++++++ > 5 files changed, 28 insertions(+), 30 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 0e96087885fe..b5cdfb6cb9c7 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -244,14 +244,8 @@ struct kvm_cpu_context { > struct kvm_vcpu *__hyp_running_vcpu; > }; > > -struct kvm_pmu_events { > - u32 events_host; > - u32 events_guest; > -}; > - > struct kvm_host_data { > struct kvm_cpu_context host_ctxt; > - struct kvm_pmu_events pmu_events; > }; > > struct kvm_host_psci_config { > @@ -728,6 +722,7 @@ void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome); > struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr); > > DECLARE_KVM_HYP_PER_CPU(struct kvm_host_data, kvm_host_data); > +DECLARE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); > > static inline void kvm_init_host_cpu_context(struct kvm_cpu_context *cpu_ctxt) > { > @@ -781,6 +776,7 @@ void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu); > void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr); > void kvm_clr_pmu_events(u32 clr); > > +void kvm_vcpu_pmu_load(struct kvm_vcpu *vcpu); > void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu); > void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu); > #else > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index ba9165e84396..e6f76d843558 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -400,7 +400,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) > if (has_vhe()) > kvm_vcpu_load_sysregs_vhe(vcpu); > kvm_arch_vcpu_load_fp(vcpu); > - kvm_vcpu_pmu_restore_guest(vcpu); > + kvm_vcpu_pmu_load(vcpu); > if (kvm_arm_is_pvtime_enabled(&vcpu->arch)) > kvm_make_request(KVM_REQ_RECORD_STEAL, vcpu); > > diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c > index 6410d21d8695..ff7b29fb9787 100644 > --- a/arch/arm64/kvm/hyp/nvhe/switch.c > +++ b/arch/arm64/kvm/hyp/nvhe/switch.c > @@ -123,13 +123,9 @@ static void __hyp_vgic_restore_state(struct kvm_vcpu *vcpu) > /** > * Disable host events, enable guest events > */ > -static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt) > +static bool __pmu_switch_to_guest(struct kvm_vcpu *vcpu) > { > - struct kvm_host_data *host; > - struct kvm_pmu_events *pmu; > - > - host = container_of(host_ctxt, struct kvm_host_data, host_ctxt); > - pmu = &host->pmu_events; > + struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events; > > if (pmu->events_host) > write_sysreg(pmu->events_host, pmcntenclr_el0); > @@ -143,13 +139,9 @@ static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt) > /** > * Disable guest events, enable host events > */ > -static void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt) > +static void __pmu_switch_to_host(struct kvm_vcpu *vcpu) > { > - struct kvm_host_data *host; > - struct kvm_pmu_events *pmu; > - > - host = container_of(host_ctxt, struct kvm_host_data, host_ctxt); > - pmu = &host->pmu_events; > + struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events; > > if (pmu->events_guest) > write_sysreg(pmu->events_guest, pmcntenclr_el0); > @@ -274,7 +266,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) > host_ctxt->__hyp_running_vcpu = vcpu; > guest_ctxt = &vcpu->arch.ctxt; > > - pmu_switch_needed = __pmu_switch_to_guest(host_ctxt); > + pmu_switch_needed = __pmu_switch_to_guest(vcpu); > > __sysreg_save_state_nvhe(host_ctxt); > /* > @@ -336,7 +328,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) > __debug_restore_host_buffers_nvhe(vcpu); > > if (pmu_switch_needed) > - __pmu_switch_to_host(host_ctxt); > + __pmu_switch_to_host(vcpu); > > /* Returning to host will clear PSR.I, remask PMR if needed */ > if (system_uses_irq_prio_masking()) > diff --git a/arch/arm64/kvm/pmu.c b/arch/arm64/kvm/pmu.c > index 310d47c9990f..8f722692fb58 100644 > --- a/arch/arm64/kvm/pmu.c > +++ b/arch/arm64/kvm/pmu.c > @@ -5,7 +5,8 @@ > */ > #include <linux/kvm_host.h> > #include <linux/perf_event.h> > -#include <asm/kvm_hyp.h> > + > +DEFINE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); > > /* > * Given the perf event attributes and system type, determine > @@ -27,12 +28,7 @@ static bool kvm_pmu_switch_needed(struct perf_event_attr *attr) > > static struct kvm_pmu_events *get_kvm_pmu_events(void) > { > - struct kvm_host_data *ctx = this_cpu_ptr_hyp_sym(kvm_host_data); > - > - if (!ctx) > - return NULL; > - > - return &ctx->pmu_events; > + return this_cpu_ptr(&kvm_pmu_events); > } > > /* > @@ -43,7 +39,7 @@ void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr) > { > struct kvm_pmu_events *pmu = get_kvm_pmu_events(); > > - if (!kvm_arm_support_pmu_v3() || !pmu || !kvm_pmu_switch_needed(attr)) > + if (!kvm_arm_support_pmu_v3() || !kvm_pmu_switch_needed(attr)) > return; > > if (!attr->exclude_host) > @@ -59,7 +55,7 @@ void kvm_clr_pmu_events(u32 clr) > { > struct kvm_pmu_events *pmu = get_kvm_pmu_events(); > > - if (!kvm_arm_support_pmu_v3() || !pmu) > + if (!kvm_arm_support_pmu_v3()) > return; > > pmu->events_host &= ~clr; > @@ -213,3 +209,11 @@ void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) > kvm_vcpu_pmu_enable_el0(events_host); > kvm_vcpu_pmu_disable_el0(events_guest); > } > + > +void kvm_vcpu_pmu_load(struct kvm_vcpu *vcpu) > +{ > + kvm_vcpu_pmu_restore_guest(vcpu); > + > + if (kvm_arm_support_pmu_v3() && !has_vhe()) > + vcpu->arch.pmu.events = *get_kvm_pmu_events(); What guarantees do you have that the structure isn't updated between load() and the point where the data is used? For example, can an interrupt enable or disable a counter behind our back? I have the feeling it can happen. > +} > diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h > index 20193416d214..0b3898e0313f 100644 > --- a/include/kvm/arm_pmu.h > +++ b/include/kvm/arm_pmu.h > @@ -20,6 +20,11 @@ struct kvm_pmc { > struct perf_event *perf_event; > }; > > +struct kvm_pmu_events { > + u32 events_host; > + u32 events_guest; > +}; > + > struct kvm_pmu { > int irq_num; > struct kvm_pmc pmc[ARMV8_PMU_MAX_COUNTERS]; > @@ -27,6 +32,7 @@ struct kvm_pmu { > bool created; > bool irq_level; > struct irq_work overflow_work; > + struct kvm_pmu_events events; This makes be realise that the packing of this structure is absolutely awful, and that has ripple effects in the vcpu struct. Can you please reorganise the struct so that irq_num, created and irq_level are at the end? Thanks, M.
Hi Marc, On Thu, May 5, 2022 at 10:00 AM Marc Zyngier <maz@kernel.org> wrote: > > On Fri, 08 Apr 2022 09:40:51 +0100, > Fuad Tabba <tabba@google.com> wrote: > > > > Instead of accessing hyp data, pass the pmu events of the current > > cpu to hyp via the loaded vcpu. > > This really deserves a more thorough explanation. What this is doing > is moving the part of the shared memory between EL1 and EL2 into each > vcpu, effectively multiplying the memory usage by the number of vcpus > in the system. > > It isn't a big deal (what are 64 bits between friends?), but this is > definitely worth calling out. I will explain it and motivate it better in the next respin. The reasoning behind this is to better isolate hyp (EL2) from the host (EL1), and not allow the host to simply peek into hyp. > > > > > No functional change intended. > > > > Signed-off-by: Fuad Tabba <tabba@google.com> > > --- > > arch/arm64/include/asm/kvm_host.h | 8 ++------ > > arch/arm64/kvm/arm.c | 2 +- > > arch/arm64/kvm/hyp/nvhe/switch.c | 20 ++++++-------------- > > arch/arm64/kvm/pmu.c | 22 +++++++++++++--------- > > include/kvm/arm_pmu.h | 6 ++++++ > > 5 files changed, 28 insertions(+), 30 deletions(-) > > > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 0e96087885fe..b5cdfb6cb9c7 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -244,14 +244,8 @@ struct kvm_cpu_context { > > struct kvm_vcpu *__hyp_running_vcpu; > > }; > > > > -struct kvm_pmu_events { > > - u32 events_host; > > - u32 events_guest; > > -}; > > - > > struct kvm_host_data { > > struct kvm_cpu_context host_ctxt; > > - struct kvm_pmu_events pmu_events; > > }; > > > > struct kvm_host_psci_config { > > @@ -728,6 +722,7 @@ void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome); > > struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr); > > > > DECLARE_KVM_HYP_PER_CPU(struct kvm_host_data, kvm_host_data); > > +DECLARE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); > > > > static inline void kvm_init_host_cpu_context(struct kvm_cpu_context *cpu_ctxt) > > { > > @@ -781,6 +776,7 @@ void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu); > > void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr); > > void kvm_clr_pmu_events(u32 clr); > > > > +void kvm_vcpu_pmu_load(struct kvm_vcpu *vcpu); > > void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu); > > void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu); > > #else > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > > index ba9165e84396..e6f76d843558 100644 > > --- a/arch/arm64/kvm/arm.c > > +++ b/arch/arm64/kvm/arm.c > > @@ -400,7 +400,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) > > if (has_vhe()) > > kvm_vcpu_load_sysregs_vhe(vcpu); > > kvm_arch_vcpu_load_fp(vcpu); > > - kvm_vcpu_pmu_restore_guest(vcpu); > > + kvm_vcpu_pmu_load(vcpu); > > if (kvm_arm_is_pvtime_enabled(&vcpu->arch)) > > kvm_make_request(KVM_REQ_RECORD_STEAL, vcpu); > > > > diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c > > index 6410d21d8695..ff7b29fb9787 100644 > > --- a/arch/arm64/kvm/hyp/nvhe/switch.c > > +++ b/arch/arm64/kvm/hyp/nvhe/switch.c > > @@ -123,13 +123,9 @@ static void __hyp_vgic_restore_state(struct kvm_vcpu *vcpu) > > /** > > * Disable host events, enable guest events > > */ > > -static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt) > > +static bool __pmu_switch_to_guest(struct kvm_vcpu *vcpu) > > { > > - struct kvm_host_data *host; > > - struct kvm_pmu_events *pmu; > > - > > - host = container_of(host_ctxt, struct kvm_host_data, host_ctxt); > > - pmu = &host->pmu_events; > > + struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events; > > > > if (pmu->events_host) > > write_sysreg(pmu->events_host, pmcntenclr_el0); > > @@ -143,13 +139,9 @@ static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt) > > /** > > * Disable guest events, enable host events > > */ > > -static void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt) > > +static void __pmu_switch_to_host(struct kvm_vcpu *vcpu) > > { > > - struct kvm_host_data *host; > > - struct kvm_pmu_events *pmu; > > - > > - host = container_of(host_ctxt, struct kvm_host_data, host_ctxt); > > - pmu = &host->pmu_events; > > + struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events; > > > > if (pmu->events_guest) > > write_sysreg(pmu->events_guest, pmcntenclr_el0); > > @@ -274,7 +266,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) > > host_ctxt->__hyp_running_vcpu = vcpu; > > guest_ctxt = &vcpu->arch.ctxt; > > > > - pmu_switch_needed = __pmu_switch_to_guest(host_ctxt); > > + pmu_switch_needed = __pmu_switch_to_guest(vcpu); > > > > __sysreg_save_state_nvhe(host_ctxt); > > /* > > @@ -336,7 +328,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) > > __debug_restore_host_buffers_nvhe(vcpu); > > > > if (pmu_switch_needed) > > - __pmu_switch_to_host(host_ctxt); > > + __pmu_switch_to_host(vcpu); > > > > /* Returning to host will clear PSR.I, remask PMR if needed */ > > if (system_uses_irq_prio_masking()) > > diff --git a/arch/arm64/kvm/pmu.c b/arch/arm64/kvm/pmu.c > > index 310d47c9990f..8f722692fb58 100644 > > --- a/arch/arm64/kvm/pmu.c > > +++ b/arch/arm64/kvm/pmu.c > > @@ -5,7 +5,8 @@ > > */ > > #include <linux/kvm_host.h> > > #include <linux/perf_event.h> > > -#include <asm/kvm_hyp.h> > > + > > +DEFINE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); > > > > /* > > * Given the perf event attributes and system type, determine > > @@ -27,12 +28,7 @@ static bool kvm_pmu_switch_needed(struct perf_event_attr *attr) > > > > static struct kvm_pmu_events *get_kvm_pmu_events(void) > > { > > - struct kvm_host_data *ctx = this_cpu_ptr_hyp_sym(kvm_host_data); > > - > > - if (!ctx) > > - return NULL; > > - > > - return &ctx->pmu_events; > > + return this_cpu_ptr(&kvm_pmu_events); > > } > > > > /* > > @@ -43,7 +39,7 @@ void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr) > > { > > struct kvm_pmu_events *pmu = get_kvm_pmu_events(); > > > > - if (!kvm_arm_support_pmu_v3() || !pmu || !kvm_pmu_switch_needed(attr)) > > + if (!kvm_arm_support_pmu_v3() || !kvm_pmu_switch_needed(attr)) > > return; > > > > if (!attr->exclude_host) > > @@ -59,7 +55,7 @@ void kvm_clr_pmu_events(u32 clr) > > { > > struct kvm_pmu_events *pmu = get_kvm_pmu_events(); > > > > - if (!kvm_arm_support_pmu_v3() || !pmu) > > + if (!kvm_arm_support_pmu_v3()) > > return; > > > > pmu->events_host &= ~clr; > > @@ -213,3 +209,11 @@ void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) > > kvm_vcpu_pmu_enable_el0(events_host); > > kvm_vcpu_pmu_disable_el0(events_guest); > > } > > + > > +void kvm_vcpu_pmu_load(struct kvm_vcpu *vcpu) > > +{ > > + kvm_vcpu_pmu_restore_guest(vcpu); > > + > > + if (kvm_arm_support_pmu_v3() && !has_vhe()) > > + vcpu->arch.pmu.events = *get_kvm_pmu_events(); > > What guarantees do you have that the structure isn't updated between > load() and the point where the data is used? For example, can an > interrupt enable or disable a counter behind our back? I have the > feeling it can happen. You're right. It can happen -- I just missed it. I think that the solution would be to do it at vcpu_run() rather than at vcpu_load(). It would incur more copying, but as someone said, "what are 64 bits between friends?" :) > > +} > > diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h > > index 20193416d214..0b3898e0313f 100644 > > --- a/include/kvm/arm_pmu.h > > +++ b/include/kvm/arm_pmu.h > > @@ -20,6 +20,11 @@ struct kvm_pmc { > > struct perf_event *perf_event; > > }; > > > > +struct kvm_pmu_events { > > + u32 events_host; > > + u32 events_guest; > > +}; > > + > > struct kvm_pmu { > > int irq_num; > > struct kvm_pmc pmc[ARMV8_PMU_MAX_COUNTERS]; > > @@ -27,6 +32,7 @@ struct kvm_pmu { > > bool created; > > bool irq_level; > > struct irq_work overflow_work; > > + struct kvm_pmu_events events; > > This makes be realise that the packing of this structure is absolutely > awful, and that has ripple effects in the vcpu struct. > > Can you please reorganise the struct so that irq_num, created and > irq_level are at the end? Will do. Cheers, /fuad > > Thanks, > > M. > > -- > Without deviation from the norm, progress is not possible.
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 0e96087885fe..b5cdfb6cb9c7 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -244,14 +244,8 @@ struct kvm_cpu_context { struct kvm_vcpu *__hyp_running_vcpu; }; -struct kvm_pmu_events { - u32 events_host; - u32 events_guest; -}; - struct kvm_host_data { struct kvm_cpu_context host_ctxt; - struct kvm_pmu_events pmu_events; }; struct kvm_host_psci_config { @@ -728,6 +722,7 @@ void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome); struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr); DECLARE_KVM_HYP_PER_CPU(struct kvm_host_data, kvm_host_data); +DECLARE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); static inline void kvm_init_host_cpu_context(struct kvm_cpu_context *cpu_ctxt) { @@ -781,6 +776,7 @@ void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu); void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr); void kvm_clr_pmu_events(u32 clr); +void kvm_vcpu_pmu_load(struct kvm_vcpu *vcpu); void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu); void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu); #else diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index ba9165e84396..e6f76d843558 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -400,7 +400,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) if (has_vhe()) kvm_vcpu_load_sysregs_vhe(vcpu); kvm_arch_vcpu_load_fp(vcpu); - kvm_vcpu_pmu_restore_guest(vcpu); + kvm_vcpu_pmu_load(vcpu); if (kvm_arm_is_pvtime_enabled(&vcpu->arch)) kvm_make_request(KVM_REQ_RECORD_STEAL, vcpu); diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index 6410d21d8695..ff7b29fb9787 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -123,13 +123,9 @@ static void __hyp_vgic_restore_state(struct kvm_vcpu *vcpu) /** * Disable host events, enable guest events */ -static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt) +static bool __pmu_switch_to_guest(struct kvm_vcpu *vcpu) { - struct kvm_host_data *host; - struct kvm_pmu_events *pmu; - - host = container_of(host_ctxt, struct kvm_host_data, host_ctxt); - pmu = &host->pmu_events; + struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events; if (pmu->events_host) write_sysreg(pmu->events_host, pmcntenclr_el0); @@ -143,13 +139,9 @@ static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt) /** * Disable guest events, enable host events */ -static void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt) +static void __pmu_switch_to_host(struct kvm_vcpu *vcpu) { - struct kvm_host_data *host; - struct kvm_pmu_events *pmu; - - host = container_of(host_ctxt, struct kvm_host_data, host_ctxt); - pmu = &host->pmu_events; + struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events; if (pmu->events_guest) write_sysreg(pmu->events_guest, pmcntenclr_el0); @@ -274,7 +266,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) host_ctxt->__hyp_running_vcpu = vcpu; guest_ctxt = &vcpu->arch.ctxt; - pmu_switch_needed = __pmu_switch_to_guest(host_ctxt); + pmu_switch_needed = __pmu_switch_to_guest(vcpu); __sysreg_save_state_nvhe(host_ctxt); /* @@ -336,7 +328,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) __debug_restore_host_buffers_nvhe(vcpu); if (pmu_switch_needed) - __pmu_switch_to_host(host_ctxt); + __pmu_switch_to_host(vcpu); /* Returning to host will clear PSR.I, remask PMR if needed */ if (system_uses_irq_prio_masking()) diff --git a/arch/arm64/kvm/pmu.c b/arch/arm64/kvm/pmu.c index 310d47c9990f..8f722692fb58 100644 --- a/arch/arm64/kvm/pmu.c +++ b/arch/arm64/kvm/pmu.c @@ -5,7 +5,8 @@ */ #include <linux/kvm_host.h> #include <linux/perf_event.h> -#include <asm/kvm_hyp.h> + +DEFINE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); /* * Given the perf event attributes and system type, determine @@ -27,12 +28,7 @@ static bool kvm_pmu_switch_needed(struct perf_event_attr *attr) static struct kvm_pmu_events *get_kvm_pmu_events(void) { - struct kvm_host_data *ctx = this_cpu_ptr_hyp_sym(kvm_host_data); - - if (!ctx) - return NULL; - - return &ctx->pmu_events; + return this_cpu_ptr(&kvm_pmu_events); } /* @@ -43,7 +39,7 @@ void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr) { struct kvm_pmu_events *pmu = get_kvm_pmu_events(); - if (!kvm_arm_support_pmu_v3() || !pmu || !kvm_pmu_switch_needed(attr)) + if (!kvm_arm_support_pmu_v3() || !kvm_pmu_switch_needed(attr)) return; if (!attr->exclude_host) @@ -59,7 +55,7 @@ void kvm_clr_pmu_events(u32 clr) { struct kvm_pmu_events *pmu = get_kvm_pmu_events(); - if (!kvm_arm_support_pmu_v3() || !pmu) + if (!kvm_arm_support_pmu_v3()) return; pmu->events_host &= ~clr; @@ -213,3 +209,11 @@ void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) kvm_vcpu_pmu_enable_el0(events_host); kvm_vcpu_pmu_disable_el0(events_guest); } + +void kvm_vcpu_pmu_load(struct kvm_vcpu *vcpu) +{ + kvm_vcpu_pmu_restore_guest(vcpu); + + if (kvm_arm_support_pmu_v3() && !has_vhe()) + vcpu->arch.pmu.events = *get_kvm_pmu_events(); +} diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h index 20193416d214..0b3898e0313f 100644 --- a/include/kvm/arm_pmu.h +++ b/include/kvm/arm_pmu.h @@ -20,6 +20,11 @@ struct kvm_pmc { struct perf_event *perf_event; }; +struct kvm_pmu_events { + u32 events_host; + u32 events_guest; +}; + struct kvm_pmu { int irq_num; struct kvm_pmc pmc[ARMV8_PMU_MAX_COUNTERS]; @@ -27,6 +32,7 @@ struct kvm_pmu { bool created; bool irq_level; struct irq_work overflow_work; + struct kvm_pmu_events events; }; struct arm_pmu_entry {
Instead of accessing hyp data, pass the pmu events of the current cpu to hyp via the loaded vcpu. No functional change intended. Signed-off-by: Fuad Tabba <tabba@google.com> --- arch/arm64/include/asm/kvm_host.h | 8 ++------ arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/hyp/nvhe/switch.c | 20 ++++++-------------- arch/arm64/kvm/pmu.c | 22 +++++++++++++--------- include/kvm/arm_pmu.h | 6 ++++++ 5 files changed, 28 insertions(+), 30 deletions(-)