mm/sl[aou]b: Do slab aliasing call from common code
The slab aliasing logic causes some strange contortions in slub. So add a call to deal with aliases to slab_common.c but disable it for other slab allocators by providng stubs that fail to create aliases. Full general support for aliases will require additional cleanup passes and more standardization of fields in kmem_cache. Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
parent
db265eca77
commit
cbb79694d5
10
mm/slab.h
10
mm/slab.h
|
@ -36,6 +36,16 @@ extern struct kmem_cache *kmem_cache;
|
|||
struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
|
||||
size_t align, unsigned long flags, void (*ctor)(void *));
|
||||
|
||||
#ifdef CONFIG_SLUB
|
||||
struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
|
||||
size_t align, unsigned long flags, void (*ctor)(void *));
|
||||
#else
|
||||
static inline struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
|
||||
size_t align, unsigned long flags, void (*ctor)(void *))
|
||||
{ return NULL; }
|
||||
#endif
|
||||
|
||||
|
||||
int __kmem_cache_shutdown(struct kmem_cache *);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -115,6 +115,10 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
|
|||
goto out_locked;
|
||||
}
|
||||
|
||||
s = __kmem_cache_alias(name, size, align, flags, ctor);
|
||||
if (s)
|
||||
goto out_locked;
|
||||
|
||||
s = __kmem_cache_create(n, size, align, flags, ctor);
|
||||
|
||||
if (s) {
|
||||
|
|
13
mm/slub.c
13
mm/slub.c
|
@ -3922,7 +3922,7 @@ static struct kmem_cache *find_mergeable(size_t size,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
|
||||
struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
|
||||
size_t align, unsigned long flags, void (*ctor)(void *))
|
||||
{
|
||||
struct kmem_cache *s;
|
||||
|
@ -3939,10 +3939,17 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
|
|||
|
||||
if (sysfs_slab_alias(s, name)) {
|
||||
s->refcount--;
|
||||
return NULL;
|
||||
s = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
|
||||
size_t align, unsigned long flags, void (*ctor)(void *))
|
||||
{
|
||||
struct kmem_cache *s;
|
||||
|
||||
s = kmem_cache_alloc(kmem_cache, GFP_KERNEL);
|
||||
if (s) {
|
||||
|
|
Loading…
Reference in New Issue