kevin/linux
1
Fork 0
Code

rust: block: do not use removed queue limit API

Browse Source 
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: 3253aba340 ("rust: block: introduce `kernel::block::mq` module")
Signed-off-by: Andreas Hindborg <a.hindborg@samsung.com>
Link: https://lore.kernel.org/r/20240614235350.621121-1-nmi@metaspace.dk
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Andreas Hindborg 2024-06-15 01:53:50 +02:00 committed by Jens Axboe
parent e3e72fe4cb
commit 5e3b7009f1
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rust/kernel/block/mq/gen_disk.rs
View File

@ -95,11 +95,17 @@ impl GenDiskBuilder {
) -> Result<GenDisk<T>> { ) -> Result<GenDisk<T>> {
let lock_class_key = crate::sync::LockClassKey::new(); 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 // SAFETY: `tagset.raw_tag_set()` points to a valid and initialized tag set
let gendisk = from_err_ptr(unsafe { let gendisk = from_err_ptr(unsafe {
bindings::__blk_mq_alloc_disk( bindings::__blk_mq_alloc_disk(
tagset.raw_tag_set(), tagset.raw_tag_set(),
core::ptr::null_mut(), // TODO: We can pass queue limits right here &mut lim,
core::ptr::null_mut(), core::ptr::null_mut(),
lock_class_key.as_ptr(), lock_class_key.as_ptr(),
) )
@ -141,18 +147,6 @@ impl GenDiskBuilder {
raw_writer.write_fmt(name)?; raw_writer.write_fmt(name)?;
raw_writer.write_char('\0')?; 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 // SAFETY: `gendisk` points to a valid and initialized instance of
// `struct gendisk`. `set_capacity` takes a lock to synchronize this // `struct gendisk`. `set_capacity` takes a lock to synchronize this
// operation, so we will not race. // operation, so we will not race.