From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93EB93BB690 for ; Thu, 8 Oct 2026 05:38:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791437882; cv=none; b=J4Ip+tPq6xmFcMs66XtWcIr+nurHQHX516pqDSSPg0i4oEWC5NiRarxfYnPpjLRhfQkLvYVsW81Cq6siObOCHxURV6GlBDMz7S0/4rcZ6n+XN5FjSmc6Z9Xxs7tid02/SFgdXX9T6xOyeK80WGQqf+ZYRXB1uRX/B/5JC1JqmhM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791437882; c=relaxed/simple; bh=rvDjT6+rkk/VmCiFIRydEcSy1yOMxPWIRLLIGRibt+E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RFidmNI0jGCwAX1jEp74vyoOcUnfz3Q2MCBxf5VJJN/FF6fGLH19dmDDakysNNvBjrQMnZjUAWDw7DMEtGepJWJOEEv0MIQQMrEKF9sbDwdCsqS789rkVb8XXD8odIkXM7S1bR0D5Q+cdiDjFySUI58hQeYp54M9hmJ//byfmsA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Yh7cMBgm; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Yh7cMBgm" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-48af27fe287so1891698f8f.0 for ; Wed, 07 Oct 2026 22:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791437879; x=1792042679; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FsH0cWn1LlvsmNG6WCJYq22XE9O6pVl1IRSuRFpVGDU=; b=Yh7cMBgmo/6b3k4PctoEFzhD1e/0KD17cA82ogqXm+7ubHjRBxuz3nyiQmM8Cx+5r9 DIxXxYjk2hJMGrkqsr55v+zrTCI5ifQ+Jd332fas4pNIUvVHQtb/t0BfYILk46GepYtb Q9wklXu2iHmxarNKtwahW+5Eig4JSHSxv6+DePExzzuui0MkdSb7fTEKDuswI/FuuQaB 3pt/S5Aj6GCvNGVKCUYLlzF4SH4aLF8D1D+UQfMniBiHyIqvOZkBThYNSXg70oWufCup /k5KPKimHiSZhBn+E8rwczL516L733mvPmYFVL6EUFgdvre/F85WnkHAxsS3riXCVISl qXXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791437879; x=1792042679; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=FsH0cWn1LlvsmNG6WCJYq22XE9O6pVl1IRSuRFpVGDU=; b=wKpswCrebxdXMSyQNpO40hBvW8XZosMICj15/DuzJAjpoW2V8yz3gXVOu+TLMjsTOg 3f2aN0JwXGejmom/qnqocSo3BqDsuog4xQjC48SPgHpzIQ5hWhPRms6XDW7x5jt2vLF4 cozzu6R/dLI6IE4pSrnF14Rxac/OGtqPW3QQiVjs3sOLPLdwi+GDXnP2Bp3XwLTXnCZW SQjqpu1Uj40PsopbPBCovuObtaFRAlXtrxooen2v5oedJ5z61jeY5YqVayBto3UmspB4 4nTzkgNGNn8I7Y2BQPNfiYTc3o3RUB27ySHEbp6DsCgMn7lguFr2qmIhM8eGJSEpouZ6 ofsA== X-Forwarded-Encrypted: i=1; AKwUvBxKhx+Y9EY6jRvvfoUt2jY2pWuUuuLQplJ/tUHxgFAOfuELoExD2jtEKJAU2k84xVppocViq+OO0OYNvpmk5w==@vger.kernel.org X-Gm-Message-State: AFq9FYLUoCQW3IDVrCcf7bdfjVgC9QzyOYSr0DNaCo+FBMal5jFSTbvC srcR7PPjnTE6vCTQbd5/82oInChVh1VUrfLRo/uXr7++Tg2x6s+7j0z9 X-Gm-Gg: AYBFou3/OCDG17DOWujw5mqc4dGDqHBQf6bgw2QnF1pKt9boP+9/bAq3mcVqF8T2khh BZsoX6mgOL7hI9vHbQmUNWzntCJMszkRgFdYALd70hg1r8X0FZGI28ry/7YPz/R3+ii18YR27eW H9e2+j6NVEjCFRB7hwpXMzKta0ivdTTxauZDjzpPUK+SY3Ggto+IFiwpwBEao1EYtLJz8iwQXl5 j4sf35/zKuIAGH8+1hJ5v0OJH0+C2Kph7WkTqnvikWFzshSfxaWu7fMdyg0lHye9NeAJ4fkgTsZ KYp7GNTyN2yIPQo0smodt8yFCcHg5Fii/ECDf4l0gAQGyf7DVkj29dj8k8ohlRvROY+KkUOKAbS /4LmNrdDYeCdBtnMuj8q6JxbstN2TCe74QLNvn2gG9QiPi5w5ec9CVd5WR4V+rDv0J8BvdyYV4T 390EY3vefzxqb6bB/Ra0A7r52iAFkl7L9X7euWQWOj2yyiO7oYn8pdAvz3eB95hoRVcwa2JBTeY 7oE3Ryn/zvltM9UztWjclQJK/7L01A+eK6VADdXERLzOGbOozUKr2bVdXGW4QHlOV+Hq2MF20gk 8P+BTe8TPU770RgniOKfp49hXYFEG6Z7H0Bm6VO2t4cqr1C0oAk8DfFD5LomN2IrxOhRyqH7KRT u+o5S73w= X-Received: by 2002:a05:6000:2407:b0:48a:fcf9:aca5 with SMTP id ffacd0b85a97d-48c72779796mr7901474f8f.11.1791437878835; Wed, 07 Oct 2026 22:37:58 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-ad61-5a01-743c-891f-b33c-cae7.310.pool.telefonica.de. [2a02:3100:ad61:5a01:743c:891f:b33c:cae7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48c71d1f8fbsm8458219f8f.33.2026.10.07.22.37.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 07 Oct 2026 22:37:58 -0700 (PDT) From: Karl Mehltretter To: Russell King , Miguel Ojeda Cc: Karl Mehltretter , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?UTF-8?q?Onur=20=C3=96zkan?= , Arnd Bergmann , Linus Walleij , Christian Schrefl , Bradley Morgan , "Paul E . McKenney" , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-arm-kernel@lists.infradead.org, rust-for-linux@vger.kernel.org, llvm@lists.linux.dev, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] ARM: cmpxchg: support 2-byte xchg() on pre-ARMv6 CPUs Date: Thu, 8 Oct 2026 07:37:42 +0200 Message-Id: <20261008053746.49631-3-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261008053746.49631-1-kmehltretter@gmail.com> References: <20261008053746.49631-1-kmehltretter@gmail.com> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Pre-ARMv6 CPUs have no halfword swp, so __arch_xchg() only handles 1- and 4-byte exchanges there and turns any other size into a link error via __bad_xchg(). No C code needs a 16-bit xchg() on these CPUs, but the Rust atomic helpers in rust/helpers/atomic_ext.c provide xchg() for Atomic unconditionally, so building with CONFIG_RUST=y for ARMv5 fails: ld.lld: error: undefined symbol: __bad_xchg >>> referenced by helpers.c >>> rust/helpers/helpers.o:(rust_helper_atomic_i16_xchg) Implement the 2-byte case with interrupts disabled, as the pre-ARMv6 atomic_t operations already do. This is safe because a kernel built for ARMv5 or older is never SMP. ARMv6 before ARMv6K (ARM1136r0) has no 16-bit exclusive access either. It is not handled here. Rust stays disabled for those kernels, and they cannot be SMP since commit d70242427110 ("ARM: rework ARM11 CPU selection logic"). Acked-by: Arnd Bergmann Reviewed-by: Linus Walleij Reviewed-by: Bradley Morgan Assisted-by: LLM Signed-off-by: Karl Mehltretter --- arch/arm/include/asm/cmpxchg.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h index 0ce5225af442..18555ae22893 100644 --- a/arch/arm/include/asm/cmpxchg.h +++ b/arch/arm/include/asm/cmpxchg.h @@ -31,11 +31,10 @@ __arch_xchg(unsigned long x, volatile void *ptr, int size) { extern void __bad_xchg(volatile void *, int); unsigned long ret; -#ifdef swp_is_buggy - unsigned long flags; -#endif #if __LINUX_ARM_ARCH__ >= 6 unsigned int tmp; +#else + unsigned long flags; #endif prefetchw((const void *)ptr); @@ -106,6 +105,15 @@ __arch_xchg(unsigned long x, volatile void *ptr, int size) : "r" (x), "r" (ptr) : "memory", "cc"); break; +#endif +#if __LINUX_ARM_ARCH__ < 6 + case 2: + /* swp has no halfword form. Pre-ARMv6 is never SMP. */ + raw_local_irq_save(flags); + ret = *(volatile unsigned short *)ptr; + *(volatile unsigned short *)ptr = x; + raw_local_irq_restore(flags); + break; #endif default: /* Cause a link-time error, the xchg() size is not supported */ -- 2.39.5 (Apple Git-154)