From nobody Tue Sep 29 04:39:46 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010043.outbound.protection.outlook.com [52.101.46.43]) (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 6E44A325704; Wed, 12 Aug 2026 08:51:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524712; cv=fail; b=NLW7EtI0LZ6Elr+vWHnd2rdcUPwxd3WX2SlfmiTg5JRK1qMPz1EZGvztCt+u4JDJRdC03rf1gxYwiAKuDvP1H0TM4ZJ1WXasSRbqzrdGEdkUwm0zCmK3UYAPQF5I9CPkKSHCL99M5xfBOAzvSR52JdtiA++s0oQ8q0ZQczHhrHw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524712; c=relaxed/simple; bh=/IBBxOTdY8A2ygAuP6hjpUMvkt+3YrpRdUQjh+sefdY=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=kWJpMvS6j9HooV02BMMDr9Py2Es4Jp5/MlSalWHlfPoykZeQQ++u4KhM75Rf2ibv8I11N2iOXzJguCA741l+Oc5DImafkNJgVE1ww2hkXBnCZDSHU9IIIMrFJoaRaTvGAYlfwF4sWzGYRm8M5wXnyctozwnNitcZCGZ7cK/yEzw= 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=rccQ12r7; arc=fail smtp.client-ip=52.101.46.43 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="rccQ12r7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tf+rbSM/fJkmlL0QIlEoBfna0OV8sCznmgsBUS5JznZrFjPEZvWMRTldDm2uiBRo4QfB0rQqSzz1kMEHsgmL6NljZWQsQAWhxAaicDT9LYqRJkJw7HXcBkA24Cxm6m4As5mhHOmTZeqmTAk9bZQ5NWhtYTK32KMMXebgIHqMJp9fVrvmQrtI0VGZSrmR2NKda/JSvKqA/R/C7HU2e+D+EnGRW1gzf8Sp+XHmwGnZd6DG5qmXGUcAajxgbOubEUT5GhnJmgNI08Lz0sMg63TfCzkFJ0Vl/IkdiuAb4tzVYrNxIsos9SPDJWU+ifCqrVELOu8U9QgSaHy9dLakwVO9Tw== 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=7u7dvAPBl2WuKO3iwzYyxwsdySo7yOHzfxH3cCQuXO4=; b=irudkK7sfNPXU8LMgA9bCXGwBvZZmsU64JygMEvwuPFcVnexllaJ6i6zu++JQTC9e6zNayNxXkXC71THRlyh72pfinNscUTzETN3hyFLJluPhzRkCihMO2U1nrsN1QwHxXSswfPAUaUlibcYFYSfBf47V1QxR7AdedMlc9alTdUZ2zJ9/AuDRqmrBr6WV9XYXz8tEz17BaE5sKGZ7nlgOUJlg4pL/JBLhzYZfHZ1Xz8Q4TjWOtUH14KZqucAUQ01FcFranNUtBO15S/VmDdzbbYwMk4jETcYpAiKdwfdzpbng09cLKv9rCchVlo05rgd++W8KnsDRw5vBoZvEDAlhQ== 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=7u7dvAPBl2WuKO3iwzYyxwsdySo7yOHzfxH3cCQuXO4=; b=rccQ12r7Br+Zb+oP3MD/X5Jdktov7RHz4sGoAmdjViBBMh3FRE+lEsM16uIaoBXrNRaSjteQVSwJjuoi0FJxcQxX9FGR4MMjekUAG3d4HzZrTmMDfwXbnePGjF4aEX3AyCAHjOAOxtLDyz3ygyG85iy7ccRV2KBdDHFTWNr4E3UBIbmgckiH1bJA0KVOeCCPntodPN5Vov3gTrWN2euRtp826xFXu2JWGwUIxj7qHHsonoil+r2E8ZWWxOMfi0d2J88leswmbcoWGulN/eSPLGigs96l2PjkrOkl4VvRFcac0ah7E47KK22pGbd2Ff8mnAcSNNUgEmRoE2fs+MQVhQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by IA1PR12MB8519.namprd12.prod.outlook.com (2603:10b6:208:44c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.12; Wed, 12 Aug 2026 08:51:45 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0315.014; Wed, 12 Aug 2026 08:51:45 +0000 From: Eliot Courtney Date: Wed, 12 Aug 2026 17:51:21 +0900 Subject: [PATCH v5 1/5] rust: bitmap: use function-level cfg on kunit test Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260812-chid-v5-1-6c767770b3f4@nvidia.com> References: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> In-Reply-To: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> To: Alice Ryhl , Burak Emir , Yury Norov , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , David Airlie , Simona Vetter Cc: Greg Kroah-Hartman , John Hubbard , Alistair Popple , Timur Tabi , Zhi Wang , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYWP286CA0001.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::12) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) 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: BL0PR12MB2353:EE_|IA1PR12MB8519:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a1bd7fe-487f-4fc9-f5a3-08def84eefdb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|10070799003|7416014|376014|366016|1800799024|921020|10067099003|11063799006|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: zzA4kK88kdjPOBOpkfHzi1UBbekQayW0+0GurPYWK9JoUkSspr02pJC7WR2CMEURXWD2nXAYMX0VCQf/DrPO3FPFQcx/Al56oqY+Qu0DbgDOu2F0OvEM9j+Hwe+UI0d2cWy9LNVxvb94hX2tnYr70YTWu0NtwjfL0l3csvyGHAlSJaY/UnfWHJ8JJ4Ss7B4X6Rh5t0L4a3uJB45WcRbEoA/iYtoL42w/lnViciLL4h0goRYLrRT69duNY66HUSO3C2JXD7VLYgFn48oYbio/kpz+kvs7oFm4J+02vPPtM/u5mrBuzhrETGib1V18qcbCloFiv2gbuJqVW3KO682J/OMR7gFI/V3RneVDyQ/ZStxlYONPvwXwqwLGIBfVnDHMcC4H5iublTUw3a7uiLLt6CP0Jq8qlh0quAMzvxXAUxoumdn/icQxJ8xU4cUMSV8OClPGpS/1faU+GpbQVEfqMKozlj0lHeVnFeyAlJxaqyUbvpYgvWt01728Mz7HYRavFAk53O9g0asNlEjhJ74YXMskoj4YRaQ8e5CoEehAM5RO9yXPhnGkBLS/LMsZTqxxVwZTj/3Un+ftcPBpo8ugKxQ/IFBamh8UMJV11v8f6WVbOzbPWj+gTLA8+rmyANA6TbAS/afFXgP86id3k3xhwhfFRcUOeffZTAtmfavOqogmDze1XmczR6Muz4ki9SPJgnEGWfntXgB6QekgY7NoRw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(10070799003)(7416014)(376014)(366016)(1800799024)(921020)(10067099003)(11063799006)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Wld2dHZ0VXNZY1VjL0xtbzVpZGNTL3RYMlVyVkNEdzNwK1JIU1Z3UzBFVHNQ?= =?utf-8?B?OUVreTdCTmhDdjdiTWVqVnZSdkF1cjZsTXhzYTl5VmV4UXNKV0ZtY25ESFlV?= =?utf-8?B?RHJMck1BOEIrQUc3NzFSQktwWE1idkI0TzQ4U2t6MmczZFEzZlkyL1R4RytV?= =?utf-8?B?Z2RXVlNKcXdCRDVMSldsMmVVVFIxUmU5aEJxRTVJTkZlNnIwRzZUMFI1bTc2?= =?utf-8?B?NXFhUW1LTmR2WFFhSmpMQUQ1SnBCYjdRZDN5MS9VcEJSLzY1OUJrRHk4NE9J?= =?utf-8?B?aFpreXZvTy84U2VuRFJHTkdpelZ5MDQ3TU8wRTQ2d3VDb01IK0d2NWZRWnFu?= =?utf-8?B?aEVha1ljaFdvMm9wUEV6djA5N3NLRlZ2aS9nSnVjZ2VmZ3F1Ti9LNDQwTmgr?= =?utf-8?B?eWdzQjBaUXRiaCs0elFmZTAxOEtWVzJGWENGbjVRaHdGWnFDdTNBU3JCTkhI?= =?utf-8?B?Uk1NR1RZZ0RGOXUrM29ycnpFYjVhRlJ2TkFUVlg4SmdSb3VQSVpKRUE2SDRJ?= =?utf-8?B?SHp6bnlrWTdyQnMwZTJ0anhnalBsNU5hZHdFSU9TTUljcUdoYUJmMmhXd3ZV?= =?utf-8?B?a09Bd0Q2dys3aDNmZXlkWTR3UC9Oa1hoZGFqd05td0dkS0d2ZnBFdmlCUWhI?= =?utf-8?B?dHFEdEF5dWU5ZGczTWZITWtYeDYwd1dPRllUUXNoZmVySEc3dFpUbE5jNTZ5?= =?utf-8?B?TFFsRytSNHJjUmxJdlY2YmJuYXhqYWM5d1dxQW5WU2NEMmtGTjc2WStvUTFG?= =?utf-8?B?R1BNMmloMTdLRXY0eWR4Q2VTU3RDOTFyWlIrcUVwU21JejVzQ0pJTkxjWC9R?= =?utf-8?B?bmtPRERBQzFFd1NUSlRtNmVNU25YdjlMOXFTV09JblZtRWp5bktDQjg2blZ6?= =?utf-8?B?K1NIY1NTaGJ2bmJYQjE1bktuSU9Ob3Mxa014eUJDTmVJbHliK2VpMjJRVnlZ?= =?utf-8?B?czY5RWlLUmczU25JNTQyYXJxYTFkNUtJYXBNbll6U2RqNW54bnJmbFVuSXd0?= =?utf-8?B?SWp2ajRRcGU2dlVqZXZUUFJyemoyY3ZBZ1pwKzlvMXRaRW1HMlF3YnVCK3Va?= =?utf-8?B?cDFaS2ozeEQ1dktDODFKdzdoeWF2aWlzWmN1NnRHNEFlZTkxVEcyd21MWkV1?= =?utf-8?B?eHk4bU5IU3dxUno5K1k3eUdsb3pnZWFtOHU2OGw4NXF3QW5zdndTUDFUSGx0?= =?utf-8?B?NkNiOElEaWd0MW5QYnBqaDB3bmhnUUhmdGg3OWZxdGJRMVF2ZUVxeGRMODkr?= =?utf-8?B?bGlMaWYwNElwVTFWL1Y4YmMwbHVkUk11SkR2cTRxNjFmOEw1bFg5Wmo2TVRF?= =?utf-8?B?WmJpZytCclp6TndEZ1U5STdlVkU3aVV3UTVaNzY1NnlIZ2dQWnk2NWU4NDR1?= =?utf-8?B?UXdOeUFwa2dzbE11V0kwQWt5RHU1SFJsUlBYK2FZVWRzWkY1WWFsWVltY2Mw?= =?utf-8?B?Q1lqUUtDRk5XRU4rOTJDQ2JVQVIrQ0xKYi9NWGY1K1p5K0wvQkt3VU9ZMU11?= =?utf-8?B?S2FTTDhvSm1mUWR1dDNEYXkyUXNPTFFsbFdLM0FrY2l2b0gvMGorMm5CTlBq?= =?utf-8?B?WTcxcjRFc0JHZERjdDk4bll2KzBKa2RJUUdtWGFmb21wbjBVQlUyZ1lpR29J?= =?utf-8?B?UmhZYjBRQlFDMHlUSzQ2L2tFNDJqQ3BwNTZYZURLK2dPSmhUNnlKaDVjVG41?= =?utf-8?B?anNXL0hvY1FXWHdQRTkxejAxbGFBVjVNa1lCYU1BTGFlZGRIcUdKcUc4RUt6?= =?utf-8?B?dDFQKy8vUUpJMFdOc09TalJzQjhlYUVCdFNCSW1xYS9VQ0gwSDZqUG10V1NF?= =?utf-8?B?M0R2WUNZWWQ2dWMyZTJYQm5xSGVNN2twUnN0VG0yVWxObTBnQlo1OWxSaDdC?= =?utf-8?B?WlpFa29NdmxBS3BsTTJXWDNYZjA1SHRWZWpEL0Y3Vk54YVE4MitmK3RoL043?= =?utf-8?B?TWNnemF0UTJsLzI1QUwvdEV1ajdJOTJWLzVjV0JWY05ZbkNYVDAxK2NxWlpJ?= =?utf-8?B?Smk0Z0RId0V5VkdNb3UzeWM0V1lIRFZZTUFTY2l5VUVWTWI1TUZ3eENZWFJm?= =?utf-8?B?cjIwbVdmWUpSa09zNk5tOTM2YTVRa0F3alluMEREVXByaWs0UGxGcGFpcDdr?= =?utf-8?B?SGN6ODk3VVRSZjdtamxiNDN2ek12Sk5sRy92YllCSGVNSTBWcGc4eEx6Wk9l?= =?utf-8?B?SXc1TExxYmU4LzdKenNzS1lIbU5kb1RBK2tlWnB3alNhZm5JQzR4SUVWWUUz?= =?utf-8?B?U3VvSlB5TVpxV1pLL2dtSG1qczMrTGN5UEZXMldueXhUbUkxaVJjWHhUcHJG?= =?utf-8?B?UERYTGRhS3k4ZFQxcldJamxiZFBrNlRBSVpzbUM1YmQxVlFqaWpqNEVJd2Vr?= =?utf-8?Q?E4N3lDKXpxbOvLmL3czhy58NofwR6TIugwcnSBEUsyXQg?= X-MS-Exchange-AntiSpam-MessageData-1: e32z8AU+iBQdVA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a1bd7fe-487f-4fc9-f5a3-08def84eefdb X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2026 08:51:44.9896 (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: Y20eDm641UnVHXXcIAgiqy1/eK9g9BA73dKPI+jgtGrSeMczVwEuSS2Ou4l1xvs9dlo6vUW1MI+3NpgqIoOVKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8519 Since commit c652dc44192d ("rust: kunit: allow `cfg` on `test`s"), we no longer need this workaround. Reviewed-by: Alice Ryhl Signed-off-by: Eliot Courtney Reviewed-by: Yury Norov --- rust/kernel/bitmap.rs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/rust/kernel/bitmap.rs b/rust/kernel/bitmap.rs index b27e0ec80d64..a43bfe0ec3dc 100644 --- a/rust/kernel/bitmap.rs +++ b/rust/kernel/bitmap.rs @@ -572,24 +572,21 @@ fn bitmap_set_clear_find() -> Result<(), AllocError> { } =20 #[test] + #[cfg(not(CONFIG_RUST_BITMAP_HARDENED))] fn owned_bitmap_out_of_bounds() -> Result<(), AllocError> { - // TODO: Kunit #[test]s do not support `cfg` yet, - // so we add it here in the body. - #[cfg(not(CONFIG_RUST_BITMAP_HARDENED))] - { - let mut b =3D BitmapVec::new(128, GFP_KERNEL)?; - b.set_bit(2048); - b.set_bit_atomic(2048); - b.clear_bit(2048); - b.clear_bit_atomic(2048); - assert_eq!(None, b.next_bit(2048)); - assert_eq!(None, b.next_zero_bit(2048)); - assert_eq!(None, b.last_bit()); - } + let mut b =3D BitmapVec::new(128, GFP_KERNEL)?; + + b.set_bit(2048); + b.set_bit_atomic(2048); + b.clear_bit(2048); + b.clear_bit_atomic(2048); + assert_eq!(None, b.next_bit(2048)); + assert_eq!(None, b.next_zero_bit(2048)); + assert_eq!(None, b.last_bit()); Ok(()) } =20 - // TODO: uncomment once kunit supports [should_panic] and `cfg`. + // TODO: uncomment once kunit supports `#[should_panic]`. // #[cfg(CONFIG_RUST_BITMAP_HARDENED)] // #[test] // #[should_panic] --=20 2.55.0 From nobody Tue Sep 29 04:39:46 2026 Received: from BN8PR05CU002.outbound.protection.outlook.com (mail-eastus2azon11011049.outbound.protection.outlook.com [52.101.57.49]) (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 E74E63EFFD1; Wed, 12 Aug 2026 08:51:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.57.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524720; cv=fail; b=DXKNWmqd1GijbOzjacPukzZ8XY3C+M/soXynMXUR8Le9XG01mPJ3zpWr2hSElrf0j6ThvRDOzSgcayyej2zqVsUfiBEZ9ucul9ypX47DJl7FUY9dPtqM5T/+NjPVLSxICZCIaJhgdaMw58fPPKZJy/msKF9XkwavM05T9EhdCDU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524720; c=relaxed/simple; bh=WWcYmiyrNWRcTt9enQlzif/eKNCXfJ1hzr5hD957H7Q=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=fVJUIWOe8qEqzGgVC7bisLJtFqQ9hawBDWuL5SIUX08Fljfgiotn8sIa6kJ55DJXW/X5A9N9l86NJ4XawK8LwW4e8CrrccbeJ0YdrvjWiSPzangDKT31rVmB5+SMIA0w6ESjW1HwYBHKJ6KD4D8OKo/SHICxtOn0mJntMaqbbf0= 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=f18gu0Tp; arc=fail smtp.client-ip=52.101.57.49 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="f18gu0Tp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d7wplp4WGsgfV6NrHLNTD+BPmIbHknaoYSjzcVbsAW6iIiYgN+of7FZ7FSrFoeGTYoKY1RBAbnynrXsAY888IJYINOpaCAziOP1sxxdit8blM2Y42gziCHY2pwqJKWz2QJEJHFOEMAW2Jxb7OTotkftfwK41lFrfxU/YJ1ne65SpAw0hw517wA7Cjx84S2KRspYhW9oscPY32sN40s2vR3rlTVH8tv8gWPLcJjSZdX4I2qe2I/m3HtkBHyuFMnvewcrx5ok3xU7+gUPLQmS90FKwzVHn+kZdN5TFs2ieof0jaZpJCNNy0TegnM19Q48X4PGGOiGf7hA85NDpfs7RMQ== 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=nZAlwK41n82g8iatn565fzjdFwir6Ged75v/SjZwXFs=; b=Hj8eFthTY128OfDJ4KzKjyqPLT3x0jrFZLqoFvPy4M9ZeWNp6+JQXeYCjSZ24G0AwNVYIIPwa7Fm2vcZflbeVvgwzfcMv7VSQ5/m34vd/UL3pQdqrvQpGH8qqaASvXfkbYIUbKa1GeUtbECpl/X9BQN5a3xf9Fx4NQvdyK3iGDFWyjirx2ZmZGetuOo8bI7V1KLYm4b7UYHzZDnoX2b9Jlk2J6e6/TP/lS/F7rQhRd1SDnnHtZ9ET2iTGN+fZTQGjrC8vKjej4S/37E2N+0mx7sImpkIcDaRIlrL/GG1HCjXqGWezNerVvqIbLDlXcSO6h5W7WQq6h+e66ripiPDHg== 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=nZAlwK41n82g8iatn565fzjdFwir6Ged75v/SjZwXFs=; b=f18gu0TpHtuzWWJlkQoR8Jsi42MOTuAqgWgk/PYt19kgCmHI58JUrSLycibZ0pW3JHkLL9gI1wCZVtUmrn8qUwBgJUcfx0/aWsHG6c9OJ3v3tGhinGU3ciYS5hrSTOpSne830SLLkBIYLacNxATrsE7tGPu1zoepcJXaNlLtcTCT11bujWWyBpJXflZ7pp6KgHnaMSPGoKFJdwhcKVCaKGC6NwIvFIhcgSNtsmw3LShDUmql+sGzJ+OLn1+mHMbJFzCJNbsXsJtVPJXRvFQT2ZeXAZ04xPyC675ZMF8FRnhCTQM4pnTPEfPLFisjA19nBMdmxk5IYWAGj/KgobsQqQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by IA1PR12MB8519.namprd12.prod.outlook.com (2603:10b6:208:44c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.12; Wed, 12 Aug 2026 08:51:50 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0315.014; Wed, 12 Aug 2026 08:51:50 +0000 From: Eliot Courtney Date: Wed, 12 Aug 2026 17:51:22 +0900 Subject: [PATCH v5 2/5] rust: bitmap: restrict bitmap length to at most i32::MAX Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260812-chid-v5-2-6c767770b3f4@nvidia.com> References: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> In-Reply-To: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> To: Alice Ryhl , Burak Emir , Yury Norov , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , David Airlie , Simona Vetter Cc: Greg Kroah-Hartman , John Hubbard , Alistair Popple , Timur Tabi , Zhi Wang , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: DU2PR04CA0207.eurprd04.prod.outlook.com (2603:10a6:10:28d::32) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) 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: BL0PR12MB2353:EE_|IA1PR12MB8519:EE_ X-MS-Office365-Filtering-Correlation-Id: 35230042-eebf-4fae-c687-08def84ef355 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|10070799003|7416014|376014|366016|1800799024|921020|6133799003|10067099003|11063799006|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: MCKjDtPxXvQVhhobR80+XNJ3q/AVuBPGYvJsmUNgzIoLkY2v9uBCxuwU1gfEeE8JHYPTdh7Sni4MfOl4ywiehtPSq277RdonOSzstGJk2Arsl0hD8va0p2+G+WANae7xaHyGwgPTAuvIcOc5Ica0MbIPFyxS13PPSZWObcPOYOka8WpA/9CfXmw/9EN2ap+g1PEHot7QvkKWgM+1hh8qtaXwek354YyOYGbRfwtghCZmHKrvZm+xsROr8LoJlRyUfXGtEXYzl8R/nmJgBIDzi4mhHmfC/Gk+fmtY5t/yeYSx8OFzwoYk7+UCkr2vIjFPA+h0fsd7P9O/Vc9lruvVwt782v9tAp29HnysTWhHtQjMZdwjfXQcH4ML8n3i70D/ljXJpHYfjviQG0sXe3PrV07Zo2HwWNHY8WBvO8dXeSoZsIIsVq4mInQLIBlT+11wNBrMEEga8PscFgliPsl0wgB2OuLzLnf+jdDVs5S3gqewc0byvELp95Ab3A9vVwEMELGQdiYNLv4Ltd4gL6Vh05zjTFvBskG6gs9mT4+1JrN/x0BwWIPQK06qM8ue9pxtF93lE9rwxlfsXW/AfcohtA0uPxmBTVANyGB6qevL98ebb4IMNwDBQ85C7h8Wl1KZoHweMJQfq1ECtyKOJ7z+suuQ2eKye51RJMSDpG1ziQfCkr6AOJPf7wZEpe1Un1Cr7XVrySofk3xgxrDGEPCPCg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(10070799003)(7416014)(376014)(366016)(1800799024)(921020)(6133799003)(10067099003)(11063799006)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UjBXUDFKb1BLQlQ2NEJaMGQ2VzJTTGIrTzRQUTFYWVFxamxVS09sa3Z0ZFBS?= =?utf-8?B?NG9tS3lsSmtGMElmQ3dUZW05cHBlenZUMHZEbGpoK2tVMHhiVjl3ekk5QU1a?= =?utf-8?B?NmJzTTk2ZUIrYkpRUWZrMnpMYkNIb1dUa05nL2lINlJzYXZTWVRGVG1uQ291?= =?utf-8?B?VkVJRUJPbi83c2hjWGNTcEp6c05XbU5sTjB4WmUxcHUvclhoaFVTQlJtWnA5?= =?utf-8?B?VTR6bDJ3ck1oNGJqNDdGQzQ2ckp5MTNZaWovQUhzYSs4N29nSUUzYThPZ2JN?= =?utf-8?B?QUpSTG56Qk1MMHJCTHBhSnMxU05VTXR2UDdmZDEwNkJaTnNwY0FVaFlOc0V5?= =?utf-8?B?WjhxYmRHenFJb0wvRXI5WFRLWnJDU0VLU3QxaTBBdlFRZ1g2Rkx2MENZUFA2?= =?utf-8?B?NUQybEc5RVlOLzI2dnN1RDZBNkJnWmhxV05IS0szNWR4RWJ0cXdYVGRLS1gr?= =?utf-8?B?RmlFRGVicXhCbGVyTU9xd1k5U092RHFSZFlPOFhVRFlFcCt5UkJndmozUlJy?= =?utf-8?B?QmwxNVFndlV1cHoyaDJYZzFBNEV3MUIvNXAzMFRBdVltNkl2V2ZFMktMMWkr?= =?utf-8?B?cVZEM09wMFA5VUdXb3ZiNGpsRkVxcnR2eTVTMXdWZTI1ajNJU2tDVkhTZU5j?= =?utf-8?B?QWtiODI3R3lxbzhSMWRsMFhGeUpJemtYVTl6U1BxdmU2QUFvUFJVQk5zMno0?= =?utf-8?B?WnJ3bXZ2VHdLSFRYU0FHblpyRXRnVU0wSUpRY2pHcnlGQjQxNVdKSURScmlM?= =?utf-8?B?ak9LTDNWSWJqMGllYjl3a0x0d2ZmMThvdEY5Z2h6cTZZNHJyZVcvYTNVcGFh?= =?utf-8?B?L0tDNUZ5VVJLQU40UTYyVkNja1lqVzVwM2hPY2wzRUFFNjJkRU5LN3JyNDlm?= =?utf-8?B?OVAyb3o0V1RqTTJGWUpCNUJWVjVPQW9ib1VySXlGWThJRFlrV0dmOHExL0lk?= =?utf-8?B?aXhCZGZncHdSblovWTBqSWhNclhxTTIzUk1YaDU4MDVSanYrN2hoRi9VNTd4?= =?utf-8?B?VExVNFZsN2l6aUx3dXlHdUNqZEU0VU44UlJOeG1YaWViaHhJdFg1L0FqTzlp?= =?utf-8?B?MEt2elBCL0d1OG93YWNOYzJYRUd0blUveXFZeXZaaU1pR0NGeS9pTUhoQlM4?= =?utf-8?B?ZWVhUDFPRFFpYytGK0s0V21FcVRCQWFHZ1lGYTNDVmt4ai9hL3djeUpQU1V0?= =?utf-8?B?b3lmQVQrR0hEOTJTSzcrZmhyVkFXVlRvcDJpQWtDSE9rSUN1UE5Zd09pSGNs?= =?utf-8?B?K3VjUWpJNGVOZkZrMUxxVkNnY1N1Y3NLQTR4QTE3Z0Ric1dUWGNPTFBnSGpX?= =?utf-8?B?bDFwclBnSEFIRDBTaGhodktKMUp2eTd3WkZnZXYwdk1LRWljdCtmU3F2UGZr?= =?utf-8?B?UlZNM3EyQUh0blBKenFxUlhXejExWHNyeDBjK2lBWjJtRm94TU93T0wvbm0x?= =?utf-8?B?RDZHb2JwZVpWalUvWnZwMjhhWHBEc0liaisvQU1kRCsvZTdMMlNzd2tsMnl5?= =?utf-8?B?dHc4ODJFeng3VnBmcUl4Y21MWGVXRnB6TER0bGJzZXVZWUl1UVBMMDNRQk4z?= =?utf-8?B?OW5GVTN0eHJsS2RIdVVLYU9VdjBMcitMS2pGZXlNU1ltalRzdjhWNHlNRENT?= =?utf-8?B?MXdhZkQwaEV5Ny90dHFReXd3QzE3NUtCQTdkWElzOGVmOTVWUVdDOVc3d2pX?= =?utf-8?B?OUtHM2FTYmR3d1kxcm9LZENVa21ZNGd2T0xaSHJ0eVZQOWxDSHRLUUVPemtW?= =?utf-8?B?Lzc1TzArWk90czJCb3I4QXZDOGk5QThlbEc1U0RmNnhZZ09DRHNCU3BDQjBj?= =?utf-8?B?cm1zQzlRdnpTV2RRVXJLU2ZPcVJ1eXQvY0RRV0dVbm13R09QNmFEc3BXT1gx?= =?utf-8?B?ZmY0aklWaWUxemdxRE4yeVg3WGlYc1lUelBIQ0xTU3ZoeFdUTkxMUjFqbGtx?= =?utf-8?B?aWZ6eW5YMFkrZ1ZqQ3dBUlVxaUNiVFkxa3ZKU3A4Z2ovYjVMWUsyWWJHMVpZ?= =?utf-8?B?TCtBYXhWSzVBaXQ5Y29IdkxGUEhIN1lwci9SYUJrL0ZDaUZuclpsQ0U1MFhk?= =?utf-8?B?UTlxbFlDZG94SDRMdWk5WkNLZldVb0xqOVI1L2t0SVJNRTB2eHVBMHRaVzZk?= =?utf-8?B?NkpWeU9aQXpob0hrb3BVeVUzdGFkcEthU2lWNDBLVUJqQVdMdTlhTkhzWisw?= =?utf-8?B?VURqWjExY3YrQWdsUlpyeW41b3YvVlN0bGhCY29RKzk0L2ZOeVd0RlQ2WFR1?= =?utf-8?B?VkZjUTI1RFlqR3NEWEFTN3JwVmJIMm9LdTVQeThUb1FCdU5SalBNc3R5TDE2?= =?utf-8?B?bWlQbjY3UmI3cVhxQkRhOU1YbndqbnhPNTVGOTVEdXJpUHp3QmE1cWpqa1c1?= =?utf-8?Q?6Ddjv4fn+XEWcWcnEei+02/AYLPqax7h//dkgHh7vSAZI?= X-MS-Exchange-AntiSpam-MessageData-1: uI8rlKdlqyQQ/w== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35230042-eebf-4fae-c687-08def84ef355 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2026 08:51:50.7931 (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: iAF6Ed+MfzkKTZ1vKUG0sTvvcHsN2f6WKM8dfDjTlMz/1rV/fwMSKg803M3w/8M/UZQIfKXG375gSbdiZdox3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8519 It is currently possible to construct a non-`BitmapVec` backed `Bitmap` using `Bitmap::from_raw` that is larger than `i32::MAX`, and it is not part of the unsafe requirements. Restricting all bitmaps (even non-`BitmapVec` backed ones) to a maximum size of `i32::MAX` simplifies a few things and matches `BitmapVec::MAX_LEN`. Add that requirement to the unsafe requirements on `Bitmap::from_raw` and `Bitmap::from_raw_mut`, and to the invariants on `Bitmap`. This also fixes u32 casts truncating in `copy_and_extend`, which could otherwise lead to OOB writes. Fixes: 11eca92a2cae ("rust: add bitmap API.") Link: https://lore.kernel.org/DKG0U8RLO7LZ.2I1AIH0S38PAP@nvidia.com Signed-off-by: Eliot Courtney Reviewed-by: Yury Norov --- rust/kernel/bitmap.rs | 68 +++++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/rust/kernel/bitmap.rs b/rust/kernel/bitmap.rs index a43bfe0ec3dc..fdcfc0409773 100644 --- a/rust/kernel/bitmap.rs +++ b/rust/kernel/bitmap.rs @@ -17,24 +17,57 @@ /// # Invariants /// /// Must reference a `[c_ulong]` long enough to fit `data.len()` bits. +/// Must not be longer than `i32::MAX` bits. #[cfg_attr(CONFIG_64BIT, repr(align(8)))] #[cfg_attr(not(CONFIG_64BIT), repr(align(4)))] pub struct Bitmap { data: [()], } =20 +macro_rules! bitmap_assert { + ($cond:expr, $($arg:tt)+) =3D> { + #[cfg(CONFIG_RUST_BITMAP_HARDENED)] + assert!($cond, $($arg)*); + } +} + +macro_rules! bitmap_assert_return { + ($cond:expr, $($arg:tt)+) =3D> { + #[cfg(CONFIG_RUST_BITMAP_HARDENED)] + assert!($cond, $($arg)*); + + #[cfg(not(CONFIG_RUST_BITMAP_HARDENED))] + if !($cond) { + pr_err!($($arg)*); + return + } + } +} + impl Bitmap { /// Borrows a C bitmap. /// + /// # Panics + /// + /// Panics if CONFIG_RUST_BITMAP_HARDENED is enabled and `nbits` excee= ds `i32::MAX`. + /// /// # Safety /// /// * `ptr` holds a non-null address of an initialized array of `unsig= ned long` /// that is large enough to hold `nbits` bits. + /// * `nbits` must not exceed `i32::MAX`. /// * the array must not be freed for the lifetime of this [`Bitmap`] /// * concurrent access only happens through atomic operations pub unsafe fn from_raw<'a>(ptr: *const usize, nbits: usize) -> &'a Bit= map { + bitmap_assert!( + nbits <=3D i32::MAX as usize, + "`nbits` must be <=3D {}, was {}", + i32::MAX, + nbits + ); let data: *const [()] =3D core::ptr::slice_from_raw_parts(ptr.cast= (), nbits); // INVARIANT: `data` references an initialized array that can hold= `nbits` bits. + // INVARIANT: the caller guarantees that `nbits` does not exceed `= i32::MAX`. // SAFETY: // The caller guarantees that `data` (derived from `ptr` and `nbit= s`) // points to a valid, initialized, and appropriately sized memory = region @@ -51,15 +84,27 @@ pub unsafe fn from_raw<'a>(ptr: *const usize, nbits: us= ize) -> &'a Bitmap { =20 /// Borrows a C bitmap exclusively. /// + /// # Panics + /// + /// Panics if CONFIG_RUST_BITMAP_HARDENED is enabled and `nbits` excee= ds `i32::MAX`. + /// /// # Safety /// /// * `ptr` holds a non-null address of an initialized array of `unsig= ned long` /// that is large enough to hold `nbits` bits. + /// * `nbits` must not exceed `i32::MAX`. /// * the array must not be freed for the lifetime of this [`Bitmap`] /// * no concurrent access may happen. pub unsafe fn from_raw_mut<'a>(ptr: *mut usize, nbits: usize) -> &'a m= ut Bitmap { + bitmap_assert!( + nbits <=3D i32::MAX as usize, + "`nbits` must be <=3D {}, was {}", + i32::MAX, + nbits + ); let data: *mut [()] =3D core::ptr::slice_from_raw_parts_mut(ptr.ca= st(), nbits); // INVARIANT: `data` references an initialized array that can hold= `nbits` bits. + // INVARIANT: the caller guarantees that `nbits` does not exceed `= i32::MAX`. // SAFETY: // The caller guarantees that `data` (derived from `ptr` and `nbit= s`) // points to a valid, initialized, and appropriately sized memory = region @@ -96,26 +141,6 @@ union BitmapRepr { ptr: NonNull, } =20 -macro_rules! bitmap_assert { - ($cond:expr, $($arg:tt)+) =3D> { - #[cfg(CONFIG_RUST_BITMAP_HARDENED)] - assert!($cond, $($arg)*); - } -} - -macro_rules! bitmap_assert_return { - ($cond:expr, $($arg:tt)+) =3D> { - #[cfg(CONFIG_RUST_BITMAP_HARDENED)] - assert!($cond, $($arg)*); - - #[cfg(not(CONFIG_RUST_BITMAP_HARDENED))] - if !($cond) { - pr_err!($($arg)*); - return - } - } -} - /// Represents an owned bitmap. /// /// Wraps underlying C bitmap API. See [`Bitmap`] for available @@ -415,7 +440,8 @@ pub fn clear_bit_atomic(&self, index: usize) { #[inline] pub fn copy_and_extend(&mut self, src: &Bitmap) { let len =3D core::cmp::min(src.len(), self.len()); - // SAFETY: access to `self` and `src` is within bounds. + // SAFETY: access to `self` and `src` is within bounds. Both lengt= hs fit in `u32` + // because a `Bitmap` is at most `i32::MAX` bits, so the casts are= lossless. unsafe { bindings::bitmap_copy_and_extend( self.as_mut_ptr(), --=20 2.55.0 From nobody Tue Sep 29 04:39:46 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010046.outbound.protection.outlook.com [52.101.193.46]) (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 813DD38F646; Wed, 12 Aug 2026 08:52:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524723; cv=fail; b=MZrIno2oT1R3EMEPzyfHPXN9tBGgp+aTWxXU5CX0BYyNHI/CYi130jycS8GexWWgA687ZA1ANUFC2mR4at+YY7KJyr6j231pFzd0PGjuKF4WS4kF6LHiv6gMHkr6AJQt7vCSEBWB0ocPgnHrNH/Q54ZlRsY7EtPd3Y3mvhBDftg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524723; c=relaxed/simple; bh=jpIVmPGwCtw6og/+6XsfcBvURRaA/9/ppRuFR03bBkU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Pq+mhiTK3AnUZ+eycP3Tc5JE4rd80meu+dYfR00BD8tJuTOmgTADu+voqncf1aK3S+7fB/J+eXo1KOslVWv8Nj0gKugLkh+sXxPLEQQiJgihttw1bdClQHUh6J4MdhmRkMmwZz+jiO1GYhRMNv8K6y22rj7mAaVS1N8jmShVKMI= 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=pxhGYq3a; arc=fail smtp.client-ip=52.101.193.46 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="pxhGYq3a" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lV26MiT/zbrXiWRDVSB/EF1rF9UZ7d7rm/v5GoCMLfIfNdzTnIDvTQZEwDF9jrSBGZyn4Ki5x4iYpn6g0xvFVVKOIgoh/6AKcs+JM3HfOgIDAWGxovdEPsKEaYibW0i8cY36AAIi8LYhU6QczND73ZRrXC5Unq6B9Zc087bRpF+MQgJKv6XNEgZKkw2cAZ3gUvdoMmHtnk/f2Ka0SADVinHctXtT00T/1Np+NaM7+XwN/BtNGPhJehUo2GkSsc3JoFZgNqnO2PFV49WzG3+Gm+MHF2NiqgOi+OcBSPD2YDH2O6GPkJ+8tk5rxXWgIZgHq1nkZlyKJ6SbzH7cihwB8A== 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=JI5YO14EBH7jrfKXmTFOimrsxEJ4OqmjrhnnTe2TufQ=; b=akgUem9UcgFgiRuSPQzcQ9HE52cMi3wlmUHPZZFgTha2Kqd5VGbgVCMr13yKkEeiR+fv3SQEK7hC5gu1r/5omylA+ZSHDY+Bj0P7BxJKAWDkLZCQiEx5h/SpfVxi5xG4JRKPuUGAYOG46yx9IChLwof2tm25vNx0eAitt2vYCKQiErP+qBSH9hHvkYxiOTgCpgb5xU8ZKiiAS71nMXxc10kBbdo6yw/1Eww2eJa972/NxnLC2y/32OjUkni6CI7PFe5pkI/gj8ao61/a8ZgwPrcWOdf2041Bt4AJ5S2nlATOBr/6Am+fe3W7q+CqRCSWKyKkAQj2HLsKJRe1M10KXA== 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=JI5YO14EBH7jrfKXmTFOimrsxEJ4OqmjrhnnTe2TufQ=; b=pxhGYq3axY0U/EIW/VzyQhA1IIsgF2FHMV3pndhA/JpQxAvi3aGmmdXDazjCimzvdvORCx2PWVbPApJuio3V2XGegLZ2OHLwMzsfbtO9cOn0LF+cGOlhD/v1FHBLkkCXSHtbmifoVVes84l2ZKujCCRaS0HI18p7Z9yw2DR/DIW3Y63Bb20+kXzDClYHsxav9Q67E1uK7eZ8Y5CHFuv3L+Q0P7O+Cw7sflhUH+uU6oR4QUFANTuRxFfPye32RDM6cfHdT7PWPG3C8cSS7B6x2xuD4WpqLjpLV8zXBg+PvlLYSY//OQftV3dD3KL7VUE/Wo9cJcB6GP6V73Cduirmug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by IA1PR12MB8519.namprd12.prod.outlook.com (2603:10b6:208:44c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.12; Wed, 12 Aug 2026 08:51:56 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0315.014; Wed, 12 Aug 2026 08:51:56 +0000 From: Eliot Courtney Date: Wed, 12 Aug 2026 17:51:23 +0900 Subject: [PATCH v5 3/5] rust: bitmap: add contiguous area operations Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260812-chid-v5-3-6c767770b3f4@nvidia.com> References: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> In-Reply-To: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> To: Alice Ryhl , Burak Emir , Yury Norov , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , David Airlie , Simona Vetter Cc: Greg Kroah-Hartman , John Hubbard , Alistair Popple , Timur Tabi , Zhi Wang , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: DU7P189CA0003.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:552::9) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) 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: BL0PR12MB2353:EE_|IA1PR12MB8519:EE_ X-MS-Office365-Filtering-Correlation-Id: 1eb76d2a-19f9-4e16-ed3c-08def84ef6bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|10070799003|7416014|376014|366016|1800799024|921020|6133799003|10067099003|11063799006|5023799004|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: J17lICQlf1f/MbYSWTqmSpbNOwuAEnXhz+ueADDP/zaPS7zRFLYlYpcgjJeXLriT2PKVOEmGHUV3DiojoWybqDs8vmG0ntUm6LHvOz31esvzb2vmf/qYajsUvgTvfMy+6UXlUT+KpnTVqUS2OtUxocTXYixLMrcAgIs6TBRrihBg6Bj6fJY1XXvpE6AEtvei2CmPH7fvBoYXlGqSUyfb2QG1QYHL/ZwuWkOhaiX+HQlPUixw67q796ArbRU6JznMdBAVLH1Iqj8rIiwHW/two17IrINRRZwZs0M/qQrOm5mP9aZ84OpRiXyxNDBk0wblOY34HyH3bNoTqQTNEKPxZcL6Mzi/2rLtm4Ayih0DzTogfH6bBSMo/j/O3JmSeofhFMrIZt6XSUZOG3WXwybmchZ8r6WSHcRrfPOwoV61JJ/f29ZTBOEwrJw0oVawOvNtksA69wECD+w6AVGplxIiDlttfZD545lF/P6Qp5kN/ObCiswhr8jytFoEZcmH8adg3sbnaQk+TYp1KGauOqrsD/TaFoVhslMV7JshRaioYvBoKAUpltKtIH+dH96saOsGoP7xJCYxQLRHpwwYUIeTGrviHTAT17eO0WOiVVcewW2hPkodZ6YbQ7VOAD+pj372cIv8PIVYyQ6L1YO14HXRUehdF6yg8k8t5qudxBVZtUS7lOqBOXcLOYIJRNODXmNT6SVwoTJXoQNDiItQnxMJNA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(10070799003)(7416014)(376014)(366016)(1800799024)(921020)(6133799003)(10067099003)(11063799006)(5023799004)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TUw3VWVraWV2cHZKMkxsbUVNSUVOd3FsektMM0dpVkdNNUJJendCaFoycUtp?= =?utf-8?B?eE1Ea1ZhWlh5YjNQZTlGUlpPWFZqWU4vQmxvQ1ovdTBqSzV1VEwycUJRSkJT?= =?utf-8?B?bUZJZjdpckRWYnNPOGt5LzhtZnoyQ1l6dGdMYW1NWEk2YzV3dXNvSTgzNmpW?= =?utf-8?B?OHNEbE80MnhyeEc1cUY1N3hWTGlLTmI0K0dLVHZjZHY0YW4zSlU1OExYQmlv?= =?utf-8?B?M25MblNGNG9KOUNMdllub0hHTUNzQS8rTjUvUHljamVDTlFaYW9OejFmdUxS?= =?utf-8?B?U0NlSFRwOE4rZEdwLzJxK1Y5akpibWR2OEdhbGZSdVBvczkxNWUzaGdtSzRq?= =?utf-8?B?ZzRSMytuVkJwbU56OFAxY0czM01aczFzUnBYK2FxNXpWZ2V0SkhiQzJZYzk2?= =?utf-8?B?SUpaaEF0V2dXcloyWkdtd1RGVWhLa1lkSDVka3BxcndqRmxjWllncG5qTzJv?= =?utf-8?B?bFJyOUcwV2xCZzZyb0JHa0dGMmJpbHM0bHk0U2QxRm1PaVRiU29NWU84bTdL?= =?utf-8?B?cFVRU2tka2dGQVdvOHlRVDFNcVEvSmtZY3RZSDVLUHhWYTR1S005NHc0WWl6?= =?utf-8?B?dzFBSlZES3J3TjhiK1JMcXZIVG9zQS9ZTmVMTm82L2F0K2NqK0VHSGkzRElk?= =?utf-8?B?Y2FOU2w1TXgyNnh5SlZTb1c3NnpKUEFTbmhqakhqME95ZlhkUk9vYXJZMGl5?= =?utf-8?B?NTlNLzZSYTduRzJQYUw4UmpTUHdLTjJVb09CSFpSN2lKT0RBZjRKb2M5L3JG?= =?utf-8?B?Uy9mN3dkNHA2ZnpTVWEvRlFuQ1E4RWluVmFPSC81K1RObTJuby9jd0ZrNEt6?= =?utf-8?B?ZVF3RmpMUm1WVVV0VzliMFhQZGFERkp3VExWak5aNTRKUXRBZW92a1BsbjVL?= =?utf-8?B?Vm5adlFRRU1wRzVxN3Z6VU0zalhGUDRFeVJ0UjlndU51VnhzcUNuVldyOTZ5?= =?utf-8?B?bmZwY2ZpOHdEM0M0N1B1WjI4RFhiNk5idmtTWkdJME03b3VaQ1VrTVhvZ1pi?= =?utf-8?B?VTk5cWdKNktOZkNiaFNPK2IzV2J6SXNtR1dTV2xGNHFnUzV2cmJNUGhxU2Zs?= =?utf-8?B?N0pNU1k5YVRxd3JrQzJHMTVqd2ppbFZDYkp4dDZ3djFrU1BqdjB2WjEyTDBL?= =?utf-8?B?NEZtekN5OTRUNnpzbWxMakx3TzdNbDQxbFBCaHNvalJLOHlpQ3kyQjFYUlJW?= =?utf-8?B?eFV5Uk83NFlNQThnSno1cUQremlLMlNkalVmeTNjTHYxU251clJ2N2s1d2lP?= =?utf-8?B?S1lUT2F3UkozUmhGV0VFZVQrTGtVM2ppTHBqNWx1VzRWNzB4dll1b3d6c0JM?= =?utf-8?B?UUhkY1QzZ0x1VTlFSnM4NThmUDRlcE5zNTUzN3psS0RyWmYycURMc1dIRWV0?= =?utf-8?B?MTBlWWxzc29OWlIxeFEzY1dyYVFhcDM0U3VPb2hTWmZoWW9RRWpMYzBtR0hY?= =?utf-8?B?RVRJZEkyK1NpUFBBNTUvNkJEd1Njck11TVI5bTU1MUw0eEMwd3A3T2dWY3hC?= =?utf-8?B?M0Rjd09HT0ZhaWpaM1lNUUVRNGhCQ1hxTXg0V29Ua2Q3M3VTOStCZVQ3V3c1?= =?utf-8?B?N1dyRllPUGNMVHZDVjZoTlJueEtEUW4xS0N5aysvVTE1dXRmYnF0d1ZEY0ZK?= =?utf-8?B?eUxkWW1QcVJLOEllRXJhTi84KzlaUmFLNXA4eEJCd0Jmc0RLNVNkNE5mRDNR?= =?utf-8?B?THYwRVlqeFdXVk5SblgxWHllbXVENCtBWkxzQjQrL3RkVzlwQ2o3WFZMb3Nm?= =?utf-8?B?K2NXQmR0azYzcllIL3ZkbDRWa0k0UGNObHVsQmI5Mkw3Y3hhd2JEZjFuM0l2?= =?utf-8?B?U2FQWUZWNnVkRnU0R2hCU0RzMkorczlvT24wK2N4NWFNODJSaUVLdEpWSnpl?= =?utf-8?B?ZDFqMmQveXdUVmlpdXZ0bWMzNVRqZ2hLUHg5VW0rVDhHV3BNVHNDeWJIblJE?= =?utf-8?B?YUFUWi8wTUNGeW0wL285YW0xUjdqQlZmR0Ywb25haHZwL2haczVRbUxrc0lo?= =?utf-8?B?eDVRaUVCZ25Cb1J2ZzR3UmpTRVhHeFVvb25aT0FJdEd2N3h3T3B5c1JueFVS?= =?utf-8?B?QmpMelFISlpoSU15WmdMS3FHTzI2dVB3cHdTRCtLN0w4V2RxWS83WlhXLzVo?= =?utf-8?B?Yys0RFp4clZEV1VhZWNuTElPSWE3TUg2MGc3bGFva2VaRkdXUlBQVHVKeG9J?= =?utf-8?B?bVN3Sm5QRC9Gd3Z5MEdUOXdNcGsrOE52dFJCYjZxMlN0OVBRYnRMbVgrOHdH?= =?utf-8?B?NzZ2c1hYMno0ZGVIaGxBRC80TTBVTWtObDhSdUtCd2RiaUw2NERyeG1rdmRE?= =?utf-8?B?QjJOQ3Y1TjEyTXVWZEtYUDlqWUxjUTFCaHdzaUllckwzZTFXUkhMTGxIejdE?= =?utf-8?Q?Q2CgJxxMd8jGwodUduSRsAFpXotr75dRmIv5xnGIcwxWL?= X-MS-Exchange-AntiSpam-MessageData-1: /72MAhH5xutDAQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1eb76d2a-19f9-4e16-ed3c-08def84ef6bd X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2026 08:51:56.5871 (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: 5Da5nCmgkHyhRYES5qlEV75rBTZHyvkRFCTFJgXiChNUeDGrl3RnuX3rZikAKrFNfUObv5/2eA7IPuk5C3ZvqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8519 Add bindings for area operations on bitmaps. Each one is made safe by adding some extra checks compared to the underlying C code (for example, checking bounds) and with additional checks to catch likely erroneous usage if `CONFIG_RUST_BITMAP_HARDENED` is on. Add tests demonstrating the edge cases. Signed-off-by: Eliot Courtney --- rust/kernel/bitmap.rs | 236 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 236 insertions(+) diff --git a/rust/kernel/bitmap.rs b/rust/kernel/bitmap.rs index fdcfc0409773..74c92cc452c9 100644 --- a/rust/kernel/bitmap.rs +++ b/rust/kernel/bitmap.rs @@ -10,6 +10,7 @@ use crate::bindings; #[cfg(not(CONFIG_RUST_BITMAP_HARDENED))] use crate::pr_err; +use crate::ptr::Alignment; use core::ptr::NonNull; =20 /// Represents a C bitmap. Wraps underlying C bitmap API. @@ -523,6 +524,139 @@ pub fn next_zero_bit(&self, start: usize) -> Option { Some(index) } } + + /// Finds a contiguous area of `nbits` zero bits at or after `start`, = where the area plus + /// `align_offset` is aligned to `align`. + /// + /// Returns the bit index of the start of the area, or [`None`] if no = such area fitting in + /// the bitmap exists. + /// + /// The returned index plus `align_offset` is a multiple of `align`. + /// + /// # Panics + /// + /// Panics if CONFIG_RUST_BITMAP_HARDENED is enabled and `start` is ou= t of bounds. + #[inline] + pub fn next_zero_area_off( + &self, + start: usize, + nbits: usize, + align: Alignment, + align_offset: usize, + ) -> Option { + bitmap_assert!( + start < self.len(), + "`start` must be < {}, was {}", + self.len(), + start + ); + + let nr =3D u32::try_from(nbits).ok()?; + let align_mask =3D align.as_usize() - 1; + + // The C alignment and end arithmetic must not overflow, or it can= read out of bounds. + // Overflow is only possible on 32-bit. + #[cfg(not(CONFIG_64BIT))] + align_mask.checked_add(self.len())?.checked_add(nbits)?; + + // SAFETY: `bitmap_find_next_zero_area_off` is safe to use with an= out of bounds `start` + // value and, given the overflow check above, never reads beyond `= self.len()` bits. + let index =3D unsafe { + bindings::bitmap_find_next_zero_area_off( + self.as_ptr().cast_mut(), + self.len(), + start, + nr, + align_mask, + align_offset, + ) + }; + + (index < self.len()).then_some(index) + } + + /// Finds a contiguous area of `nbits` zero bits at or after `start`, = aligned to `align`. + /// + /// Returns the bit index of the start of the area, or [`None`] if no = such area fitting in + /// the bitmap exists. + /// + /// The returned index is a multiple of `align`. + /// + /// # Panics + /// + /// Panics if CONFIG_RUST_BITMAP_HARDENED is enabled and `start` is ou= t of bounds. + /// + /// # Examples + /// + /// ``` + /// use kernel::alloc::{AllocError, flags::GFP_KERNEL}; + /// use kernel::bitmap::BitmapVec; + /// use kernel::ptr::Alignment; + /// + /// let mut b =3D BitmapVec::new(64, GFP_KERNEL)?; + /// let unaligned =3D Alignment::new::<1>(); + /// + /// assert_eq!(Some(0), b.next_zero_area(0, 8, unaligned)); + /// b.set(0, 5); + /// assert_eq!(Some(5), b.next_zero_area(0, 8, unaligned)); + /// assert_eq!(Some(8), b.next_zero_area(0, 8, Alignment::new::<8>())); + /// assert_eq!(None, b.next_zero_area(0, 65, unaligned)); + /// # Ok::<(), AllocError>(()) + /// ``` + #[inline] + pub fn next_zero_area(&self, start: usize, nbits: usize, align: Alignm= ent) -> Option { + self.next_zero_area_off(start, nbits, align, 0) + } + + /// Sets a contiguous area of `nbits` bits starting at `start`. + /// + /// If CONFIG_RUST_BITMAP_HARDENED is not enabled and the area `start.= .start + nbits` is out of + /// bounds, does nothing. + /// + /// # Panics + /// + /// Panics if CONFIG_RUST_BITMAP_HARDENED is enabled and the area `sta= rt..start + nbits` is out + /// of bounds. + #[inline] + pub fn set(&mut self, start: usize, nbits: usize) { + bitmap_assert_return!( + start + .checked_add(nbits) + .is_some_and(|end| end <=3D self.len()), + "Area `start..start + nbits` ({}..{}) must be within bounds {}= ", + start, + start.saturating_add(nbits), + self.len() + ); + // SAFETY: The area `start..start + nbits` is within bounds and a = `Bitmap` is at most + // `i32::MAX` bits, so the casts are lossless. + unsafe { bindings::__bitmap_set(self.as_mut_ptr(), start as u32, n= bits as i32) }; + } + + /// Clears a contiguous area of `nbits` bits starting at `start`. + /// + /// If CONFIG_RUST_BITMAP_HARDENED is not enabled and the area `start.= .start + nbits` is out of + /// bounds, does nothing. + /// + /// # Panics + /// + /// Panics if CONFIG_RUST_BITMAP_HARDENED is enabled and the area `sta= rt..start + nbits` is out + /// of bounds. + #[inline] + pub fn clear(&mut self, start: usize, nbits: usize) { + bitmap_assert_return!( + start + .checked_add(nbits) + .is_some_and(|end| end <=3D self.len()), + "Area `start..start + nbits` ({}..{}) must be within bounds {}= ", + start, + start.saturating_add(nbits), + self.len() + ); + // SAFETY: The area `start..start + nbits` is within bounds and a = `Bitmap` is at most + // `i32::MAX` bits, so the casts are lossless. + unsafe { bindings::__bitmap_clear(self.as_mut_ptr(), start as u32,= nbits as i32) }; + } } =20 #[cfg(CONFIG_RUST_BITMAP_KUNIT_TEST)] @@ -640,4 +774,106 @@ fn bitmap_copy_and_extend() -> Result<(), AllocError>= { assert_eq!(Some(17), long_bitmap.last_bit()); Ok(()) } + + #[test] + fn bitmap_area_set_clear_find() -> Result<(), AllocError> { + let mut b =3D BitmapVec::new(128, GFP_KERNEL)?; + let unaligned =3D Alignment::new::<1>(); + + assert_eq!(Some(0), b.next_zero_area(0, 5, unaligned)); + b.set(0, 5); // Now contains {[0, 5)}. + + assert_eq!(Some(0), b.next_bit(0)); + assert_eq!(Some(4), b.next_bit(4)); + assert_eq!(Some(5), b.next_zero_bit(0)); + assert_eq!(Some(5), b.next_zero_area(0, 5, unaligned)); + assert_eq!(Some(8), b.next_zero_area(0, 5, Alignment::new::<8>())); + + b.set(8, 8); // Now contains {[0, 5), [8, 16)}. + assert_eq!(Some(16), b.next_zero_area(0, 4, Alignment::new::<16>()= )); + assert_eq!(Some(16), b.next_zero_area(0, 4, unaligned)); + + b.clear(0, 5); // Now contains {[8, 16)}. + assert_eq!(Some(0), b.next_zero_area(0, 5, unaligned)); + assert_eq!(Some(8), b.next_bit(0)); + assert_eq!(Some(15), b.last_bit()); + + b.clear(16, 0); // Zero-length in-bounds clears are no-ops. + assert_eq!(Some(8), b.next_bit(0)); + assert_eq!(Some(15), b.last_bit()); + + // A zero-length request returns the first aligned position at or + // after the next zero bit, even if that position's own bit is set. + assert_eq!(Some(1), b.next_zero_area(1, 0, unaligned)); + assert_eq!(Some(8), b.next_zero_area(1, 0, Alignment::new::<8>())); + + b.set(60, 10); // Now contains {[8, 16), [60, 70)}. + assert_eq!(Some(60), b.next_bit(16)); + assert_eq!(Some(69), b.last_bit()); + assert_eq!(Some(16), b.next_zero_area(9, 40, unaligned)); + assert_eq!(Some(70), b.next_zero_area(0, 45, unaligned)); + + b.clear(62, 6); // Now contains {[8, 16), [60, 62), [68, 70)}. + assert_eq!(Some(62), b.next_zero_area(60, 6, unaligned)); + assert_eq!(Some(61), b.next_bit(61)); + assert_eq!(Some(69), b.last_bit()); + + b.set(64, 0); // Zero-length in-bounds sets are no-ops. + assert_eq!(Some(62), b.next_zero_bit(62)); + Ok(()) + } + + #[test] + fn bitmap_area_exhaustion() -> Result<(), AllocError> { + let mut b =3D BitmapVec::new(64, GFP_KERNEL)?; + let unaligned =3D Alignment::new::<1>(); + + assert_eq!(None, b.next_zero_area(0, 65, unaligned)); + assert_eq!(None, b.next_zero_area(0, usize::MAX, unaligned)); + assert_eq!(None, b.next_zero_area(1, usize::MAX, unaligned)); + + b.set_bit(0); // Now contains {[0, 1)}. + assert_eq!(None, b.next_zero_area(0, usize::MAX, unaligned)); + + b.set(0, 61); // Now contains {[0, 61)}. + assert_eq!(None, b.next_zero_area(0, 4, unaligned)); + assert_eq!(Some(61), b.next_zero_area(0, 3, unaligned)); + assert_eq!(None, b.next_zero_area(0, 1, Alignment::new::<64>())); + Ok(()) + } + + #[test] + fn bitmap_area_off() -> Result<(), AllocError> { + let mut b =3D BitmapVec::new(64, GFP_KERNEL)?; + let align8 =3D Alignment::new::<8>(); + + b.set(0, 5); // Now contains {[0, 5)}. + + // The area plus align_offset starts at a multiple of the alignmen= t. + assert_eq!(Some(7), b.next_zero_area_off(0, 8, align8, 1)); + assert_eq!(Some(5), b.next_zero_area_off(0, 8, align8, 3)); + + // A zero offset behaves like next_zero_area(). + assert_eq!( + b.next_zero_area(0, 8, align8), + b.next_zero_area_off(0, 8, align8, 0) + ); + Ok(()) + } + + #[test] + #[cfg(not(CONFIG_RUST_BITMAP_HARDENED))] + fn owned_bitmap_area_out_of_bounds() -> Result<(), AllocError> { + let mut b =3D BitmapVec::new(64, GFP_KERNEL)?; + + // Should be ignored since out of bounds. + b.set(64, 4); + b.set(62, 8); + b.set(usize::MAX, 0); + b.clear(usize::MAX, 0); + b.clear(2048, 8); + assert_eq!(None, b.next_bit(0)); + assert_eq!(None, b.next_zero_area(64, 1, Alignment::new::<1>())); + Ok(()) + } } --=20 2.55.0 From nobody Tue Sep 29 04:39:46 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012017.outbound.protection.outlook.com [52.101.43.17]) (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 805253EFFB2; Wed, 12 Aug 2026 08:52:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524726; cv=fail; b=EXh83Ajq00jbSdMVwdMU7pT5iF9hnru9hVA+TmVbuHfkOCPnciB0RdCipBKUgTLPqY/tap4jJR0ZiPYzoWSNiQ3kwHHK01qQnJV8wO6FSMuB9oL6NIQkR7G0ZGppWVog8Y16GmVIdvhWLdrf5lgYXgOUxX03I3GElP4VRFAIhfg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524726; c=relaxed/simple; bh=rciIy2lr4prGOGGPlEq8Tf4+YnmFt4iVnDhMAuc4LfY=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=RJ9F5X1LaJtugYiNiYzpSLG4lN1sH6G1YJXAwmK8I0zfje+aNAkgnpPq6RrxY/NRIEWUrIPtnH188AQdAisVnUOqiHHMLBJey0UbLbcRZp0FpDljz0qqtwJuzpLBhIEAoFriRiy6PKhyEAP9yaoPbARx8UoXy8dlRnDQ0OWRhA0= 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=rAipExcx; arc=fail smtp.client-ip=52.101.43.17 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="rAipExcx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gXf2NrnSIkgrdPCpqZAo9aCFlViXWpZ+RtoS2Up9qUiyxteJX5TcJ4Oe5+JXZMXH4BT/cxXHgIaZvFtugKCd+v9toixuVVc9GKSq7ohyj8nMexAabJtmP+JLQP52JRjv1G0ufng0NtjtvoNtikyK0mfOLppvOlqJvOfee6hfL1wW9j4deBohRAW+P3thPBs1uHKFiITyfoB1FXglPyG8BrBVTdai+2SyjKHiPgZ+dXVuXOEqEvU1RQwXDUHoaYAtw8Gjw8D1qV9mdxUhHysbMQZ9TKnvWDkrS1ohe/Gc4H0XbsmE0eVH5oGiMXhhfPFvFk7IPqBY5HofJzMJfxzHxA== 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=mBWa5tFnDAYid/53BtJQEhxB04OqYLxXPt1H44UHjD8=; b=XvYoin0xoIXj2MLf1AwBbGvd2cXfsAdoy1S6qWga9a+vRQOhSpHm3wLW5aUPoHi4XLM4xG8ZzRBStsc6nFh0I75oiFstTRoBzohn9kuY/W9IkorETmW/3Rgni4RHUtltkZOLU+EqpIeHZjG+h6zWGlaYhlE5gmKLgGt9Xmf2CwhF2fX9yd5Vle0KlL6GyTSm0RWsmKW1n4R81G2Ujn8zDqTshpzi1Y+N09tYSy0EageklEdTPwRSNIv4S6q4CfhWLIlX4sDM0uutC9EwHAW1fOe3hD3T2tmuPTqXtzxDd3/zYFyLGShfdwPMuYkROh7leDQ7qi/n1VHGy5J10qrCyw== 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=mBWa5tFnDAYid/53BtJQEhxB04OqYLxXPt1H44UHjD8=; b=rAipExcxIfZG+zcZR/MndsZmu2G7dn3ptUyIRoUm4cjm8ykjfmGUvwSNd6YJ+zqYW9MShccLn4mSad0+9cuSzGcGWfQ2+OctJKqTQ2+ypwF10hnpMlgB4g+CZQO7H+F0q0PnoZZFFBBXFXdQbjjfbda8CaBxZJgsDvQxkooVn/JhzELW3hozc4q0xLrdrs1PfRJaM/esDy8nupAFNDRNnNURLUwqQaRNBW4nqKj0z/R4UBMsm5EYP9eFn95f4qZ8oiSBKS9xtiSwrpjuIWDzmjqtsg3vcAy4Zc8ZgzZHvSyG01zsGQHFU0aj9eQH8gSR+fbz7Dbqq7TRO3UFEDwowg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by IA1PR12MB8519.namprd12.prod.outlook.com (2603:10b6:208:44c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.12; Wed, 12 Aug 2026 08:52:00 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0315.014; Wed, 12 Aug 2026 08:52:00 +0000 From: Eliot Courtney Date: Wed, 12 Aug 2026 17:51:24 +0900 Subject: [PATCH v5 4/5] rust: id_pool: add contiguous area allocation Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260812-chid-v5-4-6c767770b3f4@nvidia.com> References: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> In-Reply-To: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> To: Alice Ryhl , Burak Emir , Yury Norov , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , David Airlie , Simona Vetter Cc: Greg Kroah-Hartman , John Hubbard , Alistair Popple , Timur Tabi , Zhi Wang , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0351.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:7c::20) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) 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: BL0PR12MB2353:EE_|IA1PR12MB8519:EE_ X-MS-Office365-Filtering-Correlation-Id: 1942b742-b822-42a6-e17f-08def84ef92b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|10070799003|7416014|376014|366016|1800799024|921020|10067099003|11063799006|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: B61lbB9KWLieQvQnzQsN5jErFgDwds8UUP+tic8X2R62Cuqee/E3Hq0WAvMaFksG4JiK1yUbE2+TPdGAsLofSyjQBHxl69XXungqyQdI1ZcZnkGwMWKTSFmXiQ7CHahLz2ge8n4czaRyBC9vme52xrvzaOjebKywBbAqpkmTLGQ+jl48W1/du1MB37KST4bAMTrR958MRNoreanDWYPx7Hwnl00eIWOjMVXdCBdz9w45aWAeFX4rMFyrwlRP9tJ6NQH5LxJjEarMT0IsXqRkqKr62Qc2TsjH/JKoaoF73oRnVe+BcGMcr0LBcgl85gIwxJg70toSjSiiLKPc5jheXLlAv8DQGPBLIH2cycftGvUtA4uqqasoqwlED6EVPwVfMg7jgntgjzhu0xFIe5AtYND37elqGmXv4dhAP/Yyd0ltPvwnWuCHyOlJbtr7McQDnIqHuyaGkEBbVdTO2TTnDV9XgWXeYygHtqXHekQEE85eCQu9WM0FKoMqK8/9HdFU72etz+hvmjCf9Qgaafw+zTvcvHFM64CcVzZx0XiVsXXGQ5bZgoRYaxm38jjtABhNVpYGMcfZEqbPrsP3C8vsDjL4tGBb++rF1fqiVGxr2QEyETy8szEA3Mst5me/Lq2BT6DOLAGm3ZL4cuzE1caAc/3Ucy+NhxgrFr3SE2rsYDbhKLFjHXkHU3lJ2QQQP5GrTKjgB7reoQ1mQrVg4cGBmg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(10070799003)(7416014)(376014)(366016)(1800799024)(921020)(10067099003)(11063799006)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M09iQ016RFo4VEJBVmpSNnIwZzFmaXVpdElLRm9aekhNekNNdEpTcUQ3V0o2?= =?utf-8?B?S29CMHJkM1VSRE54RTlCbEpJL3NoNFk3NXVwSkVpeUZjeExMN29GQVJiV1Z5?= =?utf-8?B?RTBDcHhucDMvU0VIQUFpbWNPRG0wUEMvRnJucU9paFVDcitXTUFNZWFDR2Fw?= =?utf-8?B?YUVTRW1VcTJEN1ZETytpQ0hhR05NcjRaMlY5WHd0cTdlWVlHTVZJUVdHdUhT?= =?utf-8?B?NXd5UUdQa0ZqcHRJVU9WdjJTUFpjTVdpMDlVbzdzcFovQ0d2aVNXV3RINURL?= =?utf-8?B?Y2xwaTFiLzZVSFVVN1l6VmRlUzFzeGNLRmpNcVduQWJvNUtYUDRlWmdxU2I0?= =?utf-8?B?V1lYUDJHc083UmVzUnAzYlV6ei90RC9Qdlo1Q2E4NVB2cEJzSDA2SDhyNFRq?= =?utf-8?B?ZTB0WjBVZVk2SlBjSzBtZEVvUE03ZXhubzZQYlJMZzI3eXhQbkNLMVRsUWQ1?= =?utf-8?B?KzJPS0w4S1JueUVzZnJyb2dKOEYySlUwcDIwSWdhMjhaN0U2d0g1QThmQTE3?= =?utf-8?B?T0N2SEJmRjlKZWR0QkZuMThSRHJrTFR5YjcxU3RqRnRjcGVPbGlUcTdQL3Fv?= =?utf-8?B?KzZiai9rV1hCbmhjUERBQnRZZC95WFlya3FRSmpiTlFaQyt1aDd1aFFlL3Ux?= =?utf-8?B?S3ZycUtoUVh2V01Qa1VJSnpUWXhOemp3UDhpcFhaakt6UTVRYy96eG05OWNT?= =?utf-8?B?QXIrcFgyc25jQXJTSDhXcVd2dkNOS042Vnl1c1hQTVJ0QXZibnF6REU5QVA4?= =?utf-8?B?OWY1enRPdHhEWkw4YlRmQ2Zra0tiM1FBUlNBUUJadEd1Ti9TZEk0V09GbW9L?= =?utf-8?B?Yzg0ZFJWSTZ5QnEveUtSdzBxbE1BY2hkL1NrTXNJYmRFOU9CdEdhN1AxMDZO?= =?utf-8?B?WTNqeUVLS3FDRGZZUk9HZG1JS09QL1pEd0ZPVFNtSmZNRXBjR05Jc2Z1MWVi?= =?utf-8?B?cWtLTXJXS2k3amk4ZWxGWHlZUStvRXlmK1RhbHBGNGIvOUM3NjdNMXFEV0Js?= =?utf-8?B?bS84MDJOTGwvVXVwYkpzN2JrQUcxaSs2MldGbFYzd3k0RmtPd2xPUkY5OURo?= =?utf-8?B?VU42U25zRjh4MUI1b0EyZWMrN0czUHlSbFE5dzZldWoydTdoZmhuZ2NzWkhL?= =?utf-8?B?Sy8xOTMrM0JYWXNYejVMUWJIUkVLVERBQmNEbXFYck9ZdDAyU2xyaEtWeFJM?= =?utf-8?B?OGMrVjRTQlk3NkxXcXRNaHkrWEZKeUtjWWxrd1Q2T0ZqY1h6dDRUNGN2SXpn?= =?utf-8?B?TytDRXY4Uzhsd0FJT3lhK0Q4emRxWmRPMVlWYnFqTzYyOWtrZXB1cU9VUDhj?= =?utf-8?B?Znc4TmxLcXNGS25MeEpsanc1SnI0S0FEVXVhclZBMlQyOEgzQ29ReVp0aEZs?= =?utf-8?B?TU5LMkFBZkNZMHA2eFVhbFo5RFVyZmgyQTVycldtU01aNkFQdFFDYXBsbXVm?= =?utf-8?B?UGw2NWFjN2w1VUtJSnlCbktwdlZFK1IzQTVzbjFwRElkQi9hWWVjUmhxY2Zn?= =?utf-8?B?eEJLQnVkQVR5ZzhYanAvRDlraEc2djFobGt0RUZYd1AyRHk4Yko0ajhjOXFY?= =?utf-8?B?aDdhU1JKREhuWU84cW9KNk5vRDV5R2dXdkpsUnlaY3BHbWNZeDA3VjBvMjRW?= =?utf-8?B?c0dHbGFVK1JwK1Z6eEk1TVFYNWE3RDdvR0xOTHFzc0N6cUdnM0hkZWhDSXRt?= =?utf-8?B?eUdxOHFRYmVjYUxRaUZSeHpDSVVSSmhxR09DZC9BM0x3Y0hIeVA0L1c3T2dE?= =?utf-8?B?L3ZocjY5RFVrQVpiczRvVkVaaWpVaXJwNEZ5OVhOeDVsazVDai9xcFNFRkJ2?= =?utf-8?B?RVdxMkR6Q3NUSGN4b1ZxbjV1SjNpVzYrY3laUmJQZ0pqWllDb0tkdWdwQlA2?= =?utf-8?B?YjIrTUduWDVOblV2b1FLb3B4Ui9NZHdRMitIU1FxRzdheFlIT0o4UVNEeFZC?= =?utf-8?B?NUZMSEJwSG1JSjZzZlZsZ2NRR0kyc0Y0cFhPalZiLzdjOFJsSU9nYVVZQ3FF?= =?utf-8?B?OXlQbTRzV005SFdrNzByUnEzNjVaUVJCRU10ZCtPd291WHJoV0hLaGhaWmZQ?= =?utf-8?B?U1lMeVVkMDZFK0xDQmlsN2FWNTFGczM5WVBha0xBL2hsY2htcGE0bnRqQXJl?= =?utf-8?B?dGNZeldmTDRoNkM0WUhWRXVvY3ZTYjFXVW9ZOGErVy9JYTVmcDJTajFoODIz?= =?utf-8?B?dkhnZ3pjbGovU1pkeGszdW8wL29hcy9yL3N6Q3JQYmVpVG0wOWNkd2ZYVXdG?= =?utf-8?B?bEQ3Wkx3ZERrQkVTckljRmY2Rk8yZjdKQ0hnWEZ4UXVGNzlwOFhNcFEvZ2V0?= =?utf-8?B?NWNvVFpWdTNGK0toTTNTa0Q5UDA1WU5oVWIyd3R1MlRxQWxiekFaczl6b01S?= =?utf-8?Q?P6xQ8KbIp/TqeXYTVmo0o+6Chnpv+9pfssfueIG7oYPDQ?= X-MS-Exchange-AntiSpam-MessageData-1: Ox23RJs1JLV7wQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1942b742-b822-42a6-e17f-08def84ef92b X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2026 08:52:00.5877 (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: z4oRqAsls/bJPHNczY7Qhl3n4gp4OGKbw1sGfC1Rs1xApyO7uLlAX+H2Grc+hUO/W1HGvk+32Z1I3aJ+kfXMYQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8519 Add support for contiguous area allocation. Add a new type, `UnusedArea`, following the same pattern as `UnusedId`. Signed-off-by: Eliot Courtney --- rust/kernel/id_pool.rs | 69 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 69 insertions(+) diff --git a/rust/kernel/id_pool.rs b/rust/kernel/id_pool.rs index 384753fe0e44..eb911a0e3217 100644 --- a/rust/kernel/id_pool.rs +++ b/rust/kernel/id_pool.rs @@ -4,8 +4,14 @@ =20 //! Rust API for an ID pool backed by a [`BitmapVec`]. =20 +use core::{ + num::NonZero, + ops::Range, // +}; + use crate::alloc::{AllocError, Flags}; use crate::bitmap::BitmapVec; +use crate::ptr::Alignment; =20 /// Represents a dynamic ID pool backed by a [`BitmapVec`]. /// @@ -240,6 +246,33 @@ pub fn find_unused_id(&mut self, offset: usize) -> Opt= ion> { pub fn release_id(&mut self, id: usize) { self.map.clear_bit(id); } + + /// Finds a contiguous area of `count` unused IDs at or after `offset`. + /// + /// The start of the returned area is a multiple of `align`. + /// + /// Returns an [`UnusedArea`] upon success, or [`None`] if no such are= a could be found. + #[inline] + #[must_use] + pub fn find_unused_area( + &mut self, + offset: usize, + count: NonZero, + align: Alignment, + ) -> Option> { + let start =3D self.map.next_zero_area(offset, count.get(), align)?; + // INVARIANT: `next_zero_area()` returns None or a start with `sta= rt + count <=3D map.len()`. + Some(UnusedArea { + range: start..start + count.get(), + pool: self, + }) + } + + /// Releases a contiguous area of IDs. + #[inline] + pub fn release_area(&mut self, range: &Range) { + self.map.clear(range.start, range.len()); + } } =20 /// Represents an unused id in an [`IdPool`]. @@ -287,6 +320,42 @@ pub fn acquire(self) -> usize { } } =20 +/// Represents an unused, contiguous area of IDs in an [`IdPool`]. +/// +/// # Invariants +/// +/// `range.start <=3D range.end <=3D pool.map.len()`. +#[must_use =3D "the ID range is not reserved unless acquired"] +pub struct UnusedArea<'pool> { + range: Range, + pool: &'pool mut IdPool, +} + +impl<'pool> UnusedArea<'pool> { + /// Returns the unused ID range. + /// + /// Be aware that the area has not yet been acquired in the pool. The + /// [`acquire`] method must be called to prevent others from taking it. + /// + /// [`acquire`]: UnusedArea::acquire() + #[inline] + #[must_use] + pub fn range(&self) -> Range { + self.range.clone() + } + + /// Acquires the area. + /// + /// Returns the now-reserved ID range. + #[inline] + pub fn acquire(self) -> Range { + let Self { range, pool } =3D self; + // By the type invariants, the range is within bounds. + pool.map.set(range.start, range.end - range.start); + range + } +} + impl Default for IdPool { #[inline] fn default() -> Self { --=20 2.55.0 From nobody Tue Sep 29 04:39:46 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012005.outbound.protection.outlook.com [52.101.43.5]) (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 288103AD513; Wed, 12 Aug 2026 08:52:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524732; cv=fail; b=SwEQm37LopQZTpKa2lEZALy0wOBiuQEkNh9tPQpdOgSNihI2sTI0d0ueqmcmzZPpThQj1ujP+P5fnxFEyseucrW4QO9R0J0hSAuGZ+BMyJLU9FaYTYGsh1gvGUxYBITiyvWC8NNKaOMcgFxqXtOm4cb7Erd+vwy5cr6/+gCMces= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786524732; c=relaxed/simple; bh=CBRJK9QDKkwtIHAPU3IaTh14bAJrWIGItKf60vdLGzQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=EpC6gvqMTMc9OW6fL6GB1tCR8ddFXZoSTH5WIgdRHu29r2cbV/g24T4LgT/yYpnSTEzURoNDNAyj7eR2aXAt21ZTvNBcXXJCIohyJgKdeQlNcWq8GFTWQAJgASy+4FQVmEGPJrNTajaRh7xggmWm9Pr3AyWwm9yob2m9X658BLQ= 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=Bk07PpFX; arc=fail smtp.client-ip=52.101.43.5 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="Bk07PpFX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IpFJ1pNeguWP25BSywFIxg+eY1FWpIuFiVu2ztfN72Rglwi3GAdcMldZXvVgl/yVlUlObTFg2o5FLZ64bS7kd1UBVm+FvP8Zso0aecn4s7Y+FwdGNR1Ad/AK8T1tZn+ePWc1DX7NS6FJi6oZaFmwaIZ3yVBxTq6PXcbPtSDEHwXWMa9U76BlhQ5VcT6Dsi/R7sfbNisSoazCBUEjS8T1tHQNIVkNlqdkKpx7vz3r3pBxJlBeYgvg1cbE14HwMBIiPuppTrpRgxBg/1ZIbM1BF0r2bnURTGnsbXNTxOg7k+A2j/1nMswjDV3HiKhFYv2HYMO4EDje3XSkYtedvxVbSQ== 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=kYYa87mvZyrUbfsj52KaS35BAILXm/I/ciOxRXaZQOs=; b=acseGBnZpEQMdDlJYNufBonsPQGRBNMkTYu1MS8ao/nLVsU8qAJEIGFaMImOiLwx96ye2Hye8CEkanXTlylRgIgBGwP2GGvp/W93qVOdKh4IFq53nU+q3iNBCf4ndIaLnJXtNd8rU0RzimGWYomr8JihJoCSOyD4/Chj0d03e+bqC2u7xHG4e3tKiAdGpWkwOKOfzhntXfvEBuvv/O3Lc8hlu931D/kWl/KD3Q9vz7Q/4pZvpI71sDmTwX63iLam7tScQkii5/uCTekXjR7LUe8Yf7JqQzrGlBsmJjK15ySAj9Msd9DNJ1TIEv1wteLdjSx9nL4fmBwIdcxWd4zc7g== 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=kYYa87mvZyrUbfsj52KaS35BAILXm/I/ciOxRXaZQOs=; b=Bk07PpFXbQggKQ7kwtpA86VeQk9xT3Bo3a2c+mDpfTlrYsxVUnyTtuIlEblpnJfEiR6Q35gUNbFvFfSyXxvfKBOscGwP/WlhJj3zzslO5Sz1rNbQaA2DUMPhtYHeQaW8rJ7EEPUiQEKx0U4u/n3YlA9vMaULn16GYf32zxdsgzMVM5r7FwUCVL2epGKmq7WtSKt9dlYf5/vsEqZiWwzNYZni8fnZzTrkh5PZehNRR6YrUFLbKW/cbXMhQbI/6T8pkLI01cW5t64R5oUJHbS7n8o/ujSao+4lOMg8KbaGb8udDHU2G8y+yPo0+gDb+bwLHj1PvaWs57oiCvQ75fXAlw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by IA1PR12MB8519.namprd12.prod.outlook.com (2603:10b6:208:44c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.12; Wed, 12 Aug 2026 08:52:04 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0315.014; Wed, 12 Aug 2026 08:52:04 +0000 From: Eliot Courtney Date: Wed, 12 Aug 2026 17:51:25 +0900 Subject: [PATCH v5 5/5] gpu: nova-core: add ChannelIdPool Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260812-chid-v5-5-6c767770b3f4@nvidia.com> References: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> In-Reply-To: <20260812-chid-v5-0-6c767770b3f4@nvidia.com> To: Alice Ryhl , Burak Emir , Yury Norov , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , David Airlie , Simona Vetter Cc: Greg Kroah-Hartman , John Hubbard , Alistair Popple , Timur Tabi , Zhi Wang , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0360.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:7c::6) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) 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: BL0PR12MB2353:EE_|IA1PR12MB8519:EE_ X-MS-Office365-Filtering-Correlation-Id: d1b97548-bd52-4a02-9d39-08def84efb88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|10070799003|7416014|376014|366016|1800799024|921020|10067099003|11063799006|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: EQcL+3TzmH6+8r7aE8lsaj4e93o92YZwauF1f96MOHq9DoPtjep+ty2cOboOa+/+1nGKCR3PAEWc28OpvN/Sxrfq26L5YhXmQgJkQM0GxF5PvjCMYoXKei0M6i1f/41utVtpOP06FMrWFV0pKgdiqPtCEONgScKDjIL9KtaGuaGQ/0KT+Y62jokNXMngxrQfX38q8QX8/va+zatej3+8SjZnykVkYJqBSykA7yKJbrCpmw8VBbM5RjMj+gUgEXVn55lkxqLQVN/MdiBXxOTCRTZO6HkbxkKGqc/MJPC6gxA3UeWgSnbQ5xHCq6ryZCpcQxkDL+pxbhGbDNw0ecOB7ikBVbwB1LNu8hsP+VvD38GV+syc/D0QfdKVOF/wLArV4l/+anHKseqR/yNCPXkvIprThIWYmukveZ77hcSNbBD6hECrYIObVDGt7tFEEwa2mlax6Z6vU57isxy6J4PTtg4aoDM4c/Z+zwCOqSHk4WSn4FNqn2LhQMorW5VluELMvJ5iSodVcELPIjEpw90NUw3YQc4gdDZj59eJXir3q+qFgIYFpD5mjCMmOEgIFgI3Vb7/htyVVsbnzeeC/sJEz5b8geYb1ttBVoIpyq4Wump30JlCEzPWCrJMGpccPX34U9n22ENfGe0lCYN7o04zxkToaq3FfrOMoKO4Wo4j4I0yT9RqjHrwIj7LAkEzXN1bPMIotiSSNQvsPe7ZdWjf/g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(10070799003)(7416014)(376014)(366016)(1800799024)(921020)(10067099003)(11063799006)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGtpaS9MVjBFUHJYWGZ6a3R3Z2c2QytyQ0YwRjVobGp0STFveGVJRkV3UFFF?= =?utf-8?B?dGJ5SThpYU93dlF6Q2dOaHdzQmRYN3VTemd4QjBXb2MySU1xWktTcDhqeWpl?= =?utf-8?B?dUUyUHJVbVRhNERwZmJIWlRkd2Rpbk50MTJOeS9yMXB3djk5QTdzYzJBZVAv?= =?utf-8?B?UFpnQUF0V3FlRG1WU245ZDJCc0YyemVqcDJINkpVeE9YZnlhUUxxNFdud00y?= =?utf-8?B?MVFsN2pzTWlTb0JZNWdjRGxteHNNN2NzNjZjODhCRkthNGZBRVpZZFhzZDFv?= =?utf-8?B?YVBiVzNVcCsrTzk0bHZUNmRoWHhMcTlhSktEZGZXaUxHVDBDRjFKdGcyVjZw?= =?utf-8?B?R3hZYTdkT21OcEplT3M5RC9HNTJRWmRYYnJFUXhZNVJZcTl5bzdzYmlwNUxo?= =?utf-8?B?M1ZycDB3Uk0xUGxyR2kyMkp0UVgzZkJhUzRuYzhVYUR5MkpIZzlGdXZBakRB?= =?utf-8?B?WHVvRC9seG1OOU1Ua0wrUmc1U0R0WmxtS25CTXhaOTBYQlYreXN4WXd4QjA5?= =?utf-8?B?UnNuMWY3SFlRVXJWUGREZXFWc2dLUXdNeXdVV2RGaHcvMEZaMm94aVdxM3NK?= =?utf-8?B?WTd6WjBncFE5ZU1oVERlcVpudWQzVjVoNjk1MGs2eE1pb3J0KzY3cTh5eVlL?= =?utf-8?B?VGkwMkxNVlNYWHowN2dGQzg1RllWWVpOWjdtdWJ0YnZqbWV3alR0K0xTanp4?= =?utf-8?B?aWtmMEpxY0h2dlJ2Njk5NUI1a2EyVkVsbzhLK1ZnbEFBd1BWQ1o1cG1udmlt?= =?utf-8?B?dGFQOGJxVzd2TmVhNmZNbjZ6NE9FZUhiSExsMnUzb3NKWTNlQ0NwZlVYTWhw?= =?utf-8?B?YU5BUWxWZ0J6dXZjOGdPdngwaE9XVHo5RzNQRTl1c2ptdXppcUptbEVDNVFp?= =?utf-8?B?TG9YUG8zVkQraDYxeS9xckN1elZOMExxTjI2dStQdENKMW8wNlB0Q3UyVXpv?= =?utf-8?B?RGpIamlOK211N01XTi9LYkZaQTcvNnowOEw4Q050RXR4YmJkbXlvblQ3czFv?= =?utf-8?B?TjVHV1RJMkxBcHVHTkdmVHF0OFhiRWdVbWl4VnNaMy9RVTFzN1RjT0FVVTRq?= =?utf-8?B?TFZOMGJ4Uk4wWGszNFB5bUVGelc4RDQzcWdZM0lBajRtR3hXMjZ1MnRqdEJ5?= =?utf-8?B?aDBMaEZjNzVZNXJmU3lqTUF4QkkvQ2RCVHdEclhmWmM2cmZRZ05RSVFJeDB3?= =?utf-8?B?U09TdXk5ZDF0OStjWFVGMFZwNG96NmVMMzFFMkoxUFJ5Q0JYcmxpTzRvQlpR?= =?utf-8?B?NW1HYmxrd1FZSXZlY2lKQVFWeXVWc2hRaG9hc0dsbVJBTndSd0JCM0ZMUUJH?= =?utf-8?B?RkU0bGlRbjBkc1ZmOThKNE5WV1ViWUhmN3Rxcy9UelJwODhxeFlMMFRhV1hS?= =?utf-8?B?WnJaN0dTOStyMVd0Vk5xbkpmYlZWNGVoUUNHY2ZXNnlVVElUVmh4blFUMzE2?= =?utf-8?B?MW1nVVBxZHJhSHY4NDU1Yk9mUTJWbXU2R1BZZHM1cmxicFdSWlRBWkQ1MVZo?= =?utf-8?B?MlFEMkQ4N2c3Yzk5K3ZDZmNiMkF6azlWQ2tzRzNJb2RlVTFCRXJpYmxOb1Vq?= =?utf-8?B?SEVPbmhVclJQem5xSlVsS01kWCtPeXgvVi9XallEK0VPN1BoSTNYdWZxdXp2?= =?utf-8?B?ZFJGMFdCdDBwQ2RSNURvZUFMdURrK2ZYRDBjWnpiaTlMVkdMNzlUc0JtV2I1?= =?utf-8?B?dHJ0YTBUMyt4Q3NhU0V4RDBZM1UzdEtmSEdPR2FDL3ZzUGhRSFZoSUtRa1BW?= =?utf-8?B?L1B6SGVkeGpnOVJmNXhRU2NwSWJmYXFmSERINzBMNi81QjlFMFArWVFCYmRV?= =?utf-8?B?ZWhyZE9CZnhMY2dWNEUxWUF0dTAxUTkwTjRBZ0RXdTVERjI3QUo5V0xXMXg4?= =?utf-8?B?bERjenVTOHRwVlFwQU40aVVSTzNzbVFNNmJkcVQ5NGlqbS9CQWFGQmxmWXE3?= =?utf-8?B?RzlsSEZUZ0xBUS9GY2Q1VHRoNG5TdVhLMGR4UjQ5OHRmUXZTeUh6TXU2NWtJ?= =?utf-8?B?WEJmVFlad1F2VS9tMVhBRlljK2NXVFpyRVJnUmtrS08xdUJBQUpsajZNRVpJ?= =?utf-8?B?TnRVVXlrTGd0ZjJMN1lxVEJJM2VMd1hWK29hODdhamJFWVpEeU5rTEdJN0Ru?= =?utf-8?B?OUh4R2wvN3hNdDRkWmVDak81WHBqaTVjczRzaGNWcmlOY2RDUGFXc1hmQUtH?= =?utf-8?B?OHJ3OXhqNnU1ZlZyNGtFTXZST1hJZGVtdnVHZlY4MjBqc29WVmZSZ1VGenJB?= =?utf-8?B?YTJwbWt3ZWJQRS9hU0NBRHJoeGlxd3NoM2lDNnROd2Z1RGJNYTVobXNXZkIx?= =?utf-8?B?alczb1hZb2UxMFhMTkJMczlyeEttSmRGY3lHb3M1WEtXSXB6RC9zdGVYWno1?= =?utf-8?Q?H4FQ6cb7B1rPOMFHprJ1/fexl3W+ecvdD+JW8wKSjF5Ir?= X-MS-Exchange-AntiSpam-MessageData-1: I7tbhtt/z9G0lw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1b97548-bd52-4a02-9d39-08def84efb88 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2026 08:52:04.5593 (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: PpCnDBHd8qhjvHrBjF3lwav8D57IwcZONJ556DJoZQDEIgnZtvSN+YvVMh7v5BZ+9BN0eGd9qML4boeVhMZaRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8519 Add `ChannelIdPool` which adds automatic tracking and releasing of channel IDs on top of `IdPool`. This is necessary for apportioning ranges of channel IDs to be used in e.g. vGPU. Channel IDs are allocated as a contiguous sequence with a specific length and sometimes a specific alignment [1] for vGPU. The ID space is small (limited to 2048) and allocation is not on a hot path, so a bitmap-backed `IdPool` is a better fit than IDA/xarray (which allocate a single ID within a range, not a contiguous sequence) or a maple tree (where aligned allocation needs an alloc_range()+erase() retry loop that essentially reimplements bitmap_find_next_zero_area()) [2]. It is also faster than maple tree [3]. Link: https://lore.kernel.org/all/84bc8bd2-e292-4b84-9580-a1b5df4c5bdc@nvid= ia.com/ # [1] Link: https://lore.kernel.org/all/20260710-chid-maple-v1-1-4ee869055268@nvi= dia.com/ # [2] Link: https://lore.kernel.org/all/20260717053241.916441-1-ynorov@nvidia.com= / # [3] Signed-off-by: Eliot Courtney --- drivers/gpu/nova-core/gpu.rs | 2 + drivers/gpu/nova-core/gpu/channel.rs | 180 +++++++++++++++++++++++++++++++= ++++ 2 files changed, 182 insertions(+) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 42a4cd7971fa..66ea697a89f8 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -33,6 +33,8 @@ vgpu::VgpuManager, // }; =20 +#[cfg_attr(not(CONFIG_KUNIT =3D "y"), expect(dead_code))] +mod channel; mod hal; =20 macro_rules! define_chipset { diff --git a/drivers/gpu/nova-core/gpu/channel.rs b/drivers/gpu/nova-core/g= pu/channel.rs new file mode 100644 index 000000000000..b755d2184aee --- /dev/null +++ b/drivers/gpu/nova-core/gpu/channel.rs @@ -0,0 +1,180 @@ +// SPDX-License-Identifier: GPL-2.0 +// SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIA= TES. All rights reserved. + +//! Channel ID allocation. + +use core::{ + num::NonZero, + ops::{ + Deref, + Range, // + }, // +}; + +use kernel::{ + id_pool::IdPool, + prelude::*, + ptr::Alignment, + sync::{ + new_mutex, + Mutex, // + }, // +}; + +/// Pool for tracking reservations of channel IDs. +#[pin_data] +pub(crate) struct ChannelIdPool { + #[pin] + inner: Mutex, + num_chids: usize, +} + +impl ChannelIdPool { + /// Creates a pool managing `num_chids` channel IDs. + pub(crate) fn new(num_chids: usize) -> impl PinInit { + try_pin_init!(Self { + inner <- new_mutex!(IdPool::with_capacity(num_chids, GFP_KERNE= L)?), + num_chids, + }) + } + + /// Reserves a contiguous area of `count` channel IDs starting at a mu= ltiple of `align`, + /// returning a guard that releases the area on drop. + pub(crate) fn alloc_area( + &self, + count: NonZero, + align: Alignment, + ) -> Result> { + let mut ids =3D self.inner.lock(); + let area =3D ids.find_unused_area(0, count, align).ok_or(ENOSPC)?; + + // If the pool is small, the backing bitmap may be rounded up to a= larger size. + if area.range().end > self.num_chids { + return Err(ENOSPC); + } + Ok(ChannelIdArea { + pool: self, + range: area.acquire(), + }) + } +} + +/// A reserved contiguous area of channel IDs. +/// +/// Releases the whole area back to its [`ChannelIdPool`] when dropped. Re= leasing locks a +/// sleeping [`Mutex`], so the area must be dropped in a context that is a= llowed to sleep. +#[must_use =3D "the channel ID area is released immediately when unused"] +pub(crate) struct ChannelIdArea<'a> { + pool: &'a ChannelIdPool, + range: Range, +} + +impl Drop for ChannelIdArea<'_> { + fn drop(&mut self) { + self.pool.inner.lock().release_area(&self.range); + } +} + +impl Deref for ChannelIdArea<'_> { + type Target =3D Range; + + fn deref(&self) -> &Self::Target { + &self.range + } +} + +#[kunit_tests(nova_core_channel)] +mod tests { + use super::*; + + const fn nz() -> NonZero { + const { NonZero::new(N).unwrap() } + } + + #[test] + fn chid_area() -> Result { + let pool =3D KBox::pin_init(ChannelIdPool::new(2048), GFP_KERNEL)?; + let unaligned =3D Alignment::new::<1>(); + + let first =3D pool.alloc_area(nz::<48>(), unaligned)?; + assert_eq!(0, first.start); + assert_eq!(48, first.len()); + assert_eq!(48, first.end); + + let second =3D pool.alloc_area(nz::<48>(), unaligned)?; + assert!(first.end <=3D second.start || second.end <=3D first.start= ); + + let first_start =3D first.start; + drop(first); + assert_eq!(first_start, pool.alloc_area(nz::<48>(), unaligned)?.st= art); + Ok(()) + } + + #[test] + fn chid_bounded_by_num_chids() -> Result { + let pool =3D KBox::pin_init(ChannelIdPool::new(4), GFP_KERNEL)?; + let unaligned =3D Alignment::new::<1>(); + + { + let a =3D pool.alloc_area(nz::<1>(), unaligned)?; + let b =3D pool.alloc_area(nz::<1>(), unaligned)?; + let c =3D pool.alloc_area(nz::<1>(), unaligned)?; + let d =3D pool.alloc_area(nz::<1>(), unaligned)?; + assert_eq!(0, a.start); + assert_eq!(1, b.start); + assert_eq!(2, c.start); + assert_eq!(3, d.start); + assert_eq!( + Err(ENOSPC), + pool.alloc_area(nz::<1>(), unaligned).map(|_| ()) + ); + } + + assert_eq!(0, pool.alloc_area(nz::<4>(), unaligned)?.start); + assert_eq!( + Err(ENOSPC), + pool.alloc_area(nz::<5>(), unaligned).map(|_| ()) + ); + + let head =3D pool.alloc_area(nz::<3>(), unaligned)?; + assert_eq!(0, head.start); + assert_eq!( + Err(ENOSPC), + pool.alloc_area(nz::<2>(), unaligned).map(|_| ()) + ); + assert_eq!(3, pool.alloc_area(nz::<1>(), unaligned)?.start); + Ok(()) + } + + #[test] + fn chid_area_aligned() -> Result { + let pool =3D KBox::pin_init(ChannelIdPool::new(16), GFP_KERNEL)?; + let unaligned =3D Alignment::new::<1>(); + let align4 =3D Alignment::new::<4>(); + + // Alloc 0 so the first fit for the next area is unaligned. + let pad =3D pool.alloc_area(nz::<1>(), unaligned)?; + assert_eq!(0, pad.start); + + let a =3D pool.alloc_area(nz::<4>(), align4)?; + assert_eq!(4, a.start); + + // The area skipped over by the aligned allocation should still be= available. + let b =3D pool.alloc_area(nz::<1>(), unaligned)?; + assert_eq!(1, b.start); + + let c =3D pool.alloc_area(nz::<8>(), Alignment::new::<8>())?; + assert_eq!(8, c.start); + + // Only 2 IDs left. + assert_eq!(Err(ENOSPC), pool.alloc_area(nz::<4>(), align4).map(|_|= ())); + assert_eq!( + Err(ENOSPC), + pool.alloc_area(nz::<1>(), Alignment::new::<32>()) + .map(|_| ()) + ); + + assert_eq!(2, pool.alloc_area(nz::<2>(), unaligned)?.start); + Ok(()) + } +} --=20 2.55.0