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=-13.7 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 BF9A8C433FE for ; Mon, 7 Dec 2020 14:43:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 22D2923602 for ; Mon, 7 Dec 2020 14:43:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22D2923602 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 3AE4A8D0003; Mon, 7 Dec 2020 09:43:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 35FA28D0001; Mon, 7 Dec 2020 09:43:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2282C8D0003; Mon, 7 Dec 2020 09:43:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0212.hostedemail.com [216.40.44.212]) by kanga.kvack.org (Postfix) with ESMTP id 0BD7A8D0001 for ; Mon, 7 Dec 2020 09:43:02 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id B3963362B for ; Mon, 7 Dec 2020 14:43:01 +0000 (UTC) X-FDA: 77566753362.13.fog17_12002ab273df Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 8EEC318140B60 for ; Mon, 7 Dec 2020 14:43:01 +0000 (UTC) X-HE-Tag: fog17_12002ab273df X-Filterd-Recvd-Size: 4990 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Mon, 7 Dec 2020 14:43:00 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id s21so10167878pfu.13 for ; Mon, 07 Dec 2020 06:43:00 -0800 (PST) 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=k5xJHpzkWq3fPFICAliDXY3lW0eacrQxvWesbPVfrbE=; b=EUAmfB9SgQWGY0xQeiOXG4pQKS43QKzYf3yuQ8Ye8ujw4OpjxQlgbf7IFawwWV6J8+ LZWGoT3a398qvBw0Wokn0cie7dA/rEBL30q7Dtcg8FMNzvRI6+D3lh1NDq0hIBkCII8m kXXClFXnHpU2dAaE3Wsz9V347BXi4Ga2c1IP3LXXISZ4NS7ZDmWpjIGQRiiND02ffFqg nMuiI9+cAfVytHw4ZAWkVLIi2fUK6pkvtRYTMQEc3rw5IeUV4abTqgb8BdkZu9fef4E2 08pO9BV9k0l9CdkSYJa92yP/oajzhQJjELkO17ZflxwWQxgHQ9RYUyo5XDqYpT/sfS6u NjmA== 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=k5xJHpzkWq3fPFICAliDXY3lW0eacrQxvWesbPVfrbE=; b=hWN2qQvcS3IlmCw0gSeqmbQtnz4HTQPwC6HyqPiHAmBSJ1h8eJIerEz9wD9wwCqdrX facbkSSx9/n2Vxv5nc5LorYU08J3i7LoWivhm/oiXRLdsp4dCHumLJK2z6HnqvFmznpl vRgTKOvZBIlM8edpQrk3o+8tZWU4yZ1S+9TjrJN7YMlkW/5L5l/kVqjdPsM5Iopd1PH1 FXerOsqrEjgEkkOVheI9Ak9+GBvyyvxFKOl8oAITpVhgQbA0aTt0wfpUJPy8jkDv4nU3 Hl2GjK5KJhg71RcxcHl6u9jy4d6PUd89/+jZOqpnCPG2vrkM3A2I5q8n13p8rng3jsed /XZg== X-Gm-Message-State: AOAM530OxIzWkweJBs+eMywYOIZ9tx5mk81JpjPWgnNivCesKMiolgcr 8LGp29xswMm6qyG2hB2OUpMXgW8SlEiXDtlKKSii2A== X-Google-Smtp-Source: ABdhPJyiFFoSswfMQwRHj9c+4GSiFy7hnaCjcOgu/Zq+G/6ZotsSkCqJ+4mSPA0JgGTgrNSFNWee2/6qmNg5DLjBWh0= X-Received: by 2002:aa7:8701:0:b029:19e:561:d476 with SMTP id b1-20020aa787010000b029019e0561d476mr5707847pfo.2.1607352179512; Mon, 07 Dec 2020 06:42:59 -0800 (PST) MIME-Version: 1.0 References: <20201207142204.GA18516@rlk> In-Reply-To: <20201207142204.GA18516@rlk> From: Muchun Song Date: Mon, 7 Dec 2020 22:42:23 +0800 Message-ID: Subject: Re: [External] [PATCH] mm/page_alloc: simplify kmem cgroup charge/uncharge code To: Hui Su Cc: Andrew Morton , Shakeel Butt , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" 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 Mon, Dec 7, 2020 at 10:22 PM Hui Su 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 Reviewed-by: Muchun Song > --- > 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