From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38612C433F5 for ; Wed, 16 Feb 2022 16:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236286AbiBPQWy (ORCPT ); Wed, 16 Feb 2022 11:22:54 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:32918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232378AbiBPQWv (ORCPT ); Wed, 16 Feb 2022 11:22:51 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4EE2517184D for ; Wed, 16 Feb 2022 08:22:38 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0A883D6E; Wed, 16 Feb 2022 08:22:38 -0800 (PST) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 278D03F70D; Wed, 16 Feb 2022 08:22:36 -0800 (PST) From: Mark Rutland To: linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, peterz@infradead.org Cc: acme@redhat.com, ardb@kernel.org, bp@alien8.de, broonie@kernel.org, dave.hansen@linux.intel.com, joey.gouly@arm.com, jpoimboe@redhat.com, jslaby@suse.cz, linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com, mingo@redhat.com, tglx@linutronix.de Subject: [PATCH v4 0/4] linkage: better symbol aliasing Date: Wed, 16 Feb 2022 16:22:25 +0000 Message-Id: <20220216162229.1076788-1-mark.rutland@arm.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.30.2