perf/core: Drop __weak attribute from arch_perf_update_userpage() prototype
PATCH v2 1/1 perf/core: Drop __weak attribute from arch_perf_update_userpage() prototype
Reiji reports that the arm64 implementation of arch_perf_update_userpage() is now ignored and replaced by the dummy stub in core code. This seems to happen since the PMUv3 driver was moved to driver/perf.
As it turns out, dropping the __weak attribute from the *prototype* of the function solves the problem. You're right, this doesn't seem to make much sense. And yet... It appears that both symbols get flagged as weak, and that the first one to appear in the link order wins:
$ nm drivers/perf/arm_pmuv3.o|grep arch_perf_update_userpage 0000000000001db0 W arch_perf_update_userpage
Dropping the attribute from the prototype restores the expected behaviour, and arm64 is able to enjoy arch_perf_update_userpage() again.
--- include/linux/perf_event.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/perf_event.h +3 -3
@@ -1845,9 +1845,9 @@ int perf_event_exit_cpu(unsigned int cpu);#define perf_event_exit_cpu NULL#endif -extern void __weak arch_perf_update_userpage (struct perf_event *event, -struct perf_event_mmap_page *userpg, -u64 now); +extern void arch_perf_update_userpage (struct perf_event *event, +struct perf_event_mmap_page *userpg, +u64 now);#ifdef CONFIG_MMU extern __weak u64 arch_perf_get_page_size (struct mm_struct *mm,unsigned long addr);
Signature · 1 line
2.34.1
Quoted 19 lines · Marc Zyngier
Reiji reports that the arm64 implementation of
arch_perf_update_userpage()is now ignored and replaced by the dummy stub in core code. This seems to happen since the PMUv3 driver was moved to driver/perf.As it turns out, dropping the
__weakattribute from the *prototype* of the function solves the problem. You're right, this doesn't seem to make much sense. And yet... It appears that both symbols get flagged as weak, and that the first one to appear in the link order wins:$ nm drivers/perf/arm_pmuv3.o|grep arch_perf_update_userpage 0000000000001db0 W arch_perf_update_userpageDropping the attribute from the prototype restores the expected behaviour, and arm64 is able to enjoy
arch_perf_update_userpage()again.Fixes 7755cec63ade ("arm64: perf: Move PMUv3 driver to drivers/perf")Fixes f1ec3a517b43 ("kernel/events: Add a missing prototype for
Quoted 7 lines
arch_perf_update_userpage()")Reported-by Reiji Watanabe <[email protected]>Tested-by Reiji Watanabe <[email protected]>Acked-by Mark Rutland <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Will Deacon <[email protected]>
And of course I forgot to pass --notes to git-send-email...
v2: Added fixes tags, both for the commit that introduce the
breakage
on arm64, and for the commit introducing the offending
prototype.
I did not Cc stable on purpose, as nothing appears to be broken in other architectures.
Thanks,
M.
Signature · 6 lines
Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Peter Zijlstra
maintainerQuoted 17 lines · Marc Zyngier
Reiji reports that the arm64 implementation of
arch_perf_update_userpage()is now ignored and replaced by the dummy stub in core code. This seems to happen since the PMUv3 driver was moved to driver/perf.As it turns out, dropping the
__weakattribute from the *prototype* of the function solves the problem. You're right, this doesn't seem to make much sense. And yet... It appears that both symbols get flagged as weak, and that the first one to appear in the link order wins:$ nm drivers/perf/arm_pmuv3.o|grep arch_perf_update_userpage 0000000000001db0 W arch_perf_update_userpageDropping the attribute from the prototype restores the expected behaviour, and arm64 is able to enjoy
arch_perf_update_userpage()again.
Quoted 8 lines
Fixes 7755cec63ade ("arm64: perf: Move PMUv3 driver to drivers/perf")Fixes f1ec3a517b43 ("kernel/events: Add a missing prototype for arch_perf_update_userpage()")Reported-by Reiji Watanabe <[email protected]>Tested-by Reiji Watanabe <[email protected]>Acked-by Mark Rutland <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Will Deacon <[email protected]>
Thanks! in perf/urgent it goes
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: b50f26a44887f3f71ff5457135ee1d5f1d542d7d Gitweb: https://git.kernel.org/tip/b50f26a44887f3f71ff5457135ee1d5f1d542d7d Author: Marc Zyngier <[email protected]> AuthorDate: Fri, 16 Jun 2023 12:48:31 +01:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 16 Jun 2023 16:46:33 +02:00
perf/core: Drop __weak attribute from arch_perf_update_userpage() prototype
Reiji reports that the arm64 implementation of arch_perf_update_userpage() is now ignored and replaced by the dummy stub in core code. This seems to happen since the PMUv3 driver was moved to driver/perf.
As it turns out, dropping the __weak attribute from the *prototype* of the function solves the problem. You're right, this doesn't seem to make much sense. And yet... It appears that both symbols get flagged as weak, and that the first one to appear in the link order wins:
$ nm drivers/perf/arm_pmuv3.o|grep arch_perf_update_userpage 0000000000001db0 W arch_perf_update_userpage
Dropping the attribute from the prototype restores the expected behaviour, and arm64 is able to enjoy arch_perf_update_userpage() again.
--- include/linux/perf_event.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/perf_event.h +3 -3
@@ -1845,9 +1845,9 @@ int perf_event_exit_cpu(unsigned int cpu);#define perf_event_exit_cpu NULL#endif -extern void __weak arch_perf_update_userpage (struct perf_event *event, -struct perf_event_mmap_page *userpg, -u64 now); +extern void arch_perf_update_userpage (struct perf_event *event, +struct perf_event_mmap_page *userpg, +u64 now);#ifdef CONFIG_MMU extern __weak u64 arch_perf_get_page_size (struct mm_struct *mm,unsigned long addr);