Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Gary Guo <gary@garyguo.net>
To:     Miguel Ojeda <ojeda@kernel.org>,
        Alex Gaynor <alex.gaynor@gmail.com>,
        Wedson Almeida Filho <wedsonaf@gmail.com>,
        Boqun Feng <boqun.feng@gmail.com>, Gary Guo <gary@garyguo.net>,
        =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= <bjorn3_gh@protonmail.com>,
        rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3] rust: compiler_builtins: make stubs non-global
Date:   Mon,  5 Dec 2022 21:44:54 +0000
Message-Id: <20221205214454.2542888-1-gary@garyguo.net>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?alfLTapgbApl0uy3ah/Y7f39Znh6EFLB1xML/xc9AddgPAPXgUHkNih+zdEw?=
 =?us-ascii?Q?fDxKAJx0pFsk6WdKGBtY56iRWibMa4wOWh4YAqQSHFx0z17qMaypB6L47ikF?=
 =?us-ascii?Q?+RfjFxHLyf6PtnC3PkTQo1C06Tp6KTphyE4FoBLFL2NjqOmT6bL+FEpYI4iM?=
 =?us-ascii?Q?SJ1B5Op9TH7MGYC4VGU6Tl0MeqlfwyUaCqWtd5ggqCdh4hR5IFhC2KyHT3dU?=
 =?us-ascii?Q?iSW8CujF/eIOAlX9tL3m3jQBpb59/kQg0Ce7yd3+p+3YY7t0/eYZX4mmkBut?=
 =?us-ascii?Q?BUqzvt0noCro77UongOAeCswW4TLN9OJymBmwo3NGLDNLDY4oqOhQcS9GPE7?=
 =?us-ascii?Q?Zqe3Ih3TgOUjpK17rVKeDgwc0XH281I3q4H0EPMyYrSM45kYW3VDzbUdRsx/?=
 =?us-ascii?Q?18XzWlbhmtJR2SgeA3evbodJWDjDCXuxb1qJLTEJFscUq+pXNXbEvb8AqVfH?=
 =?us-ascii?Q?N6UoKx4lpVWNPbkvcbA/pDG7bWyjVUKxr2/csl0ODni3BKs67gCUiCItncB6?=
 =?us-ascii?Q?2oW3UQSR9XSqvfefuiw24OAAHiYa0pjgpoj17CkvoClOTsX+/c6idg7Q8C0R?=
 =?us-ascii?Q?uxRuxAGLdiZ0nJ7b46+hg5dX0eTADD7tYm9xF/DH8KCMYNePiGg87r9YpCfx?=
 =?us-ascii?Q?+NgaI/3lejpvKdCyN2w96OwY9rfnUvECOyzSEuRTVxFo39/56ymvUEsI/o2t?=
 =?us-ascii?Q?hwvMSyOY3YhHhf1bOglnhnVEYO2jb4I6mfCTb2fJB8ai3EFmklDJossDWbOL?=
 =?us-ascii?Q?tJsVp2IFIKjDVl+QaKd8P5kwvBFFa4fA/ojbwYMhNvSGjK4iPT5Pf/GvFlR5?=
 =?us-ascii?Q?+gP8fHN8sqWvAqqGBvyuUWCOX8y6B8SySJImhiSQikMIm6Kklj4/ydhZe2++?=
 =?us-ascii?Q?E+p4/Kdc0MDXvnwILSGgZpNI8KfgSUBuwX/F61uTR2CAbftNRdlNoCbaSTjo?=
 =?us-ascii?Q?HJAYWBN/lGE5t8GodQyasFBoZfe8brcIw/4geeWc7fIgjPMT0ChQYXDwA4V6?=
 =?us-ascii?Q?d+hmpWWmlliZQtvwqUYEt+qoznI+4CRBQTheBir+/vDmy+vVqLl+ojJrML99?=
 =?us-ascii?Q?lvD8uf8wxiR5SyyXa5pse6oO+LhKIJiEJTrHDEdI9CDeXLUonRVRLX9kL9LG?=
 =?us-ascii?Q?Bhw4SA7HoUaVuplh8wPAFQArVvOP7OUtbb84NQMAirZjPsnmQY5AXC8hVLtf?=
 =?us-ascii?Q?xlh+L+9+LDG99gKCz0Z/S/LtqZHyBeaWAjkks0gNWR6hQ8dQ/m0BH+Zs7rQf?=
 =?us-ascii?Q?xrPTBNMhwOZ79miiH2u5ZSPvfZiZsS6GH6LmEi3HUSie2NeUW8L2Tn+3frGH?=
 =?us-ascii?Q?hsvsVHzdbCrwT2AbnpwM/uefnn4hMXzdqYUXF+uBsV8WMSNVsEtJvCSuti6m?=
 =?us-ascii?Q?5S3uWquVDCksqgce+reDfGSSI/uy5mrGLVE5c+U+7wC2730c9Lx3y5767SQ1?=
 =?us-ascii?Q?PG8BWJiU5IQtOv1mCUfHepwHajbXoqTa2Z1rRDlTjMI9uAaC3oT30Vl7d7bp?=
 =?us-ascii?Q?vMI+e0ZJN9hWuGg4bUahA8bDa0ssZ8vm6bhOSAYdbAV46L4fLTHTvFGcRoYz?=
 =?us-ascii?Q?aKAvRmO/jiWFdrE4HK4=3D?=
