mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 23:09:29 +02:00
Merge patch series "rust: I/O type generalization and projection"
Gary Guo <gary@garyguo.net> says: This series presents a major rework of I/O types, as a summary: - Make I/O regions typed. The existing untyped region still exists with a dynamically sized `Region` type. - Create I/O view types to represent subregion of a full I/O region mapped. A projection macro is added to allow safely create such subviews. - Split I/O traits, make I/O views play a central role, avoid duplicate monomorphization and less `unsafe` code. - Add a `SysMem` backend, and make `Coherent` implement `Io`. - Add copying methods (memcpy_{from,to}io and friends). This series generalize `Mmio` type from just an untyped region to typed representations (so `MmioRaw<T>` is `__iomem *T`). This allows us to remove the `IoKnownSize` trait; the information is sourced from just the pointer from the `KnownSize` trait instead. Building on top of that, `Mmio` and `ConfigSpace` have been converted to typed views of I/O regions rather than just a big chunk of untyped I/O memory. These changes made it possible to implement `Io` trait for `Coherent<T>`. Shared system memory, `SysMem` is also added to the series, given it similarity in implementation compared to `Coherent`. In fact, the series use `SysMem` to implement `Coherent`'s I/O methods. Built on these generalization, this series add `io_project!()`. `io_project!()` performs a safe way to project a bigger view to a small subviews, and some Nova code has been converted in this series to demonstrate cleanups possible with this addition. New `io_read!()`, `io_write!()` has been added that supersedes `dma_read!()`, `dma_write!()` macro. Although, they work for primitives only (to be exact, types that the backend is `IoCapable` of). One feature that was lost from the old `dma_read!()` and `dma_write!()` series was the ability to read/write a large structs. However, the semantics was unclear to begin with, as there was no guarantee about their atomicity even for structs that were small enough to fit in u32. Suggested-by: Danilo Krummrich <dakr@kernel.org> Link: https://rust-for-linux.zulipchat.com/#narrow/channel/288089-General/topic/Generic.20I.2FO.20backends/near/571198078 Link: https://patch.msgid.link/20260706-io_projection-v6-0-72cd5d055d54@garyguo.net Signed-off-by: Danilo Krummrich <dakr@kernel.org>
This commit is contained in:
@@ -12,6 +12,11 @@ use kernel::{
|
||||
Device,
|
||||
DmaMask, //
|
||||
},
|
||||
io::{
|
||||
io_project,
|
||||
io_read,
|
||||
Io, //
|
||||
},
|
||||
page, pci,
|
||||
prelude::*,
|
||||
scatterlist::{Owned, SGTable},
|
||||
@@ -34,6 +39,7 @@ const TEST_VALUES: [(u32, u32); 5] = [
|
||||
(0xcd, 0xef),
|
||||
];
|
||||
|
||||
#[derive(FromBytes, IntoBytes)]
|
||||
struct MyStruct {
|
||||
h: u32,
|
||||
b: u32,
|
||||
@@ -77,7 +83,7 @@ impl pci::Driver for DmaSampleDriver {
|
||||
Coherent::zeroed_slice(pdev.as_ref(), TEST_VALUES.len(), GFP_KERNEL)?;
|
||||
|
||||
for (i, value) in TEST_VALUES.into_iter().enumerate() {
|
||||
kernel::dma_write!(ca, [try: i], MyStruct::new(value.0, value.1));
|
||||
io_project!(ca, [panic: i]).copy_write(MyStruct::new(value.0, value.1));
|
||||
}
|
||||
|
||||
let size = 4 * page::PAGE_SIZE;
|
||||
@@ -97,8 +103,8 @@ impl pci::Driver for DmaSampleDriver {
|
||||
impl DmaSampleDriver {
|
||||
fn check_dma(&self) {
|
||||
for (i, value) in TEST_VALUES.into_iter().enumerate() {
|
||||
let val0 = kernel::dma_read!(self.ca, [panic: i].h);
|
||||
let val1 = kernel::dma_read!(self.ca, [panic: i].b);
|
||||
let val0 = io_read!(self.ca, [panic: i].h);
|
||||
let val1 = io_read!(self.ca, [panic: i].b);
|
||||
|
||||
assert_eq!(val0, value.0);
|
||||
assert_eq!(val1, value.1);
|
||||
|
||||
Reference in New Issue
Block a user