2022-03-08 14:48:38

by Hyeonggon Yoo

Subject: [RFC PATCH v1 08/15] mm/sl[auo]b: cleanup kmalloc()

Now that kmalloc() and kmalloc_node() do same job, make kmalloc()
wrapper of kmalloc_node().

Remove kmalloc_trace() that is now unused. This patch makes slab
allocator use kmalloc_node tracepoints in kmalloc().

Signed-off-by: Hyeonggon Yoo <[email protected]>
---
include/linux/slab.h | 82 +++++++++++++++++---------------------------
mm/slab.c | 14 --------
mm/slub.c | 9 -----
3 files changed, 31 insertions(+), 74 deletions(-)

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 33d4260bce8b..dfcc8301d969 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -460,9 +460,6 @@ static __always_inline void kfree_bulk(size_t size, void **p)
kmem_cache_free_bulk(NULL, size, p);
}

-extern void *kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t flags, size_t size)
- __assume_slab_alignment __alloc_size(3);
-
extern void *kmem_cache_alloc_node_trace(struct kmem_cache *s, gfp_t gfpflags,
int node, size_t size) __assume_slab_alignment
__alloc_size(4);
@@ -475,6 +472,36 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
return kmalloc_large_node(size, flags, NUMA_NO_NODE);
}

+#ifndef CONFIG_SLOB
+static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
+{
+ if (__builtin_constant_p(size)) {
+ unsigned int index;
+
+ if (size > KMALLOC_MAX_CACHE_SIZE)
+ return kmalloc_large(size, flags);
+
+ index = kmalloc_index(size);
+
+ if (!index)
+ return ZERO_SIZE_PTR;
+
+ return kmem_cache_alloc_node_trace(
+ kmalloc_caches[kmalloc_type(flags)][index],
+ flags, node, size);
+ }
+ return __kmalloc_node(size, flags, node);
+}
+#else
+static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
+{
+ if (__builtin_constant_p(size) && size > KMALLOC_MAX_CACHE_SIZE)
+ return kmalloc_large(size, flags);
+
+ return __kmalloc_node(size, flags, node);
+}
+#endif
+
/**
* kmalloc - allocate memory
* @size: how many bytes of memory are required.
@@ -531,55 +558,8 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
*/
static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags)
{
- if (__builtin_constant_p(size)) {
-#ifndef CONFIG_SLOB
- unsigned int index;
-#endif
- if (size > KMALLOC_MAX_CACHE_SIZE)
- return kmalloc_large(size, flags);
-#ifndef CONFIG_SLOB
- index = kmalloc_index(size);
-
- if (!index)
- return ZERO_SIZE_PTR;
-
- return kmem_cache_alloc_trace(
- kmalloc_caches[kmalloc_type(flags)][index],
- flags, size);
-#endif
- }
- return __kmalloc(size, flags);
-}
-
-#ifndef CONFIG_SLOB
-static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
- if (__builtin_constant_p(size)) {
- unsigned int index;
-
- if (size > KMALLOC_MAX_CACHE_SIZE)
- return kmalloc_large_node(size, flags, node);
-
- index = kmalloc_index(size);
-
- if (!index)
- return ZERO_SIZE_PTR;
-
- return kmem_cache_alloc_node_trace(
- kmalloc_caches[kmalloc_type(flags)][i],
- flags, node, size);
- }
- return __kmalloc_node(size, flags, node);
-}
-#else
-static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
- if (__builtin_constant_p(size) && size > KMALLOC_MAX_CACHE_SIZE)
- return kmalloc_large_node(size, flags, node);
-
- return __kmalloc_node(size, flags, node);
+ return kmalloc_node(size, flags, NUMA_NO_NODE);
}
-#endif