X-OriginatorOrg: garyguo.net
X-MS-Exchange-CrossTenant-Network-Message-Id: aca7cffe-d9f0-4d4d-3cf8-08dad709fd93
X-MS-Exchange-CrossTenant-AuthSource: LO2P265MB5183.GBRP265.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2022 21:45:13.6570
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YPt0UXNnTo3iq10W0fT2cVZI1+Zrik/0apmt1/ORmLfAMouP0j5mKvoBFgTZasGEMeOAcD+jQ1EnmjeBNqQkkQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO6P265MB6238
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Currently we define a number of stubs for compiler-builtin intrinsics
that compiled libcore generates. The defined stubs are weak so they will
not conflict with genuine implementation of these intrinsics, but their
effect is global and will cause non-libcore code that accidently
generate these intrinsics calls compile and bug on runtime.

Instead of defining a stub that can affect all code, this patch uses
objcopy's `--redefine-sym` flag to redirect these calls (from libcore
only) to a prefixed version (e.g. redirect `__multi3` to `__rust_multi3`),
so we can define panciking stubs that are only visible to libcore.

This patch was previously discussed on GitHub [1].

Link: https://github.com/Rust-for-Linux/linux/pull/779 [1]
Signed-off-by: Gary Guo <gary@garyguo.net>
---
 rust/Makefile             | 14 ++++++++++++++
 rust/compiler_builtins.rs |  5 ++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/rust/Makefile b/rust/Makefile
index ff70c4c916f8..aed6f7eca36f 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -359,8 +359,22 @@ rust-analyzer:
 	$(Q)$(srctree)/scripts/generate_rust_analyzer.py $(srctree) $(objtree) \
 		$(RUST_LIB_SRC) > $(objtree)/rust-project.json
 
+redirect-intrinsics = \
+	__eqsf2 __gesf2 __lesf2 __nesf2 __unordsf2 \
+	__unorddf2 \
+	__muloti4 __multi3 \
+	__udivmodti4 __udivti3 __umodti3
+
+ifneq ($(or $(CONFIG_ARM64),$(and $(CONFIG_RISCV),$(CONFIG_64BIT))),)
+	# These intrinsics are defined for ARM64 and RISCV64
+	redirect-intrinsics += \
+		__ashrti3 \
+		__ashlti3 __lshrti3
+endif
+
 $(obj)/core.o: private skip_clippy = 1
 $(obj)/core.o: private skip_flags = -Dunreachable_pub
+$(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
 $(obj)/core.o: private rustc_target_flags = $(core-cfgs)
 $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs $(obj)/target.json FORCE
 	$(call if_changed_dep,rustc_library)
diff --git a/rust/compiler_builtins.rs b/rust/compiler_builtins.rs
index f8f39a3e6855..43378357ece9 100644
--- a/rust/compiler_builtins.rs
+++ b/rust/compiler_builtins.rs
@@ -28,7 +28,7 @@ macro_rules! define_panicking_intrinsics(
     ($reason: tt, { $($ident: ident, )* }) => {
         $(
             #[doc(hidden)]
-            #[no_mangle]
+            #[export_name = concat!("__rust", stringify!($ident))]
             pub extern "C" fn $ident() {
                 panic!($reason);
             }
@@ -61,3 +61,6 @@ define_panicking_intrinsics!("`u128` should not be used", {
     __udivti3,
     __umodti3,
 });
+
+// NOTE: if you are adding a new intrinsic here, you should also add it to
+// `redirect-intrinsics` in `rust/Makefile`.
-- 
2.34.1