From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 1D6F1286D7D for ; Mon, 19 May 2025 16:17:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747671461; cv=none; b=dqKdWQWRdCwedBi4SiqYnnUs6Erpq0kk2kO+AhaH0G3BWBQ7BdBD+gj7gAsDWb6agY6difD92isqXi4qDwjDvLnAzBnjW/TJuljBQqU2baquCahvvkFrMC4XVbaPK1/4ua72CAeaV5q0jc4+x+R02FXeEJwuHHBtPexwWWHKuKo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747671461; c=relaxed/simple; bh=A2vcimdo91Db/C+CJNN9YS7LNgV+bE3hpqZjImDFRQw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=R8rz2eUavcgfHer3xS8xn2KN3gS/0s2UJ8tZFcl0Ah8l2Geq2X+AJ8HFk97s4xvp37WSra+W88SAIKof1SmcLyqXdO4mmnB55D6mu09O3umNt9YVUAf60MUPwGkZuss2CA5w685Ge9DETJ7B56yTwto9QOnoxaHnghA6ahw4q1E= 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=Hfhd0+E9; arc=none smtp.client-ip=209.85.128.73 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="Hfhd0+E9" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-440667e7f92so23799545e9.3 for ; Mon, 19 May 2025 09:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747671457; x=1748276257; 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=MSmVioyXmmwvYcQv1eghQliH8ReaGKH9UaRa1j6LEaY=; b=Hfhd0+E9wMYuhbvT7h6X3I6WOGqazT+SDQT0lYzgmpXbiox0OgvxkBaQy2vYkA4owS Kv7xyNdcFaZF5TDvOYrnujrNIQp1NMPNE2RneP30YwIkPZ5AFDA0AoyF2p8egZlnr8Ql 5agFyzdbiNINcQ1W1ed/Y3WLwVXd0Ts+YDGABhJC/chdxtMoIrWaicEYUx1gknzE/hdJ 7ldyIyXCrvpAyfwubKrIvCbSdEJbMacwgIAwwbAknyGZVIzClGasFo+H+XmF18DOIug/ Ve+Z5zWXrBQlW4GGuVAMn/BTyINhJR+lSDSXGyh0HHXmvxPxIftatI08w7HWhiUsdGJ0 dcLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747671457; x=1748276257; 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=MSmVioyXmmwvYcQv1eghQliH8ReaGKH9UaRa1j6LEaY=; b=EQyUBSGhkoCYmOAS9lFQtUnc8aQyKSU2LcLEuEOJurAWTPvB/fKQYflFGD/jrLvuVl Gc6X/slxjF+uxWMuKwUXFsO9ZsfVSYxuoaduBBGJv6pA4o79HvrY1mMoi9Ju0STCltdE /cLQX7eWZGKAMPwjsj06ubQRttEKFcPPCA0teXIA+XjNoicnYjT3vJP3gT0P98F7x54w VS/T21u4jz3kfZlTrrHB4XrMUexEVd49/odUZAXfRExbGG9nmYy6mw6wXkdhS0eCWrFh r/MLMDsllWXZ851TGhZKpUJpoUSetz0CtWf85H+60/HN1EEM0Ehnm/qdy/NVhTdrFSi/ fDfA== X-Forwarded-Encrypted: i=1; AJvYcCXn+TvvijUDrK+JMUz/GENKD/6RzXGsIDU9hGf0a1bE8xR0Kb9ntuqioqzLswO5dPRapWTj6CbcGr1K5POB+4E=@vger.kernel.org X-Gm-Message-State: AOJu0YxkzJGjA/MIg7kynyjGHXCJ5fZbJ5mR0SckoZk5VbNRMxnv6pcL aqNorcbNiUvz5W8584x2QASzv17IC/t41BGhQ4Sj+sazGqo76VtOImXu/TXKCLBvbm0zWQ== X-Google-Smtp-Source: AGHT+IGml/YtjllhNJ54nIk+Ysxm78efQivAD3ThoIWPXeVgkiOEHYcUO6jbPJ9gyRT2W4tdao3tzLw= X-Received: from wmqb16.prod.google.com ([2002:a05:600c:4e10:b0:440:68aa:44b]) (user=bqe job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8889:20b0:442:f44f:66f with SMTP id 5b1f17b1804b1-442fd672542mr85780545e9.31.1747671457562; Mon, 19 May 2025 09:17:37 -0700 (PDT) Date: Mon, 19 May 2025 16:17:04 +0000 In-Reply-To: <20250519161712.2609395-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: <20250519161712.2609395-1-bqe@google.com> X-Mailer: git-send-email 2.49.0.1101.gccaa498523-goog Message-ID: <20250519161712.2609395-5-bqe@google.com> Subject: [PATCH v8 4/5] rust: add find_bit_benchmark_rust module. 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" , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Microbenchmark protected by a config FIND_BIT_BENCHMARK_RUST, following `find_bit_benchmark.c` but testing the Rust Bitmap API. We add a fill_random() method protected by the config in order to maintain the abstraction. Suggested-by: Alice Ryhl Suggested-by: Yury Norov Signed-off-by: Burak Emir --- MAINTAINERS | 1 + lib/Kconfig.debug | 13 +++++ lib/Makefile | 1 + lib/find_bit_benchmark_rust.rs | 94 +++++++++++++++++++++++++++++++++ rust/bindings/bindings_helper.h | 1 + rust/kernel/bitmap.rs | 14 +++++ 6 files changed, 124 insertions(+) create mode 100644 lib/find_bit_benchmark_rust.rs diff --git a/MAINTAINERS b/MAINTAINERS index 565eaa015d9e..943d85ed1876 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4132,6 +4132,7 @@ M: Alice Ryhl M: Burak Emir R: Yury Norov S: Maintained +F: lib/find_bit_benchmark_rust.rs F: rust/kernel/bitmap.rs BITOPS API diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index f9051ab610d5..37a07559243e 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2605,6 +2605,19 @@ config FIND_BIT_BENCHMARK If unsure, say N. +config FIND_BIT_BENCHMARK_RUST + tristate "Test find_bit functions in Rust" + help + This builds the "find_bit_benchmark_rust" module. It is a micro + benchmark that measures the performance of Rust functions that + correspond to the find_*_bit() operations in C. It follows the + FIND_BIT_BENCHMARK closely but will in general not yield same + numbers due to extra bounds checks and overhead of foreign + function calls. + + If unsure, say N. + + config TEST_FIRMWARE tristate "Test firmware loading via userspace interface" depends on FW_LOADER diff --git a/lib/Makefile b/lib/Makefile index f07b24ce1b3f..99e49a8f5bf8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -62,6 +62,7 @@ obj-y += hexdump.o obj-$(CONFIG_TEST_HEXDUMP) += test_hexdump.o obj-y += kstrtox.o obj-$(CONFIG_FIND_BIT_BENCHMARK) += find_bit_benchmark.o +obj-$(CONFIG_FIND_BIT_BENCHMARK_RUST) += find_bit_benchmark_rust.o obj-$(CONFIG_TEST_BPF) += test_bpf.o test_dhry-objs := dhry_1.o dhry_2.o dhry_run.o obj-$(CONFIG_TEST_DHRY) += test_dhry.o diff --git a/lib/find_bit_benchmark_rust.rs b/lib/find_bit_benchmark_rust.rs new file mode 100644 index 000000000000..13830477a8d2 --- /dev/null +++ b/lib/find_bit_benchmark_rust.rs @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0 +//! Benchmark for find_bit-like methods in Bitmap Rust API. + +use kernel::alloc::flags::GFP_KERNEL; +use kernel::bindings; +use kernel::bitmap::Bitmap; +use kernel::error::{code, Result}; +use kernel::pr_err; +use kernel::prelude::module; +use kernel::time::Ktime; +use kernel::ThisModule; + +const BITMAP_LEN: usize = 4096 * 8 * 10; +// Reciprocal of the fraction of bits that are set in sparse bitmap. +const SPARSENESS: usize = 500; + +/// Test module that benchmarks performance of traversing bitmaps. +struct FindBitBenchmarkModule(); + +fn test_next_bit(bitmap: &Bitmap) { + let mut time = Ktime::ktime_get(); + let mut cnt = 0; + let mut i = 0; + + while let Some(index) = bitmap.next_bit(i) { + cnt += 1; + i = index + 1; + } + + time = Ktime::ktime_get() - time; + pr_err!( + "next_bit: {:18} ns, {:6} iterations\n", + time.to_ns(), + cnt + ); +} + +fn test_next_zero_bit(bitmap: &Bitmap) { + let mut time = Ktime::ktime_get(); + let mut cnt = 0; + let mut i = 0; + + while let Some(index) = bitmap.next_zero_bit(i) { + cnt += 1; + i = index + 1; + } + + time = Ktime::ktime_get() - time; + pr_err!( + "next_zero_bit: {:18} ns, {:6} iterations\n", + time.to_ns(), + cnt + ); +} + +fn find_bit_test() { + pr_err!("Start testing find_bit() Rust with random-filled bitmap\n"); + + let mut bitmap = Bitmap::new(BITMAP_LEN, GFP_KERNEL).expect("alloc bitmap failed"); + bitmap.fill_random(); + + test_next_bit(&bitmap); + test_next_zero_bit(&bitmap); + + pr_err!("Start testing find_bit() Rust with sparse bitmap\n"); + + let mut bitmap = Bitmap::new(BITMAP_LEN, GFP_KERNEL).expect("alloc sparse bitmap failed"); + let nbits = BITMAP_LEN / SPARSENESS; + for _i in 0..nbits { + // SAFETY: BITMAP_LEN fits in 32 bits. + let bit: usize = + unsafe { bindings::__get_random_u32_below(BITMAP_LEN.try_into().unwrap()) as _ }; + bitmap.set_bit(bit); + } + + test_next_bit(&bitmap); + test_next_zero_bit(&bitmap); +} + +impl kernel::Module for FindBitBenchmarkModule { + fn init(_module: &'static ThisModule) -> Result { + find_bit_test(); + // Return error so test module can be inserted again without rmmod. + Err(code::EINVAL) + } +} + +module! { + type: FindBitBenchmarkModule, + name: "find_bit_benchmark_rust_module", + authors: ["Rust for Linux Contributors"], + description: "Module with benchmark for bitmap code!", + license: "GPL v2", +} diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index b6bf3b039c1b..f6ca7f1dd08b 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/rust/kernel/bitmap.rs b/rust/kernel/bitmap.rs index 943dbef7948b..fb0c687420cd 100644 --- a/rust/kernel/bitmap.rs +++ b/rust/kernel/bitmap.rs @@ -124,6 +124,20 @@ pub fn len(&self) -> usize { self.nbits } + /// Fills this `Bitmap` with random bits. + #[cfg(CONFIG_FIND_BIT_BENCHMARK_RUST)] + pub fn fill_random(&mut self) { + // SAFETY: `self.as_mut_ptr` points to either an array of the + // appropriate length or one usize. + unsafe { + bindings::get_random_bytes( + self.as_mut_ptr() as *mut ffi::c_void, + usize::div_ceil(self.nbits, bindings::BITS_PER_LONG as usize) + * bindings::BITS_PER_LONG as usize, + ); + } + } + /// Returns a mutable raw pointer to the backing [`Bitmap`]. #[inline] fn as_mut_ptr(&mut self) -> *mut usize { -- 2.49.0.1101.gccaa498523-goog