From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010000.outbound.protection.outlook.com [52.101.56.0]) (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 6F678248F73 for ; Sat, 25 Apr 2026 02:09:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.0 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777082954; cv=fail; b=Clj+oHL/FnHA2j4q0mhwIPdFr03LLlbZ2AraF+/IOjru9U5jvzTHKN/fnNNd9jATva6Q/aIszzBoIP+RJizWhrngoERR4+NHbs/1c2p8GNEvLEfSnA18unl4okvmL7gFPNSME7OTrN4PUyZtmzIZVtSQotbTKnjs3GbexK7ZtYM= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777082954; c=relaxed/simple; bh=zAqHaUNpr3DLyQrWFZ9xty3t9GIRFH/6CtDBDozDqco=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=DQHMZSJ0Q0USuRu9pFpcBMmNmGPyiKEd7G6uIcJHMzBnDViQtf9SkLi4fKyzhJQ5Gs/ZxSIHe6oHNjWiMfYl/AivxaQ5Uz8MPwZsq7w/jDrZ66MUu6uMTIBYWI+1D7co5Rf9O3hIYCP4lTuoOzVJynMdzYsE+yVazvMQm5VK3bk= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=e5Jy94/Z; arc=fail smtp.client-ip=52.101.56.0 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="e5Jy94/Z" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iPzjkhZqMTVgIcOyVxT+0HpEkX2naJZvJ6TrsJHHmF497XTzJgST1kLmmPgd8tmkrwv26Q877n2DTbeRzHLhvPU5y+cZouTceE4JSxNa55vrjoj27VCIL9HG8BRNLsJZOQWpIYip/XA/jMUp1M/j4SGuJZLfsgzalXK+AZqfn35fyJMyvtlcyPMtsscYhcxWbVFz9BJl1jk/1ktPMLY4Ln7Bgn/vuxXyhorJsCanjU1tYOYAwi38WgL5BF502pB7n4M2BJIwCmXpD+RSVJJKbULzgkLLffIRLXA8WnW40M2VjMR8/z+9SejaGTvvDuIa7ubZuX3BTy5Kg1+K4v519Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PRzR7TNsqtrYsbeOwxunIihaCLU3JScv9Wlyyv6wgcM=; b=tAMGMyWY4tF83UyvsuKPSn/azh4KDDbWx68BOMTfsQbgeXtTAwgrIsfMd3IEuGqLOFhpFAJwpL398VswQLS1J49x6ghsrNEUX1mmUNi9U51Eg10TUmu43J5rsmeOEj1+gYI28dUAEmfFc94RxPScdZM/rAQpZelUd2JfG2D0JuJK7EPigd/1pREgZ5G1+/X36Xrafj3lauEuarkTpVlG2S+lKcgCGtwhHFhlz0c+HHUkNeRqkL2uk0y1hM37rcypbJuLggey+NF/F+cfDC7eGlhxET7hNCPy6Q2ImsFFlHAdl+3xTHpyMoiZck/ttM1DSUV5Jfn4ArgiQ5ve2iPp/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PRzR7TNsqtrYsbeOwxunIihaCLU3JScv9Wlyyv6wgcM=; b=e5Jy94/ZTh2s8Fw+AzZxjRpWapkGg66Ezd5IFTpkfpS4+HR7y+ocRf6x69i0xlWIVoDeYsiIIqIYsw7YgoLBzfXBPcQBnczTalyxISoS31NtJVS/CnLOfWll+e7raYG1LTTp1ieRC3ttdiW7Y2r/BzlTHsMlRIUfhWYDOuCkaO/J1I/eccWfdHx7KENr52zh5jcPD/rGpBQzw/s6+awVKKaA0y+/GGEKQfWcWEjPrH+y3OxQgRxsQBmGFybbTEeJ3SRrhnspd5fCaTxhjnJyrkjmDB1LjShz/6T4AZkARBLI6ugsrK+YdOqigqyHA6yhLTsTeEtOTy9G3IbU2wTlRw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CY8PR12MB8300.namprd12.prod.outlook.com (2603:10b6:930:7d::16) by IA0PR12MB8227.namprd12.prod.outlook.com (2603:10b6:208:406::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.22; Sat, 25 Apr 2026 02:09:09 +0000 Received: from CY8PR12MB8300.namprd12.prod.outlook.com ([fe80::ce75:8187:3ac3:c5de]) by CY8PR12MB8300.namprd12.prod.outlook.com ([fe80::ce75:8187:3ac3:c5de%3]) with mapi id 15.20.9846.021; Sat, 25 Apr 2026 02:09:09 +0000 From: Yury Norov To: Andrew Morton , Thomas Gleixner , "Peter Zijlstra (Intel)" , Mathieu Desnoyers , Alice Ryhl , Viktor Malik , Randy Dunlap , David Laight , linux-kernel@vger.kernel.org Cc: Yury Norov , "Christophe Leroy (CS GROUP)" , Yury Norov Subject: [PATCH v2 3/3] uaccess: minimize INLINE_COPY_USER-related ifdefery Date: Fri, 24 Apr 2026 22:08:57 -0400 Message-ID: <20260425020857.356850-4-ynorov@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260425020857.356850-1-ynorov@nvidia.com> References: <20260425020857.356850-1-ynorov@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BN9PR03CA0453.namprd03.prod.outlook.com (2603:10b6:408:139::8) To CY8PR12MB8300.namprd12.prod.outlook.com (2603:10b6:930:7d::16) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY8PR12MB8300:EE_|IA0PR12MB8227:EE_ X-MS-Office365-Filtering-Correlation-Id: ac59bc74-43ce-437e-0195-08dea26fa2ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|10070799003|1800799024|7416014|376014|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: FH4DFZPRK9HyisD1/kFQCSOKz+B1vt5bRCOn6ismdIF2UKzLEtA9m8GJZ05+l1+EJuXvPGIDG0BBFtPpl5axWtn43awBrUnW4siJFOlHqXC9/rfFmx4HO2t9UuWkww8Hf5t0Qa6EoppFv9DOURg9NLQzzH6z773TddFMXENIct8bAA0y7xZxxKNS+ngVZTLLgWJdhuSVGLjNY06cLCDGRJ2/8A99xYNi/4Akblufc1Tv0yaJvhbiA8G6Lu6VvxeExjYQa9W/8jW2uldl81szR8ocdSb2jtMrTHmP+gi/KXyJlofx4/c/Cu9IeDi3XjeGO6iM7fpOzrKFmaHGOAstE2FAAjUHKtHXJuBTlcj2PS+5dFVexm7QUevETYS9HpmA8OdaXj3rDkCTqq7vXtf7cqbaUFj/+QdLCTZFRJBW6g/p2xfrldEuN53QeeVaawYqdGd+pUCuCB7XwAbp3shF3Kg1WEQmWeKwIFDOk51+NB2h9F/AQ8iafchhbwknCdywIjt5W0NGlmwHva3bXtbId+o9j6x7Ib2xmlp4sANCbi6aH1jxeeU/Tsl5fvdquBgrld0gQ2AXkYuJIMyvVitfSPZ2jC16L1t8O8rMT9BCYK+TKIhERvCRrcnj2tuS0T/fAkGLJ0AWXHsdUi01gaEcT0NAX7q3Vig89qtBxxeWY6ZZhT/MW0/oSfW2JqESdp+PLgNv5ldt2HWvaRZl2YasGpIFHUyRV34Qbrh0pJKqfww= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY8PR12MB8300.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(10070799003)(1800799024)(7416014)(376014)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?G3+yzhLhg33pgBLrCwbyEef6kTzdqqpPEQpux0UtU5lTIjNGEk+BK8vGRJe6?= =?us-ascii?Q?5YHANkMpxiTqwpVLuI4KSxtob68A2aVqsxqm7rXaaRJqumF8E9pB8c1SxHav?= =?us-ascii?Q?H+zjHCHsql4bMF5KHoJD4dLGEz55zxrY3v6R7u6t9yIdyXCd1vJAmSZdhsnL?= =?us-ascii?Q?wjpYBTEJ4UJQPnTJXyr9IqzL4iasvMoLl64bW3u0tHJZ3qhArxr3O6pH9nGZ?= =?us-ascii?Q?kucJRwF16KLPB3znXshD2i9s/eGo0BZaLRMAkhsUEiyWvHtEViLptDMgcOAc?= =?us-ascii?Q?7xphx0Cha5nREnLRHOPBfqa8mI7t1pjghf8/6+HS16MAWqeTzQdFPAFzUmT7?= =?us-ascii?Q?7qvWIuzv2Ejcm7swIMVwheU7mBkD3XJa6q6y/VA/ai61E8y4dvskxv7BaNxZ?= =?us-ascii?Q?8AOA3+rzKNgdVc6DBLcwfEwmJ/BPhOv4Wk9B4IkRMGBLMDV0csg7+vMwp02n?= =?us-ascii?Q?q5NQBXvpELCG4u+3D92rcy/F4Q32Rl50v8pbZ6PYv1vfyR7figI5XvCaoaUD?= =?us-ascii?Q?LT2EYN9h0rvDP64pY6zwYvoMrVcTCNB2r0T0lMml7uZmbd7/IH/aQV/39qjX?= =?us-ascii?Q?T8r1HD3y2CeOrABahyQRT1eVpBrDxnWvuaHODY2SqH0deFBYNQAFEaoxFhf1?= =?us-ascii?Q?t17kTkRwip4YaHB13C8NFjQPXhExvz7+wQaifaVmEQ9TNmHFWL7O/RwJWa1P?= =?us-ascii?Q?FjJmLEEn0tS95jccXtBqCzT3DTiNhSWZTJ1ArElqMVSBcsr1coXTNiCC/rCt?= =?us-ascii?Q?JPeBr3nL/mxG8FGXcQvDAFnCMmAM7tDJQ0sm4fpfrmGRhgQGtGyzLQdKPpdH?= =?us-ascii?Q?Mku4gzv00d2aWLBhTFY08IMJod/27cR5QurbvUd1VZhbGFwedMjoyvBieOzw?= =?us-ascii?Q?C2c3T1NHcw+608JbO0pR4DrAVuhQH9TJ5N1hro9+kNAUnH5r2HF+0/8bijXp?= =?us-ascii?Q?15dg5LbQDVbI4MiGb2bnUcVkW4Sna5On+aTC80qOotTg3PF9W5aWDfBe6P9z?= =?us-ascii?Q?EHVV0/q9P6p4cQWxVR+8qwAa6leMX1AhXOKYfPuYXPkQklFnx97K16Adn/du?= =?us-ascii?Q?iQ34ovHBUN2oc4fSerz/kbWSb6mJQgyD32p3pLtakb49VMYmMwAXyaHWnmN/?= =?us-ascii?Q?/9U9BjbOhiKxZ9OYq3BVPWXADiWtYpYVKBPv5HILZXFKlctTFkRbN4lk4w+y?= =?us-ascii?Q?Pt8JhIfDg5RrzrY/sJ31hi1EDDQvUOomt8lhIjsIXr4Wdw3m/WhPpxX8/xGU?= =?us-ascii?Q?oVEd/8m9Xh9JEPVL2BaReADud19BPn3Rprf22nPWh6c2LuvuQxoFIg/yCfDu?= =?us-ascii?Q?uj70p0x333fPoZ2xRn9vObdHpEEhbx6TQteoaIegyStoIw3D9+AnsvxWHEWa?= =?us-ascii?Q?43VUPdS37R4hUjK58h4E1dQG0h7O+CRiNY84s+a/emkFcSEJ8JAqYRq32Z21?= =?us-ascii?Q?vo4ZFeNgvdhtyIAAuLeKtZSQbDdTZXpbe4HhfNbgmg5jbOMq7X9DYEtICoUG?= =?us-ascii?Q?I2EVtBt5Ios+lLs31jI2efDhdPV3klgPZ2PYzO+lmO+tvbCFBk6wcRkBsgqc?= =?us-ascii?Q?GNQC4gfMk/rzh5K9sv8l9ZXhmwfnr7u26ahNmPBNRjTZn4leIFwWr4wLMFg0?= =?us-ascii?Q?bDAcFIkvkTmEnyvRvdXv8KciH+g7hWrTT0Z9suFyCI0W5yLYsnxl2fh+iGA8?= =?us-ascii?Q?CzIDL819ODhgIWci4WqR8n9eaVR0coQOpSS1fwQjV8Yz3o3Ds5H38i9Sboap?= =?us-ascii?Q?HYb++1ePxAAkE9tTlBsqFSx6/VnPJqjPbkX1nv4Dh/5lh/g/gw2g?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac59bc74-43ce-437e-0195-08dea26fa2ff X-MS-Exchange-CrossTenant-AuthSource: CY8PR12MB8300.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2026 02:09:09.3812 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Lxbnp3njmbcuZkwVUDcYvD464G7TPwBTxo7PwffdtiL0k3ycrSPD28YfBwnTkFjIBAkPYw3vVYgjtemsJubpQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8227 Now that we've got the same config selecting inline vs outline copy_to_user() and copy_from_user(), we can simplify the corresponding logic in the uaccess.h. Fixes: 1f9a8286bc0c ("uaccess: always export _copy_[from|to]_user with CONFIG_RUST") Tested-by: Alice Ryhl Signed-off-by: Yury Norov --- include/linux/uaccess.h | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 6100f1046546..e0c3d6e29301 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -190,10 +190,6 @@ _inline_copy_from_user(void *to, const void __user *from, unsigned long n) memset(to + (n - res), 0, res); return res; } -#ifndef INLINE_COPY_USER -extern __must_check unsigned long -_copy_from_user(void *, const void __user *, unsigned long); -#endif static inline __must_check unsigned long _inline_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -207,7 +203,13 @@ _inline_copy_to_user(void __user *to, const void *from, unsigned long n) } return n; } -#ifndef INLINE_COPY_USER +#ifdef INLINE_COPY_USER +# define _copy_to_user _inline_copy_to_user +# define _copy_from_user _inline_copy_from_user +#else +extern __must_check unsigned long +_copy_from_user(void *, const void __user *, unsigned long); + extern __must_check unsigned long _copy_to_user(void __user *, const void *, unsigned long); #endif @@ -217,11 +219,7 @@ copy_from_user(void *to, const void __user *from, unsigned long n) { if (!check_copy_size(to, n, false)) return n; -#ifdef INLINE_COPY_USER - return _inline_copy_from_user(to, from, n); -#else return _copy_from_user(to, from, n); -#endif } static __always_inline unsigned long __must_check @@ -229,12 +227,7 @@ copy_to_user(void __user *to, const void *from, unsigned long n) { if (!check_copy_size(from, n, true)) return n; - -#ifdef INLINE_COPY_USER - return _inline_copy_to_user(to, from, n); -#else return _copy_to_user(to, from, n); -#endif } #ifndef copy_mc_to_kernel -- 2.51.0