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=-14.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 E42ACC10F11 for ; Wed, 24 Apr 2019 17:24:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9921205ED for ; Wed, 24 Apr 2019 17:24:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Vt3p40z+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389219AbfDXRYD (ORCPT ); Wed, 24 Apr 2019 13:24:03 -0400 Received: from mail-yw1-f68.google.com ([209.85.161.68]:40345 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389430AbfDXRX5 (ORCPT ); Wed, 24 Apr 2019 13:23:57 -0400 Received: by mail-yw1-f68.google.com with SMTP id t79so5487551ywc.7 for ; Wed, 24 Apr 2019 10:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=P/nz9VR/h2t1C0BDhNs/FXtJ48OP3Xb65UuEQTQTNEE=; b=Vt3p40z+raPN5tAp3qp0BsPy91f6BiaoxxlBm9cRok1FjkccVUaH2Rvmi+1Rgw3NFP ZXmxhYzoK7JpHWD35WfNXmv5F0bH7y5z+T26AepQlpLzeVZ2sMslPeU2MGny6G6M8DAY N98BT6DMiHguAcXyiAp2920sXzczkW6CDLUgB0d/b5V2ww3yUzBeUoxtrIi0ERuR9MMR fPe89YMsDx0QJB7/xMLO5SmUPGXq2VfSWCL0FbvKMP/VLLx0i1xIlLNuaIUjxFHkPTQe gZLAIVdspnd+fSTumdyjkQGSb52+fbv6UyvIhSlCXMtoIRB6MttLnw4DfY4Mm+xVXrH6 7Dmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=P/nz9VR/h2t1C0BDhNs/FXtJ48OP3Xb65UuEQTQTNEE=; b=eKrtkgcfJgwCqxchLxSlqhZ1CQsTXexpFmY/RmTg0meZoooEZahwxvgSZvTN3E2sHg 07J0pdpnpWplLsONcApOqRqz0lKNI4GwuMHgFY3S/jCB58f/BIK/PqISkA5bx9WZ5VOQ Hk2PCRUE9cSFpFS0/nMweAQhqaNixg1uihFwgjQqUKVedA2hEowgUhGE12sXD50zNXI+ Pvdrm+PLNyDy1I6q1LaTBXZ9pRGpjy6e68uDKborgyip6k5EJtjSk+PTRD0UF7XTzCVA q+CGzD3bGjVVc42MXJuJ0Y66GX2zuUgLu95SpPEXCzLkSkzFTE8DRfe6lh4JC4lWXb/6 4sEw== X-Gm-Message-State: APjAAAXm6ul3P29CVgo303dljd9SiznxqZ8Eh1RSkRg2ApHres+nCQJs sLutGZ3IzFfy+pVRLMHaiZIGPtghxqHX7z9wBuh1jQ== X-Google-Smtp-Source: APXvYqwEAA+o9fjHgMNik2D6cPaCQj9XkIZYRv4qFpJW86ir8ocBUPoF/b5vAbPPEayUA5pmG8gBqteUMCjnR8DZbCI= X-Received: by 2002:a81:480d:: with SMTP id v13mr13052602ywa.489.1556126636403; Wed, 24 Apr 2019 10:23:56 -0700 (PDT) MIME-Version: 1.0 References: <20190423213133.3551969-1-guro@fb.com> <20190423213133.3551969-5-guro@fb.com> In-Reply-To: <20190423213133.3551969-5-guro@fb.com> From: Shakeel Butt Date: Wed, 24 Apr 2019 10:23:45 -0700 Message-ID: Subject: Re: [PATCH v2 4/6] mm: unify SLAB and SLUB page accounting To: Roman Gushchin Cc: Andrew Morton , Linux MM , LKML , Kernel Team , Johannes Weiner , Michal Hocko , Rik van Riel , Christoph Lameter , Vladimir Davydov , Cgroups Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Roman, On Tue, Apr 23, 2019 at 9:30 PM Roman Gushchin wrote: > > Currently the page accounting code is duplicated in SLAB and SLUB > internals. Let's move it into new (un)charge_slab_page helpers > in the slab_common.c file. These helpers will be responsible > for statistics (global and memcg-aware) and memcg charging. > So they are replacing direct memcg_(un)charge_slab() calls. > > Signed-off-by: Roman Gushchin > --- > mm/slab.c | 19 +++---------------- > mm/slab.h | 22 ++++++++++++++++++++++ > mm/slub.c | 14 ++------------ > 3 files changed, 27 insertions(+), 28 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index 14466a73d057..53e6b2687102 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -1389,7 +1389,6 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, > int nodeid) > { > struct page *page; > - int nr_pages; > > flags |= cachep->allocflags; > > @@ -1399,17 +1398,11 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, > return NULL; > } > > - if (memcg_charge_slab(page, flags, cachep->gfporder, cachep)) { > + if (charge_slab_page(page, flags, cachep->gfporder, cachep)) { > __free_pages(page, cachep->gfporder); > return NULL; > } > > - nr_pages = (1 << cachep->gfporder); > - if (cachep->flags & SLAB_RECLAIM_ACCOUNT) > - mod_lruvec_page_state(page, NR_SLAB_RECLAIMABLE, nr_pages); > - else > - mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE, nr_pages); > - > __SetPageSlab(page); > /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ > if (sk_memalloc_socks() && page_is_pfmemalloc(page)) > @@ -1424,12 +1417,6 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, > static void kmem_freepages(struct kmem_cache *cachep, struct page *page) > { > int order = cachep->gfporder; > - unsigned long nr_freed = (1 << order); > - > - if (cachep->flags & SLAB_RECLAIM_ACCOUNT) > - mod_lruvec_page_state(page, NR_SLAB_RECLAIMABLE, -nr_freed); > - else > - mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE, -nr_freed); > > BUG_ON(!PageSlab(page)); > __ClearPageSlabPfmemalloc(page); > @@ -1438,8 +1425,8 @@ static void kmem_freepages(struct kmem_cache *cachep, struct page *page) > page->mapping = NULL; > > if (current->reclaim_state) > - current->reclaim_state->reclaimed_slab += nr_freed; > - memcg_uncharge_slab(page, order, cachep); > + current->reclaim_state->reclaimed_slab += 1 << order; > + uncharge_slab_page(page, order, cachep); > __free_pages(page, order); > } > > diff --git a/mm/slab.h b/mm/slab.h > index 4a261c97c138..0f5c5444acf1 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -205,6 +205,12 @@ ssize_t slabinfo_write(struct file *file, const char __user *buffer, > void __kmem_cache_free_bulk(struct kmem_cache *, size_t, void **); > int __kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **); > > +static inline int cache_vmstat_idx(struct kmem_cache *s) > +{ > + return (s->flags & SLAB_RECLAIM_ACCOUNT) ? > + NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE; > +} > + > #ifdef CONFIG_MEMCG_KMEM > > /* List of all root caches. */ > @@ -352,6 +358,22 @@ static inline void memcg_link_cache(struct kmem_cache *s, > > #endif /* CONFIG_MEMCG_KMEM */ > > +static __always_inline int charge_slab_page(struct page *page, > + gfp_t gfp, int order, > + struct kmem_cache *s) > +{ > + memcg_charge_slab(page, gfp, order, s); This does not seem right. Why the return of memcg_charge_slab is ignored? > + mod_lruvec_page_state(page, cache_vmstat_idx(s), 1 << order); > + return 0; > +} > + > +static __always_inline void uncharge_slab_page(struct page *page, int order, > + struct kmem_cache *s) > +{ > + mod_lruvec_page_state(page, cache_vmstat_idx(s), -(1 << order)); > + memcg_uncharge_slab(page, order, s); > +} > + > static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x) > { > struct kmem_cache *cachep; > diff --git a/mm/slub.c b/mm/slub.c > index 195f61785c7d..90563c0b3b5f 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1499,7 +1499,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, > else > page = __alloc_pages_node(node, flags, order); > > - if (page && memcg_charge_slab(page, flags, order, s)) { > + if (page && charge_slab_page(page, flags, order, s)) { > __free_pages(page, order); > page = NULL; > } > @@ -1692,11 +1692,6 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) > if (!page) > return NULL; > > - mod_lruvec_page_state(page, > - (s->flags & SLAB_RECLAIM_ACCOUNT) ? > - NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE, > - 1 << oo_order(oo)); > - > inc_slabs_node(s, page_to_nid(page), page->objects); > > return page; > @@ -1730,18 +1725,13 @@ static void __free_slab(struct kmem_cache *s, struct page *page) > check_object(s, page, p, SLUB_RED_INACTIVE); > } > > - mod_lruvec_page_state(page, > - (s->flags & SLAB_RECLAIM_ACCOUNT) ? > - NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE, > - -pages); > - > __ClearPageSlabPfmemalloc(page); > __ClearPageSlab(page); > > page->mapping = NULL; > if (current->reclaim_state) > current->reclaim_state->reclaimed_slab += pages; > - memcg_uncharge_slab(page, order, s); > + uncharge_slab_page(page, order, s); > __free_pages(page, order); > } > > -- > 2.20.1 >