The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Miguel Ojeda <ojeda@kernel.org>, Gary Guo <gary@garyguo.net>,
	Alice Ryhl <aliceryhl@google.com>,
	Trevor Gross <tmgross@umich.edu>,
	Boqun Feng <boqun.feng@gmail.com>,
	Sasha Levin <sashal@kernel.org>,
	alex.gaynor@gmail.com, wedsonaf@gmail.com, nathan@kernel.org,
	rust-for-linux@vger.kernel.org, llvm@lists.linux.dev
Subject: [PATCH AUTOSEL 6.10 10/24] rust: add intrinsics to fix `-Os` builds
Date: Fri, 23 Aug 2024 10:00:32 -0400	[thread overview]
Message-ID: <20240823140121.1974012-10-sashal@kernel.org> (raw)
In-Reply-To: <20240823140121.1974012-1-sashal@kernel.org>

From: Miguel Ojeda <ojeda@kernel.org>

[ Upstream commit 02dfd63afe65f7bacad543ba2b10f77083ae7929 ]

Alice reported [1] that an arm64 build failed with:

    ld.lld: error: undefined symbol: __extendsfdf2
    >>> referenced by core.a6f5fc5794e7b7b3-cgu.0
    >>>               rust/core.o:(<f32>::midpoint) in archive vmlinux.a
    >>> referenced by core.a6f5fc5794e7b7b3-cgu.0
    >>>               rust/core.o:(<f32>::midpoint) in archive vmlinux.a

    ld.lld: error: undefined symbol: __truncdfsf2
    >>> referenced by core.a6f5fc5794e7b7b3-cgu.0
    >>>               rust/core.o:(<f32>::midpoint) in archive vmlinux.a

Rust 1.80.0 or later together with `CONFIG_CC_OPTIMIZE_FOR_SIZE=y`
is what triggers it.

In addition, x86_64 builds also fail the same way.

Similarly, compiling with Rust 1.82.0 (currently in nightly) makes
another one appear, possibly due to the LLVM 19 upgrade there:

    ld.lld: error: undefined symbol: __eqdf2
    >>> referenced by core.20495ea57a9f069d-cgu.0
    >>>               rust/core.o:(<f64>::next_up) in archive vmlinux.a
    >>> referenced by core.20495ea57a9f069d-cgu.0
    >>>               rust/core.o:(<f64>::next_down) in archive vmlinux.a

Gary adds [1]:

> Usually the fix on rustc side is to mark those functions as `#[inline]`
>
> All of {midpoint,next_up,next_down} are indeed unstable functions not
> marked as inline...

Fix all those by adding those intrinsics to our usual workaround.

[ Trevor quickly submitted a fix to upstream Rust [2] that has already
  been merged, to be released in Rust 1.82.0 (2024-10-17). - Miguel ]

