diff mbox series

rust: block: do not use removed queue limit API

Message ID 20240614235350.621121-1-nmi@metaspace.dk (mailing list archive)
State New, archived
Headers show
Series rust: block: do not use removed queue limit API | expand

Commit Message

Andreas Hindborg June 14, 2024, 11:53 p.m. UTC
From: Andreas Hindborg <a.hindborg@samsung.com>

The Rust block layer API was using the old queue limit API, which was just
removed. Use the new API instead.

Reported-by: Boqun Feng <boqun.feng@gmail.com>
Fixes: 3253aba3408a ("rust: block: introduce `kernel::block::mq` module")
Signed-off-by: Andreas Hindborg <a.hindborg@samsung.com>
---
 rust/kernel/block/mq/gen_disk.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)


base-commit: 813025d515f5a4c232504487f5b8b2091ab43dcc

Comments

Jens Axboe June 15, 2024, 12:25 a.m. UTC | #1
On Sat, 15 Jun 2024 01:53:50 +0200, Andreas Hindborg wrote:
> The Rust block layer API was using the old queue limit API, which was just
> removed. Use the new API instead.
> 
> 

Applied, thanks!

[1/1] rust: block: do not use removed queue limit API
      commit: 5e3b7009f116f684ac6b93d8924506154f3b1f6d

Best regards,
diff mbox series

Patch

diff --git a/rust/kernel/block/mq/gen_disk.rs b/rust/kernel/block/mq/gen_disk.rs
index 3b9edb96c8ff..e06044b549e0 100644
--- a/rust/kernel/block/mq/gen_disk.rs
+++ b/rust/kernel/block/mq/gen_disk.rs
@@ -95,11 +95,17 @@  pub fn build<T: Operations>(
     ) -> Result<GenDisk<T>> {
         let lock_class_key = crate::sync::LockClassKey::new();
 
+        // SAFETY: `bindings::queue_limits` contain only fields that are valid when zeroed.
+        let mut lim: bindings::queue_limits = unsafe { core::mem::zeroed() };
+
+        lim.logical_block_size = self.logical_block_size;
+        lim.physical_block_size = self.physical_block_size;
+
         // SAFETY: `tagset.raw_tag_set()` points to a valid and initialized tag set
         let gendisk = from_err_ptr(unsafe {
             bindings::__blk_mq_alloc_disk(
                 tagset.raw_tag_set(),
-                core::ptr::null_mut(), // TODO: We can pass queue limits right here
+                &mut lim,
                 core::ptr::null_mut(),
                 lock_class_key.as_ptr(),
             )
@@ -141,18 +147,6 @@  pub fn build<T: Operations>(
         raw_writer.write_fmt(name)?;
         raw_writer.write_char('\0')?;
 
-        // SAFETY: `gendisk` points to a valid and initialized instance of
-        // `struct gendisk`. We have exclusive access, so we cannot race.
-        unsafe {
-            bindings::blk_queue_logical_block_size((*gendisk).queue, self.logical_block_size)
-        };
-
-        // SAFETY: `gendisk` points to a valid and initialized instance of
-        // `struct gendisk`. We have exclusive access, so we cannot race.
-        unsafe {
-            bindings::blk_queue_physical_block_size((*gendisk).queue, self.physical_block_size)
-        };
-
         // SAFETY: `gendisk` points to a valid and initialized instance of
         // `struct gendisk`. `set_capacity` takes a lock to synchronize this
         // operation, so we will not race.