Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1389512
| From | Andrew Morton <akpm@linux-foundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v5] mm: SLAB freelist randomization |
| Date | 2016-04-27 21:20 +0200 |
| Message-ID | <rsDa9-6Ba-9@gated-at.bofh.it> (permalink) |
| References | <rsBrI-4Yl-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Wed, 27 Apr 2016 10:20:59 -0700 Thomas Garnier <thgarnie@google.com> wrote:
> Provides an optional config (CONFIG_SLAB_FREELIST_RANDOM) to randomize
> the SLAB freelist.
Forgot this bit?
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-slab-freelist-randomization-v5-fix
propagate gfp_t into cache_random_seq_create()
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <labbott@fedoraproject.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Thomas Garnier <thgarnie@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
--- a/mm/slab.c~mm-slab-freelist-randomization-v5-fix
+++ a/mm/slab.c
@@ -1262,7 +1262,7 @@ static void freelist_randomize(struct rn
}
/* Create a random sequence per cache */
-static int cache_random_seq_create(struct kmem_cache *cachep)
+static int cache_random_seq_create(struct kmem_cache *cachep, gfp_t gfp)
{
unsigned int seed, count = cachep->num;
struct rnd_state state;
@@ -1271,7 +1271,7 @@ static int cache_random_seq_create(struc
return 0;
/* If it fails, we will just use the global lists */
- cachep->random_seq = kcalloc(count, sizeof(freelist_idx_t), GFP_KERNEL);
+ cachep->random_seq = kcalloc(count, sizeof(freelist_idx_t), gfp);
if (!cachep->random_seq)
return -ENOMEM;
@@ -1290,7 +1290,7 @@ static void cache_random_seq_destroy(str
cachep->random_seq = NULL;
}
#else
-static inline int cache_random_seq_create(struct kmem_cache *cachep)
+static inline int cache_random_seq_create(struct kmem_cache *cachep, gfp_t gfp)
{
return 0;
}
@@ -3999,7 +3999,7 @@ static int enable_cpucache(struct kmem_c
int shared = 0;
int batchcount = 0;
- err = cache_random_seq_create(cachep);
+ err = cache_random_seq_create(cachep, gfp);
if (err)
goto end;
_
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v5] mm: SLAB freelist randomization Thomas Garnier <thgarnie@google.com> - 2016-04-27 19:30 +0200
Re: [PATCH v5] mm: SLAB freelist randomization Andrew Morton <akpm@linux-foundation.org> - 2016-04-27 21:20 +0200
Re: [PATCH v5] mm: SLAB freelist randomization Thomas Garnier <thgarnie@google.com> - 2016-04-27 22:10 +0200
csiph-web