From: Thomas Garnier <thgarnie@google.com> To: David Rientjes <rientjes@google.com> Cc: Christoph Lameter <cl@linux.com>, Pekka Enberg <penberg@kernel.org>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Andrew Morton <akpm@linux-foundation.org>, Linux-MM <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, Greg Thelen <gthelen@google.com>, Vladimir Davydov <vdavydov.dev@gmail.com>, Michal Hocko <mhocko@kernel.org> Subject: Re: [PATCH v2] memcg: Prevent memcg caches to be both OFF_SLAB & OBJFREELIST_SLAB Date: Wed, 2 Nov 2016 08:59:05 -0700 [thread overview] Message-ID: <CAJcbSZHic9gfpYHFXySZf=EmUjztBvuHeWWq7CQFi=0Om7OJoA@mail.gmail.com> (raw) In-Reply-To: <alpine.DEB.2.10.1610311625430.62482@chino.kir.corp.google.com> On Mon, Oct 31, 2016 at 4:38 PM, David Rientjes <rientjes@google.com> wrote: > On Mon, 31 Oct 2016, Thomas Garnier wrote: > >> While testing OBJFREELIST_SLAB integration with pagealloc, we found a >> bug where kmem_cache(sys) would be created with both CFLGS_OFF_SLAB & >> CFLGS_OBJFREELIST_SLAB. >> >> The original kmem_cache is created early making OFF_SLAB not possible. >> When kmem_cache(sys) is created, OFF_SLAB is possible and if pagealloc >> is enabled it will try to enable it first under certain conditions. >> Given kmem_cache(sys) reuses the original flag, you can have both flags >> at the same time resulting in allocation failures and odd behaviors. >> >> This fix discards allocator specific flags from memcg and ensure >> cache_create cannot be called with them. >> >> Fixes: b03a017bebc4 ("mm/slab: introduce new slab management type, OBJFREELIST_SLAB") >> Signed-off-by: Thomas Garnier <thgarnie@google.com> >> Signed-off-by: Greg Thelen <gthelen@google.com> > > Order of the signoffs is strange, should this have a > > From: Greg Thelen <gthelen@google.com> > > in the first line or is this your patch? > Yes, thanks for pointing that out. I will put Greg as owner and myself as tester. That make more sense for this patch. >> --- >> Based on next-20161025 >> --- >> mm/slab.h | 3 +++ >> mm/slab_common.c | 10 ++++++++-- >> 2 files changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/mm/slab.h b/mm/slab.h >> index 9653f2e..58be647 100644 >> --- a/mm/slab.h >> +++ b/mm/slab.h >> @@ -144,6 +144,9 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size, >> >> #define CACHE_CREATE_MASK (SLAB_CORE_FLAGS | SLAB_DEBUG_FLAGS | SLAB_CACHE_FLAGS) >> >> +/* Common allocator flags allowed for cache_create. */ >> +#define SLAB_FLAGS_PERMITTED (CACHE_CREATE_MASK | SLAB_KASAN) >> + >> int __kmem_cache_shutdown(struct kmem_cache *); >> void __kmem_cache_release(struct kmem_cache *); >> int __kmem_cache_shrink(struct kmem_cache *, bool); >> diff --git a/mm/slab_common.c b/mm/slab_common.c >> index 71f0b28..01d067c 100644 >> --- a/mm/slab_common.c >> +++ b/mm/slab_common.c >> @@ -329,6 +329,12 @@ static struct kmem_cache *create_cache(const char *name, >> struct kmem_cache *s; >> int err; >> >> + /* Do not allow allocator specific flags */ >> + if (flags & ~SLAB_FLAGS_PERMITTED) { >> + err = -EINVAL; >> + goto out; >> + } >> + > > Why not just flags &= SLAB_FLAGS_PERMITTED if we're concerned about this > like kmem_cache_create does &= CACHE_CREATE_MASK? > Christoph on the first version advised removing invalid flags on the caller and checking they are correct in kmem_cache_create. The memcg path putting the wrong flags is through create_cache but I still used this approach. >> err = -ENOMEM; >> s = kmem_cache_zalloc(kmem_cache, GFP_KERNEL); >> if (!s) >> @@ -533,8 +539,8 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg, >> >> s = create_cache(cache_name, root_cache->object_size, >> root_cache->size, root_cache->align, >> - root_cache->flags, root_cache->ctor, >> - memcg, root_cache); >> + root_cache->flags & SLAB_FLAGS_PERMITTED, >> + root_cache->ctor, memcg, root_cache); >> /* >> * If we could not create a memcg cache, do not complain, because >> * that's not critical at all as we can always proceed with the root > > This introduces an inconsistency that isn't explained: why is SLAB_KASAN, > the only reason why SLAB_FLAGS_PERMITTED needs to be defined, permitted > for memcg_create_kmem_cache() but not kmem_cache_create()? (If we need to > keep SLAB_FLAGS_PERMITTED around, I think it needs a new name since its a > restriction on the cache, not slab.) The idea was that SLAB_FLAGS_PERMITTED would be all the common flags. SLAB_KASAN was the only one not on CACHE_CREATE_MASK. Christoph: Which approach to do you prefer? -- Thomas
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Garnier <thgarnie@google.com> To: David Rientjes <rientjes@google.com> Cc: Christoph Lameter <cl@linux.com>, Pekka Enberg <penberg@kernel.org>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Andrew Morton <akpm@linux-foundation.org>, Linux-MM <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, Greg Thelen <gthelen@google.com>, Vladimir Davydov <vdavydov.dev@gmail.com>, Michal Hocko <mhocko@kernel.org> Subject: Re: [PATCH v2] memcg: Prevent memcg caches to be both OFF_SLAB & OBJFREELIST_SLAB Date: Wed, 2 Nov 2016 08:59:05 -0700 [thread overview] Message-ID: <CAJcbSZHic9gfpYHFXySZf=EmUjztBvuHeWWq7CQFi=0Om7OJoA@mail.gmail.com> (raw) In-Reply-To: <alpine.DEB.2.10.1610311625430.62482@chino.kir.corp.google.com> On Mon, Oct 31, 2016 at 4:38 PM, David Rientjes <rientjes@google.com> wrote: > On Mon, 31 Oct 2016, Thomas Garnier wrote: > >> While testing OBJFREELIST_SLAB integration with pagealloc, we found a >> bug where kmem_cache(sys) would be created with both CFLGS_OFF_SLAB & >> CFLGS_OBJFREELIST_SLAB. >> >> The original kmem_cache is created early making OFF_SLAB not possible. >> When kmem_cache(sys) is created, OFF_SLAB is possible and if pagealloc >> is enabled it will try to enable it first under certain conditions. >> Given kmem_cache(sys) reuses the original flag, you can have both flags >> at the same time resulting in allocation failures and odd behaviors. >> >> This fix discards allocator specific flags from memcg and ensure >> cache_create cannot be called with them. >> >> Fixes: b03a017bebc4 ("mm/slab: introduce new slab management type, OBJFREELIST_SLAB") >> Signed-off-by: Thomas Garnier <thgarnie@google.com> >> Signed-off-by: Greg Thelen <gthelen@google.com> > > Order of the signoffs is strange, should this have a > > From: Greg Thelen <gthelen@google.com> > > in the first line or is this your patch? > Yes, thanks for pointing that out. I will put Greg as owner and myself as tester. That make more sense for this patch. >> --- >> Based on next-20161025 >> --- >> mm/slab.h | 3 +++ >> mm/slab_common.c | 10 ++++++++-- >> 2 files changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/mm/slab.h b/mm/slab.h >> index 9653f2e..58be647 100644 >> --- a/mm/slab.h >> +++ b/mm/slab.h >> @@ -144,6 +144,9 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size, >> >> #define CACHE_CREATE_MASK (SLAB_CORE_FLAGS | SLAB_DEBUG_FLAGS | SLAB_CACHE_FLAGS) >> >> +/* Common allocator flags allowed for cache_create. */ >> +#define SLAB_FLAGS_PERMITTED (CACHE_CREATE_MASK | SLAB_KASAN) >> + >> int __kmem_cache_shutdown(struct kmem_cache *); >> void __kmem_cache_release(struct kmem_cache *); >> int __kmem_cache_shrink(struct kmem_cache *, bool); >> diff --git a/mm/slab_common.c b/mm/slab_common.c >> index 71f0b28..01d067c 100644 >> --- a/mm/slab_common.c >> +++ b/mm/slab_common.c >> @@ -329,6 +329,12 @@ static struct kmem_cache *create_cache(const char *name, >> struct kmem_cache *s; >> int err; >> >> + /* Do not allow allocator specific flags */ >> + if (flags & ~SLAB_FLAGS_PERMITTED) { >> + err = -EINVAL; >> + goto out; >> + } >> + > > Why not just flags &= SLAB_FLAGS_PERMITTED if we're concerned about this > like kmem_cache_create does &= CACHE_CREATE_MASK? > Christoph on the first version advised removing invalid flags on the caller and checking they are correct in kmem_cache_create. The memcg path putting the wrong flags is through create_cache but I still used this approach. >> err = -ENOMEM; >> s = kmem_cache_zalloc(kmem_cache, GFP_KERNEL); >> if (!s) >> @@ -533,8 +539,8 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg, >> >> s = create_cache(cache_name, root_cache->object_size, >> root_cache->size, root_cache->align, >> - root_cache->flags, root_cache->ctor, >> - memcg, root_cache); >> + root_cache->flags & SLAB_FLAGS_PERMITTED, >> + root_cache->ctor, memcg, root_cache); >> /* >> * If we could not create a memcg cache, do not complain, because >> * that's not critical at all as we can always proceed with the root > > This introduces an inconsistency that isn't explained: why is SLAB_KASAN, > the only reason why SLAB_FLAGS_PERMITTED needs to be defined, permitted > for memcg_create_kmem_cache() but not kmem_cache_create()? (If we need to > keep SLAB_FLAGS_PERMITTED around, I think it needs a new name since its a > restriction on the cache, not slab.) The idea was that SLAB_FLAGS_PERMITTED would be all the common flags. SLAB_KASAN was the only one not on CACHE_CREATE_MASK. Christoph: Which approach to do you prefer? -- Thomas -- 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>
next prev parent reply other threads:[~2016-11-02 15:59 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-31 18:36 [PATCH v2] memcg: Prevent memcg caches to be both OFF_SLAB & OBJFREELIST_SLAB Thomas Garnier 2016-10-31 18:36 ` Thomas Garnier 2016-10-31 23:38 ` David Rientjes 2016-10-31 23:38 ` David Rientjes 2016-11-02 15:59 ` Thomas Garnier [this message] 2016-11-02 15:59 ` Thomas Garnier 2016-11-03 0:46 ` David Rientjes 2016-11-03 0:46 ` David Rientjes 2016-11-03 20:33 ` Christoph Lameter 2016-11-03 20:33 ` Christoph Lameter 2016-11-07 18:52 ` Thomas Garnier 2016-11-07 18:52 ` Thomas Garnier 2016-11-07 19:28 ` Christoph Lameter 2016-11-07 19:28 ` Christoph Lameter 2016-11-07 19:52 ` Thomas Garnier 2016-11-07 19:52 ` Thomas Garnier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAJcbSZHic9gfpYHFXySZf=EmUjztBvuHeWWq7CQFi=0Om7OJoA@mail.gmail.com' \ --to=thgarnie@google.com \ --cc=akpm@linux-foundation.org \ --cc=cl@linux.com \ --cc=gthelen@google.com \ --cc=iamjoonsoo.kim@lge.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@kernel.org \ --cc=penberg@kernel.org \ --cc=rientjes@google.com \ --cc=vdavydov.dev@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.