From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 980CB2D322D for ; Wed, 11 Jun 2025 19:48:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671338; cv=none; b=IWnzgIPDOoExY+E4f6FVjhhyV1TMOvTG1UqgHH3uVuIzkZGlfqI+c0xWGec2nFTKUGniKlpV1bu23wD2QxC5ug27OpMxhP/HnXPX7B3FHxn4TyVXz9aWi8HNIomcagqFOxfkDChVMvYHfbcbPmSRUlKb6MVP5SHZTgjUIP7dswE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671338; c=relaxed/simple; bh=7r+e/gPtaU35XspY/s7a3RF6t2VbrPmsekBgLng9xkk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Yezz/A6OiAvUlmvHJ3SE6VMlbg0RmFT+uL0DOB7ayDCEWaBeWkLA5joH0gdDTNWQncDIwN0R3GinCvVOwxImbidHGd0lEFEDdpjoIAGJK7/ZLDimHzSUcTgSg40JxW2ASuYL2f9OJMLRXy9+5qsiweNIq1cFV3jJhEOGzvgjS6A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--bqe.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=andp8j+2; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--bqe.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="andp8j+2" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-450d9f96f61so812655e9.1 for ; Wed, 11 Jun 2025 12:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749671334; x=1750276134; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=9pRs28WspQzH/SRLE3R6WBHMAHBstLB5+bHF3bHf9GI=; b=andp8j+2X1zeGnPzV/oQHnxyNtSSSua71EOHZzffLf5Oix1Uxz9G9TgBVIQbL5wgdM wg/YbsmHPHsc1+yvNvx8qTTdBf5+56EHNMdS4bM6JmtnUtjberxzLaZJ4RR67yUsST9n RV5YNTcuGFlm/yE6jF0bWfWQ7aUusjJnppf+1ze+kVy4FP0vs+d8YH078E2eLjgGVX+y sV9FdEqHDWAqXPuKAKVv6RwvTooihATG3QfpNPK5zLWNSNIb8g6s2q9wqdKcOx7ot07z urKKayGSGanQievU9ko8gjgnmUo5Uo3u0FAVX91BZqrgucRlbBNnga4Es2tVQ2LnYOV/ vXVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749671334; x=1750276134; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9pRs28WspQzH/SRLE3R6WBHMAHBstLB5+bHF3bHf9GI=; b=GfWUMiGlgKA3bYomiDZmruuK+nHx8FLYRMWyaKQttQukPfa8bQqu/Nf/ePbcTC95dm jt6n9M1CN4NFs2mXTHWePY8HWVm1Hli8eP79pauQBekU6XtOGpwQ4+t/sBGx2mexeOpY +T8176X6eznOVcGxLB7x3UuoIbLz6GJA9ieZrEWNJi3kBN1pxkiEvhFxJ5sS5Q+y9Xn5 s+XK2P0DvnRuHbanBQ/r8ZZ+MrFxZQ8MZXnUHMmrZ7M0BuwkaQqX/eST19cBHPK3zBr0 4InOggS5n0GcoZ+Kgzs2ggPGisCeTseRF4FClDseHwMSNujhHVpL06NnUk4UiK/IECyI kIBw== X-Forwarded-Encrypted: i=1; AJvYcCXXJPgfEyrUG3j4/aCPDrw0M1HaeAffO/aN+gXGsOpOI37W3JhGDwUnAHY+AS8xf0w9001khoxcoW8xj3RcrkU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzonvdh0E6rmpFuPLduHNE6/VtfPD+x4/y+1JurX/3TIJCeCVM2 J7bsBk8x+8GFxcKiZva2xCOpmRKRHxoxB4N58jBnuje6oizXEsTddM266Db86vjyJ/od8Q== X-Google-Smtp-Source: AGHT+IEX4ldcxgJ/jWH3CZaeozWQLDJgL+BLcPDjq5o+aUZSu8+LT9qfWXhXXRaLCvUkuhjl0wckrn4= X-Received: from wmgg5.prod.google.com ([2002:a05:600d:5:b0:450:dd18:ef0a]) (user=bqe job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2089:b0:3a5:2fae:1348 with SMTP id ffacd0b85a97d-3a558a42bd3mr3684475f8f.51.1749671334113; Wed, 11 Jun 2025 12:48:54 -0700 (PDT) Date: Wed, 11 Jun 2025 19:48:38 +0000 In-Reply-To: <20250611194840.877308-1-bqe@google.com> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250611194840.877308-1-bqe@google.com> X-Mailer: git-send-email 2.50.0.rc1.591.g9c95f17f64-goog Message-ID: <20250611194840.877308-6-bqe@google.com> Subject: [PATCH v12 5/5] rust: add dynamic ID pool abstraction for bitmap From: Burak Emir To: Yury Norov , Kees Cook Cc: Burak Emir , Rasmus Villemoes , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , "Gustavo A . R . Silva" , Carlos LLama , Pekka Ristola , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" This is a port of the Binder data structure introduced in commit 15d9da3f818c ("binder: use bitmap for faster descriptor lookup") to Rust. Like drivers/android/dbitmap.h, the ID pool abstraction lets clients acquire and release IDs. The implementation uses a bitmap to know what IDs are in use, and gives clients fine-grained control over the time of allocation. This fine-grained control is needed in the Android Binder. We provide an example that release a spinlock for allocation and unit tests (rustdoc examples). The implementation does not permit shrinking below capacity below BITS_PER_LONG. Suggested-by: Alice Ryhl Suggested-by: Yury Norov Signed-off-by: Burak Emir --- MAINTAINERS | 1 + rust/kernel/id_pool.rs | 223 +++++++++++++++++++++++++++++++++++++++++ rust/kernel/lib.rs | 1 + 3 files changed, 225 insertions(+) create mode 100644 rust/kernel/id_pool.rs diff --git a/MAINTAINERS b/MAINTAINERS index 943d85ed1876..bc95d98f266b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4134,6 +4134,7 @@ R: Yury Norov S: Maintained F: lib/find_bit_benchmark_rust.rs F: rust/kernel/bitmap.rs +F: rust/kernel/id_pool.rs BITOPS API M: Yury Norov diff --git a/rust/kernel/id_pool.rs b/rust/kernel/id_pool.rs new file mode 100644 index 000000000000..355a8ae93268 --- /dev/null +++ b/rust/kernel/id_pool.rs @@ -0,0 +1,223 @@ +// SPDX-License-Identifier: GPL-2.0 + +// Copyright (C) 2025 Google LLC. + +//! Rust API for an ID pool backed by a [`Bitmap`]. + +use crate::alloc::{AllocError, Flags}; +use crate::bitmap::Bitmap; + +/// Represents a dynamic ID pool backed by a [`Bitmap`]. +/// +/// Clients acquire and release IDs from unset bits in a bitmap. +/// +/// The capacity of the ID pool may be adjusted by users as +/// needed. The API supports the scenario where users need precise control +/// over the time of allocation of a new backing bitmap, which may require +/// release of spinlock. +/// Due to concurrent updates, all operations are re-verified to determine +/// if the grow or shrink is sill valid. +/// +/// # Examples +/// +/// Basic usage +/// +/// ``` +/// use kernel::alloc::{AllocError, flags::GFP_KERNEL}; +/// use kernel::id_pool::IdPool; +/// +/// let mut pool = IdPool::new(64, GFP_KERNEL)?; +/// for i in 0..64 { +/// assert_eq!(i, pool.acquire_next_id(i).ok_or(ENOSPC)?); +/// } +/// +/// pool.release_id(23); +/// assert_eq!(23, pool.acquire_next_id(0).ok_or(ENOSPC)?); +/// +/// assert_eq!(None, pool.acquire_next_id(0)); // time to realloc. +/// let resizer = pool.grow_request().ok_or(ENOSPC)?.realloc(GFP_KERNEL)?; +/// pool.grow(resizer); +/// +/// assert_eq!(pool.acquire_next_id(0), Some(64)); +/// # Ok::<(), Error>(()) +/// ``` +/// +/// Releasing spinlock to grow the pool +/// +/// ```no_run +/// use kernel::alloc::{AllocError, flags::GFP_KERNEL}; +/// use kernel::sync::{new_spinlock, SpinLock}; +/// use kernel::id_pool::IdPool; +/// +/// fn get_id_maybe_realloc(guarded_pool: &SpinLock) -> Result { +/// let mut pool = guarded_pool.lock(); +/// loop { +/// match pool.acquire_next_id(0) { +/// Some(index) => return Ok(index), +/// None => { +/// let alloc_request = pool.grow_request(); +/// drop(pool); +/// let resizer = alloc_request.ok_or(AllocError)?.realloc(GFP_KERNEL)?; +/// pool = guarded_pool.lock(); +/// pool.grow(resizer) +/// } +/// } +/// } +/// } +/// ``` +pub struct IdPool { + map: Bitmap, +} + +/// Indicates that an [`IdPool`] should change to a new target size. +pub struct ReallocRequest { + num_ids: usize, +} + +/// Contains a [`Bitmap`] of a size suitable for reallocating [`IdPool`]. +pub struct PoolResizer { + new: Bitmap, +} + +impl ReallocRequest { + /// Allocates a new backing [`Bitmap`] for [`IdPool`]. + /// + /// This method only prepares reallocation and does not complete it. + /// Reallocation will complete after passing the [`PoolResizer`] to the + /// [`IdPool::grow`] or [`IdPool::shrink`] operation, which will check + /// that reallocation still makes sense. + pub fn realloc(&self, flags: Flags) -> Result { + let new = Bitmap::new(self.num_ids, flags)?; + Ok(PoolResizer { new }) + } +} + +impl IdPool { + /// Constructs a new [`IdPool`]. + /// + /// [BITS_PER_LONG]: srctree/include/asm-generic/bitsperlong.h + /// A capacity below [`BITS_PER_LONG`][BITS_PER_LONG] is adjusted to + /// [`BITS_PER_LONG`][BITS_PER_LONG]. + #[inline] + pub fn new(num_ids: usize, flags: Flags) -> Result { + let num_ids = core::cmp::max(num_ids, bindings::BITS_PER_LONG as usize); + let map = Bitmap::new(num_ids, flags)?; + Ok(Self { map }) + } + + /// Returns how many IDs this pool can currently have. + #[expect(clippy::len_without_is_empty)] + #[inline] + pub fn len(&self) -> usize { + self.map.len() + } + + /// Returns a [`ReallocRequest`] if the [`IdPool`] can be shrunk, [`None`] otherwise. + /// + /// [BITS_PER_LONG]: srctree/include/asm-generic/bitsperlong.h + /// The capacity of an [`IdPool`] cannot be shrunk below [`BITS_PER_LONG`][BITS_PER_LONG]. + /// + /// # Examples + /// + /// ``` + /// use kernel::alloc::{AllocError, flags::GFP_KERNEL}; + /// use kernel::id_pool::{ReallocRequest, IdPool}; + /// + /// let mut pool = IdPool::new(1024, GFP_KERNEL)?; + /// let alloc_request = pool.shrink_request().ok_or(AllocError)?; + /// let resizer = alloc_request.realloc(GFP_KERNEL)?; + /// pool.shrink(resizer); + /// assert_eq!(pool.len(), kernel::bindings::BITS_PER_LONG as usize); + /// # Ok::<(), AllocError>(()) + /// ``` + #[inline] + pub fn shrink_request(&self) -> Option { + let len = self.map.len(); + // Shrinking below [`BITS_PER_LONG`] is never possible. + if len <= bindings::BITS_PER_LONG as usize { + return None; + } + // Determine if the bitmap can shrink based on the position of + // its last set bit. If the bit is within the first quarter of + // the bitmap then shrinking is possible. In this case, the + // bitmap should shrink to half its current size. + let Some(bit) = self.map.last_bit() else { + return Some(ReallocRequest { + num_ids: bindings::BITS_PER_LONG as usize, + }); + }; + if bit >= (len / 4) { + return None; + } + let num_ids = core::cmp::max(bindings::BITS_PER_LONG as usize, len / 2); + Some(ReallocRequest { num_ids }) + } + + /// Shrinks pool by using a new [`Bitmap`], if still possible. + #[inline] + pub fn shrink(&mut self, mut resizer: PoolResizer) { + // Between request to shrink that led to allocation of `resizer` and now, + // bits may have changed. + // Verify that shrinking is still possible. In case shrinking to + // the size of `resizer` is no longer possible, do nothing, + // drop `resizer` and move on. + let Some(updated) = self.shrink_request() else { + return; + }; + if updated.num_ids > resizer.new.len() { + return; + } + + resizer.new.copy_and_extend(&self.map); + self.map = resizer.new; + } + + /// Returns a [`ReallocRequest`] for growing this [`IdPool`], if possible. + /// + /// The capacity of an [`IdPool`] cannot be grown above [`i32::MAX`]. + #[inline] + pub fn grow_request(&self) -> Option { + let num_ids = self.map.len() * 2; + if num_ids > i32::MAX.try_into().unwrap() { + return None; + } + Some(ReallocRequest { num_ids }) + } + + /// Grows pool by using a new [`Bitmap`], if still necessary. + /// + /// The `resizer` arguments has to be obtained by calling [`Self::grow_request`] + /// on this object and performing a [`ReallocRequest::realloc`]. + #[inline] + pub fn grow(&mut self, mut resizer: PoolResizer) { + // Between request to grow that led to allocation of `resizer` and now, + // another thread may have already grown the capacity. + // In this case, do nothing, drop `resizer` and move on. + if resizer.new.len() <= self.map.len() { + return; + } + + resizer.new.copy_and_extend(&self.map); + self.map = resizer.new; + } + + /// Acquires a new ID by finding and setting the next zero bit in the + /// bitmap. + /// + /// Upon success, returns its index. Otherwise, returns [`None`] + /// to indicate that a [`Self::grow_request`] is needed. + #[inline] + pub fn acquire_next_id(&mut self, offset: usize) -> Option { + let next_zero_bit = self.map.next_zero_bit(offset); + if let Some(nr) = next_zero_bit { + self.map.set_bit(nr); + } + next_zero_bit + } + + /// Releases an ID. + #[inline] + pub fn release_id(&mut self, id: usize) { + self.map.clear_bit(id); + } +} diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 8c4161cd82ac..d7def807900a 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -54,6 +54,7 @@ #[cfg(CONFIG_RUST_FW_LOADER_ABSTRACTIONS)] pub mod firmware; pub mod fs; +pub mod id_pool; pub mod init; pub mod io; pub mod ioctl; -- 2.50.0.rc1.591.g9c95f17f64-goog