Re: [PATCH V6 04/15] rust: device: Add few helpers

From: Danilo Krummrich
Date: Tue Jan 07 2025 - 06:57:20 EST


On Tue, Jan 07, 2025 at 04:51:37PM +0530, Viresh Kumar wrote:
> Add from_cpu() and property_present() helpers to the device bindings.

I think you should split this into two separate patches.

>
> Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> ---
> rust/bindings/bindings_helper.h | 1 +
> rust/kernel/device.rs | 21 +++++++++++++++++++++
> 2 files changed, 22 insertions(+)
>
> diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
> index 43f5c381aab0..70e4b7b0f638 100644
> --- a/rust/bindings/bindings_helper.h
> +++ b/rust/bindings/bindings_helper.h
> @@ -31,6 +31,7 @@
> #include <linux/pid_namespace.h>
> #include <linux/platform_device.h>
> #include <linux/poll.h>
> +#include <linux/property.h>
> #include <linux/refcount.h>
> #include <linux/sched.h>
> #include <linux/security.h>
> diff --git a/rust/kernel/device.rs b/rust/kernel/device.rs
> index d5e6a19ff6b7..5bfbc4bdfadc 100644
> --- a/rust/kernel/device.rs
> +++ b/rust/kernel/device.rs
> @@ -6,6 +6,9 @@
>
> use crate::{
> bindings,
> + error::Result,
> + prelude::ENODEV,
> + str::CString,
> types::{ARef, Opaque},
> };
> use core::{fmt, ptr};
> @@ -59,6 +62,18 @@ pub unsafe fn get_device(ptr: *mut bindings::device) -> ARef<Self> {
> unsafe { Self::as_ref(ptr) }.into()
> }
>
> + /// Creates a new ref-counted instance of device of a CPU.
> + pub fn from_cpu(cpu: u32) -> Result<ARef<Self>> {
> + // SAFETY: It is safe to call `get_cpu_device()` for any CPU number.
> + let ptr = unsafe { bindings::get_cpu_device(cpu) };
> + if ptr.is_null() {
> + return Err(ENODEV);
> + }
> +
> + // SAFETY: By the safety requirements, ptr is valid.

There are no safety requirements for from_cpu().

Instead, you should say that the pointer returned by get_cpu_device(), if not
NULL, is a valid pointer to a struct device with a non-zero reference count.

> + Ok(unsafe { Device::get_device(ptr) })
> + }
> +
> /// Obtain the raw `struct device *`.
> pub(crate) fn as_raw(&self) -> *mut bindings::device {
> self.0.get()
> @@ -180,6 +195,12 @@ unsafe fn printk(&self, klevel: &[u8], msg: fmt::Arguments<'_>) {
> )
> };
> }
> +
> + /// Checks if property is present or not.
> + pub fn property_present(&self, name: &CString) -> bool {
> + // SAFETY: `name` is null-terminated. `self.as_raw` is valid because `self` is valid.

Maybe "by the invariant of `CString` `name` is null-terminated."?

> + unsafe { bindings::device_property_present(self.as_raw(), name.as_ptr() as *const _) }
> + }
> }
>
> // SAFETY: Instances of `Device` are always reference-counted.
> --
> 2.31.1.272.g89b43f80a514
>