From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <owner-linux-mm@kvack.org>
Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72])
	by kanga.kvack.org (Postfix) with ESMTP id 1C2466B0005
	for <linux-mm@kvack.org>; Wed, 27 Apr 2016 16:04:19 -0400 (EDT)
Received: by mail-qg0-f72.google.com with SMTP id e35so24239757qge.0
        for <linux-mm@kvack.org>; Wed, 27 Apr 2016 13:04:19 -0700 (PDT)
Received: from mail-yw0-x231.google.com (mail-yw0-x231.google.com. [2607:f8b0:4002:c05::231])
        by mx.google.com with ESMTPS id z7si1779499ywe.122.2016.04.27.13.04.18
        for <linux-mm@kvack.org>
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Wed, 27 Apr 2016 13:04:18 -0700 (PDT)
Received: by mail-yw0-x231.google.com with SMTP id j74so87862887ywg.1
        for <linux-mm@kvack.org>; Wed, 27 Apr 2016 13:04:18 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <20160427121617.5a3123d75230effd7842e408@linux-foundation.org>
References: <1461777659-81290-1-git-send-email-thgarnie@google.com>
	<20160427121617.5a3123d75230effd7842e408@linux-foundation.org>
Date: Wed, 27 Apr 2016 13:04:17 -0700
Message-ID: <CAJcbSZH1H2M2q7Kj_9+61O462uTNwNf5DFG1-qqm32d5rFqWaA@mail.gmail.com>
Subject: Re: [PATCH v5] mm: SLAB freelist randomization
From: Thomas Garnier <thgarnie@google.com>
Content-Type: text/plain; charset=UTF-8
Sender: owner-linux-mm@kvack.org
List-ID: <linux-mm.kvack.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Lameter <cl@linux.com>, Pekka Enberg <penberg@kernel.org>, David Rientjes <rientjes@google.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Kees Cook <keescook@chromium.org>, Greg Thelen <gthelen@google.com>, Laura Abbott <labbott@fedoraproject.org>, kernel-hardening@lists.openwall.com, LKML <linux-kernel@vger.kernel.org>, Linux-MM <linux-mm@kvack.org>

On Wed, Apr 27, 2016 at 12:16 PM, Andrew Morton
<akpm@linux-foundation.org> wrote:
> 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?
>

I thought I would change it when we support other kernel heaps.

> 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;
>
> _
>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>