| Message ID | 20231113191340.17482-25-vbabka@suse.cz (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | remove the SLAB allocator | expand |
On Mon, Nov 13, 2023 at 08:13:44PM +0100, Vlastimil Babka wrote: > Some struct slab fields are initialized differently for SLAB and SLUB so > we can simplify with SLUB being the only remaining allocator. > > Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Reviewed-by: Kees Cook <keescook@chromium.org>
On Mon, 13 Nov 2023 at 20:14, Vlastimil Babka <vbabka@suse.cz> wrote: > > Some struct slab fields are initialized differently for SLAB and SLUB so > we can simplify with SLUB being the only remaining allocator. > > Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Reviewed-by: Marco Elver <elver@google.com> > --- > mm/kfence/core.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/mm/kfence/core.c b/mm/kfence/core.c > index 3872528d0963..8350f5c06f2e 100644 > --- a/mm/kfence/core.c > +++ b/mm/kfence/core.c > @@ -463,11 +463,7 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g > /* Set required slab fields. */ > slab = virt_to_slab((void *)meta->addr); > slab->slab_cache = cache; > -#if defined(CONFIG_SLUB) > slab->objects = 1; > -#elif defined(CONFIG_SLAB) > - slab->s_mem = addr; > -#endif > > /* Memory initialization. */ > set_canary(meta); > -- > 2.42.1 >
diff --git a/mm/kfence/core.c b/mm/kfence/core.c index 3872528d0963..8350f5c06f2e 100644 --- a/mm/kfence/core.c +++ b/mm/kfence/core.c @@ -463,11 +463,7 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g /* Set required slab fields. */ slab = virt_to_slab((void *)meta->addr); slab->slab_cache = cache; -#if defined(CONFIG_SLUB) slab->objects = 1; -#elif defined(CONFIG_SLAB) - slab->s_mem = addr; -#endif /* Memory initialization. */ set_canary(meta);
Some struct slab fields are initialized differently for SLAB and SLUB so we can simplify with SLUB being the only remaining allocator. Signed-off-by: Vlastimil Babka <vbabka@suse.cz> --- mm/kfence/core.c | 4 ---- 1 file changed, 4 deletions(-)