Cc: Gary Guo <gary@garyguo.net>
Reported-by: Alice Ryhl <aliceryhl@google.com>
Closes: https://rust-for-linux.zulipchat.com/#narrow/stream/x/topic/x/near/455637364 [1]
Reviewed-by: Trevor Gross <tmgross@umich.edu>
Tested-by: Alice Ryhl <aliceryhl@google.com>
Tested-by: Boqun Feng <boqun.feng@gmail.com>
Reviewed-by: Gary Guo <gary@garyguo.net>
Link: https://github.com/rust-lang/rust/pull/128749 [2]
Link: https://lore.kernel.org/r/20240806150619.192882-1-ojeda@kernel.org
[ Shortened Zulip link. - Miguel ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 rust/Makefile             | 4 ++--
 rust/compiler_builtins.rs | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rust/Makefile b/rust/Makefile
index 5a41ace9fea10..de223d74d683d 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -408,8 +408,8 @@ rust-analyzer:
 		$(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json
 
 redirect-intrinsics = \
-	__addsf3 __eqsf2 __gesf2 __lesf2 __ltsf2 __mulsf3 __nesf2 __unordsf2 \
-	__adddf3 __ledf2 __ltdf2 __muldf3 __unorddf2 \
+	__addsf3 __eqsf2 __extendsfdf2 __gesf2 __lesf2 __ltsf2 __mulsf3 __nesf2 __truncdfsf2 __unordsf2 \
+	__adddf3 __eqdf2 __ledf2 __ltdf2 __muldf3 __unorddf2 \
 	__muloti4 __multi3 \
 	__udivmodti4 __udivti3 __umodti3
 
diff --git a/rust/compiler_builtins.rs b/rust/compiler_builtins.rs
index bba2922c6ef77..f14b8d7caf899 100644
--- a/rust/compiler_builtins.rs
+++ b/rust/compiler_builtins.rs
@@ -40,16 +40,19 @@ pub extern "C" fn $ident() {
 define_panicking_intrinsics!("`f32` should not be used", {
     __addsf3,
     __eqsf2,
+    __extendsfdf2,
     __gesf2,
     __lesf2,
     __ltsf2,
     __mulsf3,
     __nesf2,
+    __truncdfsf2,
     __unordsf2,
 });
 
 define_panicking_intrinsics!("`f64` should not be used", {
     __adddf3,
+    __eqdf2,
     __ledf2,
     __ltdf2,
     __muldf3,
-- 
2.43.0


  parent reply	other threads:[~2024-08-23 14:01 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-23 14:00 [PATCH AUTOSEL 6.10 01/24] drm/mediatek: Set sensible cursor width/height values to fix crash Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 02/24] ksmbd: override fsids for share path check Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 03/24] ksmbd: override fsids for smb2_query_info() Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 04/24] usbnet: ipheth: race between ipheth_close and error handling Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 05/24] usbnet: ipheth: remove extraneous rx URB length check Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 06/24] usbnet: ipheth: drop RX URBs with no payload Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 07/24] usbnet: ipheth: do not stop RX on failing RX callback Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 08/24] usbnet: ipheth: fix carrier detection in modes 1 and 4 Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 09/24] kbuild: rust: skip -fmin-function-alignment in bindgen flags Sasha Levin
2024-08-24 14:45   ` Miguel Ojeda
2024-08-23 14:00 ` Sasha Levin [this message]
2024-08-24 14:45   ` [PATCH AUTOSEL 6.10 10/24] rust: add intrinsics to fix `-Os` builds Miguel Ojeda
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 11/24] net: ethernet: use ip_hdrlen() instead of bit shift Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 12/24] drm: panel-orientation-quirks: Add quirk for Ayn Loki Zero Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 13/24] drm: panel-orientation-quirks: Add quirk for Ayn Loki Max Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 14/24] net: phy: vitesse: repair vsc73xx autonegotiation Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 15/24] powerpc/mm: Fix boot warning with hugepages and CONFIG_DEBUG_VIRTUAL Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 16/24] wifi: mt76: mt7921: fix NULL pointer access in mt7921_ipv6_addr_change Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 17/24] Squashfs: sanity check symbolic link size Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 18/24] drm/amdgpu: Update kmd_fw_shared for VCN5 Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 19/24] of/irq: Prevent device address out-of-bounds read in interrupt map walk Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 20/24] lib/generic-radix-tree.c: Fix rare race in __genradix_ptr_alloc() Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 21/24] net: hns3: void array out of bound when loop tnl_num Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 22/24] net: hns3: use correct release function during uninitialization Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 23/24] kunit/overflow: Fix UB in overflow_allocation_test Sasha Levin
2024-08-23 14:00 ` [PATCH AUTOSEL 6.10 24/24] btrfs: update target inode's ctime on unlink Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240823140121.1974012-10-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=boqun.feng@gmail.com \
    --cc=gary@garyguo.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=llvm@lists.linux.dev \
    --cc=nathan@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tmgross@umich.edu \
    --cc=wedsonaf@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox