hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/slab: convert cache name allocations to kstrdup_const 

slab frequently performs duplication of strings located in read-only
memory section.  Replacing kstrdup by kstrdup_const allows to avoid such
operations.

[akpm@linux-foundation.org: make the handling of kmem_cache.name const-correct]
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Greg KH <greg@kroah.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrzej Hajda 2015-02-13 14:36:38 -08:00 committed by Linus Torvalds
parent 612936f212
commit 3dec16ea38
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mm/slab_common.c
View File

@ -295,8 +295,8 @@ unsigned long calculate_alignment(unsigned long flags,
} }
static struct kmem_cache * static struct kmem_cache *
do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align, do_kmem_cache_create(const char *name, size_t object_size, size_t size,
unsigned long flags, void (*ctor)(void *), size_t align, unsigned long flags, void (*ctor)(void *),
struct mem_cgroup *memcg, struct kmem_cache *root_cache) struct mem_cgroup *memcg, struct kmem_cache *root_cache)
{ {
struct kmem_cache *s; struct kmem_cache *s;
@ -363,7 +363,7 @@ kmem_cache_create(const char *name, size_t size, size_t align,
unsigned long flags, void (*ctor)(void *)) unsigned long flags, void (*ctor)(void *))
{ {
struct kmem_cache *s; struct kmem_cache *s;
char *cache_name; const char *cache_name;
int err; int err;
get_online_cpus(); get_online_cpus();
@ -390,7 +390,7 @@ kmem_cache_create(const char *name, size_t size, size_t align,
if (s) if (s)
goto out_unlock; goto out_unlock;
cache_name = kstrdup(name, GFP_KERNEL); cache_name = kstrdup_const(name, GFP_KERNEL);
if (!cache_name) { if (!cache_name) {
err = -ENOMEM; err = -ENOMEM;
goto out_unlock; goto out_unlock;
@ -401,7 +401,7 @@ kmem_cache_create(const char *name, size_t size, size_t align,
flags, ctor, NULL, NULL); flags, ctor, NULL, NULL);
if (IS_ERR(s)) { if (IS_ERR(s)) {
err = PTR_ERR(s); err = PTR_ERR(s);
kfree(cache_name); kfree_const(cache_name);
} }
out_unlock: out_unlock:
@ -607,7 +607,7 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *memcg)
void slab_kmem_cache_release(struct kmem_cache *s) void slab_kmem_cache_release(struct kmem_cache *s)
{ {
destroy_memcg_params(s); destroy_memcg_params(s);
kfree(s->name); kfree_const(s->name);
kmem_cache_free(kmem_cache, s); kmem_cache_free(kmem_cache, s);
} }