From patchwork Sat Apr 17 04:35:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12209531 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 49C21C433ED for ; Sat, 17 Apr 2021 04:38:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C6148611AB for ; Sat, 17 Apr 2021 04:38:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6148611AB 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 65F136B0073; Sat, 17 Apr 2021 00:38:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 634736B0074; Sat, 17 Apr 2021 00:38:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D6666B0075; Sat, 17 Apr 2021 00:38:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id 340176B0073 for ; Sat, 17 Apr 2021 00:38:27 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EE5791801587F for ; Sat, 17 Apr 2021 04:38:26 +0000 (UTC) X-FDA: 78040602612.03.1CD83EB Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 498BCA0000FD for ; Sat, 17 Apr 2021 04:38:26 +0000 (UTC) Received: by mail-pl1-f172.google.com with SMTP id t22so14678396ply.1 for ; Fri, 16 Apr 2021 21:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CzztEYThC68iA+/H3mXFzISa6K0UiM/T7EUy8N400kM=; b=ZwQpZdb4P0z3JJJBaiDRn34BsDhgV7N2sSEU+RfSVAHDy77bCYUa42yOlGOKs0A7TU Kj/xw6XNgYv+qS/dwBKrd0p60qYp8yqtTQL3ftFDEKcKFFzEeWz0rK/vStgWPGu4vVXi Ekr8fx3oRHT4pJI4I3clORCRCha9uLyLk1MfV1EJQuayfM3Yzqo3rDKwziEv+xt7lfBX 8/9AC9jvuQdU5UU3o0mHBbePSwRw8Gw3WvWgATwgkfdqt5vxl4KGi2Va3k23f+nUNrt3 7wbApWm3nKoM1btFRS9BmewuR1HjYvLBDNKauYYE1i9M8bWV4DB+JqUdbbxCFb6xTO0n OCgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CzztEYThC68iA+/H3mXFzISa6K0UiM/T7EUy8N400kM=; b=Hakm8N+eYVOJ4G7402ya6fRSaqLpLyl5wPR0Rv8HujbN4tXzLD+4p2JHIp+PQ8VOW0 zPxqfX5Je5HA6ITR8Wx9njvzSmSinatB9jl5dutHgSPwU6EoqPqU/aZxWAxtnRSFUKBK noaZZ+y0GCrf8/IQUWDJHF/PHhEbz2N5K8rEL2icev2Zc1+0WWMEaESMvi5Hw4zW7/El VDPWk7xeOY8skQ29lHYzI20gNVvUB/EPxI1DgU7ZeEE8z8j4ERdSCMuw4M4jV4AcQuRE mEDB+KkcBKjmHtdrySyiFF/PeDXnBFVXtA+Js81hzHzVFutYn2LO89SoFDheJlbl0vXI A7gA== X-Gm-Message-State: AOAM532XRHDgP6Y/URU4+CWlB+xTY0NbGp2szMpVgUfImwZaWX2u74hc tlSvTVYJyQp9lK1IXm0W+iAPIQ== X-Google-Smtp-Source: ABdhPJwHJOXNxCRxaiJNn5wSMEycirv4bY2+aWCTu05ryyJoj5mcg7Rh8aN85bWBwHXTFU/RExwEkQ== X-Received: by 2002:a17:90a:9312:: with SMTP id p18mr12986286pjo.171.1618634305772; Fri, 16 Apr 2021 21:38:25 -0700 (PDT) Received: from localhost.bytedance.net ([139.177.225.228]) by smtp.gmail.com with ESMTPSA id w21sm7064775pjy.21.2021.04.16.21.38.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Apr 2021 21:38:25 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, Muchun Song , Michal Hocko Subject: [PATCH v3 5/8] mm: memcontrol: rename lruvec_holds_page_lru_lock to page_matches_lruvec Date: Sat, 17 Apr 2021 12:35:35 +0800 Message-Id: <20210417043538.9793-6-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210417043538.9793-1-songmuchun@bytedance.com> References: <20210417043538.9793-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 498BCA0000FD X-Stat-Signature: 9frg9ze5d4tnihpxbcqns86nmnejts58 X-Rspamd-Server: rspam02 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf07; identity=mailfrom; envelope-from=""; helo=mail-pl1-f172.google.com; client-ip=209.85.214.172 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618634306-732759 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: lruvec_holds_page_lru_lock() doesn't check anything about locking and is used to check whether the page belongs to the lruvec. So rename it to page_matches_lruvec(). Signed-off-by: Muchun Song Acked-by: Michal Hocko Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt --- include/linux/memcontrol.h | 8 ++++---- mm/vmscan.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 2fc728492c9b..0ce97eff79e2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1492,8 +1492,8 @@ static inline void unlock_page_lruvec_irqrestore(struct lruvec *lruvec, spin_unlock_irqrestore(&lruvec->lru_lock, flags); } -static inline bool lruvec_holds_page_lru_lock(struct page *page, - struct lruvec *lruvec) +/* Test requires a stable page->memcg binding, see page_memcg() */ +static inline bool page_matches_lruvec(struct page *page, struct lruvec *lruvec) { return lruvec_pgdat(lruvec) == page_pgdat(page) && lruvec_memcg(lruvec) == page_memcg(page); @@ -1504,7 +1504,7 @@ static inline struct lruvec *relock_page_lruvec_irq(struct page *page, struct lruvec *locked_lruvec) { if (locked_lruvec) { - if (lruvec_holds_page_lru_lock(page, locked_lruvec)) + if (page_matches_lruvec(page, locked_lruvec)) return locked_lruvec; unlock_page_lruvec_irq(locked_lruvec); @@ -1518,7 +1518,7 @@ static inline struct lruvec *relock_page_lruvec_irqsave(struct page *page, struct lruvec *locked_lruvec, unsigned long *flags) { if (locked_lruvec) { - if (lruvec_holds_page_lru_lock(page, locked_lruvec)) + if (page_matches_lruvec(page, locked_lruvec)) return locked_lruvec; unlock_page_lruvec_irqrestore(locked_lruvec, *flags); diff --git a/mm/vmscan.c b/mm/vmscan.c index bb8321026c0c..2bc5cf409958 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2062,7 +2062,7 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, * All pages were isolated from the same lruvec (and isolation * inhibits memcg migration). */ - VM_BUG_ON_PAGE(!lruvec_holds_page_lru_lock(page, lruvec), page); + VM_BUG_ON_PAGE(!page_matches_lruvec(page, lruvec), page); add_page_to_lru_list(page, lruvec); nr_pages = thp_nr_pages(page); nr_moved += nr_pages;