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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14E93C43458 for ; Sun, 5 Jul 2026 17:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=aswcegt+1Cm6dBIg32zh4PKIM04KfMMGt2+4p1IlwyM=; b=3BZ256z7I41zYSV0744fsSjgq3 BYPiWDh3tPKTTUt2lVFAYly7WhAqHnypuhxPVk7uvpvt6h13BE9Op7EjOeDjSRDnBTK8YnINDoRn1 /7o7WguWWwsN4XaYtXFepFQdYhEfyf5i34IrPK8CTUZ8WgMNlf9HBbZ/wugjS+MVDD1j5usiooBAb VYZwQ1/drvoE/ldgFVtnvg10MvGSALhpQNYMybBZyMP7pefTOs6Ru+edpta/CvCP3tzOPaRf7DMhR tRdQZkn92IGNJqp9oxq/3wlrMBNrW25bgTJl7hxC0mosLtj8GE1aAMzxRl2pXVpl3uz2Ksbeo8NJJ aZ2jewBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wgR6S-00000009XTH-2EgC; Sun, 05 Jul 2026 17:58:04 +0000 Received: from fanzine2.igalia.com ([213.97.179.56]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wgR6M-00000009XQZ-15Ag for linux-arm-kernel@lists.infradead.org; Sun, 05 Jul 2026 17:58:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aswcegt+1Cm6dBIg32zh4PKIM04KfMMGt2+4p1IlwyM=; b=P4sl2gXTT3Vxmc5mwu7QKntIrs gThecBcrpJHbtX7VIAts/rgABcsGkS1HoVU2C1Bd3DRPiyyaweLOyvpMuTkMrMtinKE89g8Nb2RYw Ul4536TNUUcLje2R42X3jPny2hZNRGvOc5LNSHjYeb3qp87BWCR/ewcKiGhA3+VtOHtnVO7nnJxGn XePL9W5xmFW3nQquUhppnZKqR0A/+INLiFezfOzHQf8XEjbUkCh06aVWINS9JwBy/f2mz0wzK2Mim 20OSaUxilDs4BeGjqhfqPVDBZe36XUnl340mZO4/n4TqxRSOI2LDVahDR1qK6FTEb2c6dY0SWvAyn T8ChdNsw==; Received: from 201-69-111-23.dial-up.telesp.net.br ([201.69.111.23] helo=[192.168.15.100]) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1wgR62-009PnY-SY; Sun, 05 Jul 2026 19:57:39 +0200 From: =?utf-8?q?Andr=C3=A9_Almeida?= Date: Sun, 05 Jul 2026 14:56:55 -0300 Subject: [PATCH v4 5/5] arm64: vdso32: Implement __vdso_futex_robust_try_unlock() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260705-tonyk-robust_arm-v4-5-e0fd0fa259d3@igalia.com> References: <20260705-tonyk-robust_arm-v4-0-e0fd0fa259d3@igalia.com> In-Reply-To: <20260705-tonyk-robust_arm-v4-0-e0fd0fa259d3@igalia.com> To: Catalin Marinas , Will Deacon , Thomas Gleixner , Mark Rutland , Mathieu Desnoyers , Sebastian Andrzej Siewior , Carlos O'Donell , Peter Zijlstra , Florian Weimer , Rich Felker , Torvald Riegel , Darren Hart , Ingo Molnar , Davidlohr Bueso , Arnd Bergmann , Uros Bizjak , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , "Liam R. Howlett" Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, kernel-dev@igalia.com, LKML , =?utf-8?q?Andr=C3=A9_Almeida?= X-Mailer: b4 0.15.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260705_105758_297993_FAC23353 X-CRM114-Status: GOOD ( 12.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Based on aarch64 implementation, provide a 32 bit entry point for this vDSO. In order to keep compatibility with arm64_futex_robust_unlock_get_pop(), make sure to store the pop address at r2 and the compare result value at r3. Signed-off-by: André Almeida --- arch/arm64/kernel/vdso.c | 9 +++++++++ arch/arm64/kernel/vdso32/Makefile | 4 ++++ arch/arm64/kernel/vdso32/vdso.lds.S | 9 +++++++++ arch/arm64/kernel/vdso32/vfutex.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 283b38684ef7..e72a9f086999 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -71,6 +71,15 @@ static void vdso_futex_robust_unlock_update_ips(enum vdso_abi abi, struct mm_str futex_set_vdso_cs_range(fd, 0, success, end, false); } + +#ifdef CONFIG_COMPAT_VDSO + if (abi == VDSO_ABI_AA32) { + success = (uintptr_t) VDSO_SYMBOL(vdso, futex_list32_try_unlock_cs_success); + end = (uintptr_t) VDSO_SYMBOL(vdso, futex_list32_try_unlock_cs_end); + + futex_set_vdso_cs_range(fd, 1, success, end, true); + } +#endif } #else static inline void vdso_futex_robust_unlock_update_ips(enum vdso_abi abi, struct mm_struct *mm) { } diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 4bd60f059f4a..f3190125c68b 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -97,6 +97,10 @@ munge := ../../../arm/vdso/vdsomunge hostprogs := $(munge) c-obj-vdso := note.o +ifdef CONFIG_FUTEX_ROBUST_UNLOCK + c-obj-vdso += vfutex.o +endif + c-obj-vdso-gettimeofday := vgettimeofday.o ifneq ($(c-gettimeofday-y),) diff --git a/arch/arm64/kernel/vdso32/vdso.lds.S b/arch/arm64/kernel/vdso32/vdso.lds.S index c374fb0146f3..46c0123b2684 100644 --- a/arch/arm64/kernel/vdso32/vdso.lds.S +++ b/arch/arm64/kernel/vdso32/vdso.lds.S @@ -87,6 +87,15 @@ VERSION __vdso_clock_getres; __vdso_clock_gettime64; __vdso_clock_getres_time64; +#ifdef CONFIG_FUTEX_ROBUST_UNLOCK + __vdso_futex_robust_list32_try_unlock; +#endif local: *; }; } + +#ifdef CONFIG_FUTEX_ROBUST_UNLOCK +VDSO_futex_list32_try_unlock_cs_success = __futex_list32_try_unlock_cs_success; +VDSO_futex_list32_try_unlock_cs_start = __futex_list32_try_unlock_cs_start; +VDSO_futex_list32_try_unlock_cs_end = __futex_list32_try_unlock_cs_end; +#endif diff --git a/arch/arm64/kernel/vdso32/vfutex.c b/arch/arm64/kernel/vdso32/vfutex.c new file mode 100644 index 000000000000..c47502bbe1d9 --- /dev/null +++ b/arch/arm64/kernel/vdso32/vfutex.c @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include + +#define LABEL(name, sz) __stringify(__futex_list##sz##_try_unlock_cs_##name) + +#define GLOBLS(sz) ".globl " LABEL(start, sz) ", " LABEL(success, sz) ", " LABEL(end, sz) "\n" + +__u32 __vdso_futex_robust_list32_try_unlock(__u32 *lock, __u32 tid, __u32 *pop) +{ + register __u32 *pop_reg asm("r2") = pop, result_reg asm("r3") = 0; + __u32 val, zero = 0; + + asm volatile ( + GLOBLS(32) + "retry: \n" + " ldrex %[val], %[lock] \n" + " cmp %[tid], %[val] \n" + " bne " LABEL(end, 32)" \n" + " strex %[result], %[zero], %[lock] \n" + LABEL(start, 32)": \n" + " cmp %[result], #0 \n" + " bne retry \n" + LABEL(success, 32)": \n" + " str %[zero], %[pop_reg] \n" + LABEL(end, 32)": \n" + : [val] "=&r" (val), [result] "=r" (result_reg) + : [tid] "r" (tid), [lock] "Q" (*lock), [pop_reg] "Q" (*pop_reg), [zero] "r" (zero) + : "memory" + ); + + return val; +} -- 2.54.0