From nobody Fri Apr 3 01:28:28 2026 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012062.outbound.protection.outlook.com [40.93.195.62]) (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 1F5263F789A for ; Wed, 25 Mar 2026 16:33:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456411; cv=fail; b=GigAWO9F9JvPTqXvhPrUANpOgZnM/V2ZS1bDPnC1r4bYyGTTq6wkpw7PR/amLz68rDDN87ptqOBvi7SuH5Mg7qq95hUK5ZBO4+kCtLapoIsddKziox3T7TXvL7hL6raDoXUpchBBA3y5RjUSb9/Qbh37pZyYFnPuU35BzX8v5hY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456411; c=relaxed/simple; bh=NdHFl0lNZyAc/8Fmhf2KjZ+GSaQNYOgDmAkcAULFxPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=DyfRvp+AOK1tEuiZgI5WdODaeitkbIcGQ7GpHkZXseDt5eybY/q9UHl+rhFWDcSHTygCrALZhrNBXkqMqc5Nl9SW9NdAAopzC7U2xGB0XpoDVWD701+4tt5BOGTF7YYhDbvQwX23oiavL11k+rHkoftp9ZEVja1ijGBD3IxUmIM= 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=TJxrtYlU; arc=fail smtp.client-ip=40.93.195.62 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="TJxrtYlU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IG4LpdHWEj5SZNG/s5/GvNPJk9gABOfGKHDBu3XTBSgdTF8e0DnbCjRauB4HQEbDDqdqIY9X0Rk+meDT/yvvKzENA+JfT6sHLtd6ltQMz/1enkmw4Zyc8OTmR1niv7GRfLjGKpXCrQHCiYy/hW40rkIN4KObe7z1x+6SPssofZE319GBjLyFhN7gbU3hO63/1ElMH91uwF4EG9xuGaLm40i4z/Ndvhzw1jSywnQZIoSSjUu0ReyecRR6shRRY6ggo0XPQWaQGVumCANUEwHf32F8JE8s0mghtipnPL8UsNDPFcSJIFT5IX7VJhmuS1zVmO+bbmicbzAZ64gLVyizAg== 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=jB1BTCnVyxE4fEInQw5UQtHGXDZRHXwc3HbYscqIf5s=; b=d+YRkk9s0QMZ/Z3h/ifhKcOcu5mQN4JXlPMwqcEurABIZNuEX7gArqj+Uco2+gcyniKL6CN33HP8XNp9DV0pXsHDCuzBX9tKcL3dv6EHV9LgBp+Lkmz5kMA33QESoW+mkpEhyF2FkS+BG0hzdgtSK2QSCq9Z/JOKMC0UqEhGn7+Q+UFKcA74v9mQDUZnsrdh0zI5AcHB9ahHrfAzMW0jD2MFkYH1kPlYrSD/Cif1VviGOVaF8FiD1ZaD0aqBheEVFIfV+A0SodmT1cun3cvX/676VBLFHf8XsJDazO4j/iaFJKXRpOhGj7/QDgnYQpNuWeX+M6l5KnLx7dn6rIJSdQ== 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=jB1BTCnVyxE4fEInQw5UQtHGXDZRHXwc3HbYscqIf5s=; b=TJxrtYlUHabtA5DIO/t7EWnCSCFo9BgdhO+ilqh0Tt850/z1rTeF9E1XnBNtUtKx4uP/uU9fGHOGiWeuSjeSTp6Zr7+dxdDfdnaFZEutcx+5gBuvgFlKynfRwD9/+L8Fm+W+sVe1wvczpQFi6PLMkSVCzogcAWVTv7ijinPYNX34rc1c+uFIBtMZHjgD3jxJAdEK4qaTSndPkQcxdWB8hTIR0STlMRywkcjminqTLhbgfSUitOVja58XQdTl13sqqzc+7u0A8X/r+Iuktr53TYuInLcLqPeCVHJRILnB3WC/D6BJwUTofwJmWDdSaMn1WraBz2ijWoTqcf+cF+gbMg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from PH0PR12MB8800.namprd12.prod.outlook.com (2603:10b6:510:26f::12) by SN7PR12MB7882.namprd12.prod.outlook.com (2603:10b6:806:348::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.6; Wed, 25 Mar 2026 16:33:21 +0000 Received: from PH0PR12MB8800.namprd12.prod.outlook.com ([fe80::f79d:ddc5:2ad7:762d]) by PH0PR12MB8800.namprd12.prod.outlook.com ([fe80::f79d:ddc5:2ad7:762d%4]) with mapi id 15.20.9745.019; Wed, 25 Mar 2026 16:33:21 +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 2/2] uaccess: minimize INLINE_COPY_USER-related ifdefery Date: Wed, 25 Mar 2026 12:33:12 -0400 Message-ID: <20260325163313.749336-3-ynorov@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260325163313.749336-1-ynorov@nvidia.com> References: <20260325163313.749336-1-ynorov@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BLAPR03CA0051.namprd03.prod.outlook.com (2603:10b6:208:32d::26) To PH0PR12MB8800.namprd12.prod.outlook.com (2603:10b6:510:26f::12) 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: PH0PR12MB8800:EE_|SN7PR12MB7882:EE_ X-MS-Office365-Filtering-Correlation-Id: 21058414-eee0-4519-0dcf-08de8a8c3a76 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|10070799003|1800799024|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: lhTqTkbVsZvL6JogBjbQbgR3RHri9iYVmNodlLojR09H9xQOCT68TDPn+jg9ymfsio8BJQSa0DE/ESiWoyx8aFvdjB4iT6fNwdsBCkfWtjTmRAVmrjyyz6plMUC8rPEU9Q12cewUynJ9KeHd0WCdiUbnVhBw5jdOtffwpEYIWAGb/AUPmqLzwJC+TWoVN3QLzoRnQCvKLNNUAWhmrSG7zYEDHKMBraKnMM5I9ZGURduMybtLPZktreUMiSVIILyt23r9pmJRjOL5dMPXYtw88/afUC1heM9CPgFS3BixKBGcDlwvHIj+QuSNyYs+Zg6+E4jwyelNkGG8PdFOGjK27B4jFba76sMmYzjh9xl8GASRdZb3EgbkKulc3ro/13riYcYuQks5cDHQofENVx8CfQYEejsn093efXAixwbVFihDexsbsUEXl2AMBiXLdZHObLeWcNTAJaF2WQ8dICKED8AFjpNMmAuorQulqIsR3Vs5s6QxEIWq/FGMvJzg2C/GWBneuq8SvJPXFnl/MAOit2L2EWRzWoFx6sMqgyxc71h3rLakq9405+8OI9lvM+QI+mlf1dEa9y4IBrW/kLrDBgRhwwG2dUiu88V81HCv1fly3dK5E8zLXR0OFZgOa6LqKzhbjooRk/loAXRzYsgfCNFYIZzRae9FgCxzW3DllsshYTHG+nEd72KP0iWVIle1125CUIazhaK5dRTTdlsjWqdRvyQCEbA07hKzKoOKtSA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR12MB8800.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(10070799003)(1800799024)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UA/aDMuRHYYJK2ZN/LaWVkKDxIxaP6Dng+Lvibw+sGSCn1ISFLh3VAmXA8c3?= =?us-ascii?Q?EIAeijycKC1JNA6Lnu7fCqEeSLzdgIS4lx9mvD4Nhh1EXo1Er2t3FvRaTnnN?= =?us-ascii?Q?wr2/bwpJhpVRGas9Ry7xQryufthJVM1+Hh1Ph+lLm/qZx6fRCu0rv7bxFpl6?= =?us-ascii?Q?7NUXQhckNJIv1fvk+dC3J+VK+qJAX3Sh16eaL3HHaUaNEC/5B7LeYeBbgH4D?= =?us-ascii?Q?Wis735gmvVJOyVqO+SzTRRJkiJrgIuM8dxWpA5n1DgAVpuieBHVmbC4ZqrBj?= =?us-ascii?Q?D+gvf9pa55XrGDrpkCodNopcuZfjKoEthq6+/5+s6l0pfUX39CqO/eC0N6rh?= =?us-ascii?Q?t9/l9PbxtBLlrgLCc7kxUGIqUyw5AhNFdLBJDTjH25N3hrNQI8k2iFEvNWCh?= =?us-ascii?Q?jQduQxcmblxrT77fFtKeH/4X02Lhpee3S9H62yol6ESg0OldxqDh554dD0z4?= =?us-ascii?Q?Fxk3FsOSSP1MOeIXYSxfLmurxK+OC/jHqw1JD9i7DxOHbfVBVGtATVkSUFaP?= =?us-ascii?Q?9c8AgVfoWQWZLRvmdnYia7uwK6Vs+xLH4QBKF2zqwigsRm73Z9ytqQnAP/NA?= =?us-ascii?Q?4gKsk+VSe43QosJNBNduofN0vohbxxUkpYfUgYrT77837GQIHNVvnNSpLePW?= =?us-ascii?Q?ffwwgbd+p1dqVpTIWNAlXZqFOJohEtZWB1Gke6Hw8dHjZDzdpDr0iIHgk1r1?= =?us-ascii?Q?gdqe6yFJOpsgBIaZN3nwiY+iFhwp0z0ECsBg2uKhDXg9NTk1DFFwU6sLwY3s?= =?us-ascii?Q?7MEut1dyxkSzrk28VkP9RFxgt3kK2BZVDeSXbhjc1WaYwT84O0mcO+W3VZTI?= =?us-ascii?Q?bLI48Sx7PuvIDhBE7E8DhM/74CKNJScE7VKPT3lZ5Xe1FjMoHEX3OMTis2h0?= =?us-ascii?Q?mb1AFycjU5jscgUakiy5un1ErgEf0aUL31RIO5SbiRoBObyFdOrDCSzwQMXL?= =?us-ascii?Q?7JtWcIW/vSu6M/6JtN0cxF/h6AjEldpspBWfc6fg2+1jxrK8bZPZD1KO/aGT?= =?us-ascii?Q?p4ht+gKJB5UljetCRnR8+d8bqXwjghCBtj+5/aY4aQ7iUwmwYDbh2Xe+2DCs?= =?us-ascii?Q?AW3cEgp14dnEPo/3ExWgDeyYH1pVOWerCsPkAHR3QMQOjrr79ECCfll3U+Za?= =?us-ascii?Q?eFi30CRLxyF3B2B6eRUtupk3fBCCK1gHYFzoLI7wWywy5UY7QbJ4iuNphvfw?= =?us-ascii?Q?lqYV7Nuo4fABKy8fN4th9laABCYVk0DDg8b8+cxc2JBK27ACi0xVEI9ejBJn?= =?us-ascii?Q?2896+PKGDcqLr1cbke/w1wVicMFT2MO75BuJ4xzObFUo/b3KU87I8nmk70ka?= =?us-ascii?Q?vQcVtkSgSnAxug0XYld7uCc0tbuPNfQDc6mkXbJJoziqgAuh29oa/25TCybq?= =?us-ascii?Q?tPpHCfm/o1U0uM0lD5Hic2vXbcPBhe8KzOIh34pnjdzSklJ5Aw3D/SQMnWGo?= =?us-ascii?Q?zjGJy7v/t0HXRDU+SR13xGsVMDYVlQ+gQbZ7NM1eZvk65ikJJ3ar79GxbxZo?= =?us-ascii?Q?IQZEKvVEMr38pOialx+mS6arYHL9M/Gv7fsUqoRELD3wxk1rTBKdnGLaE7Gp?= =?us-ascii?Q?WXwgQ1mdPF25LTkdAfam7UN3LCt+21HjEpcwEe0j1Zt1sqODNlkSDJrrNs4i?= =?us-ascii?Q?6yB6NDmTIXQ/wsCD5WMXXN5R0Dm+crDm6ZhbH/L7LwkHd3uoixp3XtV25nI0?= =?us-ascii?Q?MkgmpB/CQKJqOzchpY78FDvw7Y9WPG7UWjYu7daQhNfgTiZcnG0gF31O6Tfx?= =?us-ascii?Q?ufeNmd6lyt1wIho1yNdfwLwS7yBhlC/sJVEIYjjT07VU9g33144A?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21058414-eee0-4519-0dcf-08de8a8c3a76 X-MS-Exchange-CrossTenant-AuthSource: PH0PR12MB8800.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2026 16:33:21.5624 (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: cRguukvvnUa55cXKO2QlLTRM9DkpwS+JcUtfBejZarRO5Yp75c7UKTS5uT2eRyeZvcC/osiRf8u+KO8OvBD5Zw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7882 Content-Type: text/plain; charset="utf-8" Now that we've got the same knob selecting inline vs outline copy_to_user() and copy_from_user(), we can simplify the corresponding logic in the uaccess.h. Signed-off-by: Yury Norov Tested-by: Alice Ryhl --- include/linux/uaccess.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 0ddd2806d7f5..19079588c78c 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -190,10 +190,6 @@ _inline_copy_from_user(void *to, const void __user *fr= om, 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 =20 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,8 @@ copy_from_user(void *to, const void __user *from, unsi= gned 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 } =20 static __always_inline unsigned long __must_check @@ -230,11 +229,7 @@ copy_to_user(void __user *to, const void *from, unsign= ed long n) if (!check_copy_size(from, n, true)) return n; =20 -#ifdef INLINE_COPY_USER - return _inline_copy_to_user(to, from, n); -#else return _copy_to_user(to, from, n); -#endif } =20 #ifndef copy_mc_to_kernel --=20 2.43.0