Commit 5e3b7009 authored by Andreas Hindborg's avatar Andreas Hindborg Committed by Jens Axboe
Browse files

rust: block: do not use removed queue limit API



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

Reported-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Fixes: 3253aba3 ("rust: block: introduce `kernel::block::mq` module")
Signed-off-by: default avatarAndreas Hindborg <a.hindborg@samsung.com>
Link: https://lore.kernel.org/r/20240614235350.621121-1-nmi@metaspace.dk


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e3e72fe4
Loading
Loading
Loading
Loading
+7 −13
Original line number Diff line number Diff line
@@ -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.