rust: alloc: fix `rusttest` by providing `Cmalloc::aligned_layout` too
Subsystems (2)
Miguel Ojeda
maintainerPATCH 1/1 rust: alloc: fix `rusttest` by providing `Cmalloc::aligned_layout` too
Commit fde578c86281 ("rust: alloc: replace aligned_size() with Kmalloc::aligned_layout()") provides a public aligned_layout function in Kamlloc, but not in Cmalloc, and thus uses of it will trigger an error in rusttest.
Such a user appeared in the following commit 22ab0641b939 ("rust: drm:
ensure kmalloc() compatible Layout"):
error[E0599]: no function or associated item named `aligned_layout` found for struct `alloc::allocator_test::Cmalloc` in the current scope
--> rust/kernel/drm/device.rs:100:31
|
100 | let layout = Kmalloc::aligned_layout(Layout::new::<Self>());
| ^^^^^^^^^^^^^^ function or associated item not found in `Cmalloc`
|
::: rust/kernel/alloc/allocator_test.rs:19:1
|
19 | pub struct Cmalloc;
| ------------------ function or associated item `aligned_layout` not found for this structThus add an equivalent one for Cmalloc.
---
Danilo, as usual, please feel free to rebase if that is better.
Here I just copied the function, including comments, as-is, which maybe we want to tweak. However, we may want to remove allocator_test soon anyway (this adds to the justification for doing that, so that is good news :).
I am sending that one in parallel -- hopefully we can land that removal too in this cycle, but meanwhile, we can put something like this in your branch.
rust/kernel/alloc/allocator_test.rs | 11 +++++++++++ 1 file changed, 11 insertions(+)
rust/kernel/alloc/allocator_test.rs +11 -0
@@ -22,6 +22,17 @@pub type Vmalloc =Kmalloc ;pub type KVmalloc =Kmalloc ; +impl Cmalloc { +/// Returns a [`Layout`] that makes [`Kmalloc`] fulfill the requested size and alignment of +/// `layout`. +pub fn aligned_layout (layout:Layout ) ->Layout { +// Note that `layout.size()` (after padding) is guaranteed to be a multiple of +// `layout.align()` which together with the slab guarantees means that `Kmalloc` will return +// a properly aligned object (see comments in `kmalloc()` for more information). + layout.pad_to_align () + } +} +extern "C" {#[link_name = "aligned_alloc" ] fn libc_aligned_alloc (align:usize , size:usize ) -> *mut crate ::ffi::c_void ;
--
2.50.1
Danilo Krummrich
maintainerQuoted 4 lines · Miguel Ojeda
Commit
fde578c86281("rust: alloc: replacealigned_size()withKmalloc::aligned_layout()") provides a publicaligned_layoutfunction inKamlloc, but not inCmalloc, and thus uses of it will trigger an error inrusttest.
Good catch, thanks! -- Applied to drm-misc-fixes.