| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <77c33c80f878010b8cf3f8c931c3b6e46397dc34.1736248242.git.viresh.kumar@linaro.org>
Date: Tue, 7 Jan 2025 16:51:38 +0530
From: Viresh Kumar <viresh.kumar@...aro.org>
To: "Rafael J. Wysocki" <rafael@...nel.org>,
Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
Danilo Krummrich <dakr@...hat.com>,
Miguel Ojeda <ojeda@...nel.org>,
Alex Gaynor <alex.gaynor@...il.com>,
Boqun Feng <boqun.feng@...il.com>,
Gary Guo <gary@...yguo.net>,
Björn Roy Baron <bjorn3_gh@...tonmail.com>,
Benno Lossin <benno.lossin@...ton.me>,
Andreas Hindborg <a.hindborg@...nel.org>,
Alice Ryhl <aliceryhl@...gle.com>,
Trevor Gross <tmgross@...ch.edu>
Cc: Viresh Kumar <viresh.kumar@...aro.org>,
linux-pm@...r.kernel.org,
Vincent Guittot <vincent.guittot@...aro.org>,
Stephen Boyd <sboyd@...nel.org>,
Nishanth Menon <nm@...com>,
rust-for-linux@...r.kernel.org,
Manos Pitsidianakis <manos.pitsidianakis@...aro.org>,
Erik Schilling <erik.schilling@...aro.org>,
Alex Bennée <alex.bennee@...aro.org>,
Joakim Bech <joakim.bech@...aro.org>,
Rob Herring <robh@...nel.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH V6 05/15] rust: Add bindings for cpumask
Add basic Rust bindings for `struct cpumask`. Also add few Rust helpers
for the same.
Signed-off-by: Viresh Kumar <viresh.kumar@...aro.org>
---
rust/bindings/bindings_helper.h | 1 +
rust/helpers/cpumask.c | 35 ++++++++++++++
rust/helpers/helpers.c | 1 +
rust/kernel/cpumask.rs | 85 +++++++++++++++++++++++++++++++++
rust/kernel/lib.rs | 1 +
5 files changed, 123 insertions(+)
create mode 100644 rust/helpers/cpumask.c
create mode 100644 rust/kernel/cpumask.rs
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index 70e4b7b0f638..3225379abd2b 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -15,6 +15,7 @@
#include <linux/blk-mq.h>
#include <linux/blk_types.h>
#include <linux/blkdev.h>
+#include <linux/cpumask.h>
#include <linux/cred.h>
#include <linux/errname.h>
#include <linux/ethtool.h>
diff --git a/rust/helpers/cpumask.c b/rust/helpers/cpumask.c
new file mode 100644
index 000000000000..0b371826a13c
--- /dev/null
+++ b/rust/helpers/cpumask.c
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/cpumask.h>
+
+void rust_helper_cpumask_set_cpu(unsigned int cpu, struct cpumask *dstp)
+{
+ cpumask_set_cpu(cpu, dstp);
+}
+
+void rust_helper_cpumask_clear_cpu(int cpu, struct cpumask *dstp)
+{
+ cpumask_clear_cpu(cpu, dstp);
+}
+
+void rust_helper_cpumask_setall(struct cpumask *dstp)
+{
+ cpumask_setall(dstp);
+}
+
+void rust_helper_cpumask_copy(struct cpumask *dstp, const struct cpumask *srcp)
+{
+ cpumask_copy(dstp, srcp);
+}
+
+bool rust_helper_zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)
+{
+ return zalloc_cpumask_var(mask, flags);
+}
+
+#ifndef CONFIG_CPUMASK_OFFSTACK
+void rust_helper_free_cpumask_var(cpumask_var_t mask)
+{
+ free_cpumask_var(mask);
+}
+#endif
diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c
index 2f2070c15f09..1943b98aec2b 100644
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@ -11,6 +11,7 @@
#include "bug.c"
#include "build_assert.c"
#include "build_bug.c"
+#include "cpumask.c"
#include "cred.c"
#include "device.c"
#include "drm.c"
diff --git a/rust/kernel/cpumask.rs b/rust/kernel/cpumask.rs
new file mode 100644
index 000000000000..e3b15bc12798
--- /dev/null
+++ b/rust/kernel/cpumask.rs
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! CPU mask abstractions.
+//!
+//! C header: [`include/linux/cpumask.h`](srctree/include/linux/cpumask.h)
+
+use crate::{bindings, error::Result, prelude::ENOMEM};
+use core::ptr;
+
+/// A simple implementation of `struct cpumask` from the C code.
+pub struct Cpumask {
+ ptr: *mut bindings::cpumask,
+ owned: bool,
+}
+
+impl Cpumask {
+ /// Creates empty cpumask.
+ pub fn new() -> Result<Self> {
+ let mut ptr: *mut bindings::cpumask = ptr::null_mut();
+
+ // SAFETY: Depending on the value of `gfp_flags`, this call may sleep. Other than that, it
+ // is always safe to call this method.
+ if !unsafe { bindings::zalloc_cpumask_var(&mut ptr, bindings::GFP_KERNEL) } {
+ return Err(ENOMEM);
+ }
+
+ Ok(Self { ptr, owned: true })
+ }
+
+ /// Creates a new abstraction instance of an existing `struct cpumask` pointer.
+ ///
+ /// # Safety
+ ///
+ /// Callers must ensure that `ptr` is valid, and non-null.
+ pub unsafe fn get_cpumask(ptr: *mut bindings::cpumask) -> Self {
+ Self { ptr, owned: false }
+ }
+
+ /// Obtain the raw `struct cpumask *`.
+ pub fn as_raw(&mut self) -> *mut bindings::cpumask {
+ self.ptr
+ }
+
+ /// Sets CPU in the cpumask.
+ ///
+ /// Update the cpumask with a single CPU.
+ pub fn set(&mut self, cpu: u32) {
+ // SAFETY: `ptr` is guaranteed to be valid for the lifetime of `self`. And it is safe to
+ // call `cpumask_set_cpus()` for any CPU.
+ unsafe { bindings::cpumask_set_cpu(cpu, self.ptr) };
+ }
+
+ /// Clears CPU in the cpumask.
+ ///
+ /// Update the cpumask with a single CPU.
+ pub fn clear(&mut self, cpu: i32) {
+ // SAFETY: `ptr` is guaranteed to be valid for the lifetime of `self`. And it is safe to
+ // call `cpumask_clear_cpu()` for any CPU.
+ unsafe { bindings::cpumask_clear_cpu(cpu, self.ptr) };
+ }
+
+ /// Sets all CPUs in the cpumask.
+ pub fn set_all(&mut self) {
+ // SAFETY: `ptr` is guaranteed to be valid for the lifetime of `self`. And it is safe to
+ // call `cpumask_setall()`.
+ unsafe { bindings::cpumask_setall(self.ptr) };
+ }
+
+ /// Copies cpumask.
+ pub fn copy(&self, dstp: &mut Self) {
+ // SAFETY: `ptr` is guaranteed to be valid for the lifetime of `self`. And it is safe to
+ // call `cpumask_copy()`.
+ unsafe { bindings::cpumask_copy(dstp.as_raw(), self.ptr) };
+ }
+}
+
+impl Drop for Cpumask {
+ fn drop(&mut self) {
+ if self.owned {
+ // SAFETY: `ptr` is guaranteed to be valid for the lifetime of `self`. And it is safe
+ // to call `free_cpumask_var()`.
+ unsafe { bindings::free_cpumask_var(self.ptr) }
+ }
+ }
+}
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 584d95c1eb5d..8a0cd60eb6cc 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -38,6 +38,7 @@
#[cfg(CONFIG_BLOCK)]
pub mod block;
mod build_assert;
+pub mod cpumask;
pub mod cred;
pub mod device;
pub mod device_id;
--
2.31.1.272.g89b43f80a514
Powered by blists - more mailing lists