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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A16BC7115A for ; Sun, 22 Jun 2025 09:53:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1A746B00A1; Sun, 22 Jun 2025 05:53:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CF2226B00A2; Sun, 22 Jun 2025 05:53:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C08B76B00A3; Sun, 22 Jun 2025 05:53:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B32DB6B00A1 for ; Sun, 22 Jun 2025 05:53:11 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 62FBF123127 for ; Sun, 22 Jun 2025 09:53:11 +0000 (UTC) X-FDA: 83582573382.10.864846A Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by imf02.hostedemail.com (Postfix) with ESMTP id 5445580008 for ; Sun, 22 Jun 2025 09:53:09 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf02.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750585989; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zdoedn24Jwg7lQBaAjBuSixbNxSUyXO3D6vwDFgIg3w=; b=dhsx1g3vxO+AW3+yGxh1b3VC+cJpbDdWpkbWCNNHYFvd0z8W0o4dTAiCpDO7nbzoqp1t0P GjMhLdedWIbzRCUs5ecQ8tUnV8YGCdyie8XoozCn9gAsLCP0+ifnAXtu8+vgHNtOCVRik/ T2XPFkID6iQkVNDhuFs6ve12fpoUSH4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=csgroup.eu; spf=pass (imf02.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750585989; a=rsa-sha256; cv=none; b=XkKFnjp91D5MLUtzw+js11aQNQSZKlf6tMYppkwfg5XtntxPz6ngrcSRUeXJHi+W+fu8vU FwHS8am3iHjHBvDXeZ7J2lazdEKbwSL20+2EdQpeu1oG5V274NZ/N7xyqb1e19dW1Wvfbl xoN+MI0uYcXWnrRh7l4tjBLU5sTfyvc= Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4bQ62s3TsWz9sfW; Sun, 22 Jun 2025 11:52:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3Qu3VT7lXSBd; Sun, 22 Jun 2025 11:52:53 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4bQ62s2Hmfz9sfF; Sun, 22 Jun 2025 11:52:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 475B48B765; Sun, 22 Jun 2025 11:52:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id l6aql5vCM1zT; Sun, 22 Jun 2025 11:52:53 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.235.99]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 45B4A8B764; Sun, 22 Jun 2025 11:52:52 +0200 (CEST) From: Christophe Leroy To: Michael Ellerman , Nicholas Piggin , Naveen N Rao , Madhavan Srinivasan , Alexander Viro , Christian Brauner , Jan Kara , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , Davidlohr Bueso , "Andre Almeida" , Andrew Morton , David Laight , Dave Hansen , Linus Torvalds Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/5] powerpc: Move barrier_nospec() out of allow_read_{from/write}_user() Date: Sun, 22 Jun 2025 11:52:42 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1750585958; l=2362; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=wzgi8TIxhTfIFVNyBJ8YVgkDaYmDFZG7Y/RKQLlutyc=; b=SHR7GQWRwSWYB89RLRaWxjLnaNArovgMY5ntnQhDOcYsi0NJTaUtpbHESijjCGnb2sXQYAJuB 0/NeP7QB3kqCs4+wyhoCLxM/bIdw6SQ2cEBJrKh7F1NhtihxJN7KIx6 X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5445580008 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: rnimkrkh6rmcny8h8m6emrtd5yksz4rm X-HE-Tag: 1750585989-441653 X-HE-Meta: U2FsdGVkX1+ekI3QEjd5+mDU31be1GPSH7UOJwEfN8+8ckokzCUXfhW4b5ycqjMGfNQh30mUM7ozhbi6PCV2zyNmTPXXYQgBwYa8X6vBF3FD4ynFSYPoRSgwAOVwZvbC5ZD6e1ohJR0PI7EKBfsSldR2mbRVT7ZBcLzM2uoFRYM7/vFYCOYWR4lOa1a9qr66geJOveTQWYNgJZ5nDIq2jle1qqTQhnhggCvbxQmaBPfQmDYzPWFEiaoxgKSzX2MKHHrxw+vIr/ruyJk+e0votybPc+0wc+dpiGbdxKx2DUobEdS4StU/c1SghbzMuEtQmbi7sKqaRVpENnywgO1fHpndLeI5zjUzw7pCSzxhY7DWy3SerwP7Zv1GVykZUUFy85J5lJRL8PzGtnjVDyU3M0964ydjYGXXOAcXQI3FLInivgWNprrcfP+XRRvWgMTJRCFvbkp1aVZBfw+75nBonFLQlxcumxFtrpZeiowWv+HxE8Ee7j2ITGn52K/Rh9ygvx6AM+q4+m/0gFdqZvEu7cv86z4IR2G60oNBno/na+2yKxJQSTbIj8kW/oxOHQgeJ1cC3dXABgeIu8QG8NzI016x7jD0ozLjFBuibL4zEyJ3Scz1/8U6eF6QnzXP+M11Mkz8onMZgCxFGb61iplnTec7JRpIi+7c+kvtrXut5Khqd0v1vVjMUfB7m+Nh8b9p4N12csf3/pOF3wMFjZmLM3d8/9tYnPWZ5iVsu3nUhcL0GVt9gq9OCD37Jbnx9laRF+3HNH9j6VK1eVjLcVBkhXRvxgHP97ZEo8Sq1tKT6UDi0xmtp22MQCWFVqgGxLQblvaMvq7OUQ2G5B0RGvzER3n56ZlI3OHUSFdb/jbLCD0rGHxMBb0lqFtYRRn9hAlyqVYK7Nl0qxq76Le9wWsGWUxaBI8rhxzve5QmzNobFQpCGfNPa+zjdgs4WMEybcqjT/D892MEvGXID/XInzP hPQ+AN5I BWQw+doSdb5jy9MNyLDsfBgtBfSHUl1DFxa4KzzjAXJ/AHcetl344yL4oBN7PHEtfQ0p085dPeDg14yuW/k9su2dhdvYr+RBUZfRJaAK959UDVMVp6xV31fD5nT6Ka8kZqndiIYfZ95twY4pA+B8Z2nXb1orQwgWdISKRDBd8WXAy5GW3igiG7vM3qbrGyANXNg3AYgIWSTSQx97Y5qdyT4vwf+Si+eaLNeZMbIHJKrp7+oIXv1WzTaprvdb9KXC1Mb7lp+5efdMC2H5rzCfkOoukBAZ6MaYZzHKYrm+QCWYoclQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Move barrier_nospec() out of allow_read_from_user() and allow_read_write_user() in order to allow reuse of those functions when implementing masked user access. Don't add it back in raw_copy_from_user() as it is already done by callers of raw_copy_from_user(). Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/kup.h | 2 -- arch/powerpc/include/asm/uaccess.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h index 4c70be11b99a..4e2c79df4cdb 100644 --- a/arch/powerpc/include/asm/kup.h +++ b/arch/powerpc/include/asm/kup.h @@ -134,7 +134,6 @@ static __always_inline void kuap_assert_locked(void) static __always_inline void allow_read_from_user(const void __user *from) { - barrier_nospec(); allow_user_access(NULL, from, KUAP_READ); } @@ -145,7 +144,6 @@ static __always_inline void allow_write_to_user(void __user *to) static __always_inline void allow_read_write_user(void __user *to, const void __user *from) { - barrier_nospec(); allow_user_access(to, from, KUAP_READ_WRITE); } diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index dd5cf325ecde..89d53d4c2236 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -301,6 +301,7 @@ do { \ __typeof__(sizeof(*(ptr))) __gu_size = sizeof(*(ptr)); \ \ might_fault(); \ + barrier_nospec(); \ allow_read_from_user(__gu_addr); \ __get_user_size_allowed(__gu_val, __gu_addr, __gu_size, __gu_err); \ prevent_read_from_user(__gu_addr); \ @@ -329,6 +330,7 @@ raw_copy_in_user(void __user *to, const void __user *from, unsigned long n) { unsigned long ret; + barrier_nospec(); allow_read_write_user(to, from); ret = __copy_tofrom_user(to, from, n); prevent_read_write_user(to, from); @@ -415,6 +417,7 @@ static __must_check __always_inline bool user_access_begin(const void __user *pt might_fault(); + barrier_nospec(); allow_read_write_user((void __user *)ptr, ptr); return true; } @@ -431,6 +434,7 @@ user_read_access_begin(const void __user *ptr, size_t len) might_fault(); + barrier_nospec(); allow_read_from_user(ptr); return true; } -- 2.49.0