From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1ECAC433E1 for ; Mon, 15 Jun 2020 09:13:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BC7A120679 for ; Mon, 15 Jun 2020 09:13:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC7A120679 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 493896B0002; Mon, 15 Jun 2020 05:13:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 41EA16B0003; Mon, 15 Jun 2020 05:13:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30C146B0005; Mon, 15 Jun 2020 05:13:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0106.hostedemail.com [216.40.44.106]) by kanga.kvack.org (Postfix) with ESMTP id 16C7F6B0002 for ; Mon, 15 Jun 2020 05:13:40 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id AE8406D66 for ; Mon, 15 Jun 2020 09:13:39 +0000 (UTC) X-FDA: 76930883358.14.snake54_160a8ae26df5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 7D43318229835 for ; Mon, 15 Jun 2020 09:13:39 +0000 (UTC) X-HE-Tag: snake54_160a8ae26df5 X-Filterd-Recvd-Size: 6097 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Mon, 15 Jun 2020 09:13:38 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y17so16246770wrn.11 for ; Mon, 15 Jun 2020 02:13:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ovYDqOmj0RcWezm825Y7rApyl3DGymdbL53dv7LzD2A=; b=PEPG/NxhJOHl8NQAnzH0lj3ehTItWgjrMCFhOVUs99JOOsRkr3CJoIyOFioF1MeX0v CthrWCzPWdLTvMyUxEupNlZE5bHPLgLB0/0ew0AbTqwhXyQ8WyQmyauAa++iLJCzfR5O imXliuBqsmq302JTDIO/El1eBm57DQwNqcg0f5EOHaSIX/Ws8hXwoK8rkW0ig485/xcR dYkboKTQdE8Kz5Ylu++YYwOPk8WV4VWWLbZmc9p1UfTjb1yX85cUzBkDzxA5Hoimv/GL ZYPwWGHZrbi3fImEnv0Rf6IIc1SUc21dQ1uRpvHIoecWXl4MaAoo5A2dxzK3Jh8P4t4e XSRQ== X-Gm-Message-State: AOAM530wH5mf2YQTiCvzLWSqtrh/g24IYoZPsJH991NMZy8Rgc7AjdUy syFdpVOU9W8W5CGe6uYi17Q= X-Google-Smtp-Source: ABdhPJz6Kog9KdDxoSgGTpJDWYP0eNAr4wgdNbABfCWGwzNAmLS8QhURq0jOW8u0wHDKrkn7AA/nsg== X-Received: by 2002:adf:f4d2:: with SMTP id h18mr28063492wrp.370.1592212417436; Mon, 15 Jun 2020 02:13:37 -0700 (PDT) Received: from localhost (ip-37-188-174-201.eurotel.cz. [37.188.174.201]) by smtp.gmail.com with ESMTPSA id k14sm22725615wrq.97.2020.06.15.02.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 02:13:36 -0700 (PDT) Date: Mon, 15 Jun 2020 11:13:35 +0200 From: Michal Hocko To: Muchun Song Cc: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Roman Gushchin Subject: Re: [PATCH] mm/slab: Add a __GFP_ACCOUNT GFP flag check for slab allocation Message-ID: <20200615091335.GD25296@dhcp22.suse.cz> References: <20200614063858.85118-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200614063858.85118-1-songmuchun@bytedance.com> X-Rspamd-Queue-Id: 7D43318229835 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: [Cc Roman] On Sun 14-06-20 14:38:58, Muchun Song wrote: > When a kmem_cache is initialized with SLAB_ACCOUNT slab flag, we must > not call kmem_cache_alloc with __GFP_ACCOUNT GFP flag. In this case, > we can be accounted to kmemcg twice. This is not correct. So we add a > __GFP_ACCOUNT GFP flag check for slab allocation. > > We also introduce a new helper named fixup_gfp_flags to do that check. > We can reuse the fixup_gfp_flags for SLAB/SLUB. > > Signed-off-by: Muchun Song > --- > mm/slab.c | 10 +--------- > mm/slab.h | 21 +++++++++++++++++++++ > mm/slub.c | 10 +--------- > 3 files changed, 23 insertions(+), 18 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index 9350062ffc1a..6e0110bef2d6 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -126,8 +126,6 @@ > > #include > > -#include "internal.h" > - > #include "slab.h" > > /* > @@ -2579,13 +2577,7 @@ static struct page *cache_grow_begin(struct kmem_cache *cachep, > * Be lazy and only check for valid flags here, keeping it out of the > * critical path in kmem_cache_alloc(). > */ > - if (unlikely(flags & GFP_SLAB_BUG_MASK)) { > - gfp_t invalid_mask = flags & GFP_SLAB_BUG_MASK; > - flags &= ~GFP_SLAB_BUG_MASK; > - pr_warn("Unexpected gfp: %#x (%pGg). Fixing up to gfp: %#x (%pGg). Fix your code!\n", > - invalid_mask, &invalid_mask, flags, &flags); > - dump_stack(); > - } > + flags = fixup_gfp_flags(cachep, flags); > WARN_ON_ONCE(cachep->ctor && (flags & __GFP_ZERO)); > local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK); > > diff --git a/mm/slab.h b/mm/slab.h > index 815e4e9a94cd..0b91f2a7b033 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -109,6 +109,7 @@ struct memcg_cache_params { > #include > #include > #include > +#include "internal.h" > > /* > * State of the slab allocator. > @@ -627,6 +628,26 @@ struct kmem_cache_node { > > }; > > +static inline gfp_t fixup_gfp_flags(struct kmem_cache *s, gfp_t flags) > +{ > + gfp_t invalid_mask = 0; > + > + if (unlikely(flags & GFP_SLAB_BUG_MASK)) > + invalid_mask |= flags & GFP_SLAB_BUG_MASK; > + > + if (unlikely(flags & __GFP_ACCOUNT && s->flags & SLAB_ACCOUNT)) > + invalid_mask |= __GFP_ACCOUNT; > + > + if (unlikely(invalid_mask)) { > + flags &= ~invalid_mask; > + pr_warn("Unexpected gfp: %#x (%pGg). Fixing up to gfp: %#x (%pGg). Fix your code!\n", > + invalid_mask, &invalid_mask, flags, &flags); > + dump_stack(); > + } > + > + return flags; > +} > + > static inline struct kmem_cache_node *get_node(struct kmem_cache *s, int node) > { > return s->node[node]; > diff --git a/mm/slub.c b/mm/slub.c > index b8f798b50d44..49b5cb7da318 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -37,8 +37,6 @@ > > #include > > -#include "internal.h" > - > /* > * Lock order: > * 1. slab_mutex (Global Mutex) > @@ -1745,13 +1743,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) > > static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) > { > - if (unlikely(flags & GFP_SLAB_BUG_MASK)) { > - gfp_t invalid_mask = flags & GFP_SLAB_BUG_MASK; > - flags &= ~GFP_SLAB_BUG_MASK; > - pr_warn("Unexpected gfp: %#x (%pGg). Fixing up to gfp: %#x (%pGg). Fix your code!\n", > - invalid_mask, &invalid_mask, flags, &flags); > - dump_stack(); > - } > + flags = fixup_gfp_flags(s, flags); > > return allocate_slab(s, > flags & (GFP_RECLAIM_MASK | GFP_CONSTRAINT_MASK), node); > -- > 2.11.0 -- Michal Hocko SUSE Labs