From patchwork Fri Apr 16 05:14:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12206705 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 70D33C433B4 for ; Fri, 16 Apr 2021 05:16:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 06468610FB for ; Fri, 16 Apr 2021 05:16:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 06468610FB 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 974DC6B007B; Fri, 16 Apr 2021 01:16:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 94AEA6B007D; Fri, 16 Apr 2021 01:16:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EC646B007E; Fri, 16 Apr 2021 01:16:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0114.hostedemail.com [216.40.44.114]) by kanga.kvack.org (Postfix) with ESMTP id 60A2F6B007B for ; Fri, 16 Apr 2021 01:16:05 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 234681822B821 for ; Fri, 16 Apr 2021 05:16:05 +0000 (UTC) X-FDA: 78037068690.27.D53BAF8 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf16.hostedemail.com (Postfix) with ESMTP id 27BF980192DA for ; Fri, 16 Apr 2021 05:16:04 +0000 (UTC) Received: by mail-pf1-f176.google.com with SMTP id 10so8699791pfl.1 for ; Thu, 15 Apr 2021 22:16:04 -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=quvF2EjF/xPK4PyQGSt8Z2m2h60Cl4Xz0YmhFi/qiI8=; b=wT8QOhtF0Xk3DzJURDe0I2FPnhhBjN6WF3ukTAggd/ZvLUS8hIyGkQMjuXxsfhlJNK MA7nkojnWv4ZUHPHV0/jKpXU9mf79GZsZcfx5Qgo+YDZiNXpmMp80mPzbja4fl+Z0nkr 7ny44DwYeAIT8iTY+qHqEulVRhBNOdmT7Z2pM82H9op1rRDKA5x8zQeQY+WP0mjjZYj4 xBDpQc4C7hAbt7Q3AtV6SlDYT2kaS6AK+XuBEeVzg48e+Wk+cyxRS95bJvwJZLx9T2bx PfzfJkPH/kiRnFiQqdhVAZYclcXAQl8mz/mlu8d45AoSRk+Z6AE2rKpAPNBNGgtk8lor Wtzw== 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=quvF2EjF/xPK4PyQGSt8Z2m2h60Cl4Xz0YmhFi/qiI8=; b=I6eJtrMdjTpai4dC+auvYiYzUiwi60Uzsd9ew8YaAt1gmjN262QLQvr0I8XqbzV7V9 5ToxLn3txuzl99wQhnfGOt52CZ6+eQNG7YVOJXBm3fYUkVjpyiHZ0YtKdyt6x5b1wTqg URC0eM7h28dB/a6vMV1z8VVwQ+2nrPID+osa5BxjgKZvwCfAqTu4TOIiNHUxiECM+LH1 xp0bbaOnpd8472ev47TAdgiq/ZvgC7fWBx378OjY78xMevGmv4ffGSNVtOGvfAh0dIUB /ke1LjC82TsaILK6msqwNa3rjCdbQb9MUu9iqVovsefklzTniKQw8LQ5fjQkLdoaS8Q+ VUbg== X-Gm-Message-State: AOAM530WE6VKi8Cb4t5iS4eeRe1+U3SYji0O2iZWp6bCe/ujaEDSz4l4 cNM9QrR0vn+6Koed2Ix9pSPy/A== X-Google-Smtp-Source: ABdhPJwLW+IwtkWVKRKXZQMrb5e0hyLANL5+//jsyPZ/VYECJqDhd2JzUG8ROI5TDfmpH9bmgwID1A== X-Received: by 2002:a62:1ec1:0:b029:24d:b3de:25be with SMTP id e184-20020a621ec10000b029024db3de25bemr6421893pfe.17.1618550163986; Thu, 15 Apr 2021 22:16:03 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.235]) by smtp.gmail.com with ESMTPSA id j7sm3518540pfd.129.2021.04.15.22.15.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Apr 2021 22:16:03 -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 Subject: [PATCH v2 5/8] mm: memcontrol: rename lruvec_holds_page_lru_lock to page_matches_lruvec Date: Fri, 16 Apr 2021 13:14:04 +0800 Message-Id: <20210416051407.54878-6-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210416051407.54878-1-songmuchun@bytedance.com> References: <20210416051407.54878-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 27BF980192DA X-Stat-Signature: 8t59qq6kysa5bt4jpsxfb177ocdfab7n Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf16; identity=mailfrom; envelope-from=""; helo=mail-pf1-f176.google.com; client-ip=209.85.210.176 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618550164-335934 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 | 7 +++---- mm/vmscan.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 2fc728492c9b..40b0c31ea4ba 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1492,8 +1492,7 @@ 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) +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 +1503,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 +1517,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;