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.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 BDBCBC07E9C for ; Sat, 10 Jul 2021 11:08:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E4EB613E5 for ; Sat, 10 Jul 2021 11:08:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232644AbhGJLLk (ORCPT ); Sat, 10 Jul 2021 07:11:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230512AbhGJLLj (ORCPT ); Sat, 10 Jul 2021 07:11:39 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0667AC0613DD for ; Sat, 10 Jul 2021 04:08:55 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id a127so11252164pfa.10 for ; Sat, 10 Jul 2021 04:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iHOLK1FYMKPl4w+01Mt+LZRFbB4PbbyNSj4oldd4dZs=; b=aWIygH1Xn0ppYNtHlA/yEW7r4AyE9HfNS4d5ZwSzcFpWGPppoBsUwhGHkvgl7MML3L 3dzTvDisWhidcvrObMAnacJa83nP3loQd+jGBvxA4Cga0hfwkhCDEgkwJ8RE15kTPHz4 zm2jHC8qFo17G/v03QK0NrZEPvCEU7tvVXLNUCmaMNE0SbsgPkNbPczhEjsPX6udJQlv sBhNXf+/IUO+85NioIiL4IuYqJfvYpWRofUBnOIRvmHHeBH8lw/r6mm59X0172ht4W/4 jA0/NAzq3T8LvucAn7CYKNuyFQdUSB7vd7/KYLywZouo7CyC+j4EToUy5AWGWedAfjm9 Iq7g== 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=iHOLK1FYMKPl4w+01Mt+LZRFbB4PbbyNSj4oldd4dZs=; b=VAHhMEbDU87/dR8VyVnqtowa947LU2LM0XYiTeTbGokmpRY52nfj4kuO0PZMUEFjAj 8k8s9ZHvWcjaz834hKPdaCZuNS8v6+Vq2bm4FPKnIETeTtrb6yp02A0cyT/U6B9uyH8e 9d89xC+nu6wPa9EHp0T8qsCdE4gWlginOPaE4EEgb6XuRNsakDtljTuCpDB9cfybXlq9 yl3GZiZdtKgShUjlwRzjLL4drlYc62ziskZmg6/m9/SiT1ozvP7dEJ8cl8uLOdc7wGfW AROsIGqLijIu/UgQZmTUR5FBeqwqEigWaoOk6umYmwTzj9lUKUxPCQ+7fgmXQkWKmKTk NSEQ== X-Gm-Message-State: AOAM533+uc443VDUXtHlhc4KjR/5MVOB6k3h9i7ltb9dq8F9OXzMnlAX xBY0trk7RAmYHISsvbSQo/KsJZ3GrwtMX3GS6U8cSQ== X-Google-Smtp-Source: ABdhPJw3ZkAEJErp6tvCkZsrv56L0hxL4AmLfrmN+oFf2IIgk3CDs/XOJn2m+oLTpgBSTaxyzpr17xhoKOZMzRR1bHs= X-Received: by 2002:a63:4607:: with SMTP id t7mr43271329pga.31.1625915334522; Sat, 10 Jul 2021 04:08:54 -0700 (PDT) MIME-Version: 1.0 References: <20210710003626.3549282-1-surenb@google.com> <20210710003626.3549282-2-surenb@google.com> In-Reply-To: <20210710003626.3549282-2-surenb@google.com> From: Muchun Song Date: Sat, 10 Jul 2021 19:08:17 +0800 Message-ID: Subject: Re: [External] [PATCH v3 2/3] mm, memcg: inline mem_cgroup_{charge/uncharge} to improve disabled memcg config To: Suren Baghdasaryan Cc: Tejun Heo , Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Shakeel Butt , Roman Gushchin , Yang Shi , Alex Shi , Wei Yang , Vlastimil Babka , Jens Axboe , Joonsoo Kim , David Hildenbrand , Matthew Wilcox , apopple@nvidia.com, Minchan Kim , Miaohe Lin , LKML , Cgroups , Linux Memory Management List , kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jul 10, 2021 at 8:36 AM Suren Baghdasaryan wrote: > > Inline mem_cgroup_{charge/uncharge} and mem_cgroup_uncharge_list functions > functions to perform mem_cgroup_disabled static key check inline before > calling the main body of the function. This minimizes the memcg overhead > in the pagefault and exit_mmap paths when memcgs are disabled using > cgroup_disable=memory command-line option. > This change results in ~0.4% overhead reduction when running PFT test > comparing {CONFIG_MEMCG=n} against {CONFIG_MEMCG=y, cgroup_disable=memory} > configurationon on an 8-core ARM64 Android device. > > Signed-off-by: Suren Baghdasaryan > Reviewed-by: Shakeel Butt Reviewed-by: Muchun Song But some nits below. > --- > include/linux/memcontrol.h | 28 +++++++++++++++++++++++++--- > mm/memcontrol.c | 29 ++++++++++------------------- > 2 files changed, 35 insertions(+), 22 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index bfe5c486f4ad..39fa88051a42 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -693,13 +693,35 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *memcg) > page_counter_read(&memcg->memory); > } > > -int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask); > +int __mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask); > +static inline int mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask) > +{ > + if (mem_cgroup_disabled()) > + return 0; > + return __mem_cgroup_charge(page, mm, gfp_mask); > +} > + > int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, > gfp_t gfp, swp_entry_t entry); > void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry); > > -void mem_cgroup_uncharge(struct page *page); > -void mem_cgroup_uncharge_list(struct list_head *page_list); > +void __mem_cgroup_uncharge(struct page *page); > +static inline void mem_cgroup_uncharge(struct page *page) > +{ > + if (mem_cgroup_disabled()) > + return; > + __mem_cgroup_uncharge(page); > +} > + > +void __mem_cgroup_uncharge_list(struct list_head *page_list); > +static inline void mem_cgroup_uncharge_list(struct list_head *page_list) > +{ > + if (mem_cgroup_disabled()) > + return; > + __mem_cgroup_uncharge_list(page_list); > +} > > void mem_cgroup_migrate(struct page *oldpage, struct page *newpage); > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index a228cd51c4bd..cdaf7003b43d 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -6701,8 +6701,7 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, > atomic_long_read(&parent->memory.children_low_usage))); > } > > -static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > - gfp_t gfp) > +static int charge_memcg(struct page *page, struct mem_cgroup *memcg, gfp_t gfp) > { > unsigned int nr_pages = thp_nr_pages(page); > int ret; > @@ -6723,7 +6722,7 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > } > > /** > - * mem_cgroup_charge - charge a newly allocated page to a cgroup > + * __mem_cgroup_charge - charge a newly allocated page to a cgroup > * @page: page to charge > * @mm: mm context of the victim > * @gfp_mask: reclaim mode > @@ -6736,16 +6735,14 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > * > * Returns 0 on success. Otherwise, an error code is returned. > */ > -int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask) > +int __mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask) > { > struct mem_cgroup *memcg; > int ret; > > - if (mem_cgroup_disabled()) > - return 0; > - > memcg = get_mem_cgroup_from_mm(mm); > - ret = __mem_cgroup_charge(page, memcg, gfp_mask); > + ret = charge_memcg(page, memcg, gfp_mask); > css_put(&memcg->css); > > return ret; > @@ -6780,7 +6777,7 @@ int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, > memcg = get_mem_cgroup_from_mm(mm); > rcu_read_unlock(); > > - ret = __mem_cgroup_charge(page, memcg, gfp); > + ret = charge_memcg(page, memcg, gfp); > > css_put(&memcg->css); > return ret; > @@ -6916,18 +6913,15 @@ static void uncharge_page(struct page *page, struct uncharge_gather *ug) > } > > /** > - * mem_cgroup_uncharge - uncharge a page > + * __mem_cgroup_uncharge - uncharge a page > * @page: page to uncharge > * > * Uncharge a page previously charged with mem_cgroup_charge(). The comment here also needs to be updated. mem_cgroup_uncharge() -> __mem_cgroup_uncharge() > */ > -void mem_cgroup_uncharge(struct page *page) > +void __mem_cgroup_uncharge(struct page *page) > { > struct uncharge_gather ug; > > - if (mem_cgroup_disabled()) > - return; > - > /* Don't touch page->lru of any random page, pre-check: */ > if (!page_memcg(page)) > return; > @@ -6938,20 +6932,17 @@ void mem_cgroup_uncharge(struct page *page) > } > > /** > - * mem_cgroup_uncharge_list - uncharge a list of page > + * __mem_cgroup_uncharge_list - uncharge a list of page > * @page_list: list of pages to uncharge > * > * Uncharge a list of pages previously charged with > * mem_cgroup_charge(). Should be __mem_cgroup_charge(). Thanks. > */ > -void mem_cgroup_uncharge_list(struct list_head *page_list) > +void __mem_cgroup_uncharge_list(struct list_head *page_list) > { > struct uncharge_gather ug; > struct page *page; > > - if (mem_cgroup_disabled()) > - return; > - > uncharge_gather_clear(&ug); > list_for_each_entry(page, page_list, lru) > uncharge_page(page, &ug); > -- > 2.32.0.93.g670b81a890-goog > 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.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 AFC6AC07E95 for ; Sat, 10 Jul 2021 11:08:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3A230613D2 for ; Sat, 10 Jul 2021 11:08:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A230613D2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0A4F86B0073; Sat, 10 Jul 2021 07:08:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 054186B0078; Sat, 10 Jul 2021 07:08:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0F7C6B007B; Sat, 10 Jul 2021 07:08:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0162.hostedemail.com [216.40.44.162]) by kanga.kvack.org (Postfix) with ESMTP id B5D796B0073 for ; Sat, 10 Jul 2021 07:08:58 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id E07BE299B5 for ; Sat, 10 Jul 2021 11:08:57 +0000 (UTC) X-FDA: 78346405914.03.73E8F30 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf28.hostedemail.com (Postfix) with ESMTP id A72E090000AB for ; Sat, 10 Jul 2021 11:08:55 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id 17so11290304pfz.4 for ; Sat, 10 Jul 2021 04:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iHOLK1FYMKPl4w+01Mt+LZRFbB4PbbyNSj4oldd4dZs=; b=aWIygH1Xn0ppYNtHlA/yEW7r4AyE9HfNS4d5ZwSzcFpWGPppoBsUwhGHkvgl7MML3L 3dzTvDisWhidcvrObMAnacJa83nP3loQd+jGBvxA4Cga0hfwkhCDEgkwJ8RE15kTPHz4 zm2jHC8qFo17G/v03QK0NrZEPvCEU7tvVXLNUCmaMNE0SbsgPkNbPczhEjsPX6udJQlv sBhNXf+/IUO+85NioIiL4IuYqJfvYpWRofUBnOIRvmHHeBH8lw/r6mm59X0172ht4W/4 jA0/NAzq3T8LvucAn7CYKNuyFQdUSB7vd7/KYLywZouo7CyC+j4EToUy5AWGWedAfjm9 Iq7g== 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=iHOLK1FYMKPl4w+01Mt+LZRFbB4PbbyNSj4oldd4dZs=; b=GBgfKzv0+9xN1iEFKrqltL98h9qqIYPrk+RTnhyl0VRoJSzLeW5POuahyF7bOOt8he CrLFPIalZ4iEuty6CO1ydPqvg7SoU0x6IS+PUQUFWhV6It4Ka1YTZekjGRF+NN7I7DsU hI4YH6khfR8lHpklEna+gVabsftk0OACb2G1iAyJGJSyY+gXmB//g2B41V2SB47/13xt LzJFAgCAzeTh82fX8TI0/8Dmj59VI1a8n3EBoH4CtWjDWCdPZfmCAibf2WvDiD4t1I2a /VhPlLn0SHjA54yr2mSufHHXdcqqiPZNS2C0jQeLWZt0EKOntXe39HQub/Hf0bYE5Ea/ CEAA== X-Gm-Message-State: AOAM532TmfZOyvOzBOFqcjSuVfzxYsvQVXY91VaLseT9M47P20bGg5KN BL6XEtSn1arTFsFgjR8jl2S6h0iLpn1HKLbvLFfvCA== X-Google-Smtp-Source: ABdhPJw3ZkAEJErp6tvCkZsrv56L0hxL4AmLfrmN+oFf2IIgk3CDs/XOJn2m+oLTpgBSTaxyzpr17xhoKOZMzRR1bHs= X-Received: by 2002:a63:4607:: with SMTP id t7mr43271329pga.31.1625915334522; Sat, 10 Jul 2021 04:08:54 -0700 (PDT) MIME-Version: 1.0 References: <20210710003626.3549282-1-surenb@google.com> <20210710003626.3549282-2-surenb@google.com> In-Reply-To: <20210710003626.3549282-2-surenb@google.com> From: Muchun Song Date: Sat, 10 Jul 2021 19:08:17 +0800 Message-ID: Subject: Re: [External] [PATCH v3 2/3] mm, memcg: inline mem_cgroup_{charge/uncharge} to improve disabled memcg config To: Suren Baghdasaryan Cc: Tejun Heo , Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Shakeel Butt , Roman Gushchin , Yang Shi , Alex Shi , Wei Yang , Vlastimil Babka , Jens Axboe , Joonsoo Kim , David Hildenbrand , Matthew Wilcox , apopple@nvidia.com, Minchan Kim , Miaohe Lin , LKML , Cgroups , Linux Memory Management List , kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=aWIygH1X; spf=pass (imf28.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.210.177 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: A72E090000AB X-Stat-Signature: 3g49gskki4sw31tqofdm1eiofujt33oq X-HE-Tag: 1625915335-56807 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: On Sat, Jul 10, 2021 at 8:36 AM Suren Baghdasaryan wrote: > > Inline mem_cgroup_{charge/uncharge} and mem_cgroup_uncharge_list functions > functions to perform mem_cgroup_disabled static key check inline before > calling the main body of the function. This minimizes the memcg overhead > in the pagefault and exit_mmap paths when memcgs are disabled using > cgroup_disable=memory command-line option. > This change results in ~0.4% overhead reduction when running PFT test > comparing {CONFIG_MEMCG=n} against {CONFIG_MEMCG=y, cgroup_disable=memory} > configurationon on an 8-core ARM64 Android device. > > Signed-off-by: Suren Baghdasaryan > Reviewed-by: Shakeel Butt Reviewed-by: Muchun Song But some nits below. > --- > include/linux/memcontrol.h | 28 +++++++++++++++++++++++++--- > mm/memcontrol.c | 29 ++++++++++------------------- > 2 files changed, 35 insertions(+), 22 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index bfe5c486f4ad..39fa88051a42 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -693,13 +693,35 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *memcg) > page_counter_read(&memcg->memory); > } > > -int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask); > +int __mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask); > +static inline int mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask) > +{ > + if (mem_cgroup_disabled()) > + return 0; > + return __mem_cgroup_charge(page, mm, gfp_mask); > +} > + > int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, > gfp_t gfp, swp_entry_t entry); > void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry); > > -void mem_cgroup_uncharge(struct page *page); > -void mem_cgroup_uncharge_list(struct list_head *page_list); > +void __mem_cgroup_uncharge(struct page *page); > +static inline void mem_cgroup_uncharge(struct page *page) > +{ > + if (mem_cgroup_disabled()) > + return; > + __mem_cgroup_uncharge(page); > +} > + > +void __mem_cgroup_uncharge_list(struct list_head *page_list); > +static inline void mem_cgroup_uncharge_list(struct list_head *page_list) > +{ > + if (mem_cgroup_disabled()) > + return; > + __mem_cgroup_uncharge_list(page_list); > +} > > void mem_cgroup_migrate(struct page *oldpage, struct page *newpage); > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index a228cd51c4bd..cdaf7003b43d 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -6701,8 +6701,7 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, > atomic_long_read(&parent->memory.children_low_usage))); > } > > -static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > - gfp_t gfp) > +static int charge_memcg(struct page *page, struct mem_cgroup *memcg, gfp_t gfp) > { > unsigned int nr_pages = thp_nr_pages(page); > int ret; > @@ -6723,7 +6722,7 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > } > > /** > - * mem_cgroup_charge - charge a newly allocated page to a cgroup > + * __mem_cgroup_charge - charge a newly allocated page to a cgroup > * @page: page to charge > * @mm: mm context of the victim > * @gfp_mask: reclaim mode > @@ -6736,16 +6735,14 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > * > * Returns 0 on success. Otherwise, an error code is returned. > */ > -int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask) > +int __mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask) > { > struct mem_cgroup *memcg; > int ret; > > - if (mem_cgroup_disabled()) > - return 0; > - > memcg = get_mem_cgroup_from_mm(mm); > - ret = __mem_cgroup_charge(page, memcg, gfp_mask); > + ret = charge_memcg(page, memcg, gfp_mask); > css_put(&memcg->css); > > return ret; > @@ -6780,7 +6777,7 @@ int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, > memcg = get_mem_cgroup_from_mm(mm); > rcu_read_unlock(); > > - ret = __mem_cgroup_charge(page, memcg, gfp); > + ret = charge_memcg(page, memcg, gfp); > > css_put(&memcg->css); > return ret; > @@ -6916,18 +6913,15 @@ static void uncharge_page(struct page *page, struct uncharge_gather *ug) > } > > /** > - * mem_cgroup_uncharge - uncharge a page > + * __mem_cgroup_uncharge - uncharge a page > * @page: page to uncharge > * > * Uncharge a page previously charged with mem_cgroup_charge(). The comment here also needs to be updated. mem_cgroup_uncharge() -> __mem_cgroup_uncharge() > */ > -void mem_cgroup_uncharge(struct page *page) > +void __mem_cgroup_uncharge(struct page *page) > { > struct uncharge_gather ug; > > - if (mem_cgroup_disabled()) > - return; > - > /* Don't touch page->lru of any random page, pre-check: */ > if (!page_memcg(page)) > return; > @@ -6938,20 +6932,17 @@ void mem_cgroup_uncharge(struct page *page) > } > > /** > - * mem_cgroup_uncharge_list - uncharge a list of page > + * __mem_cgroup_uncharge_list - uncharge a list of page > * @page_list: list of pages to uncharge > * > * Uncharge a list of pages previously charged with > * mem_cgroup_charge(). Should be __mem_cgroup_charge(). Thanks. > */ > -void mem_cgroup_uncharge_list(struct list_head *page_list) > +void __mem_cgroup_uncharge_list(struct list_head *page_list) > { > struct uncharge_gather ug; > struct page *page; > > - if (mem_cgroup_disabled()) > - return; > - > uncharge_gather_clear(&ug); > list_for_each_entry(page, page_list, lru) > uncharge_page(page, &ug); > -- > 2.32.0.93.g670b81a890-goog > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Muchun Song Subject: Re: [External] [PATCH v3 2/3] mm, memcg: inline mem_cgroup_{charge/uncharge} to improve disabled memcg config Date: Sat, 10 Jul 2021 19:08:17 +0800 Message-ID: References: <20210710003626.3549282-1-surenb@google.com> <20210710003626.3549282-2-surenb@google.com> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iHOLK1FYMKPl4w+01Mt+LZRFbB4PbbyNSj4oldd4dZs=; b=aWIygH1Xn0ppYNtHlA/yEW7r4AyE9HfNS4d5ZwSzcFpWGPppoBsUwhGHkvgl7MML3L 3dzTvDisWhidcvrObMAnacJa83nP3loQd+jGBvxA4Cga0hfwkhCDEgkwJ8RE15kTPHz4 zm2jHC8qFo17G/v03QK0NrZEPvCEU7tvVXLNUCmaMNE0SbsgPkNbPczhEjsPX6udJQlv sBhNXf+/IUO+85NioIiL4IuYqJfvYpWRofUBnOIRvmHHeBH8lw/r6mm59X0172ht4W/4 jA0/NAzq3T8LvucAn7CYKNuyFQdUSB7vd7/KYLywZouo7CyC+j4EToUy5AWGWedAfjm9 Iq7g== In-Reply-To: <20210710003626.3549282-2-surenb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Suren Baghdasaryan Cc: Tejun Heo , Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Shakeel Butt , Roman Gushchin , Yang Shi , Alex Shi , Wei Yang , Vlastimil Babka , Jens Axboe , Joonsoo Kim , David Hildenbrand , Matthew Wilcox , apopple-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, Minchan Kim , Miaohe Lin , LKML , Cgroups , Linux Memory Management List , kernel-team@android. On Sat, Jul 10, 2021 at 8:36 AM Suren Baghdasaryan wrote: > > Inline mem_cgroup_{charge/uncharge} and mem_cgroup_uncharge_list functions > functions to perform mem_cgroup_disabled static key check inline before > calling the main body of the function. This minimizes the memcg overhead > in the pagefault and exit_mmap paths when memcgs are disabled using > cgroup_disable=memory command-line option. > This change results in ~0.4% overhead reduction when running PFT test > comparing {CONFIG_MEMCG=n} against {CONFIG_MEMCG=y, cgroup_disable=memory} > configurationon on an 8-core ARM64 Android device. > > Signed-off-by: Suren Baghdasaryan > Reviewed-by: Shakeel Butt Reviewed-by: Muchun Song But some nits below. > --- > include/linux/memcontrol.h | 28 +++++++++++++++++++++++++--- > mm/memcontrol.c | 29 ++++++++++------------------- > 2 files changed, 35 insertions(+), 22 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index bfe5c486f4ad..39fa88051a42 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -693,13 +693,35 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *memcg) > page_counter_read(&memcg->memory); > } > > -int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask); > +int __mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask); > +static inline int mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask) > +{ > + if (mem_cgroup_disabled()) > + return 0; > + return __mem_cgroup_charge(page, mm, gfp_mask); > +} > + > int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, > gfp_t gfp, swp_entry_t entry); > void mem_cgroup_swapin_uncharge_swap(swp_entry_t entry); > > -void mem_cgroup_uncharge(struct page *page); > -void mem_cgroup_uncharge_list(struct list_head *page_list); > +void __mem_cgroup_uncharge(struct page *page); > +static inline void mem_cgroup_uncharge(struct page *page) > +{ > + if (mem_cgroup_disabled()) > + return; > + __mem_cgroup_uncharge(page); > +} > + > +void __mem_cgroup_uncharge_list(struct list_head *page_list); > +static inline void mem_cgroup_uncharge_list(struct list_head *page_list) > +{ > + if (mem_cgroup_disabled()) > + return; > + __mem_cgroup_uncharge_list(page_list); > +} > > void mem_cgroup_migrate(struct page *oldpage, struct page *newpage); > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index a228cd51c4bd..cdaf7003b43d 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -6701,8 +6701,7 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, > atomic_long_read(&parent->memory.children_low_usage))); > } > > -static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > - gfp_t gfp) > +static int charge_memcg(struct page *page, struct mem_cgroup *memcg, gfp_t gfp) > { > unsigned int nr_pages = thp_nr_pages(page); > int ret; > @@ -6723,7 +6722,7 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > } > > /** > - * mem_cgroup_charge - charge a newly allocated page to a cgroup > + * __mem_cgroup_charge - charge a newly allocated page to a cgroup > * @page: page to charge > * @mm: mm context of the victim > * @gfp_mask: reclaim mode > @@ -6736,16 +6735,14 @@ static int __mem_cgroup_charge(struct page *page, struct mem_cgroup *memcg, > * > * Returns 0 on success. Otherwise, an error code is returned. > */ > -int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask) > +int __mem_cgroup_charge(struct page *page, struct mm_struct *mm, > + gfp_t gfp_mask) > { > struct mem_cgroup *memcg; > int ret; > > - if (mem_cgroup_disabled()) > - return 0; > - > memcg = get_mem_cgroup_from_mm(mm); > - ret = __mem_cgroup_charge(page, memcg, gfp_mask); > + ret = charge_memcg(page, memcg, gfp_mask); > css_put(&memcg->css); > > return ret; > @@ -6780,7 +6777,7 @@ int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm, > memcg = get_mem_cgroup_from_mm(mm); > rcu_read_unlock(); > > - ret = __mem_cgroup_charge(page, memcg, gfp); > + ret = charge_memcg(page, memcg, gfp); > > css_put(&memcg->css); > return ret; > @@ -6916,18 +6913,15 @@ static void uncharge_page(struct page *page, struct uncharge_gather *ug) > } > > /** > - * mem_cgroup_uncharge - uncharge a page > + * __mem_cgroup_uncharge - uncharge a page > * @page: page to uncharge > * > * Uncharge a page previously charged with mem_cgroup_charge(). The comment here also needs to be updated. mem_cgroup_uncharge() -> __mem_cgroup_uncharge() > */ > -void mem_cgroup_uncharge(struct page *page) > +void __mem_cgroup_uncharge(struct page *page) > { > struct uncharge_gather ug; > > - if (mem_cgroup_disabled()) > - return; > - > /* Don't touch page->lru of any random page, pre-check: */ > if (!page_memcg(page)) > return; > @@ -6938,20 +6932,17 @@ void mem_cgroup_uncharge(struct page *page) > } > > /** > - * mem_cgroup_uncharge_list - uncharge a list of page > + * __mem_cgroup_uncharge_list - uncharge a list of page > * @page_list: list of pages to uncharge > * > * Uncharge a list of pages previously charged with > * mem_cgroup_charge(). Should be __mem_cgroup_charge(). Thanks. > */ > -void mem_cgroup_uncharge_list(struct list_head *page_list) > +void __mem_cgroup_uncharge_list(struct list_head *page_list) > { > struct uncharge_gather ug; > struct page *page; > > - if (mem_cgroup_disabled()) > - return; > - > uncharge_gather_clear(&ug); > list_for_each_entry(page, page_list, lru) > uncharge_page(page, &ug); > -- > 2.32.0.93.g670b81a890-goog >