Re: [PATCH] rust: alloc: satisfy `aligned_alloc` requirements

[Danilo Krummrich <dakr@kernel.org>]

Hi Tamir,

On Sat, Feb 01, 2025 at 01:58:10PM -0500, Tamir Duberstein wrote:
> The implementation added in commit dd09538fb409 ("rust: alloc: implement
> `Cmalloc` in module allocator_test") did not honor the documented
> requirements of `aligned_alloc`. These requirements may not be enforced
> on all system, but they are on macOS. Ensure that alignment is at least
> `sizeof(void *)` and round size up to the nearest multiple of that
> value.

Good catch!

> 
> Fixes: dd09538fb409 ("rust: alloc: implement `Cmalloc` in module allocator_test")
> 
> Signed-off-by: Tamir Duberstein <tamird@gmail.com>
> ---
>  rust/kernel/alloc/allocator_test.rs | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/rust/kernel/alloc/allocator_test.rs b/rust/kernel/alloc/allocator_test.rs
> index e3240d16040b..f360fc2e20f2 100644
> --- a/rust/kernel/alloc/allocator_test.rs
> +++ b/rust/kernel/alloc/allocator_test.rs
> @@ -62,9 +62,22 @@ unsafe fn realloc(
>              ));
>          }
>  
> +        // According to `man aligned_alloc`:
> +        //
> +        // aligned_alloc() returns a NULL pointer and sets errno to EINVAL if size is not an
> +        // integral multiple of alignment, or if alignment is not a power of 2 at least as large as
> +        // sizeof(void *).
> +        let alignment = layout.align();
> +        let minimum_alignment = core::mem::size_of::<*const crate::ffi::c_void>();
> +        let (alignment, size) = if alignment < minimum_alignment {
> +            (minimum_alignment, layout.size().div_ceil(minimum_alignment) * minimum_alignment)
> +        } else {
> +            (alignment, layout.size())
> +        };
> +

I think I prefer this to be slightly more compact:

   let min_align = core::mem::size_of::<*const crate::ffi::c_void>();
   let (align, size) = if layout.align() < min_align {
       (min_align, layout.size().div_ceil(min_align) * min_align)
   } else {
       (layout.align(), layout.size())
   };