[v5,24/37] rust: Add a rust helper for krealloc()

Commit Message

Suren Baghdasaryan March 6, 2024, 6:24 p.m. UTC

From: Kent Overstreet <[e-mail]>

Memory allocation profiling is turning krealloc() into a nontrivial
macro - so for now, we need a helper for it.

Until we have proper support on the rust side for memory allocation
profiling this does mean that all Rust allocations will be accounted to
the helper.

Signed-off-by: Kent Overstreet <[e-mail]>
Cc: Miguel Ojeda <[e-mail]>
Cc: Alex Gaynor <[e-mail]>
Cc: Wedson Almeida Filho <[e-mail]>
Cc: Boqun Feng <[e-mail]>
Cc: Gary Guo <[e-mail]>
Cc: "Björn Roy Baron" <[e-mail]>
Cc: Benno Lossin <[e-mail]>
Cc: Andreas Hindborg <[e-mail]>
Cc: Alice Ryhl <[e-mail]>
Cc: [e-mail]
Signed-off-by: Suren Baghdasaryan <[e-mail]>
Reviewed-by: Alice Ryhl <[e-mail]>
---
 rust/helpers.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Miguel Ojeda March 8, 2024, 3:23 p.m. UTC | #1

On Wed, Mar 6, 2024 at 7:26 PM Suren Baghdasaryan <[e-mail]> wrote:
>
> +void * __must_check rust_helper_krealloc(const void *objp, size_t new_size,
> +                                        gfp_t flags) __realloc_size(2)

The `__realloc_size(2)` should be placed earlier, i.e. this triggers:

rust/helpers.c:162:20: error: GCC does not allow '__alloc_size__'
attribute in this position on a function definition [-Wgcc-compat]

With that fixed:

Acked-by: Miguel Ojeda <[e-mail]>

Cheers,
Miguel

Patch

diff --git a/rust/helpers.c b/rust/helpers.c
index 70e59efd92bc..ad62eaf604b3 100644
--- a/rust/helpers.c
+++ b/rust/helpers.c
@@ -28,6 +28,7 @@ 
 #include <linux/mutex.h>
 #include <linux/refcount.h>
 #include <linux/sched/signal.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
@@ -157,6 +158,13 @@  void rust_helper_init_work_with_key(struct work_struct *work, work_func_t func,
 }
 EXPORT_SYMBOL_GPL(rust_helper_init_work_with_key);
 
+void * __must_check rust_helper_krealloc(const void *objp, size_t new_size,
+					 gfp_t flags) __realloc_size(2)
+{
+	return krealloc(objp, new_size, flags);
+}
+EXPORT_SYMBOL_GPL(rust_helper_krealloc);
+
 /*
  * `bindgen` binds the C `size_t` type as the Rust `usize` type, so we can
  * use it in contexts where Rust expects a `usize` like slice (array) indices.