From nobody Sun Dec 14 18:10:41 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37871324B06; Tue, 4 Nov 2025 08:17:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762244271; cv=none; b=pudFK0Gza7CsmS/au+al2Gpke+fhBtMGkmmxlFsWyxVT3caHkS4k8esAbLg3algBgbYoatl4z3gWmOO0PRgPM5PCfBnfIELYSayaBx49ifJqIAIwTJN9FcEA9VZH5cPn7c52orq4fprbWgd/nitKCgQZgLLGyZos5P1fQhFXE4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762244271; c=relaxed/simple; bh=hXHZlSwlzdGOlkiNYz83Nug4v9mIrqcF/dsUoh64UYY=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=lzgissgIMXWq0zDS1BS+CSAC+wUpYkPSbB8rheoICil/3LjT8cFG54uwjT8Jj/r6W+L2//NUeu40Vc7dBNtact7AQvZpuBJzhMhkfKJ5oi9u/7wi0tlWhv982CNCDWCMs8gMpbSVyEelQ/Mix52ePA0n5wBQEN+8xhbN/u4ih8s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=3XMQym4q; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=SfXbxI2O; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3XMQym4q"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="SfXbxI2O" Date: Tue, 04 Nov 2025 08:17:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1762244267; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9pIc39GIhFr6XsUrYOZ7/IfKAr6SiyIFtnpnqHx98Ww=; b=3XMQym4qFryh7sW0oPq83z2d2/gnRBNGrfv2/9GGD0oTYOr1dR78V33zAFu4DcEPJAjNF1 aZ7hvTqQFJResgUi4iHUOkHtVPYpceDAh943KA1jKqJIvlkpxX2jYSmycI88ZF6O4EEOTT 5ovck5HWqOpnlMHVJQ4HMPxRKTRzE7bF/M1VOsA645W+ziWxrboobgpPiGSuOlqSPtaHKF TqUeJyiGwYrIhcyCY595sovuFtfncPbkx4SkgimKSFCuWqAMsxpNciqQx6oqoCZVyK/8GP X2uFTr1ZhmXz9P1lLm+qHFpTYAUmIQk98QJjsmf2I02RUXfRni5EL5CA+VcWAQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1762244267; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9pIc39GIhFr6XsUrYOZ7/IfKAr6SiyIFtnpnqHx98Ww=; b=SfXbxI2Oh+ZrGweYuzhjccCvYC6HEXy44hi+DCXyvbv4XC3vQV3/b0QxnhlUFAaXj9a5Em FSJ1OPLVnr9UoiBg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/rseq] x86/futex: Convert to scoped user access Cc: Thomas Gleixner , "Peter Zijlstra (Intel)" , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20251027083745.799714344@linutronix.de> References: <20251027083745.799714344@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <176224426614.2601451.13726852614994178548.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the core/rseq branch of tip: Commit-ID: e02718c9865c7cbcb7959044a704b3dc5929640e Gitweb: https://git.kernel.org/tip/e02718c9865c7cbcb7959044a704b3dc5= 929640e Author: Thomas Gleixner AuthorDate: Mon, 27 Oct 2025 09:44:02 +01:00 Committer: Ingo Molnar CommitterDate: Tue, 04 Nov 2025 08:28:29 +01:00 x86/futex: Convert to scoped user access Replace the open coded implementation with the scoped user access guards No functional change intended. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Link: https://patch.msgid.link/20251027083745.799714344@linutronix.de --- arch/x86/include/asm/futex.h | 75 +++++++++++++++-------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h index 6e24580..fe5d9a1 100644 --- a/arch/x86/include/asm/futex.h +++ b/arch/x86/include/asm/futex.h @@ -46,38 +46,31 @@ do { \ } while(0) =20 static __always_inline int arch_futex_atomic_op_inuser(int op, int oparg, = int *oval, - u32 __user *uaddr) + u32 __user *uaddr) { - if (can_do_masked_user_access()) - uaddr =3D masked_user_access_begin(uaddr); - else if (!user_access_begin(uaddr, sizeof(u32))) - return -EFAULT; - - switch (op) { - case FUTEX_OP_SET: - unsafe_atomic_op1("xchgl %0, %2", oval, uaddr, oparg, Efault); - break; - case FUTEX_OP_ADD: - unsafe_atomic_op1(LOCK_PREFIX "xaddl %0, %2", oval, - uaddr, oparg, Efault); - break; - case FUTEX_OP_OR: - unsafe_atomic_op2("orl %4, %3", oval, uaddr, oparg, Efault); - break; - case FUTEX_OP_ANDN: - unsafe_atomic_op2("andl %4, %3", oval, uaddr, ~oparg, Efault); - break; - case FUTEX_OP_XOR: - unsafe_atomic_op2("xorl %4, %3", oval, uaddr, oparg, Efault); - break; - default: - user_access_end(); - return -ENOSYS; + scoped_user_rw_access(uaddr, Efault) { + switch (op) { + case FUTEX_OP_SET: + unsafe_atomic_op1("xchgl %0, %2", oval, uaddr, oparg, Efault); + break; + case FUTEX_OP_ADD: + unsafe_atomic_op1(LOCK_PREFIX "xaddl %0, %2", oval, uaddr, oparg, Efaul= t); + break; + case FUTEX_OP_OR: + unsafe_atomic_op2("orl %4, %3", oval, uaddr, oparg, Efault); + break; + case FUTEX_OP_ANDN: + unsafe_atomic_op2("andl %4, %3", oval, uaddr, ~oparg, Efault); + break; + case FUTEX_OP_XOR: + unsafe_atomic_op2("xorl %4, %3", oval, uaddr, oparg, Efault); + break; + default: + return -ENOSYS; + } } - user_access_end(); return 0; Efault: - user_access_end(); return -EFAULT; } =20 @@ -86,21 +79,19 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uv= al, u32 __user *uaddr, { int ret =3D 0; =20 - if (can_do_masked_user_access()) - uaddr =3D masked_user_access_begin(uaddr); - else if (!user_access_begin(uaddr, sizeof(u32))) - return -EFAULT; - asm volatile("\n" - "1:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" - "2:\n" - _ASM_EXTABLE_TYPE_REG(1b, 2b, EX_TYPE_EFAULT_REG, %0) \ - : "+r" (ret), "=3Da" (oldval), "+m" (*uaddr) - : "r" (newval), "1" (oldval) - : "memory" - ); - user_access_end(); - *uval =3D oldval; + scoped_user_rw_access(uaddr, Efault) { + asm_inline volatile("\n" + "1:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" + "2:\n" + _ASM_EXTABLE_TYPE_REG(1b, 2b, EX_TYPE_EFAULT_REG, %0) + : "+r" (ret), "=3Da" (oldval), "+m" (*uaddr) + : "r" (newval), "1" (oldval) + : "memory"); + *uval =3D oldval; + } return ret; +Efault: + return -EFAULT; } =20 #endif