lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <ZXEhbUL371iZztHQ@localhost.localdomain> Date: Thu, 7 Dec 2023 10:35:41 +0900 From: Hyeonggon Yoo <42.hyeyoo@...il.com> To: Vlastimil Babka <vbabka@...e.cz> Cc: David Rientjes <rientjes@...gle.com>, Christoph Lameter <cl@...ux.com>, Pekka Enberg <penberg@...nel.org>, Joonsoo Kim <iamjoonsoo.kim@....com>, Andrew Morton <akpm@...ux-foundation.org>, Roman Gushchin <roman.gushchin@...ux.dev>, Andrey Ryabinin <ryabinin.a.a@...il.com>, Alexander Potapenko <glider@...gle.com>, Andrey Konovalov <andreyknvl@...il.com>, Dmitry Vyukov <dvyukov@...gle.com>, Vincenzo Frascino <vincenzo.frascino@....com>, Marco Elver <elver@...gle.com>, Johannes Weiner <hannes@...xchg.org>, Michal Hocko <mhocko@...nel.org>, Shakeel Butt <shakeelb@...gle.com>, Muchun Song <muchun.song@...ux.dev>, Kees Cook <keescook@...omium.org>, linux-mm@...ck.org, linux-kernel@...r.kernel.org, kasan-dev@...glegroups.com, cgroups@...r.kernel.org, linux-hardening@...r.kernel.org Subject: Re: [PATCH v2 19/21] mm/slub: remove slab_alloc() and __kmem_cache_alloc_lru() wrappers On Mon, Nov 20, 2023 at 07:34:30PM +0100, Vlastimil Babka wrote: > slab_alloc() is a thin wrapper around slab_alloc_node() with only one > caller. Replace with direct call of slab_alloc_node(). > __kmem_cache_alloc_lru() itself is a thin wrapper with two callers, > so replace it with direct calls of slab_alloc_node() and > trace_kmem_cache_alloc(). > > This also makes sure _RET_IP_ has always the expected value and not > depending on inlining decisions. > > Reviewed-by: Kees Cook <keescook@...omium.org> > Signed-off-by: Vlastimil Babka <vbabka@...e.cz> > --- > mm/slub.c | 25 +++++++++---------------- > 1 file changed, 9 insertions(+), 16 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index d6bc15929d22..5683f1d02e4f 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3821,33 +3821,26 @@ static __fastpath_inline void *slab_alloc_node(struct kmem_cache *s, struct list > return object; > } > > -static __fastpath_inline void *slab_alloc(struct kmem_cache *s, struct list_lru *lru, > - gfp_t gfpflags, unsigned long addr, size_t orig_size) > -{ > - return slab_alloc_node(s, lru, gfpflags, NUMA_NO_NODE, addr, orig_size); > -} > - > -static __fastpath_inline > -void *__kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru, > - gfp_t gfpflags) > +void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags) > { > - void *ret = slab_alloc(s, lru, gfpflags, _RET_IP_, s->object_size); > + void *ret = slab_alloc_node(s, NULL, gfpflags, NUMA_NO_NODE, _RET_IP_, > + s->object_size); > > trace_kmem_cache_alloc(_RET_IP_, ret, s, gfpflags, NUMA_NO_NODE); > > return ret; > } > - > -void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags) > -{ > - return __kmem_cache_alloc_lru(s, NULL, gfpflags); > -} > EXPORT_SYMBOL(kmem_cache_alloc); > > void *kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru, > gfp_t gfpflags) > { > - return __kmem_cache_alloc_lru(s, lru, gfpflags); > + void *ret = slab_alloc_node(s, lru, gfpflags, NUMA_NO_NODE, _RET_IP_, > + s->object_size); > + > + trace_kmem_cache_alloc(_RET_IP_, ret, s, gfpflags, NUMA_NO_NODE); > + > + return ret; > } > EXPORT_SYMBOL(kmem_cache_alloc_lru); Looks good to me, Reviewed-by: Hyeonggon Yoo <42.hyeyoo@...il.com> > > > -- > 2.42.1 > >
Powered by blists - more mailing lists