* [PATCH v10 1/4] mm/vmalloc: allow to set node and align in vrealloc
2025-07-02 16:07 [PATCH v10 0/4] support large align and nid in Rust allocators Vitaly Wool
@ 2025-07-02 16:08 ` Vitaly Wool
2025-07-04 10:10 ` Uladzislau Rezki
2025-07-02 16:08 ` [PATCH v10 2/4] mm/slub: allow to set node and align in k[v]realloc Vitaly Wool
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Vitaly Wool @ 2025-07-02 16:08 UTC (permalink / raw)
To: linux-mm
Cc: akpm, linux-kernel, Uladzislau Rezki, Danilo Krummrich,
Alice Ryhl, rust-for-linux, Vitaly Wool
Reimplement vrealloc() to be able to set node and alignment should
a user need to do so. Rename the function to vrealloc_node_align()
to better match what it actually does now and introduce macros for
vrealloc() and friends for backward compatibility.
With that change we also provide the ability for the Rust part of
the kernel to set node and alignment in its allocations.
Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.se>
---
include/linux/vmalloc.h | 12 +++++++++---
mm/nommu.c | 3 ++-
mm/vmalloc.c | 28 +++++++++++++++++++++++-----
3 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index fdc9aeb74a44..68791f7cb3ba 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -197,9 +197,15 @@ extern void *__vcalloc_noprof(size_t n, size_t size, gfp_t flags) __alloc_size(1
extern void *vcalloc_noprof(size_t n, size_t size) __alloc_size(1, 2);
#define vcalloc(...) alloc_hooks(vcalloc_noprof(__VA_ARGS__))
-void * __must_check vrealloc_noprof(const void *p, size_t size, gfp_t flags)
- __realloc_size(2);
-#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__))
+void *__must_check vrealloc_node_align_noprof(const void *p, size_t size,
+ unsigned long align, gfp_t flags, int nid) __realloc_size(2);
+#define vrealloc_node_noprof(_p, _s, _f, _nid) \
+ vrealloc_node_align_noprof(_p, _s, 1, _f, _nid)
+#define vrealloc_noprof(_p, _s, _f) \
+ vrealloc_node_align_noprof(_p, _s, 1, _f, NUMA_NO_NODE)
+#define vrealloc_node_align(...) alloc_hooks(vrealloc_node_align_noprof(__VA_ARGS__))
+#define vrealloc_node(...) alloc_hooks(vrealloc_node_noprof(__VA_ARGS__))
+#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__))
extern void vfree(const void *addr);
extern void vfree_atomic(const void *addr);
diff --git a/mm/nommu.c b/mm/nommu.c
index 87e1acab0d64..8359b2025b9f 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -119,7 +119,8 @@ void *__vmalloc_noprof(unsigned long size, gfp_t gfp_mask)
}
EXPORT_SYMBOL(__vmalloc_noprof);
-void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
+void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align,
+ gfp_t flags, int node)
{
return krealloc_noprof(p, size, (flags | __GFP_COMP) & ~__GFP_HIGHMEM);
}
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 6dbcdceecae1..412664656870 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -4089,13 +4089,22 @@ void *vzalloc_node_noprof(unsigned long size, int node)
EXPORT_SYMBOL(vzalloc_node_noprof);
/**
- * vrealloc - reallocate virtually contiguous memory; contents remain unchanged
+ * vrealloc_node_align_noprof - reallocate virtually contiguous memory; contents
+ * remain unchanged
* @p: object to reallocate memory for
* @size: the size to reallocate
+ * @align: requested alignment
* @flags: the flags for the page level allocator
+ * @nid: node number of the target node
+ *
+ * If @p is %NULL, vrealloc_XXX() behaves exactly like vmalloc(). If @size is
+ * 0 and @p is not a %NULL pointer, the object pointed to is freed.
*
- * If @p is %NULL, vrealloc() behaves exactly like vmalloc(). If @size is 0 and
- * @p is not a %NULL pointer, the object pointed to is freed.
+ * if @nid is not NUMA_NO_NODE, this function will try to allocate memory on
+ * the given node. If reallocation is not necessary (e. g. the new size is less
+ * than the current allocated size), the current allocation will be preserved
+ * unless __GFP_THISNODE is set. In the latter case a new allocation on the
+ * requested node will be attempted.
*
* If __GFP_ZERO logic is requested, callers must ensure that, starting with the
* initial memory allocation, every subsequent call to this API for the same
@@ -4111,7 +4120,8 @@ EXPORT_SYMBOL(vzalloc_node_noprof);
* Return: pointer to the allocated memory; %NULL if @size is zero or in case of
* failure
*/
-void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
+void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align,
+ gfp_t flags, int nid)
{
struct vm_struct *vm = NULL;
size_t alloced_size = 0;
@@ -4135,6 +4145,12 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
if (WARN(alloced_size < old_size,
"vrealloc() has mismatched area vs requested sizes (%p)\n", p))
return NULL;
+ if (WARN(!IS_ALIGNED((unsigned long)p, align),
+ "will not reallocate with a bigger alignment (0x%lx)\n", align))
+ return NULL;
+ if (unlikely(flags & __GFP_THISNODE) && nid != NUMA_NO_NODE &&
+ nid != page_to_nid(vmalloc_to_page(p)))
+ goto need_realloc;
}
/*
@@ -4165,8 +4181,10 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
return (void *)p;
}
+need_realloc:
/* TODO: Grow the vm_area, i.e. allocate and map additional pages. */
- n = __vmalloc_noprof(size, flags);
+ n = __vmalloc_node_noprof(size, align, flags, nid, __builtin_return_address(0));
+
if (!n)
return NULL;
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v10 1/4] mm/vmalloc: allow to set node and align in vrealloc
2025-07-02 16:08 ` [PATCH v10 1/4] mm/vmalloc: allow to set node and align in vrealloc Vitaly Wool
@ 2025-07-04 10:10 ` Uladzislau Rezki
0 siblings, 0 replies; 10+ messages in thread
From: Uladzislau Rezki @ 2025-07-04 10:10 UTC (permalink / raw)
To: Vitaly Wool
Cc: linux-mm, akpm, linux-kernel, Uladzislau Rezki, Danilo Krummrich,
Alice Ryhl, rust-for-linux
On Wed, Jul 02, 2025 at 06:08:24PM +0200, Vitaly Wool wrote:
> Reimplement vrealloc() to be able to set node and alignment should
> a user need to do so. Rename the function to vrealloc_node_align()
> to better match what it actually does now and introduce macros for
> vrealloc() and friends for backward compatibility.
>
> With that change we also provide the ability for the Rust part of
> the kernel to set node and alignment in its allocations.
>
> Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.se>
> ---
> include/linux/vmalloc.h | 12 +++++++++---
> mm/nommu.c | 3 ++-
> mm/vmalloc.c | 28 +++++++++++++++++++++++-----
> 3 files changed, 34 insertions(+), 9 deletions(-)
>
> diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
> index fdc9aeb74a44..68791f7cb3ba 100644
> --- a/include/linux/vmalloc.h
> +++ b/include/linux/vmalloc.h
> @@ -197,9 +197,15 @@ extern void *__vcalloc_noprof(size_t n, size_t size, gfp_t flags) __alloc_size(1
> extern void *vcalloc_noprof(size_t n, size_t size) __alloc_size(1, 2);
> #define vcalloc(...) alloc_hooks(vcalloc_noprof(__VA_ARGS__))
>
> -void * __must_check vrealloc_noprof(const void *p, size_t size, gfp_t flags)
> - __realloc_size(2);
> -#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__))
> +void *__must_check vrealloc_node_align_noprof(const void *p, size_t size,
> + unsigned long align, gfp_t flags, int nid) __realloc_size(2);
> +#define vrealloc_node_noprof(_p, _s, _f, _nid) \
> + vrealloc_node_align_noprof(_p, _s, 1, _f, _nid)
> +#define vrealloc_noprof(_p, _s, _f) \
> + vrealloc_node_align_noprof(_p, _s, 1, _f, NUMA_NO_NODE)
> +#define vrealloc_node_align(...) alloc_hooks(vrealloc_node_align_noprof(__VA_ARGS__))
> +#define vrealloc_node(...) alloc_hooks(vrealloc_node_noprof(__VA_ARGS__))
> +#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__))
>
> extern void vfree(const void *addr);
> extern void vfree_atomic(const void *addr);
> diff --git a/mm/nommu.c b/mm/nommu.c
> index 87e1acab0d64..8359b2025b9f 100644
> --- a/mm/nommu.c
> +++ b/mm/nommu.c
> @@ -119,7 +119,8 @@ void *__vmalloc_noprof(unsigned long size, gfp_t gfp_mask)
> }
> EXPORT_SYMBOL(__vmalloc_noprof);
>
> -void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
> +void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align,
> + gfp_t flags, int node)
> {
> return krealloc_noprof(p, size, (flags | __GFP_COMP) & ~__GFP_HIGHMEM);
> }
> diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> index 6dbcdceecae1..412664656870 100644
> --- a/mm/vmalloc.c
> +++ b/mm/vmalloc.c
> @@ -4089,13 +4089,22 @@ void *vzalloc_node_noprof(unsigned long size, int node)
> EXPORT_SYMBOL(vzalloc_node_noprof);
>
> /**
> - * vrealloc - reallocate virtually contiguous memory; contents remain unchanged
> + * vrealloc_node_align_noprof - reallocate virtually contiguous memory; contents
> + * remain unchanged
> * @p: object to reallocate memory for
> * @size: the size to reallocate
> + * @align: requested alignment
> * @flags: the flags for the page level allocator
> + * @nid: node number of the target node
> + *
> + * If @p is %NULL, vrealloc_XXX() behaves exactly like vmalloc(). If @size is
> + * 0 and @p is not a %NULL pointer, the object pointed to is freed.
> *
> - * If @p is %NULL, vrealloc() behaves exactly like vmalloc(). If @size is 0 and
> - * @p is not a %NULL pointer, the object pointed to is freed.
> + * if @nid is not NUMA_NO_NODE, this function will try to allocate memory on
> + * the given node. If reallocation is not necessary (e. g. the new size is less
> + * than the current allocated size), the current allocation will be preserved
> + * unless __GFP_THISNODE is set. In the latter case a new allocation on the
> + * requested node will be attempted.
> *
> * If __GFP_ZERO logic is requested, callers must ensure that, starting with the
> * initial memory allocation, every subsequent call to this API for the same
> @@ -4111,7 +4120,8 @@ EXPORT_SYMBOL(vzalloc_node_noprof);
> * Return: pointer to the allocated memory; %NULL if @size is zero or in case of
> * failure
> */
> -void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
> +void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align,
> + gfp_t flags, int nid)
> {
> struct vm_struct *vm = NULL;
> size_t alloced_size = 0;
> @@ -4135,6 +4145,12 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
> if (WARN(alloced_size < old_size,
> "vrealloc() has mismatched area vs requested sizes (%p)\n", p))
> return NULL;
> + if (WARN(!IS_ALIGNED((unsigned long)p, align),
> + "will not reallocate with a bigger alignment (0x%lx)\n", align))
> + return NULL;
> + if (unlikely(flags & __GFP_THISNODE) && nid != NUMA_NO_NODE &&
> + nid != page_to_nid(vmalloc_to_page(p)))
> + goto need_realloc;
> }
>
> /*
> @@ -4165,8 +4181,10 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags)
> return (void *)p;
> }
>
> +need_realloc:
> /* TODO: Grow the vm_area, i.e. allocate and map additional pages. */
> - n = __vmalloc_noprof(size, flags);
> + n = __vmalloc_node_noprof(size, align, flags, nid, __builtin_return_address(0));
> +
> if (!n)
> return NULL;
>
> --
> 2.39.2
>
This one LGTM. Let's see what folk think about SLUB changes. We need to
be aligned with naming and approach on both sides.
Reviewed-by: "Uladzislau Rezki (Sony)" <urezki@gmail.com>
--
Uladzislau Rezki
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v10 2/4] mm/slub: allow to set node and align in k[v]realloc
2025-07-02 16:07 [PATCH v10 0/4] support large align and nid in Rust allocators Vitaly Wool
2025-07-02 16:08 ` [PATCH v10 1/4] mm/vmalloc: allow to set node and align in vrealloc Vitaly Wool
@ 2025-07-02 16:08 ` Vitaly Wool
2025-07-02 16:09 ` [PATCH v10 3/4] rust: add support for NUMA ids in allocations Vitaly Wool
2025-07-02 16:09 ` [PATCH v10 4/4] rust: support large alignments " Vitaly Wool
3 siblings, 0 replies; 10+ messages in thread
From: Vitaly Wool @ 2025-07-02 16:08 UTC (permalink / raw)
To: linux-mm
Cc: akpm, linux-kernel, Uladzislau Rezki, Danilo Krummrich,
Alice Ryhl, rust-for-linux, Vitaly Wool
Reimplement k[v]realloc_node() to be able to set node and
alignment should a user need to do so. In order to do that while
retaining the maximal backward compatibility, add
k[v]realloc_node_align() functions and redefine the rest of API
using these new ones.
With that change we also provide the ability for the Rust part of
the kernel to set node and alignment in its K[v]xxx
[re]allocations.
Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.se>
---
include/linux/slab.h | 40 ++++++++++++++++++---------
mm/slub.c | 64 ++++++++++++++++++++++++++++++--------------
2 files changed, 71 insertions(+), 33 deletions(-)
diff --git a/include/linux/slab.h b/include/linux/slab.h
index d5a8ab98035c..13abcf4ada22 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -465,9 +465,15 @@ int kmem_cache_shrink(struct kmem_cache *s);
/*
* Common kmalloc functions provided by all allocators
*/
-void * __must_check krealloc_noprof(const void *objp, size_t new_size,
- gfp_t flags) __realloc_size(2);
-#define krealloc(...) alloc_hooks(krealloc_noprof(__VA_ARGS__))
+void * __must_check krealloc_node_align_noprof(const void *objp, size_t new_size,
+ unsigned long align,
+ gfp_t flags, int nid) __realloc_size(2);
+#define krealloc_node_noprof(_p, _s, _f, _n) \
+ krealloc_node_align_noprof(_p, _s, 1, _f, _n)
+#define krealloc_noprof(...) krealloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE)
+#define krealloc_node_align(...) alloc_hooks(krealloc_node_align_noprof(__VA_ARGS__))
+#define krealloc_node(...) alloc_hooks(krealloc_node_noprof(__VA_ARGS__))
+#define krealloc(...) alloc_hooks(krealloc_noprof(__VA_ARGS__))
void kfree(const void *objp);
void kfree_sensitive(const void *objp);
@@ -1041,18 +1047,23 @@ static inline __alloc_size(1) void *kzalloc_noprof(size_t size, gfp_t flags)
#define kzalloc(...) alloc_hooks(kzalloc_noprof(__VA_ARGS__))
#define kzalloc_node(_size, _flags, _node) kmalloc_node(_size, (_flags)|__GFP_ZERO, _node)
-void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node) __alloc_size(1);
-#define kvmalloc_node_noprof(size, flags, node) \
- __kvmalloc_node_noprof(PASS_BUCKET_PARAMS(size, NULL), flags, node)
+void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), unsigned long align,
+ gfp_t flags, int node) __alloc_size(1);
+#define kvmalloc_node_align_noprof(_size, _align, _flags, _node) \
+ __kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, NULL), _align, _flags, _node)
+#define kvmalloc_node_noprof(_size, _flags, _node) \
+ kvmalloc_node_align_noprof(_size, 1, _flags, _node)
+#define kvmalloc_node_align(...) \
+ alloc_hooks(kvmalloc_node_align_noprof(__VA_ARGS__))
#define kvmalloc_node(...) alloc_hooks(kvmalloc_node_noprof(__VA_ARGS__))
-#define kvmalloc(_size, _flags) kvmalloc_node(_size, _flags, NUMA_NO_NODE)
-#define kvmalloc_noprof(_size, _flags) kvmalloc_node_noprof(_size, _flags, NUMA_NO_NODE)
+#define kvmalloc_noprof(...) kvmalloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE)
+#define kvmalloc(...) alloc_hooks(kvmalloc_noprof(__VA_ARGS__))
#define kvzalloc(_size, _flags) kvmalloc(_size, (_flags)|__GFP_ZERO)
-#define kvzalloc_node(_size, _flags, _node) kvmalloc_node(_size, (_flags)|__GFP_ZERO, _node)
+#define kvzalloc_node(_s, _f, _n) kvmalloc_node(_s, (_f)|__GFP_ZERO, _n)
#define kmem_buckets_valloc(_b, _size, _flags) \
- alloc_hooks(__kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, _b), _flags, NUMA_NO_NODE))
+ alloc_hooks(__kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, _b), 1, _flags, NUMA_NO_NODE))
static inline __alloc_size(1, 2) void *
kvmalloc_array_node_noprof(size_t n, size_t size, gfp_t flags, int node)
@@ -1068,13 +1079,16 @@ kvmalloc_array_node_noprof(size_t n, size_t size, gfp_t flags, int node)
#define kvmalloc_array_noprof(...) kvmalloc_array_node_noprof(__VA_ARGS__, NUMA_NO_NODE)
#define kvcalloc_node_noprof(_n,_s,_f,_node) kvmalloc_array_node_noprof(_n,_s,(_f)|__GFP_ZERO,_node)
#define kvcalloc_noprof(...) kvcalloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE)
-
#define kvmalloc_array(...) alloc_hooks(kvmalloc_array_noprof(__VA_ARGS__))
#define kvcalloc_node(...) alloc_hooks(kvcalloc_node_noprof(__VA_ARGS__))
#define kvcalloc(...) alloc_hooks(kvcalloc_noprof(__VA_ARGS__))
-void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags)
- __realloc_size(2);
+void *kvrealloc_node_align_noprof(const void *p, size_t size, unsigned long align,
+ gfp_t flags, int nid) __realloc_size(2);
+#define kvrealloc_node_align(...) kvrealloc_node_align_noprof(__VA_ARGS__)
+#define kvrealloc_node_noprof(_p, _s, _f, _n) kvrealloc_node_align_noprof(_p, _s, 1, _f, _n)
+#define kvrealloc_node(...) alloc_hooks(kvrealloc_node_noprof(__VA_ARGS__))
+#define kvrealloc_noprof(...) kvrealloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE)
#define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
extern void kvfree(const void *addr);
diff --git a/mm/slub.c b/mm/slub.c
index c4b64821e680..881244c357dd 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4845,7 +4845,7 @@ void kfree(const void *object)
EXPORT_SYMBOL(kfree);
static __always_inline __realloc_size(2) void *
-__do_krealloc(const void *p, size_t new_size, gfp_t flags)
+__do_krealloc(const void *p, size_t new_size, unsigned long align, gfp_t flags, int nid)
{
void *ret;
size_t ks = 0;
@@ -4859,6 +4859,20 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags)
if (!kasan_check_byte(p))
return NULL;
+ /* refuse to proceed if alignment is bigger than what kmalloc() provides */
+ if (!IS_ALIGNED((unsigned long)p, align) || new_size < align)
+ return NULL;
+
+ /*
+ * If reallocation is not necessary (e. g. the new size is less
+ * than the current allocated size), the current allocation will be
+ * preserved unless __GFP_THISNODE is set. In the latter case a new
+ * allocation on the requested node will be attempted.
+ */
+ if (unlikely(flags & __GFP_THISNODE) && nid != NUMA_NO_NODE &&
+ nid != page_to_nid(vmalloc_to_page(p)))
+ goto alloc_new;
+
if (is_kfence_address(p)) {
ks = orig_size = kfence_ksize(p);
} else {
@@ -4903,7 +4917,7 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags)
return (void *)p;
alloc_new:
- ret = kmalloc_node_track_caller_noprof(new_size, flags, NUMA_NO_NODE, _RET_IP_);
+ ret = kmalloc_node_track_caller_noprof(new_size, flags, nid, _RET_IP_);
if (ret && p) {
/* Disable KASAN checks as the object's redzone is accessed. */
kasan_disable_current();
@@ -4915,10 +4929,12 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags)
}
/**
- * krealloc - reallocate memory. The contents will remain unchanged.
+ * krealloc_node_align - reallocate memory. The contents will remain unchanged.
* @p: object to reallocate memory for.
* @new_size: how many bytes of memory are required.
+ * @align: desired alignment.
* @flags: the type of memory to allocate.
+ * @nid: NUMA node or NUMA_NO_NODE
*
* If @p is %NULL, krealloc() behaves exactly like kmalloc(). If @new_size
* is 0 and @p is not a %NULL pointer, the object pointed to is freed.
@@ -4947,7 +4963,8 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags)
*
* Return: pointer to the allocated memory or %NULL in case of error
*/
-void *krealloc_noprof(const void *p, size_t new_size, gfp_t flags)
+void *krealloc_node_align_noprof(const void *p, size_t new_size, unsigned long align,
+ gfp_t flags, int nid)
{
void *ret;
@@ -4956,13 +4973,13 @@ void *krealloc_noprof(const void *p, size_t new_size, gfp_t flags)
return ZERO_SIZE_PTR;
}
- ret = __do_krealloc(p, new_size, flags);
+ ret = __do_krealloc(p, new_size, align, flags, nid);
if (ret && kasan_reset_tag(p) != kasan_reset_tag(ret))
kfree(p);
return ret;
}
-EXPORT_SYMBOL(krealloc_noprof);
+EXPORT_SYMBOL(krealloc_node_align_noprof);
static gfp_t kmalloc_gfp_adjust(gfp_t flags, size_t size)
{
@@ -4993,6 +5010,7 @@ static gfp_t kmalloc_gfp_adjust(gfp_t flags, size_t size)
* failure, fall back to non-contiguous (vmalloc) allocation.
* @size: size of the request.
* @b: which set of kmalloc buckets to allocate from.
+ * @align: desired alignment.
* @flags: gfp mask for the allocation - must be compatible (superset) with GFP_KERNEL.
* @node: numa node to allocate from
*
@@ -5005,19 +5023,22 @@ static gfp_t kmalloc_gfp_adjust(gfp_t flags, size_t size)
*
* Return: pointer to the allocated memory of %NULL in case of failure
*/
-void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node)
+void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), unsigned long align,
+ gfp_t flags, int node)
{
void *ret;
/*
* It doesn't really make sense to fallback to vmalloc for sub page
- * requests
+ * requests and small alignments
*/
- ret = __do_kmalloc_node(size, PASS_BUCKET_PARAM(b),
- kmalloc_gfp_adjust(flags, size),
- node, _RET_IP_);
- if (ret || size <= PAGE_SIZE)
- return ret;
+ if (size >= align) {
+ ret = __do_kmalloc_node(size, PASS_BUCKET_PARAM(b),
+ kmalloc_gfp_adjust(flags, size),
+ node, _RET_IP_);
+ if (ret || size <= PAGE_SIZE)
+ return ret;
+ }
/* non-sleeping allocations are not supported by vmalloc */
if (!gfpflags_allow_blocking(flags))
@@ -5035,7 +5056,7 @@ void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node)
* about the resulting pointer, and cannot play
* protection games.
*/
- return __vmalloc_node_range_noprof(size, 1, VMALLOC_START, VMALLOC_END,
+ return __vmalloc_node_range_noprof(size, align, VMALLOC_START, VMALLOC_END,
flags, PAGE_KERNEL, VM_ALLOW_HUGE_VMAP,
node, __builtin_return_address(0));
}
@@ -5079,10 +5100,12 @@ void kvfree_sensitive(const void *addr, size_t len)
EXPORT_SYMBOL(kvfree_sensitive);
/**
- * kvrealloc - reallocate memory; contents remain unchanged
+ * kvrealloc_node_align - reallocate memory; contents remain unchanged
* @p: object to reallocate memory for
* @size: the size to reallocate
+ * @align: desired alignment
* @flags: the flags for the page level allocator
+ * @nid: NUMA node id
*
* If @p is %NULL, kvrealloc() behaves exactly like kvmalloc(). If @size is 0
* and @p is not a %NULL pointer, the object pointed to is freed.
@@ -5100,17 +5123,18 @@ EXPORT_SYMBOL(kvfree_sensitive);
*
* Return: pointer to the allocated memory or %NULL in case of error
*/
-void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags)
+void *kvrealloc_node_align_noprof(const void *p, size_t size, unsigned long align,
+ gfp_t flags, int nid)
{
void *n;
if (is_vmalloc_addr(p))
- return vrealloc_noprof(p, size, flags);
+ return vrealloc_node_align_noprof(p, size, align, flags, nid);
- n = krealloc_noprof(p, size, kmalloc_gfp_adjust(flags, size));
+ n = krealloc_node_align_noprof(p, size, align, kmalloc_gfp_adjust(flags, size), nid);
if (!n) {
/* We failed to krealloc(), fall back to kvmalloc(). */
- n = kvmalloc_noprof(size, flags);
+ n = kvmalloc_node_align_noprof(size, align, flags, nid);
if (!n)
return NULL;
@@ -5126,7 +5150,7 @@ void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags)
return n;
}
-EXPORT_SYMBOL(kvrealloc_noprof);
+EXPORT_SYMBOL(kvrealloc_node_align_noprof);
struct detached_freelist {
struct slab *slab;
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v10 3/4] rust: add support for NUMA ids in allocations
2025-07-02 16:07 [PATCH v10 0/4] support large align and nid in Rust allocators Vitaly Wool
2025-07-02 16:08 ` [PATCH v10 1/4] mm/vmalloc: allow to set node and align in vrealloc Vitaly Wool
2025-07-02 16:08 ` [PATCH v10 2/4] mm/slub: allow to set node and align in k[v]realloc Vitaly Wool
@ 2025-07-02 16:09 ` Vitaly Wool
2025-07-04 15:23 ` Danilo Krummrich
2025-07-06 15:18 ` kernel test robot
2025-07-02 16:09 ` [PATCH v10 4/4] rust: support large alignments " Vitaly Wool
3 siblings, 2 replies; 10+ messages in thread
From: Vitaly Wool @ 2025-07-02 16:09 UTC (permalink / raw)
To: linux-mm
Cc: akpm, linux-kernel, Uladzislau Rezki, Danilo Krummrich,
Alice Ryhl, rust-for-linux, Vitaly Wool
Add a new type to support specifying NUMA identifiers in Rust
allocators and extend the allocators to have NUMA id as a
parameter. Thus, modify ReallocFunc to use the new extended realloc
primitives from the C side of the kernel (i. e.
k[v]realloc_node_align/vrealloc_node_align) and add the new function
alloc_node to the Allocator trait while keeping the existing one
(alloc) for backward compatibility.
This will allow to specify node to use for allocation of e. g.
{KV}Box, as well as for future NUMA aware users of the API.
Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.se>
---
rust/helpers/slab.c | 8 ++--
rust/helpers/vmalloc.c | 4 +-
rust/kernel/alloc.rs | 78 ++++++++++++++++++++++++++++++++--
rust/kernel/alloc/allocator.rs | 45 ++++++++++++--------
4 files changed, 108 insertions(+), 27 deletions(-)
diff --git a/rust/helpers/slab.c b/rust/helpers/slab.c
index a842bfbddcba..8472370a4338 100644
--- a/rust/helpers/slab.c
+++ b/rust/helpers/slab.c
@@ -3,13 +3,13 @@
#include <linux/slab.h>
void * __must_check __realloc_size(2)
-rust_helper_krealloc(const void *objp, size_t new_size, gfp_t flags)
+rust_helper_krealloc_node(const void *objp, size_t new_size, gfp_t flags, int node)
{
- return krealloc(objp, new_size, flags);
+ return krealloc_node(objp, new_size, flags, node);
}
void * __must_check __realloc_size(2)
-rust_helper_kvrealloc(const void *p, size_t size, gfp_t flags)
+rust_helper_kvrealloc_node(const void *p, size_t size, gfp_t flags, int node)
{
- return kvrealloc(p, size, flags);
+ return kvrealloc_node(p, size, flags, node);
}
diff --git a/rust/helpers/vmalloc.c b/rust/helpers/vmalloc.c
index 80d34501bbc0..62d30db9a1a6 100644
--- a/rust/helpers/vmalloc.c
+++ b/rust/helpers/vmalloc.c
@@ -3,7 +3,7 @@
#include <linux/vmalloc.h>
void * __must_check __realloc_size(2)
-rust_helper_vrealloc(const void *p, size_t size, gfp_t flags)
+rust_helper_vrealloc_node(const void *p, size_t size, gfp_t flags, int node)
{
- return vrealloc(p, size, flags);
+ return vrealloc_node(p, size, flags, node);
}
diff --git a/rust/kernel/alloc.rs b/rust/kernel/alloc.rs
index a2c49e5494d3..b178ebdf2d87 100644
--- a/rust/kernel/alloc.rs
+++ b/rust/kernel/alloc.rs
@@ -28,6 +28,8 @@
/// Indicates an allocation error.
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct AllocError;
+
+use crate::error::{code::EINVAL, Result};
use core::{alloc::Layout, ptr::NonNull};
/// Flags to be used when allocating memory.
@@ -115,6 +117,28 @@ pub mod flags {
pub const __GFP_NOWARN: Flags = Flags(bindings::__GFP_NOWARN);
}
+/// Non Uniform Memory Access (NUMA) node identifier
+#[derive(Clone, Copy, PartialEq)]
+pub struct NumaNode(i32);
+
+impl NumaNode {
+ /// create a new NUMA node identifer (non-negative integer)
+ /// returns EINVAL if a negative id or an id exceeding MAX_NUMNODES is specified
+ pub fn new(node: i32) -> Result<Self> {
+ // SAFETY: MAX_NUMNODES never exceeds 2**10 because NODES_SHIFT is 0..10
+ if node < 0 || node >= bindings::MAX_NUMNODES as i32 {
+ return Err(EINVAL);
+ }
+ Ok(Self(node))
+ }
+}
+
+/// Specify necessary constant to pass the information to Allocator that the caller doesn't care
+/// about the NUMA node to allocate memory from.
+impl NumaNode {
+ pub const NO_NODE: NumaNode = NumaNode(bindings::NUMA_NO_NODE);
+}
+
/// The kernel's [`Allocator`] trait.
///
/// An implementation of [`Allocator`] can allocate, re-allocate and free memory buffers described
@@ -148,7 +172,7 @@ pub unsafe trait Allocator {
///
/// When the return value is `Ok(ptr)`, then `ptr` is
/// - valid for reads and writes for `layout.size()` bytes, until it is passed to
- /// [`Allocator::free`] or [`Allocator::realloc`],
+ /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
/// - aligned to `layout.align()`,
///
/// Additionally, `Flags` are honored as documented in
@@ -159,7 +183,41 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
unsafe { Self::realloc(None, layout, Layout::new::<()>(), flags) }
}
- /// Re-allocate an existing memory allocation to satisfy the requested `layout`.
+ /// Allocate memory based on `layout`, `flags` and `nid`.
+ ///
+ /// On success, returns a buffer represented as `NonNull<[u8]>` that satisfies the layout
+ /// constraints (i.e. minimum size and alignment as specified by `layout`).
+ ///
+ /// This function is equivalent to `realloc_node` when called with `None`.
+ ///
+ /// # Guarantees
+ ///
+ /// When the return value is `Ok(ptr)`, then `ptr` is
+ /// - valid for reads and writes for `layout.size()` bytes, until it is passed to
+ /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
+ /// - aligned to `layout.align()`,
+ ///
+ /// Additionally, `Flags` are honored as documented in
+ /// <https://docs.kernel.org/core-api/mm-api.html#mm-api-gfp-flags>.
+ fn alloc_node(
+ layout: Layout,
+ flags: Flags,
+ nid: NumaNode,
+ ) -> Result<NonNull<[u8]>, AllocError> {
+ // SAFETY: Passing `None` to `realloc_node` is valid by its safety requirements and
+ // asks for a new memory allocation.
+ unsafe { Self::realloc_node(None, layout, Layout::new::<()>(), flags, nid) }
+ }
+
+ /// Re-allocate an existing memory allocation to satisfy the requested `layout` and
+ /// a specific NUMA node request to allocate the memory for.
+ ///
+ /// Systems employing a Non Uniform Memory Access (NUMA) architecture contain collections of
+ /// hardware resources including processors, memory, and I/O buses, that comprise what is
+ /// commonly known as a NUMA node.
+ ///
+ /// `nid` stands for NUMA id, i. e. NUMA node identifier, which is a non-negative
+ /// integer if a node needs to be specified, or NO_NODE if the caller doesn't care.
///
/// If the requested size is zero, `realloc` behaves equivalent to `free`.
///
@@ -191,13 +249,27 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
/// and old size, i.e. `ret_ptr[0..min(layout.size(), old_layout.size())] ==
/// p[0..min(layout.size(), old_layout.size())]`.
/// - when the return value is `Err(AllocError)`, then `ptr` is still valid.
- unsafe fn realloc(
+ unsafe fn realloc_node(
ptr: Option<NonNull<u8>>,
layout: Layout,
old_layout: Layout,
flags: Flags,
+ nid: NumaNode,
) -> Result<NonNull<[u8]>, AllocError>;
+ /// Re-allocate an existing memory allocation to satisfy the requested `layout`. This
+ /// function works exactly as realloc_node() but it doesn't give the ability to specify
+ /// the NUMA node in the call.
+ unsafe fn realloc(
+ ptr: Option<NonNull<u8>>,
+ layout: Layout,
+ old_layout: Layout,
+ flags: Flags,
+ ) -> Result<NonNull<[u8]>, AllocError> {
+ // SAFETY: guaranteed by realloc_node()
+ unsafe { Self::realloc_node(ptr, layout, old_layout, flags, NumaNode::NO_NODE) }
+ }
+
/// Free an existing memory allocation.
///
/// # Safety
diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs
index aa2dfa9dca4c..15d737fe89ed 100644
--- a/rust/kernel/alloc/allocator.rs
+++ b/rust/kernel/alloc/allocator.rs
@@ -13,7 +13,7 @@
use core::ptr;
use core::ptr::NonNull;
-use crate::alloc::{AllocError, Allocator};
+use crate::alloc::{AllocError, Allocator, NumaNode};
use crate::bindings;
use crate::pr_warn;
@@ -58,18 +58,23 @@ fn aligned_size(new_layout: Layout) -> usize {
///
/// One of the following: `krealloc`, `vrealloc`, `kvrealloc`.
struct ReallocFunc(
- unsafe extern "C" fn(*const crate::ffi::c_void, usize, u32) -> *mut crate::ffi::c_void,
+ unsafe extern "C" fn(
+ *const crate::ffi::c_void,
+ usize,
+ u32,
+ crate::ffi::c_int,
+ ) -> *mut crate::ffi::c_void,
);
impl ReallocFunc {
- // INVARIANT: `krealloc` satisfies the type invariants.
- const KREALLOC: Self = Self(bindings::krealloc);
+ // INVARIANT: `krealloc_node` satisfies the type invariants.
+ const KREALLOC: Self = Self(bindings::krealloc_node);
- // INVARIANT: `vrealloc` satisfies the type invariants.
- const VREALLOC: Self = Self(bindings::vrealloc);
+ // INVARIANT: `vrealloc_node` satisfies the type invariants.
+ const VREALLOC: Self = Self(bindings::vrealloc_node);
- // INVARIANT: `kvrealloc` satisfies the type invariants.
- const KVREALLOC: Self = Self(bindings::kvrealloc);
+ // INVARIANT: `kvrealloc_node` satisfies the type invariants.
+ const KVREALLOC: Self = Self(bindings::kvrealloc_node);
/// # Safety
///
@@ -87,6 +92,7 @@ unsafe fn call(
layout: Layout,
old_layout: Layout,
flags: Flags,
+ nid: NumaNode,
) -> Result<NonNull<[u8]>, AllocError> {
let size = aligned_size(layout);
let ptr = match ptr {
@@ -110,7 +116,7 @@ unsafe fn call(
// - Those functions provide the guarantees of this function.
let raw_ptr = unsafe {
// If `size == 0` and `ptr != NULL` the memory behind the pointer is freed.
- self.0(ptr.cast(), size, flags.0).cast()
+ self.0(ptr.cast(), size, flags.0, nid.0).cast()
};
let ptr = if size == 0 {
@@ -123,34 +129,36 @@ unsafe fn call(
}
}
-// SAFETY: `realloc` delegates to `ReallocFunc::call`, which guarantees that
+// SAFETY: `realloc_node` delegates to `ReallocFunc::call`, which guarantees that
// - memory remains valid until it is explicitly freed,
// - passing a pointer to a valid memory allocation is OK,
// - `realloc` satisfies the guarantees, since `ReallocFunc::call` has the same.
unsafe impl Allocator for Kmalloc {
#[inline]
- unsafe fn realloc(
+ unsafe fn realloc_node(
ptr: Option<NonNull<u8>>,
layout: Layout,
old_layout: Layout,
flags: Flags,
+ nid: NumaNode,
) -> Result<NonNull<[u8]>, AllocError> {
// SAFETY: `ReallocFunc::call` has the same safety requirements as `Allocator::realloc`.
- unsafe { ReallocFunc::KREALLOC.call(ptr, layout, old_layout, flags) }
+ unsafe { ReallocFunc::KREALLOC.call(ptr, layout, old_layout, flags, nid) }
}
}
-// SAFETY: `realloc` delegates to `ReallocFunc::call`, which guarantees that
+// SAFETY: `realloc_node` delegates to `ReallocFunc::call`, which guarantees that
// - memory remains valid until it is explicitly freed,
// - passing a pointer to a valid memory allocation is OK,
// - `realloc` satisfies the guarantees, since `ReallocFunc::call` has the same.
unsafe impl Allocator for Vmalloc {
#[inline]
- unsafe fn realloc(
+ unsafe fn realloc_node(
ptr: Option<NonNull<u8>>,
layout: Layout,
old_layout: Layout,
flags: Flags,
+ nid: NumaNode,
) -> Result<NonNull<[u8]>, AllocError> {
// TODO: Support alignments larger than PAGE_SIZE.
if layout.align() > bindings::PAGE_SIZE {
@@ -160,21 +168,22 @@ unsafe fn realloc(
// SAFETY: If not `None`, `ptr` is guaranteed to point to valid memory, which was previously
// allocated with this `Allocator`.
- unsafe { ReallocFunc::VREALLOC.call(ptr, layout, old_layout, flags) }
+ unsafe { ReallocFunc::VREALLOC.call(ptr, layout, old_layout, flags, nid) }
}
}
-// SAFETY: `realloc` delegates to `ReallocFunc::call`, which guarantees that
+// SAFETY: `realloc_node` delegates to `ReallocFunc::call`, which guarantees that
// - memory remains valid until it is explicitly freed,
// - passing a pointer to a valid memory allocation is OK,
// - `realloc` satisfies the guarantees, since `ReallocFunc::call` has the same.
unsafe impl Allocator for KVmalloc {
#[inline]
- unsafe fn realloc(
+ unsafe fn realloc_node(
ptr: Option<NonNull<u8>>,
layout: Layout,
old_layout: Layout,
flags: Flags,
+ nid: NumaNode,
) -> Result<NonNull<[u8]>, AllocError> {
// TODO: Support alignments larger than PAGE_SIZE.
if layout.align() > bindings::PAGE_SIZE {
@@ -184,6 +193,6 @@ unsafe fn realloc(
// SAFETY: If not `None`, `ptr` is guaranteed to point to valid memory, which was previously
// allocated with this `Allocator`.
- unsafe { ReallocFunc::KVREALLOC.call(ptr, layout, old_layout, flags) }
+ unsafe { ReallocFunc::KVREALLOC.call(ptr, layout, old_layout, flags, nid) }
}
}
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v10 3/4] rust: add support for NUMA ids in allocations
2025-07-02 16:09 ` [PATCH v10 3/4] rust: add support for NUMA ids in allocations Vitaly Wool
@ 2025-07-04 15:23 ` Danilo Krummrich
2025-07-05 7:17 ` Vitaly Wool
2025-07-06 15:18 ` kernel test robot
1 sibling, 1 reply; 10+ messages in thread
From: Danilo Krummrich @ 2025-07-04 15:23 UTC (permalink / raw)
To: Vitaly Wool
Cc: linux-mm, akpm, linux-kernel, Uladzislau Rezki, Alice Ryhl,
rust-for-linux
On Wed, Jul 02, 2025 at 06:09:10PM +0200, Vitaly Wool wrote:
> /// The kernel's [`Allocator`] trait.
> ///
> /// An implementation of [`Allocator`] can allocate, re-allocate and free memory buffers described
> @@ -148,7 +172,7 @@ pub unsafe trait Allocator {
> ///
> /// When the return value is `Ok(ptr)`, then `ptr` is
> /// - valid for reads and writes for `layout.size()` bytes, until it is passed to
> - /// [`Allocator::free`] or [`Allocator::realloc`],
> + /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
> /// - aligned to `layout.align()`,
> ///
> /// Additionally, `Flags` are honored as documented in
> @@ -159,7 +183,41 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
> unsafe { Self::realloc(None, layout, Layout::new::<()>(), flags) }
> }
>
> - /// Re-allocate an existing memory allocation to satisfy the requested `layout`.
> + /// Allocate memory based on `layout`, `flags` and `nid`.
> + ///
> + /// On success, returns a buffer represented as `NonNull<[u8]>` that satisfies the layout
> + /// constraints (i.e. minimum size and alignment as specified by `layout`).
> + ///
> + /// This function is equivalent to `realloc_node` when called with `None`.
> + ///
> + /// # Guarantees
> + ///
> + /// When the return value is `Ok(ptr)`, then `ptr` is
> + /// - valid for reads and writes for `layout.size()` bytes, until it is passed to
> + /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
> + /// - aligned to `layout.align()`,
> + ///
> + /// Additionally, `Flags` are honored as documented in
> + /// <https://docs.kernel.org/core-api/mm-api.html#mm-api-gfp-flags>.
> + fn alloc_node(
> + layout: Layout,
> + flags: Flags,
> + nid: NumaNode,
> + ) -> Result<NonNull<[u8]>, AllocError> {
> + // SAFETY: Passing `None` to `realloc_node` is valid by its safety requirements and
> + // asks for a new memory allocation.
> + unsafe { Self::realloc_node(None, layout, Layout::new::<()>(), flags, nid) }
> + }
> +
> + /// Re-allocate an existing memory allocation to satisfy the requested `layout` and
> + /// a specific NUMA node request to allocate the memory for.
> + ///
> + /// Systems employing a Non Uniform Memory Access (NUMA) architecture contain collections of
> + /// hardware resources including processors, memory, and I/O buses, that comprise what is
> + /// commonly known as a NUMA node.
> + ///
> + /// `nid` stands for NUMA id, i. e. NUMA node identifier, which is a non-negative
> + /// integer if a node needs to be specified, or NO_NODE if the caller doesn't care.
> ///
> /// If the requested size is zero, `realloc` behaves equivalent to `free`.
> ///
> @@ -191,13 +249,27 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
> /// and old size, i.e. `ret_ptr[0..min(layout.size(), old_layout.size())] ==
> /// p[0..min(layout.size(), old_layout.size())]`.
> /// - when the return value is `Err(AllocError)`, then `ptr` is still valid.
> - unsafe fn realloc(
> + unsafe fn realloc_node(
> ptr: Option<NonNull<u8>>,
> layout: Layout,
> old_layout: Layout,
> flags: Flags,
> + nid: NumaNode,
> ) -> Result<NonNull<[u8]>, AllocError>;
>
> + /// Re-allocate an existing memory allocation to satisfy the requested `layout`. This
> + /// function works exactly as realloc_node() but it doesn't give the ability to specify
> + /// the NUMA node in the call.
> + unsafe fn realloc(
> + ptr: Option<NonNull<u8>>,
> + layout: Layout,
> + old_layout: Layout,
> + flags: Flags,
> + ) -> Result<NonNull<[u8]>, AllocError> {
> + // SAFETY: guaranteed by realloc_node()
> + unsafe { Self::realloc_node(ptr, layout, old_layout, flags, NumaNode::NO_NODE) }
> + }
I think Alice suggested to just drop alloc_node() and realloc_node() and make
alloc() and realloc() always take a NumaNode argument.
I don't have a strong preference, but keeping only alloc() and realloc() for
seems indeed simpler, so let's remove the _node() variants.
Regardless, please note that realloc() as you implemented it above misses the
safaety requirement, which should just mention that the safety requirements are
identical to realloc_node().
The safety comment on the subsequent call to realloc_node() would then be
justified with realloc() having identical safety requirements as realloc_node().
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v10 3/4] rust: add support for NUMA ids in allocations
2025-07-04 15:23 ` Danilo Krummrich
@ 2025-07-05 7:17 ` Vitaly Wool
2025-07-07 7:25 ` Alice Ryhl
0 siblings, 1 reply; 10+ messages in thread
From: Vitaly Wool @ 2025-07-05 7:17 UTC (permalink / raw)
To: Danilo Krummrich
Cc: linux-mm, akpm, linux-kernel, Uladzislau Rezki, Alice Ryhl,
rust-for-linux
> On Jul 4, 2025, at 5:23 PM, Danilo Krummrich <dakr@kernel.org> wrote:
>
> On Wed, Jul 02, 2025 at 06:09:10PM +0200, Vitaly Wool wrote:
>> /// The kernel's [`Allocator`] trait.
>> ///
>> /// An implementation of [`Allocator`] can allocate, re-allocate and free memory buffers described
>> @@ -148,7 +172,7 @@ pub unsafe trait Allocator {
>> ///
>> /// When the return value is `Ok(ptr)`, then `ptr` is
>> /// - valid for reads and writes for `layout.size()` bytes, until it is passed to
>> - /// [`Allocator::free`] or [`Allocator::realloc`],
>> + /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
>> /// - aligned to `layout.align()`,
>> ///
>> /// Additionally, `Flags` are honored as documented in
>> @@ -159,7 +183,41 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
>> unsafe { Self::realloc(None, layout, Layout::new::<()>(), flags) }
>> }
>>
>> - /// Re-allocate an existing memory allocation to satisfy the requested `layout`.
>> + /// Allocate memory based on `layout`, `flags` and `nid`.
>> + ///
>> + /// On success, returns a buffer represented as `NonNull<[u8]>` that satisfies the layout
>> + /// constraints (i.e. minimum size and alignment as specified by `layout`).
>> + ///
>> + /// This function is equivalent to `realloc_node` when called with `None`.
>> + ///
>> + /// # Guarantees
>> + ///
>> + /// When the return value is `Ok(ptr)`, then `ptr` is
>> + /// - valid for reads and writes for `layout.size()` bytes, until it is passed to
>> + /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
>> + /// - aligned to `layout.align()`,
>> + ///
>> + /// Additionally, `Flags` are honored as documented in
>> + /// <https://docs.kernel.org/core-api/mm-api.html#mm-api-gfp-flags>.
>> + fn alloc_node(
>> + layout: Layout,
>> + flags: Flags,
>> + nid: NumaNode,
>> + ) -> Result<NonNull<[u8]>, AllocError> {
>> + // SAFETY: Passing `None` to `realloc_node` is valid by its safety requirements and
>> + // asks for a new memory allocation.
>> + unsafe { Self::realloc_node(None, layout, Layout::new::<()>(), flags, nid) }
>> + }
>> +
>> + /// Re-allocate an existing memory allocation to satisfy the requested `layout` and
>> + /// a specific NUMA node request to allocate the memory for.
>> + ///
>> + /// Systems employing a Non Uniform Memory Access (NUMA) architecture contain collections of
>> + /// hardware resources including processors, memory, and I/O buses, that comprise what is
>> + /// commonly known as a NUMA node.
>> + ///
>> + /// `nid` stands for NUMA id, i. e. NUMA node identifier, which is a non-negative
>> + /// integer if a node needs to be specified, or NO_NODE if the caller doesn't care.
>> ///
>> /// If the requested size is zero, `realloc` behaves equivalent to `free`.
>> ///
>> @@ -191,13 +249,27 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
>> /// and old size, i.e. `ret_ptr[0..min(layout.size(), old_layout.size())] ==
>> /// p[0..min(layout.size(), old_layout.size())]`.
>> /// - when the return value is `Err(AllocError)`, then `ptr` is still valid.
>> - unsafe fn realloc(
>> + unsafe fn realloc_node(
>> ptr: Option<NonNull<u8>>,
>> layout: Layout,
>> old_layout: Layout,
>> flags: Flags,
>> + nid: NumaNode,
>> ) -> Result<NonNull<[u8]>, AllocError>;
>>
>> + /// Re-allocate an existing memory allocation to satisfy the requested `layout`. This
>> + /// function works exactly as realloc_node() but it doesn't give the ability to specify
>> + /// the NUMA node in the call.
>> + unsafe fn realloc(
>> + ptr: Option<NonNull<u8>>,
>> + layout: Layout,
>> + old_layout: Layout,
>> + flags: Flags,
>> + ) -> Result<NonNull<[u8]>, AllocError> {
>> + // SAFETY: guaranteed by realloc_node()
>> + unsafe { Self::realloc_node(ptr, layout, old_layout, flags, NumaNode::NO_NODE) }
>> + }
>
> I think Alice suggested to just drop alloc_node() and realloc_node() and make
> alloc() and realloc() always take a NumaNode argument.
>
> I don't have a strong preference, but keeping only alloc() and realloc() for
> seems indeed simpler, so let's remove the _node() variants.
I don’t have a strong preference either but if I modify alloc() and realloc(), I’ll have to change KVec and KBox in the same patch, would that be okay with you?
~Vitaly
<snip>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v10 3/4] rust: add support for NUMA ids in allocations
2025-07-05 7:17 ` Vitaly Wool
@ 2025-07-07 7:25 ` Alice Ryhl
0 siblings, 0 replies; 10+ messages in thread
From: Alice Ryhl @ 2025-07-07 7:25 UTC (permalink / raw)
To: Vitaly Wool
Cc: Danilo Krummrich, linux-mm, akpm, linux-kernel, Uladzislau Rezki,
rust-for-linux
On Sat, Jul 05, 2025 at 09:17:10AM +0200, Vitaly Wool wrote:
>
>
> > On Jul 4, 2025, at 5:23 PM, Danilo Krummrich <dakr@kernel.org> wrote:
> >
> > On Wed, Jul 02, 2025 at 06:09:10PM +0200, Vitaly Wool wrote:
> >> /// The kernel's [`Allocator`] trait.
> >> ///
> >> /// An implementation of [`Allocator`] can allocate, re-allocate and free memory buffers described
> >> @@ -148,7 +172,7 @@ pub unsafe trait Allocator {
> >> ///
> >> /// When the return value is `Ok(ptr)`, then `ptr` is
> >> /// - valid for reads and writes for `layout.size()` bytes, until it is passed to
> >> - /// [`Allocator::free`] or [`Allocator::realloc`],
> >> + /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
> >> /// - aligned to `layout.align()`,
> >> ///
> >> /// Additionally, `Flags` are honored as documented in
> >> @@ -159,7 +183,41 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
> >> unsafe { Self::realloc(None, layout, Layout::new::<()>(), flags) }
> >> }
> >>
> >> - /// Re-allocate an existing memory allocation to satisfy the requested `layout`.
> >> + /// Allocate memory based on `layout`, `flags` and `nid`.
> >> + ///
> >> + /// On success, returns a buffer represented as `NonNull<[u8]>` that satisfies the layout
> >> + /// constraints (i.e. minimum size and alignment as specified by `layout`).
> >> + ///
> >> + /// This function is equivalent to `realloc_node` when called with `None`.
> >> + ///
> >> + /// # Guarantees
> >> + ///
> >> + /// When the return value is `Ok(ptr)`, then `ptr` is
> >> + /// - valid for reads and writes for `layout.size()` bytes, until it is passed to
> >> + /// [`Allocator::free`], [`Allocator::realloc`] or [`Allocator::realloc_node`],
> >> + /// - aligned to `layout.align()`,
> >> + ///
> >> + /// Additionally, `Flags` are honored as documented in
> >> + /// <https://docs.kernel.org/core-api/mm-api.html#mm-api-gfp-flags>.
> >> + fn alloc_node(
> >> + layout: Layout,
> >> + flags: Flags,
> >> + nid: NumaNode,
> >> + ) -> Result<NonNull<[u8]>, AllocError> {
> >> + // SAFETY: Passing `None` to `realloc_node` is valid by its safety requirements and
> >> + // asks for a new memory allocation.
> >> + unsafe { Self::realloc_node(None, layout, Layout::new::<()>(), flags, nid) }
> >> + }
> >> +
> >> + /// Re-allocate an existing memory allocation to satisfy the requested `layout` and
> >> + /// a specific NUMA node request to allocate the memory for.
> >> + ///
> >> + /// Systems employing a Non Uniform Memory Access (NUMA) architecture contain collections of
> >> + /// hardware resources including processors, memory, and I/O buses, that comprise what is
> >> + /// commonly known as a NUMA node.
> >> + ///
> >> + /// `nid` stands for NUMA id, i. e. NUMA node identifier, which is a non-negative
> >> + /// integer if a node needs to be specified, or NO_NODE if the caller doesn't care.
> >> ///
> >> /// If the requested size is zero, `realloc` behaves equivalent to `free`.
> >> ///
> >> @@ -191,13 +249,27 @@ fn alloc(layout: Layout, flags: Flags) -> Result<NonNull<[u8]>, AllocError> {
> >> /// and old size, i.e. `ret_ptr[0..min(layout.size(), old_layout.size())] ==
> >> /// p[0..min(layout.size(), old_layout.size())]`.
> >> /// - when the return value is `Err(AllocError)`, then `ptr` is still valid.
> >> - unsafe fn realloc(
> >> + unsafe fn realloc_node(
> >> ptr: Option<NonNull<u8>>,
> >> layout: Layout,
> >> old_layout: Layout,
> >> flags: Flags,
> >> + nid: NumaNode,
> >> ) -> Result<NonNull<[u8]>, AllocError>;
> >>
> >> + /// Re-allocate an existing memory allocation to satisfy the requested `layout`. This
> >> + /// function works exactly as realloc_node() but it doesn't give the ability to specify
> >> + /// the NUMA node in the call.
> >> + unsafe fn realloc(
> >> + ptr: Option<NonNull<u8>>,
> >> + layout: Layout,
> >> + old_layout: Layout,
> >> + flags: Flags,
> >> + ) -> Result<NonNull<[u8]>, AllocError> {
> >> + // SAFETY: guaranteed by realloc_node()
> >> + unsafe { Self::realloc_node(ptr, layout, old_layout, flags, NumaNode::NO_NODE) }
> >> + }
> >
> > I think Alice suggested to just drop alloc_node() and realloc_node() and make
> > alloc() and realloc() always take a NumaNode argument.
> >
> > I don't have a strong preference, but keeping only alloc() and realloc() for
> > seems indeed simpler, so let's remove the _node() variants.
>
> I don’t have a strong preference either but if I modify alloc() and
> realloc(), I’ll have to change KVec and KBox in the same patch, would
> that be okay with you?
That's okay with me.
Alice
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v10 3/4] rust: add support for NUMA ids in allocations
2025-07-02 16:09 ` [PATCH v10 3/4] rust: add support for NUMA ids in allocations Vitaly Wool
2025-07-04 15:23 ` Danilo Krummrich
@ 2025-07-06 15:18 ` kernel test robot
1 sibling, 0 replies; 10+ messages in thread
From: kernel test robot @ 2025-07-06 15:18 UTC (permalink / raw)
To: Vitaly Wool, linux-mm
Cc: llvm, oe-kbuild-all, akpm, linux-kernel, Uladzislau Rezki,
Danilo Krummrich, Alice Ryhl, rust-for-linux, Vitaly Wool
Hi Vitaly,
kernel test robot noticed the following build warnings:
[auto build test WARNING on akpm-mm/mm-everything]
[also build test WARNING on rust/rust-next linus/master v6.16-rc4 next-20250704]
[cannot apply to vbabka-slab/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Vitaly-Wool/mm-vmalloc-allow-to-set-node-and-align-in-vrealloc/20250703-001116
base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
patch link: https://lore.kernel.org/r/20250702160910.3610134-1-vitaly.wool%40konsulko.se
patch subject: [PATCH v10 3/4] rust: add support for NUMA ids in allocations
config: x86_64-rhel-9.4-rust (https://download.01.org/0day-ci/archive/20250706/202507062327.TsP3JVhL-lkp@intel.com/config)
compiler: clang version 20.1.7 (https://github.com/llvm/llvm-project 6146a88f60492b520a36f8f8f3231e15f3cc6082)
rustc: rustc 1.88.0 (6b00bc388 2025-06-23)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250706/202507062327.TsP3JVhL-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202507062327.TsP3JVhL-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> warning: missing documentation for an associated constant
--> rust/kernel/alloc.rs:139:5
|
139 | pub const NO_NODE: NumaNode = NumaNode(bindings::NUMA_NO_NODE);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: requested on the command line with `-W missing-docs`
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v10 4/4] rust: support large alignments in allocations
2025-07-02 16:07 [PATCH v10 0/4] support large align and nid in Rust allocators Vitaly Wool
` (2 preceding siblings ...)
2025-07-02 16:09 ` [PATCH v10 3/4] rust: add support for NUMA ids in allocations Vitaly Wool
@ 2025-07-02 16:09 ` Vitaly Wool
3 siblings, 0 replies; 10+ messages in thread
From: Vitaly Wool @ 2025-07-02 16:09 UTC (permalink / raw)
To: linux-mm
Cc: akpm, linux-kernel, Uladzislau Rezki, Danilo Krummrich,
Alice Ryhl, rust-for-linux, Vitaly Wool
Add support for large (> PAGE_SIZE) alignments in Rust allocators.
All the preparations on the C side are already done, we just need
to add bindings for <alloc>_node_align() functions and start
using those.
Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.se>
---
rust/helpers/slab.c | 10 ++++++----
rust/helpers/vmalloc.c | 5 +++--
rust/kernel/alloc/allocator.rs | 27 ++++++++-------------------
3 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/rust/helpers/slab.c b/rust/helpers/slab.c
index 8472370a4338..d729be798f31 100644
--- a/rust/helpers/slab.c
+++ b/rust/helpers/slab.c
@@ -3,13 +3,15 @@
#include <linux/slab.h>
void * __must_check __realloc_size(2)
-rust_helper_krealloc_node(const void *objp, size_t new_size, gfp_t flags, int node)
+rust_helper_krealloc_node_align(const void *objp, size_t new_size, unsigned long align,
+ gfp_t flags, int node)
{
- return krealloc_node(objp, new_size, flags, node);
+ return krealloc_node_align(objp, new_size, align, flags, node);
}
void * __must_check __realloc_size(2)
-rust_helper_kvrealloc_node(const void *p, size_t size, gfp_t flags, int node)
+rust_helper_kvrealloc_node_align(const void *p, size_t size, unsigned long align,
+ gfp_t flags, int node)
{
- return kvrealloc_node(p, size, flags, node);
+ return kvrealloc_node_align(p, size, align, flags, node);
}
diff --git a/rust/helpers/vmalloc.c b/rust/helpers/vmalloc.c
index 62d30db9a1a6..7d7f7336b3d2 100644
--- a/rust/helpers/vmalloc.c
+++ b/rust/helpers/vmalloc.c
@@ -3,7 +3,8 @@
#include <linux/vmalloc.h>
void * __must_check __realloc_size(2)
-rust_helper_vrealloc_node(const void *p, size_t size, gfp_t flags, int node)
+rust_helper_vrealloc_node_align(const void *p, size_t size, unsigned long align,
+ gfp_t flags, int node)
{
- return vrealloc_node(p, size, flags, node);
+ return vrealloc_node_align(p, size, align, flags, node);
}
diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs
index 15d737fe89ed..1a54513533cf 100644
--- a/rust/kernel/alloc/allocator.rs
+++ b/rust/kernel/alloc/allocator.rs
@@ -61,20 +61,21 @@ struct ReallocFunc(
unsafe extern "C" fn(
*const crate::ffi::c_void,
usize,
+ crate::ffi::c_ulong,
u32,
crate::ffi::c_int,
) -> *mut crate::ffi::c_void,
);
impl ReallocFunc {
- // INVARIANT: `krealloc_node` satisfies the type invariants.
- const KREALLOC: Self = Self(bindings::krealloc_node);
+ // INVARIANT: `krealloc_node_align` satisfies the type invariants.
+ const KREALLOC: Self = Self(bindings::krealloc_node_align);
- // INVARIANT: `vrealloc_node` satisfies the type invariants.
- const VREALLOC: Self = Self(bindings::vrealloc_node);
+ // INVARIANT: `vrealloc_node_align` satisfies the type invariants.
+ const VREALLOC: Self = Self(bindings::vrealloc_node_align);
- // INVARIANT: `kvrealloc_node` satisfies the type invariants.
- const KVREALLOC: Self = Self(bindings::kvrealloc_node);
+ // INVARIANT: `kvrealloc_node_align` satisfies the type invariants.
+ const KVREALLOC: Self = Self(bindings::kvrealloc_node_align);
/// # Safety
///
@@ -116,7 +117,7 @@ unsafe fn call(
// - Those functions provide the guarantees of this function.
let raw_ptr = unsafe {
// If `size == 0` and `ptr != NULL` the memory behind the pointer is freed.
- self.0(ptr.cast(), size, flags.0, nid.0).cast()
+ self.0(ptr.cast(), size, layout.align(), flags.0, nid.0).cast()
};
let ptr = if size == 0 {
@@ -160,12 +161,6 @@ unsafe fn realloc_node(
flags: Flags,
nid: NumaNode,
) -> Result<NonNull<[u8]>, AllocError> {
- // TODO: Support alignments larger than PAGE_SIZE.
- if layout.align() > bindings::PAGE_SIZE {
- pr_warn!("Vmalloc does not support alignments larger than PAGE_SIZE yet.\n");
- return Err(AllocError);
- }
-
// SAFETY: If not `None`, `ptr` is guaranteed to point to valid memory, which was previously
// allocated with this `Allocator`.
unsafe { ReallocFunc::VREALLOC.call(ptr, layout, old_layout, flags, nid) }
@@ -185,12 +180,6 @@ unsafe fn realloc_node(
flags: Flags,
nid: NumaNode,
) -> Result<NonNull<[u8]>, AllocError> {
- // TODO: Support alignments larger than PAGE_SIZE.
- if layout.align() > bindings::PAGE_SIZE {
- pr_warn!("KVmalloc does not support alignments larger than PAGE_SIZE yet.\n");
- return Err(AllocError);
- }
-
// SAFETY: If not `None`, `ptr` is guaranteed to point to valid memory, which was previously
// allocated with this `Allocator`.
unsafe { ReallocFunc::KVREALLOC.call(ptr, layout, old_layout, flags, nid) }
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread