| Message ID | 20220216162229.1076788-1-mark.rutland@arm.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | linkage: better symbol aliasing | expand |
On Wed, Feb 16, 2022 at 04:22:25PM +0000, Mark Rutland wrote: > Catalin, Will, Peter: I think this is ready now and would like to get it > queued, but it looks like this may (trivially) conflict with other bits > we'll want to queue in either the arm64 tree (Joey's string routine > changes [4]), or tip tree (Peter's IBT series). > > I assume the best thing to do would be to have a stable branch merged in > both of those. I've tagged this such that it can be pulled (details > below); Peter also suggested he could make a stable branch in the tip > tree. Any preference? No real preference, The conflicts on my end are really rather trivial IIRC, but they're a nice clean-up. If I don't take then, feel free to add: Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Hi Peter, On Thu, Feb 17, 2022 at 11:58:31AM +0100, Peter Zijlstra wrote: > On Wed, Feb 16, 2022 at 04:22:25PM +0000, Mark Rutland wrote: > > Catalin, Will, Peter: I think this is ready now and would like to get it > > queued, but it looks like this may (trivially) conflict with other bits > > we'll want to queue in either the arm64 tree (Joey's string routine > > changes [4]), or tip tree (Peter's IBT series). > > > > I assume the best thing to do would be to have a stable branch merged in > > both of those. I've tagged this such that it can be pulled (details > > below); Peter also suggested he could make a stable branch in the tip > > tree. Any preference? > > No real preference, The conflicts on my end are really rather trivial > IIRC, but they're a nice clean-up. > > If I don't take then, feel free to add: > > Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Mark mentioned yesterday that this series will conflict with some pending rework to the arm64 string routines [1], so we probably want a shared branch to handle the fallout. Do you plan to queue this someplace in -tip that I can pull from, or shall I create a stable branch on the arm64 side? Cheers, Will [1] https://lore.kernel.org/r/20220215170723.21266-1-joey.gouly@arm.com
On Wed, 16 Feb 2022 16:22:25 +0000, Mark Rutland wrote: > Catalin, Will, Peter: I think this is ready now and would like to get it > queued, but it looks like this may (trivially) conflict with other bits > we'll want to queue in either the arm64 tree (Joey's string routine > changes [4]), or tip tree (Peter's IBT series). > > I assume the best thing to do would be to have a stable branch merged in > both of those. I've tagged this such that it can be pulled (details > below); Peter also suggested he could make a stable branch in the tip > tree. Any preference? > > [...] Applied to arm64 (for-next/linkage), thanks! [1/4] linkage: add SYM_FUNC_ALIAS{,_LOCAL,_WEAK}() https://git.kernel.org/arm64/c/e0891269a8c2 [2/4] arm64: clean up symbol aliasing https://git.kernel.org/arm64/c/0f61f6be1f7f [3/4] x86: clean up symbol aliasing https://git.kernel.org/arm64/c/7be2e319640c [4/4] linkage: remove SYM_FUNC_{START,END}_ALIAS() https://git.kernel.org/arm64/c/be9aea744004 Cheers,
On Tue, Feb 22, 2022 at 10:09:19AM +0000, Will Deacon wrote: > Hi Peter, > > On Thu, Feb 17, 2022 at 11:58:31AM +0100, Peter Zijlstra wrote: > > On Wed, Feb 16, 2022 at 04:22:25PM +0000, Mark Rutland wrote: > > > Catalin, Will, Peter: I think this is ready now and would like to get it > > > queued, but it looks like this may (trivially) conflict with other bits > > > we'll want to queue in either the arm64 tree (Joey's string routine > > > changes [4]), or tip tree (Peter's IBT series). > > > > > > I assume the best thing to do would be to have a stable branch merged in > > > both of those. I've tagged this such that it can be pulled (details > > > below); Peter also suggested he could make a stable branch in the tip > > > tree. Any preference? > > > > No real preference, The conflicts on my end are really rather trivial > > IIRC, but they're a nice clean-up. > > > > If I don't take then, feel free to add: > > > > Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> > > Mark mentioned yesterday that this series will conflict with some pending > rework to the arm64 string routines [1], so we probably want a shared > branch to handle the fallout. > > Do you plan to queue this someplace in -tip that I can pull from, or > shall I create a stable branch on the arm64 side? Following discussion on IRC, I've pushed this out to the for-next/linkage branch on the arm64 git. Let's give it a day or so in -next, then if it doesn't fall apart you can pull it in to -tip as well. Cheers, Will
Catalin, Will, Peter: I think this is ready now and would like to get it queued, but it looks like this may (trivially) conflict with other bits we'll want to queue in either the arm64 tree (Joey's string routine changes [4]), or tip tree (Peter's IBT series). I assume the best thing to do would be to have a stable branch merged in both of those. I've tagged this such that it can be pulled (details below); Peter also suggested he could make a stable branch in the tip tree. Any preference? The usual blurb follows. This series aims to make symbol aliasing simpler and more consistent. The basic idea is to replace SYM_FUNC_START_ALIAS(alias) and SYM_FUNC_END_ALIAS(alias) with a new SYM_FUNC_ALIAS(alias, name), so that e.g. SYM_FUNC_START(func) SYM_FUNC_START_ALIAS(alias1) SYM_FUNC_START_ALIAS(alias2) ... asm insns ... SYM_FUNC_END(func) SYM_FUNC_END_ALIAS(alias1) SYM_FUNC_END_ALIAS(alias2) EXPORT_SYMBOL(alias1) EXPORT_SYMBOL(alias2) ... can become: SYM_FUNC_START(name) ... asm insns ... SYM_FUNC_END(name) SYM_FUNC_ALIAS(alias1, func) EXPORT_SYMBOL(alias1) SYM_FUNC_ALIAS(alias2, func) EXPORT_SYMBOL(alias2) This avoids repetition and hopefully make it easier to ensure consistency (e.g. so each function has a single canonical name and associated metadata). I've build-tested the following with both GCC 10.3.0 and LLVM 13.0.0 without issues (ignoring any existing warnings): * arm omap1_defconfig (v2 broke with LLVM here) * arm multi_v7_defconfig * arm64 defconfig * i386 defconfig * x86_64 defconfig I've boot-tested the arm64 Images. I've pushed the series to my `linkage/alias-rework` branch on git.kernel.org, atop v5.17-rc2: git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git linkage/alias-rework https://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git/log/?h=linkage/alias-rework This version is tagged as: linkage-alias-rework-20220216. Since RFCv1 [1]: * Drop arm64 dma alias removal (taken via arm64 for v5.17-rc1) * Rename SYM_FUNC_LOCAL_ALIAS() -> SYM_FUNC_ALIAS_LOCAL() * Update the tools/ copies of x86 routines * Add preparatory fix for 32-bit arm * Rebase to v5.17-rc1 Since v2 [2]: * Rework to be LLVM-compatible - Drop SYM_ENTRY_AT() / SYM_END_AT() - Drop unnecessary local symbols - Calculate size in SYM_END() - Use common SYM_ALIAS() * Drop newly redundant arch/arm changes * Clarify commit message wording * Fix typos Since v3 [3]: * Update tools/perf/ header copy alongside core header * Add Josh's Acks * Fix typos * Order SYM_FUNC_ALIAS()/SYM_FUNC_ALIAS_LOCAL()/SYM_FUNC_ALIAS() consistently [1] https://lore.kernel.org/r/20211206124715.4101571-1-mark.rutland@arm.com/ [2] https://lore.kernel.org/r/20220125113200.3829108-1-mark.rutland@arm.com/ [3] https://lore.kernel.org/r/20220211151445.2027553-1-mark.rutland@arm.com/ [4] https://lore.kernel.org/linux-arm-kernel/20220215170723.21266-1-joey.gouly@arm.com/ Thanks, Mark. Mark Rutland (4): linkage: add SYM_FUNC_ALIAS{,_LOCAL,_WEAK}() arm64: clean up symbol aliasing x86: clean up symbol aliasing linkage: remove SYM_FUNC_{START,END}_ALIAS() Documentation/asm-annotations.rst | 11 ++-- arch/arm64/include/asm/linkage.h | 24 --------- arch/arm64/kvm/hyp/nvhe/cache.S | 5 +- arch/arm64/lib/clear_page.S | 5 +- arch/arm64/lib/copy_page.S | 5 +- arch/arm64/lib/memchr.S | 5 +- arch/arm64/lib/memcmp.S | 6 +-- arch/arm64/lib/memcpy.S | 21 ++++---- arch/arm64/lib/memset.S | 12 +++-- arch/arm64/lib/strchr.S | 6 ++- arch/arm64/lib/strcmp.S | 6 +-- arch/arm64/lib/strlen.S | 6 +-- arch/arm64/lib/strncmp.S | 6 +-- arch/arm64/lib/strnlen.S | 6 ++- arch/arm64/lib/strrchr.S | 5 +- arch/arm64/mm/cache.S | 35 +++++++------ arch/x86/boot/compressed/head_32.S | 3 +- arch/x86/boot/compressed/head_64.S | 3 +- arch/x86/crypto/aesni-intel_asm.S | 4 +- arch/x86/lib/memcpy_64.S | 10 ++-- arch/x86/lib/memmove_64.S | 4 +- arch/x86/lib/memset_64.S | 6 +-- include/linux/linkage.h | 67 +++++++++++++------------ tools/arch/x86/lib/memcpy_64.S | 10 ++-- tools/arch/x86/lib/memset_64.S | 6 +-- tools/perf/util/include/linux/linkage.h | 52 ++++++++++++------- 26 files changed, 169 insertions(+), 160 deletions(-)