/**
* kmalloc_array - allocate memory for an array.
diff --git a/mm/slab.c b/mm/slab.c
index 1f3195344bdf..6ebf509bf2de 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3519,20 +3519,6 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
}
EXPORT_SYMBOL(kmem_cache_alloc_bulk);

-void *
-kmem_cache_alloc_trace(struct kmem_cache *cachep, gfp_t flags, size_t size)
-{
- void *ret;
-
- ret = slab_alloc(cachep, flags, size, _RET_IP_);
-
- ret = kasan_kmalloc(cachep, ret, size, flags);
- trace_kmalloc(_RET_IP_, ret,
- size, cachep->size, flags);
- return ret;
-}
-EXPORT_SYMBOL(kmem_cache_alloc_trace);
-
/**
* kmem_cache_alloc_node - Allocate an object on the specified node
* @cachep: The cache to allocate from.
diff --git a/mm/slub.c b/mm/slub.c
index cdbbf0e97637..d8fb987ff7e0 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3230,15 +3230,6 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,
return slab_alloc_node(s, gfpflags, NUMA_NO_NODE, addr, orig_size);
}

-void *kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size)
-{
- void *ret = slab_alloc(s, gfpflags, _RET_IP_, size);
- trace_kmalloc(_RET_IP_, ret, size, s->size, gfpflags);
- ret = kasan_kmalloc(s, ret, size, gfpflags);
- return ret;
-}
-EXPORT_SYMBOL(kmem_cache_alloc_trace);
-
void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node)
{
void *ret = slab_alloc_node(s, gfpflags, node, _RET_IP_, s->object_size);
--
2.33.1

2022-03-24 23:36:26

by Vlastimil Babka

Subject: Re: [RFC PATCH v1 08/15] mm/sl[auo]b: cleanup kmalloc()

On 3/8/22 12:41, Hyeonggon Yoo wrote:
> Now that kmalloc() and kmalloc_node() do same job, make kmalloc()
> wrapper of kmalloc_node().
>
> Remove kmalloc_trace() that is now unused. This patch makes slab
> allocator use kmalloc_node tracepoints in kmalloc().
>
> Signed-off-by: Hyeonggon Yoo <[email protected]>

Actually there are more things to fix than the commit log.

> +#ifndef CONFIG_SLOB
> +static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
> +{
> + if (__builtin_constant_p(size)) {
> + unsigned int index;
> +
> + if (size > KMALLOC_MAX_CACHE_SIZE)
> + return kmalloc_large(size, flags);

Should use kmalloc_large_node().

> +
> + index = kmalloc_index(size);
> +
> + if (!index)
> + return ZERO_SIZE_PTR;
> +
> + return kmem_cache_alloc_node_trace(
> + kmalloc_caches[kmalloc_type(flags)][index],
> + flags, node, size);
> + }
> + return __kmalloc_node(size, flags, node);
> +}
> +#else
> +static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
> +{
> + if (__builtin_constant_p(size) && size > KMALLOC_MAX_CACHE_SIZE)
> + return kmalloc_large(size, flags);

And here.

> +
> + return __kmalloc_node(size, flags, node);
> +}
> +#endif

2022-03-24 23:44:01

by Vlastimil Babka

Subject: Re: [RFC PATCH v1 08/15] mm/sl[auo]b: cleanup kmalloc()

On 3/8/22 12:41, Hyeonggon Yoo wrote:
> Now that kmalloc() and kmalloc_node() do same job, make kmalloc()
> wrapper of kmalloc_node().
>
> Remove kmalloc_trace() that is now unused. This patch makes slab

You mean remove kmem_cache_alloc_trace().

> allocator use kmalloc_node tracepoints in kmalloc().
>
> Signed-off-by: Hyeonggon Yoo <[email protected]>

Reviewed-by: Vlastimil Babka <[email protected]>

2022-04-22 22:34:16

by Hyeonggon Yoo

Subject: Re: [RFC PATCH v1 08/15] mm/sl[auo]b: cleanup kmalloc()

On Thu, Mar 24, 2022 at 06:46:34PM +0100, Vlastimil Babka wrote:
> On 3/8/22 12:41, Hyeonggon Yoo wrote:
> > Now that kmalloc() and kmalloc_node() do same job, make kmalloc()
> > wrapper of kmalloc_node().
> >
> > Remove kmalloc_trace() that is now unused. This patch makes slab
> > allocator use kmalloc_node tracepoints in kmalloc().
> >
> > Signed-off-by: Hyeonggon Yoo <[email protected]>
>
> Actually there are more things to fix than the commit log.
>
> > +#ifndef CONFIG_SLOB
> > +static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
> > +{
> > + if (__builtin_constant_p(size)) {
> > + unsigned int index;
> > +
> > + if (size > KMALLOC_MAX_CACHE_SIZE)
> > + return kmalloc_large(size, flags);
>
> Should use kmalloc_large_node().
>
> > +
> > + index = kmalloc_index(size);
> > +
> > + if (!index)
> > + return ZERO_SIZE_PTR;
> > +
> > + return kmem_cache_alloc_node_trace(
> > + kmalloc_caches[kmalloc_type(flags)][index],
> > + flags, node, size);
> > + }
> > + return __kmalloc_node(size, flags, node);
> > +}
> > +#else
> > +static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node)
> > +{
> > + if (__builtin_constant_p(size) && size > KMALLOC_MAX_CACHE_SIZE)
> > + return kmalloc_large(size, flags);
>
> And here.
>

Sorry for the mistake. did it in v2. thanks!

> > +
> > + return __kmalloc_node(size, flags, node);
> > +}
> > +#endif

--
Thanks,
Hyeonggon