From: Muchun Song <songmuchun@bytedance.com>
To: Hui Su <sh_def@163.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Shakeel Butt <shakeelb@google.com>,
Linux Memory Management List <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [External] [PATCH] mm/page_alloc: simplify kmem cgroup charge/uncharge code
Date: Mon, 7 Dec 2020 22:42:23 +0800 [thread overview]
Message-ID: <CAMZfGtV8CS_Sh+N5xYsxiHCz2K2KVFrHw0ohrrboNucXucekOw@mail.gmail.com> (raw)
In-Reply-To: <20201207142204.GA18516@rlk>
On Mon, Dec 7, 2020 at 10:22 PM Hui Su <sh_def@163.com> wrote:
>
> Since the commit 60cd4bcd6238 ("memcg: localize memcg_kmem_enabled()
> check"), we have supplied the api which users don't have to explicitly
> check memcg_kmem_enabled().
>
> Signed-off-by: Hui Su <sh_def@163.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
> ---
> mm/page_alloc.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index eaa227a479e4..dc990a899ded 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -1214,8 +1214,8 @@ static __always_inline bool free_pages_prepare(struct page *page,
> * Do not let hwpoison pages hit pcplists/buddy
> * Untie memcg state and reset page's owner
> */
> - if (memcg_kmem_enabled() && PageKmemcg(page))
> - __memcg_kmem_uncharge_page(page, order);
> + if (PageKmemcg(page))
> + memcg_kmem_uncharge_page(page, order);
> reset_page_owner(page, order);
> return false;
> }
> @@ -1244,8 +1244,8 @@ static __always_inline bool free_pages_prepare(struct page *page,
> }
> if (PageMappingFlags(page))
> page->mapping = NULL;
> - if (memcg_kmem_enabled() && PageKmemcg(page))
> - __memcg_kmem_uncharge_page(page, order);
> + if (PageKmemcg(page))
> + memcg_kmem_uncharge_page(page, order);
> if (check_free)
> bad += check_free_page(page);
> if (bad)
> @@ -4965,8 +4965,8 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,
> page = __alloc_pages_slowpath(alloc_mask, order, &ac);
>
> out:
> - if (memcg_kmem_enabled() && (gfp_mask & __GFP_ACCOUNT) && page &&
> - unlikely(__memcg_kmem_charge_page(page, gfp_mask, order) != 0)) {
> + if ((gfp_mask & __GFP_ACCOUNT) && page &&
> + unlikely(memcg_kmem_charge_page(page, gfp_mask, order) != 0)) {
> __free_pages(page, order);
> page = NULL;
> }
> --
> 2.29.2
>
>
--
Yours,
Muchun
next prev parent reply other threads:[~2020-12-07 14:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 14:22 [PATCH] mm/page_alloc: simplify kmem cgroup charge/uncharge code Hui Su
2020-12-07 14:42 ` Muchun Song [this message]
2020-12-07 17:28 ` Shakeel Butt
2020-12-08 7:14 ` Hui Su
[not found] ` <20201208060747.GA56968@rlk>
2020-12-08 17:12 ` Shakeel Butt
2020-12-09 16:29 ` Michal Hocko
2020-12-09 18:15 ` Shakeel Butt
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=CAMZfGtV8CS_Sh+N5xYsxiHCz2K2KVFrHw0ohrrboNucXucekOw@mail.gmail.com \
--to=songmuchun@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=sh_def@163.com \
--cc=shakeelb@google.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).