This introduces a set of bindings for working with iosys_map in rust code using the new Io traits.
Signed-off-by: Lyude Paul <[email protected]> --- V5: - Fix incorrect field size being passed to iosys_map_memcpy_to() - Add an additional unit test, basic_macro(), which can successfully catch the above issue so it doesn't happen again in the future. V6: - Drop as_slice/as_mut_slice (Alice Rhyl) V7: - Start using Alexandre Courbot's wonderful Io, IoCapable and IoKnownSize traits instead of trying to roll our own IO accessors. This also changes the following: - We don't have a custom AsBytes/FromBytes type that we carry around any longer with maps - We now have optional compile-time size checking - We don't need our own unit tests anymore - RawIoSysMap can be used for unsafe IO operations, because why not. - IoSysMapRef::new() can fail now since it needs to ensure SIZE is valid. - We don't implement Deref<RawIoSysMap> for IoSysMapRef any longer. The main reason for this is that we want to avoid users having to manually specify if they want the RawIoSysMap or IoSysMapRef variant functions like io_read()/io_write(). This is fine IMHO, but to make sure things remain easy for APIs that wrap around iosys map we make IoSysMapRef.raw_map pub(crate). rust/helpers/helpers.c | 1 + rust/helpers/iosys_map.c | 34 +++++++ rust/kernel/iosys_map.rs | 211 +++++++++++++++++++++++++++++++++++++++ rust/kernel/lib.rs | 1 + 4 files changed, 247 insertions(+) create mode 100644 rust/helpers/iosys_map.c create mode 100644 rust/kernel/iosys_map.rs diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c index 1d3333cc0d2a8..bd8ad237aa02e 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -31,6 +31,7 @@ #include "irq.c" #include "fs.c" #include "io.c" +#include "iosys_map.c" #include "jump_label.c" #include "kunit.c" #include "maple_tree.c" diff --git a/rust/helpers/iosys_map.c b/rust/helpers/iosys_map.c new file mode 100644 index 0000000000000..6861d4ec48a4b --- /dev/null +++ b/rust/helpers/iosys_map.c @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/iosys-map.h> +#include <linux/types.h> + +#define rust_iosys_map_rd(type__) \ + __rust_helper type__ \ + rust_helper_iosys_map_rd_ ## type__(const struct iosys_map *map, size_t offset) \ + { \ + return iosys_map_rd(map, offset, type__); \ + } +#define rust_iosys_map_wr(type__) \ + __rust_helper void \ + rust_helper_iosys_map_wr_ ## type__(const struct iosys_map *map, size_t offset, \ + type__ value) \ + { \ + iosys_map_wr(map, offset, type__, value); \ + } + +rust_iosys_map_rd(u8); +rust_iosys_map_rd(u16); +rust_iosys_map_rd(u32); + +rust_iosys_map_wr(u8); +rust_iosys_map_wr(u16); +rust_iosys_map_wr(u32); + +#ifdef CONFIG_64BIT +rust_iosys_map_rd(u64); +rust_iosys_map_wr(u64); +#endif + +#undef rust_iosys_map_rd +#undef rust_iosys_map_wr diff --git a/rust/kernel/iosys_map.rs b/rust/kernel/iosys_map.rs new file mode 100644 index 0000000000000..2070f0fb42cb8 --- /dev/null +++ b/rust/kernel/iosys_map.rs @@ -0,0 +1,211 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! IO-agnostic memory mapping interfaces. +//! +//! This crate provides bindings for the `struct iosys_map` type, which provides a common interface +//! for memory mappings which can reside within coherent memory, or within IO memory. +//! +//! C header: [`include/linux/iosys-map.h`](srctree/include/linux/pci.h) + +use crate::{ + error::code::*, + io::{ + Io, + IoCapable, + IoKnownSize, // + }, + prelude::*, // +}; +use bindings; +use core::marker::PhantomData; + +/// Raw unsized representation of a `struct iosys_map`. +/// +/// This struct is a transparent wrapper around `struct iosys_map`. The C API does not provide the +/// size of the mapping by default, and thus this type also does not include the size of the +/// mapping. As such, it cannot be used for actually accessing the underlying data pointed to by the +/// mapping. +/// +/// With the exception of kernel crates which may provide their own wrappers around `RawIoSysMap`, +/// users will typically not interact with this type directly. +#[repr(transparent)] +pub struct RawIoSysMap<const SIZE: usize = 0>(bindings::iosys_map); + +impl<const SIZE: usize> RawIoSysMap<SIZE> { + /// Convert from a raw `bindings::iosys_map`. + #[expect(unused)] + #[inline] + pub(crate) fn from_raw(val: bindings::iosys_map) -> Self { + Self(val) + } + + /// Returns whether the mapping is within IO memory space or not. + #[inline] + pub fn is_iomem(&self) -> bool { + self.0.is_iomem + } + + /// Convert from a `RawIoSysMap<SIZE>` to a raw `bindings::iosys_map` ref. + #[expect(unused)] + #[inline] + pub(crate) fn as_raw(&self) -> &bindings::iosys_map { + &self.0 + } + + /// Convert from a `RawIoSysMap<SIZE>` to a raw mutable `bindings::iosys_map` ref. + #[allow(unused)] + #[inline] + pub(crate) fn as_raw_mut(&mut self) -> &mut bindings::iosys_map { + &mut self.0 + } + + /// Returns the address pointed to by this iosys map. + /// + /// Note that this address is not guaranteed to be valid, and may or may not reside in I/O + /// memory. + #[inline] + pub fn addr(&self) -> usize { + (if self.is_iomem() { + // SAFETY: We confirmed above that this iosys map is contained within iomem, so it's + // safe to read vaddr_iomem + unsafe { self.0.__bindgen_anon_1.vaddr_iomem } + } else { + // SAFETY: We confirmed above that this iosys map is not contaned within iomem, so it's + // safe to read vaddr. + unsafe { self.0.__bindgen_anon_1.vaddr } + }) as usize + } +} + +// SAFETY: As we make no guarantees about the validity of the mapping, there's no issue with sending +// this type between threads. +unsafe impl<const SIZE: usize> Send for RawIoSysMap<SIZE> {} + +impl<const SIZE: usize> Clone for RawIoSysMap<SIZE> { + fn clone(&self) -> Self { + Self(self.0) + } +} + +macro_rules! impl_raw_iosys_map_io_capable { + ($ty:ty, $read_fn:ident, $write_fn:ident) => { + impl<const SIZE: usize> IoCapable<$ty> for RawIoSysMap<SIZE> { + #[inline(always)] + unsafe fn io_read(&self, address: usize) -> $ty { + // SAFETY: By the trait invariant `address` is a valid address for iosys map + // operations. + unsafe { bindings::$read_fn(&self.0, address) } + } + + #[inline(always)] + unsafe fn io_write(&self, value: $ty, address: usize) { + // SAFETY: By the trait invariant `address` is a valid address for iosys map + // operations. + unsafe { bindings::$write_fn(&self.0, address, value) }; + } + } + }; +} + +impl_raw_iosys_map_io_capable!(u8, iosys_map_rd_u8, iosys_map_wr_u8); +impl_raw_iosys_map_io_capable!(u16, iosys_map_rd_u16, iosys_map_wr_u16); +impl_raw_iosys_map_io_capable!(u32, iosys_map_rd_u32, iosys_map_wr_u32); +#[cfg(CONFIG_64BIT)] +impl_raw_iosys_map_io_capable!(u64, iosys_map_rd_u64, iosys_map_wr_u64); + +/// A sized version of a [`RawIoSysMap`]. +/// +/// This type includes the runtime size of the [`RawIoSysMap`] and can be used for checked I/O +/// operations. +/// +/// # Invariants +/// +/// - The iosys mapping referenced by this type is guaranteed to be of at least `size` bytes in +/// size +/// - The iosys mapping referenced by this type is valid for the lifetime `'a`. +#[derive(Clone)] +pub struct IoSysMapRef<'a, const SIZE: usize = 0> { + pub(crate) raw_map: RawIoSysMap<SIZE>, + size: usize, + _p: PhantomData<&'a ()>, +} + +impl<'a, const SIZE: usize> IoSysMapRef<'a, SIZE> { + /// Create a new [`IoSysMapRef`] from a [`RawIoSysMap`]. + /// + /// Returns an error if the specified size is invalid. + /// + /// # Safety + /// + /// - The caller guarantees that the mapping is of at least `size` bytes. + /// - The caller guarantees that the mapping remains valid for the lifetime of `'a`. + #[expect(unused)] + pub(crate) unsafe fn new(map: RawIoSysMap<SIZE>, size: usize) -> Result<Self> { + if size < SIZE { + return Err(EINVAL); + } + + Ok(Self { + raw_map: map, + size, + _p: PhantomData, + }) + } + + /// Returns whether the mapping is within IO memory space or not. + #[inline] + pub fn is_iomem(&self) -> bool { + self.raw_map.is_iomem() + } + + /// Returns the address pointed to by this iosys map. + /// + /// Note that this address is not guaranteed to be valid, and may or may not reside in I/O + /// memory. + #[inline] + pub fn addr(&self) -> usize { + self.raw_map.addr() + } +} + +macro_rules! impl_iosys_map_io_capable { + ($ty:ty) => { + impl<'a, const SIZE: usize> IoCapable<$ty> for IoSysMapRef<'a, SIZE> { + #[inline(always)] + unsafe fn io_read(&self, address: usize) -> $ty { + // SAFETY: By the trait invariant `address` is a valid address for iosys map + // operations. + unsafe { self.raw_map.io_read(address) } + } + + #[inline(always)] + unsafe fn io_write(&self, value: $ty, address: usize) { + // SAFETY: By the trait invariant `address` is a valid address for iosys map + // operations. + unsafe { self.raw_map.io_write(value, address) }; + } + } + }; +} + +impl_iosys_map_io_capable!(u8); +impl_iosys_map_io_capable!(u16); +impl_iosys_map_io_capable!(u32); +#[cfg(CONFIG_64BIT)] +impl_iosys_map_io_capable!(u64); + +impl<'a, const SIZE: usize> Io for IoSysMapRef<'a, SIZE> { + #[inline] + fn addr(&self) -> usize { + self.raw_map.addr() + } + + #[inline] + fn maxsize(&self) -> usize { + self.size + } +} + +impl<'a, const SIZE: usize> IoKnownSize for IoSysMapRef<'a, SIZE> { + const MIN_SIZE: usize = SIZE; +} diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 6d637e2fed1b6..02385af66fde2 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -103,6 +103,7 @@ pub mod init; pub mod io; pub mod ioctl; +pub mod iosys_map; pub mod iov; pub mod irq; pub mod jump_label; -- 2.53.0
