KVM: arm64: pmu: Resync EL0 state on counter rotation
Subsystems (4)
Marc Zyngier
maintainerPATCH v2 1/1 KVM: arm64: pmu: Resync EL0 state on counter rotation
Huang Shijie reports that, when profiling a guest from the host with a number of events that exceeds the number of available counters, the reported counts are wildly inaccurate. Without the counter oversubscription, the reported counts are correct.
Their investigation indicates that upon counter rotation (which takes place on the back of a timer interrupt), we fail to re-apply the guest EL0 enabling, leading to the counting of host events instead of guest events.
In order to solve this, add yet another hook between the host PMU driver and KVM, re-applying the guest EL0 configuration if the right conditions apply (the host is VHE, we are in interrupt context, and we interrupted a running vcpu). This triggers a new vcpu request which will apply the correct configuration on guest reentry.
With this, we have the correct counts, even when the counters are oversubscribed.
Tested_by: Huang Shijie <[email protected]>
---
Notes:
V2: Fixed 32bit compilation
arch/arm/include/asm/arm_pmuv3.h | 2 ++ arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/arm.c | 3 +++ arch/arm64/kvm/pmu.c | 18 ++++++++++++++++++ drivers/perf/arm_pmuv3.c | 2 ++ include/kvm/arm_pmu.h | 2 ++ 6 files changed, 28 insertions(+)
arch/arm/include/asm/arm_pmuv3.h +2 -0
@@ -227,6 +227,8 @@ static inline bool kvm_set_pmuserenr(u64 val)return false; } +static inline void kvm_vcpu_pmu_resync_el0 (void ) {} +/* PMU Version in DFR Register */ #define ARMV8_PMU_DFR_VER_NI 0#define ARMV8_PMU_DFR_VER_V3P4 0x5
arch/arm64/include/asm/kvm_host.h +1 -0
@@ -49,6 +49,7 @@#define KVM_REQ_RELOAD_GICv4 KVM_ARCH_REQ(4)#define KVM_REQ_RELOAD_PMU KVM_ARCH_REQ(5)#define KVM_REQ_SUSPEND KVM_ARCH_REQ(6) +#define KVM_REQ_RESYNC_PMU_EL0 KVM_ARCH_REQ(7)#define KVM_DIRTY_LOG_MANUAL_CAPS (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \ KVM_DIRTY_LOG_INITIALLY_SET)
arch/arm64/kvm/arm.c +3 -0
@@ -803,6 +803,9 @@ static int check_vcpu_requests(struct kvm_vcpu *vcpu)kvm_pmu_handle_pmcr (vcpu,__vcpu_sys_reg (vcpu,PMCR_EL0 )); +if (kvm_check_request (KVM_REQ_RESYNC_PMU_EL0 , vcpu)) +kvm_vcpu_pmu_restore_guest (vcpu); +if (kvm_check_request (KVM_REQ_SUSPEND , vcpu))return kvm_vcpu_suspend (vcpu);
arch/arm64/kvm/pmu.c +18 -0
@@ -236,3 +236,21 @@ bool kvm_set_pmuserenr(u64 val)ctxt_sys_reg (hctxt,PMUSERENR_EL0 ) = val;return true; } + +/* +* If we interrupted the guest to update the host PMU context, make +* sure we re-apply the guest EL0 state. +*/ +void kvm_vcpu_pmu_resync_el0 (void ) +{ +struct kvm_vcpu *vcpu; + +if (!has_vhe () || !in_interrupt ()) +return ; + + vcpu =kvm_get_running_vcpu (); +if (!vcpu) +return ; + +kvm_make_request (KVM_REQ_RESYNC_PMU_EL0 , vcpu); +}
drivers/perf/arm_pmuv3.c +2 -0
@@ -772,6 +772,8 @@ static void armv8pmu_start(struct arm_pmu *cpu_pmu)/* Enable all counters */ armv8pmu_pmcr_write (armv8pmu_pmcr_read () |ARMV8_PMU_PMCR_E ); + +kvm_vcpu_pmu_resync_el0 (); }static void armv8pmu_stop (struct arm_pmu *cpu_pmu)
include/kvm/arm_pmu.h +2 -0
@@ -74,6 +74,7 @@ int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu);struct kvm_pmu_events *kvm_get_pmu_events (void );void kvm_vcpu_pmu_restore_guest (struct kvm_vcpu *vcpu);void kvm_vcpu_pmu_restore_host (struct kvm_vcpu *vcpu); +void kvm_vcpu_pmu_resync_el0 (void );#define kvm_vcpu_has_pmu (vcpu) \ (test_bit(KVM_ARM_VCPU_PMU_V3, (vcpu)->arch.features))
@@ -171,6 +172,7 @@ static inline u8 kvm_arm_pmu_get_pmuver_limit(void) {return 0 ; } +static inline void kvm_vcpu_pmu_resync_el0 (void ) {}#endif
Signature · 1 line
2.39.2
Quoted 20 lines · Marc Zyngier
Huang Shijie reports that, when profiling a guest from the host with a number of events that exceeds the number of available counters, the reported counts are wildly inaccurate. Without the counter oversubscription, the reported counts are correct.
Their investigation indicates that upon counter rotation (which takes place on the back of a timer interrupt), we fail to re-apply the guest EL0 enabling, leading to the counting of host events instead of guest events.
In order to solve this, add yet another hook between the host PMU driver and KVM, re-applying the guest EL0 configuration if the right conditions apply (the host is VHE, we are in interrupt context, and we interrupted a running vcpu). This triggers a new vcpu request which will apply the correct configuration on guest reentry.
With this, we have the correct counts, even when the counters are oversubscribed.
Quoted 8 lines
Reported-by Huang Shijie <[email protected]>Suggested-by Oliver Upton <[email protected]>
Tested_by: Huang Shijie <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Cc Leo Yan <[email protected]>Cc Mark Rutland <[email protected]>Cc Will Deacon <[email protected]>
This looks sane to me so:
It doesn't look like we have any PMU patches queued that would conflict, so if Will's happy I reckon this should go through the KVM/arm64 tree.
Mark.
Quoted 114 lines
---
Notes:
V2: Fixed 32bit compilationarch/arm/include/asm/arm_pmuv3.h | 2 ++ arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/arm.c | 3 +++ arch/arm64/kvm/pmu.c | 18 ++++++++++++++++++ drivers/perf/arm_pmuv3.c | 2 ++ include/kvm/arm_pmu.h | 2 ++ 6 files changed, 28 insertions(+)arch/arm/include/asm/arm_pmuv3.h +2
-0@@ -227,6 +227,8 @@ static inline bool kvm_set_pmuserenr(u64 val)return false; } +static inline void kvm_vcpu_pmu_resync_el0 (void ) {} +/* PMU Version in DFR Register */ #define ARMV8_PMU_DFR_VER_NI 0#define ARMV8_PMU_DFR_VER_V3P4 0x5arch/arm64/include/asm/kvm_host.h +1
-0@@ -49,6 +49,7 @@#define KVM_REQ_RELOAD_GICv4 KVM_ARCH_REQ(4)#define KVM_REQ_RELOAD_PMU KVM_ARCH_REQ(5)#define KVM_REQ_SUSPEND KVM_ARCH_REQ(6) +#define KVM_REQ_RESYNC_PMU_EL0 KVM_ARCH_REQ(7)#define KVM_DIRTY_LOG_MANUAL_CAPS (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \ KVM_DIRTY_LOG_INITIALLY_SET)arch/arm64/kvm/arm.c +3
-0@@ -803,6 +803,9 @@ static int check_vcpu_requests(struct kvm_vcpu *vcpu)kvm_pmu_handle_pmcr (vcpu,__vcpu_sys_reg (vcpu,PMCR_EL0 )); +if (kvm_check_request (KVM_REQ_RESYNC_PMU_EL0 , vcpu)) +kvm_vcpu_pmu_restore_guest (vcpu); +if (kvm_check_request (KVM_REQ_SUSPEND , vcpu))return kvm_vcpu_suspend (vcpu);arch/arm64/kvm/pmu.c +18
-0@@ -236,3 +236,21 @@ bool kvm_set_pmuserenr(u64 val)ctxt_sys_reg (hctxt,PMUSERENR_EL0 ) = val;return true; } + +/* +* If we interrupted the guest to update the host PMU context, make +* sure we re-apply the guest EL0 state. +*/ +void kvm_vcpu_pmu_resync_el0 (void ) +{ +struct kvm_vcpu *vcpu; + +if (!has_vhe () || !in_interrupt ()) +return ; + + vcpu =kvm_get_running_vcpu (); +if (!vcpu) +return ; + +kvm_make_request (KVM_REQ_RESYNC_PMU_EL0 , vcpu); +}drivers/perf/arm_pmuv3.c +2
-0@@ -772,6 +772,8 @@ static void armv8pmu_start(struct arm_pmu *cpu_pmu)/* Enable all counters */ armv8pmu_pmcr_write (armv8pmu_pmcr_read () |ARMV8_PMU_PMCR_E ); + +kvm_vcpu_pmu_resync_el0 (); }static void armv8pmu_stop (struct arm_pmu *cpu_pmu)include/kvm/arm_pmu.h +2
-0@@ -74,6 +74,7 @@ int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu);struct kvm_pmu_events *kvm_get_pmu_events (void );void kvm_vcpu_pmu_restore_guest (struct kvm_vcpu *vcpu);void kvm_vcpu_pmu_restore_host (struct kvm_vcpu *vcpu); +void kvm_vcpu_pmu_resync_el0 (void );#define kvm_vcpu_has_pmu (vcpu) \ (test_bit(KVM_ARM_VCPU_PMU_V3, (vcpu)->arch.features))@@ -171,6 +172,7 @@ static inline u8 kvm_arm_pmu_get_pmuver_limit(void) {return 0 ; } +static inline void kvm_vcpu_pmu_resync_el0 (void ) {}#endif Signature · 1 line
2.39.2
Will Deacon
maintainerQuoted 30 lines · Mark Rutland
Quoted 20 lines · Marc Zyngier
Huang Shijie reports that, when profiling a guest from the host with a number of events that exceeds the number of available counters, the reported counts are wildly inaccurate. Without the counter oversubscription, the reported counts are correct.
Their investigation indicates that upon counter rotation (which takes place on the back of a timer interrupt), we fail to re-apply the guest EL0 enabling, leading to the counting of host events instead of guest events.
In order to solve this, add yet another hook between the host PMU driver and KVM, re-applying the guest EL0 configuration if the right conditions apply (the host is VHE, we are in interrupt context, and we interrupted a running vcpu). This triggers a new vcpu request which will apply the correct configuration on guest reentry.
With this, we have the correct counts, even when the counters are oversubscribed.
Quoted 8 lines
Reported-by Huang Shijie <[email protected]>Suggested-by Oliver Upton <[email protected]>
Tested_by: Huang Shijie <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Cc Leo Yan <[email protected]>Cc Mark Rutland <[email protected]>Cc Will Deacon <[email protected]>
Quoted 6 lines
This looks sane to me so:
Acked-by Mark Rutland <[email protected]>It doesn't look like we have any PMU patches queued that would conflict, so if Will's happy I reckon this should go through the KVM/arm64 tree.
Fine by me!
Will
Quoted 11 lines · Marc Zyngier
Huang Shijie reports that, when profiling a guest from the host with a number of events that exceeds the number of available counters, the reported counts are wildly inaccurate. Without the counter oversubscription, the reported counts are correct.
Their investigation indicates that upon counter rotation (which takes place on the back of a timer interrupt), we fail to re-apply the guest EL0 enabling, leading to the counting of host events instead of guest events.
[...]
Applied to next, thanks!
[1/1] KVM: arm64: pmu: Resync EL0 state on counter rotation
commit: b1f778a223a2a8ad6262e5233cfc3483bcf6e213
Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Hi,
Quoted 17 lines · Marc Zyngier
Huang Shijie reports that, when profiling a guest from the host with a number of events that exceeds the number of available counters, the reported counts are wildly inaccurate. Without the counter oversubscription, the reported counts are correct.
Their investigation indicates that upon counter rotation (which takes place on the back of a timer interrupt), we fail to re-apply the guest EL0 enabling, leading to the counting of host events instead of guest events.
In order to solve this, add yet another hook between the host PMU driver and KVM, re-applying the guest EL0 configuration if the right conditions apply (the host is VHE, we are in interrupt context, and we interrupted a running vcpu). This triggers a new vcpu request which will apply the correct configuration on guest reentry.
Quoted 2 lines
With this, we have the correct counts, even when the counters are oversubscribed.
I gave a test for this patch, It works well.
However, I do see this patch can introduce huge amount invoking kvm_vcpu_pmu_restore_guest() when using 'perf record' command.
As I mentioned in the patch v2, we can call kvm_vcpu_pmu_resync_el0() in the function kvm_set_pmu_events() rather than in armv8pmu_start(). With this change, the kernel only syncs PMU context when the host and the guest have different traceing for EL0. Just paste the suggested code for reference:
@@ -46,6 +48,8 @@ void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr)
pmu->events_host |= set;
if (!attr->exclude_guest)
pmu->events_guest |= set;+
+ kvm_vcpu_pmu_resync_el0();
}
Below is the comparison result for counting resync, the result is for counting how many times kvm_vcpu_pmu_restore_guest() is called for 'perf stat' and 'perf record' commands.
| perf stat(*) | perf record(**)
-----------------+------------------+-----------------
Patch v3: | 2506 | 47325 Proposed change: | 2514 | 2504
(*): sudo ./perf stat -a -e cycles:G,cycles:H -d -d -d sleep 10 (**): sudo ./perf record -a -e cycles:G,cycles:H -d -d -d sleep 10
Thanks,
Leo
Quoted 46 lines · Leo Yan
Hi,
Quoted 17 lines · Marc Zyngier
Huang Shijie reports that, when profiling a guest from the host with a number of events that exceeds the number of available counters, the reported counts are wildly inaccurate. Without the counter oversubscription, the reported counts are correct.
Their investigation indicates that upon counter rotation (which takes place on the back of a timer interrupt), we fail to re-apply the guest EL0 enabling, leading to the counting of host events instead of guest events.
In order to solve this, add yet another hook between the host PMU driver and KVM, re-applying the guest EL0 configuration if the right conditions apply (the host is VHE, we are in interrupt context, and we interrupted a running vcpu). This triggers a new vcpu request which will apply the correct configuration on guest reentry.
Quoted 2 lines
With this, we have the correct counts, even when the counters are oversubscribed.
I gave a test for this patch, It works well.
However, I do see this patch can introduce huge amount invoking
kvm_vcpu_pmu_restore_guest()when using 'perf record' command.As I mentioned in the patch v2, we can call
kvm_vcpu_pmu_resync_el0()in the functionkvm_set_pmu_events()rather than inarmv8pmu_start(). With this change, the kernel only syncs PMU context when the host and the guest have different traceing for EL0. Just paste the suggested code for reference:drivers/perf/arm_pmuv3.c +2
-0@@ -46,6 +48,8 @@ void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr) pmu->events_host |= set;if (!attr->exclude_guest) pmu->events_guest |= set; + +kvm_vcpu_pmu_resync_el0 (); }Below is the comparison result for counting resync, the result is for counting how many times
kvm_vcpu_pmu_restore_guest()is called for 'perf stat' and 'perf record' commands.
Quoted 3 lines
| perf
stat(*)| perfrecord(**)
-----------------+------------------+-----------------Patch v3: | 2506 | 47325
Here should be "Patch v2", sorry for typo.
Quoted 7 lines
Proposed change: | 2514 | 2504(*): sudo ./perf stat -a -e cycles:G,cycles:H -d -d -d sleep 10 (**): sudo ./perf record -a -e cycles:G,cycles:H -d -d -d sleep 10
Thanks,
Leo
Hi,
Am Sonntag, 20. August 2023, 11:01:08 CEST schrieb Marc Zyngier:
Quoted 72 lines
Huang Shijie reports that, when profiling a guest from the host with a number of events that exceeds the number of available counters, the reported counts are wildly inaccurate. Without the counter oversubscription, the reported counts are correct.
Their investigation indicates that upon counter rotation (which takes place on the back of a timer interrupt), we fail to re-apply the guest EL0 enabling, leading to the counting of host events instead of guest events.
In order to solve this, add yet another hook between the host PMU driver and KVM, re-applying the guest EL0 configuration if the right conditions apply (the host is VHE, we are in interrupt context, and we interrupted a running vcpu). This triggers a new vcpu request which will apply the correct configuration on guest reentry.
With this, we have the correct counts, even when the counters are oversubscribed.
Reported-by Huang Shijie <[email protected]>Suggested-by Oliver Upton <[email protected]>
Tested_by: Huang Shijie <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Cc Leo Yan <[email protected]>Cc Mark Rutland <[email protected]>Cc Will Deacon <[email protected]>Link:
https://lore.kernel.org/r/[email protected]
om ---Notes:
V2: Fixed 32bit compilationarch/arm/include/asm/arm_pmuv3.h | 2 ++ arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/arm.c | 3 +++ arch/arm64/kvm/pmu.c | 18 ++++++++++++++++++ drivers/perf/arm_pmuv3.c | 2 ++ include/kvm/arm_pmu.h | 2 ++ 6 files changed, 28 insertions(+)(quoted diff) +0
-0
b/arch/arm/include/asm/arm_pmuv3.hindexf3cd04ff022d..72529f5e2bed100644arch/arm/include/asm/arm_pmuv3.h +2
-0@@ -227,6 +227,8 @@ static inline bool kvm_set_pmuserenr(u64 val)return false; } +static inline void kvm_vcpu_pmu_resync_el0 (void ) {} +/* PMU Version in DFR Register */ #define ARMV8_PMU_DFR_VER_NI 0#define ARMV8_PMU_DFR_VER_V3P4 0x5(quoted diff) +0
-0
b/arch/arm64/include/asm/kvm_host.hindexd3dd05bbfe23..553040e0e375100644arch/arm64/include/asm/kvm_host.h +1
-0@@ -49,6 +49,7 @@#define KVM_REQ_RELOAD_GICv4 KVM_ARCH_REQ(4)#define KVM_REQ_RELOAD_PMU KVM_ARCH_REQ(5)#define KVM_REQ_SUSPEND KVM_ARCH_REQ(6) +#define KVM_REQ_RESYNC_PMU_EL0 KVM_ARCH_REQ(7)#define KVM_DIRTY_LOG_MANUAL_CAPS (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \ KVM_DIRTY_LOG_INITIALLY_SET)arch/arm64/kvm/arm.c +0
-0
arch/arm64/kvm/arm.c static int check_vcpu_requests(struct kvm_vcpu *vcpu) · line 804
Quoted 2 lines
arch/arm64/kvm/arm.c +0
-0@@ -803,6 +803,9 @@ static int check_vcpu_requests(struct kvm_vcpu *vcpu) kvm_pmu_handle_pmcr(vcpu, __vcpu_sys_reg(vcpu,
PMCR_EL0));
Quoted 38 lines
arch/arm64/kvm/arm.c +3
-0+if (kvm_check_request (KVM_REQ_RESYNC_PMU_EL0 , vcpu)) +kvm_vcpu_pmu_restore_guest (vcpu); +if (kvm_check_request (KVM_REQ_SUSPEND , vcpu))return kvm_vcpu_suspend (vcpu);arch/arm64/kvm/pmu.c +18
-0@@ -236,3 +236,21 @@ bool kvm_set_pmuserenr(u64 val)ctxt_sys_reg (hctxt,PMUSERENR_EL0 ) = val;return true; } + +/* +* If we interrupted the guest to update the host PMU context, make +* sure we re-apply the guest EL0 state. +*/ +void kvm_vcpu_pmu_resync_el0 (void ) +{ +struct kvm_vcpu *vcpu; + +if (!has_vhe () || !in_interrupt ()) +return ; + + vcpu =kvm_get_running_vcpu (); +if (!vcpu) +return ; + +kvm_make_request (KVM_REQ_RESYNC_PMU_EL0 , vcpu); +}drivers/perf/arm_pmuv3.c +0
-0
drivers/perf/arm_pmuv3.c static void armv8pmu_start(struct arm_pmu *cpu_pmu) · line 776
Quoted 5 lines
drivers/perf/arm_pmuv3.c +2
-0@@ -772,6 +772,8 @@ static void armv8pmu_start(struct arm_pmu *cpu_pmu)/* Enable all counters */ armv8pmu_pmcr_write (armv8pmu_pmcr_read () |ARMV8_PMU_PMCR_E ); + +kvm_vcpu_pmu_resync_el0 ();
This breaks if CONFIG_HW_PERF_EVENTS is enabled but CONFIG_KVM is not. As in this case arch/arm64/kvm/pmu.c is never compiled, but the dummy inline in include/kvm/arm_pmu.h for kvm_vcpu_pmu_resync_el0() only depends on CONFIG_HW_PERF_EVENTS.
This results in this error:
aarch64-v8a-linux-gnu-ld: Unexpected GOT/PLT entries detected!
aarch64-v8a-linux-gnu-ld: Unexpected run-time procedure linkages detected!
aarch64-v8a-linux-gnu-ld: drivers/perf/arm_pmuv3.o: in function `armv8pmu_start':drivers/perf/arm_pmuv3.c:753: undefined reference to `kvm_vcpu_pmu_resync_el0'
Best regards,
Alexander
Quoted 8 lines
drivers/perf/arm_pmuv3.c +0
-0}static void armv8pmu_stop (struct arm_pmu *cpu_pmu)include/kvm/arm_pmu.h +0
-0
include/kvm/arm_pmu.h int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu); · line 79
Quoted 6 lines
include/kvm/arm_pmu.h +1
-0@@ -74,6 +74,7 @@ int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu);struct kvm_pmu_events *kvm_get_pmu_events (void );void kvm_vcpu_pmu_restore_guest (struct kvm_vcpu *vcpu);void kvm_vcpu_pmu_restore_host (struct kvm_vcpu *vcpu); +void kvm_vcpu_pmu_resync_el0 (void );#define kvm_vcpu_has_pmu (vcpu)
\
Quoted 8 lines
include/kvm/arm_pmu.h +1
-0(test_bit (KVM_ARM_VCPU_PMU_V3 , (vcpu)->arch.features))@@ -171,6 +172,7 @@ static inline u8 kvm_arm_pmu_get_pmuver_limit(void) {return 0 ; } +static inline void kvm_vcpu_pmu_resync_el0 (void ) {}#endif
Signature · 11 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/ _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Marc Zyngier
maintainerQuoted 20 lines · Alexander Stein
Hi,
drivers/perf/arm_pmuv3.c static void armv8pmu_start(struct arm_pmu *cpu_pmu) · line 776
Quoted 10 lines
drivers/perf/arm_pmuv3.c +2
-0@@ -772,6 +772,8 @@ static void armv8pmu_start(struct arm_pmu *cpu_pmu)/* Enable all counters */ armv8pmu_pmcr_write (armv8pmu_pmcr_read () |ARMV8_PMU_PMCR_E ); + +kvm_vcpu_pmu_resync_el0 ();This breaks if
CONFIG_HW_PERF_EVENTSis enabled butCONFIG_KVMis not. As in this casearch/arm64/kvm/pmu.cis never compiled, but the dummy inline ininclude/kvm/arm_pmu.hforkvm_vcpu_pmu_resync_el0()only depends onCONFIG_HW_PERF_EVENTS.
This results in this error:
Quoted 5 lines
aarch64-v8a-linux-gnu-ld: Unexpected GOT/PLT entries detected!
aarch64-v8a-linux-gnu-ld: Unexpected run-time procedure linkages detected!
aarch64-v8a-linux-gnu-ld:drivers/perf/arm_pmuv3.o: in function `armv8pmu_start':drivers/perf/arm_pmuv3.c:753: undefined reference to `kvm_vcpu_pmu_resync_el0'
Huh, that's unexpected. Let's fix it with an adequately sized hammer. Does the patch below work for you?
Thanks,
M.
From 2446f15d355ab7e766291eccf5b670a2060b4c3a Mon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Wed, 23 Aug 2023 10:14:48 +0100
Subject: [PATCH] KVM: arm64: pmu: Guard PMU emulation definitions with
CONFIG_KVM
Most of the internal definitions for PMU emulation are guarded with CONFIG_HW_PERF_EVENTS. However, this isn't enough, and leads to these definitions leaking if CONFIG_KVM isn't enabled.
This leads to some compilation breakage in this exact configuration. Fix it by falling back to the dummy stubs if either perf or KVM isn't selected.
--- include/kvm/arm_pmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/kvm/arm_pmu.h +1 -1
@@ -12,7 +12,7 @@#define ARMV8_PMU_CYCLE_IDX (ARMV8_PMU_MAX_COUNTERS - 1) -#ifdef CONFIG_HW_PERF_EVENTS +#if IS_ENABLED(CONFIG_HW_PERF_EVENTS) && IS_ENABLED(CONFIG_KVM) struct kvm_pmc { u8 idx; /* index into the pmu->pmc array */
Signature · 5 lines
2.34.1 -- Without deviation from the norm, progress is not possible.
Alexander Stein
Tested-byHi Marc,
Am Mittwoch, 23. August 2023, 11:21:45 CEST schrieb Marc Zyngier:
Quoted 23 lines
On Wed, 23 Aug 2023 08:15:38 +0100,
Quoted 20 lines · Alexander Stein
Hi,
drivers/perf/arm_pmuv3.c static void armv8pmu_start(struct arm_pmu *cpu_pmu) · line 777
Quoted 11 lines
drivers/perf/arm_pmuv3.c +2
-0@@ -772,6 +772,8 @@ static void armv8pmu_start(struct arm_pmu *cpu_pmu)/* Enable all counters */ armv8pmu_pmcr_write (armv8pmu_pmcr_read () |ARMV8_PMU_PMCR_E ); + +kvm_vcpu_pmu_resync_el0 ();This breaks if
CONFIG_HW_PERF_EVENTSis enabled butCONFIG_KVMis not. As in this casearch/arm64/kvm/pmu.cis never compiled, but the dummy inline ininclude/kvm/arm_pmu.hforkvm_vcpu_pmu_resync_el0()only depends onCONFIG_HW_PERF_EVENTS.
This results in this error:
Quoted 8 lines
Quoted 6 lines
aarch64-v8a-linux-gnu-ld: Unexpected GOT/PLT entries detected!
aarch64-v8a-linux-gnu-ld: Unexpected run-time procedure linkages detected!
aarch64-v8a-linux-gnu-ld:drivers/perf/arm_pmuv3.o: in function `armv8pmu_start':drivers/perf/arm_pmuv3.c:753: undefined reference to `kvm_vcpu_pmu_resync_el0'Huh, that's unexpected. Let's fix it with an adequately sized hammer. Does the patch below work for you?
Yes, the patch below does work for me. Thanks.
Best regards,
Alexander
Quoted 37 lines
Thanks,
M.From
2446f15d355ab7e766291eccf5b670a2060b4c3aMon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Wed, 23 Aug 2023 10:14:48 +0100
Subject: [PATCH] KVM: arm64: pmu: Guard PMU emulation definitions with
CONFIG_KVMMost of the internal definitions for PMU emulation are guarded with
CONFIG_HW_PERF_EVENTS. However, this isn't enough, and leads to these definitions leaking ifCONFIG_KVMisn't enabled.This leads to some compilation breakage in this exact configuration. Fix it by falling back to the dummy stubs if either perf or KVM isn't selected.
Reported-by Alexander Stein <[email protected]>Signed-off-by Marc Zyngier <[email protected]>--- include/kvm/arm_pmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/kvm/arm_pmu.h +1
-1@@ -12,7 +12,7 @@#define ARMV8_PMU_CYCLE_IDX (ARMV8_PMU_MAX_COUNTERS - 1) -#ifdef CONFIG_HW_PERF_EVENTS +#if IS_ENABLED(CONFIG_HW_PERF_EVENTS) && IS_ENABLED(CONFIG_KVM) struct kvm_pmc { u8 idx; /* index into the pmu->pmc array */
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/