[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <CE0E1F73-69CE-4629-979E-9AE5B6AB055E@collabora.com>
Date: Tue, 26 Aug 2025 14:15:04 -0300
From: Daniel Almeida <daniel.almeida@...labora.com>
To: Danilo Krummrich <dakr@...nel.org>
Cc: akpm@...ux-foundation.org,
ojeda@...nel.org,
alex.gaynor@...il.com,
boqun.feng@...il.com,
gary@...yguo.net,
bjorn3_gh@...tonmail.com,
lossin@...nel.org,
a.hindborg@...nel.org,
aliceryhl@...gle.com,
tmgross@...ch.edu,
abdiel.janulgue@...il.com,
acourbot@...dia.com,
jgg@...pe.ca,
lyude@...hat.com,
robin.murphy@....com,
rust-for-linux@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 2/5] rust: dma: add type alias for bindings::dma_addr_t
> On 25 Aug 2025, at 10:24, Danilo Krummrich <dakr@...nel.org> wrote:
>
> Add a type alias for bindings::dma_addr_t (DmaAddress), such that we do
> not have to access bindings directly.
>
> Reviewed-by: Alice Ryhl <aliceryhl@...gle.com>
> Reviewed-by: Alexandre Courbot <acourbot@...dia.com>
> Suggested-by: Alice Ryhl <aliceryhl@...gle.com>
> Signed-off-by: Danilo Krummrich <dakr@...nel.org>
> ---
> drivers/gpu/nova-core/falcon.rs | 4 ++--
> rust/kernel/dma.rs | 18 ++++++++++++++----
> 2 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon.rs
> index 50437c67c14a..aa36ed8c04ed 100644
> --- a/drivers/gpu/nova-core/falcon.rs
> +++ b/drivers/gpu/nova-core/falcon.rs
> @@ -4,8 +4,8 @@
>
> use core::ops::Deref;
> use hal::FalconHal;
> -use kernel::bindings;
> use kernel::device;
> +use kernel::dma::DmaAddress;
> use kernel::prelude::*;
> use kernel::time::Delta;
> use kernel::types::ARef;
> @@ -443,7 +443,7 @@ fn dma_wr<F: FalconFirmware<Target = E>>(
> fw.dma_handle_with_offset(load_offsets.src_start as usize)?,
> ),
> };
> - if dma_start % bindings::dma_addr_t::from(DMA_LEN) > 0 {
> + if dma_start % DmaAddress::from(DMA_LEN) > 0 {
> dev_err!(
> self.dev,
> "DMA transfer start addresses must be a multiple of {}",
> diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs
> index 27b25f041f32..b2a6282876da 100644
> --- a/rust/kernel/dma.rs
> +++ b/rust/kernel/dma.rs
> @@ -13,6 +13,16 @@
> types::ARef,
> };
>
> +/// DMA address type.
> +///
> +/// Represents a bus address used for Direct Memory Access (DMA) operations.
> +///
> +/// This is an alias of the kernel's `dma_addr_t`, which may be `u32` or `u64` depending on
> +/// `CONFIG_ARCH_DMA_ADDR_T_64BIT`.
> +///
> +/// Note that this may be `u64` even on 32-bit architectures.
> +pub type DmaAddress = bindings::dma_addr_t;
> +
> /// Trait to be implemented by DMA capable bus devices.
> ///
> /// The [`dma::Device`](Device) trait should be implemented by bus specific device representations,
> @@ -343,7 +353,7 @@ fn from(direction: DataDirection) -> Self {
> // entire `CoherentAllocation` including the allocated memory itself.
> pub struct CoherentAllocation<T: AsBytes + FromBytes> {
> dev: ARef<device::Device>,
> - dma_handle: bindings::dma_addr_t,
> + dma_handle: DmaAddress,
> count: usize,
> cpu_addr: *mut T,
> dma_attrs: Attrs,
> @@ -444,7 +454,7 @@ pub fn start_ptr_mut(&mut self) -> *mut T {
>
> /// Returns a DMA handle which may be given to the device as the DMA address base of
> /// the region.
> - pub fn dma_handle(&self) -> bindings::dma_addr_t {
> + pub fn dma_handle(&self) -> DmaAddress {
> self.dma_handle
> }
>
> @@ -452,13 +462,13 @@ pub fn dma_handle(&self) -> bindings::dma_addr_t {
> /// device as the DMA address base of the region.
> ///
> /// Returns `EINVAL` if `offset` is not within the bounds of the allocation.
> - pub fn dma_handle_with_offset(&self, offset: usize) -> Result<bindings::dma_addr_t> {
> + pub fn dma_handle_with_offset(&self, offset: usize) -> Result<DmaAddress> {
> if offset >= self.count {
> Err(EINVAL)
> } else {
> // INVARIANT: The type invariant of `Self` guarantees that `size_of::<T> * count` fits
> // into a `usize`, and `offset` is inferior to `count`.
> - Ok(self.dma_handle + (offset * core::mem::size_of::<T>()) as bindings::dma_addr_t)
> + Ok(self.dma_handle + (offset * core::mem::size_of::<T>()) as DmaAddress)
> }
> }
>
> --
> 2.51.0
>
Hmm, I wonder if this shouldn’t be its own type, instead of an alias. This
will be handy if we want to enforce that a given address is, in fact, a bus
address.
In any case, this can be a separate patch. This one is good.
Reviewed-by: Daniel Almeida <daniel.almeida@...labora.com>
Powered by blists - more mailing lists