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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 85863C433B4 for ; Fri, 16 Apr 2021 06:01:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1016561166 for ; Fri, 16 Apr 2021 06:01:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1016561166 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8F2156B0036; Fri, 16 Apr 2021 02:01:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87ADD6B006C; Fri, 16 Apr 2021 02:01:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F3DE6B0070; Fri, 16 Apr 2021 02:01:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0107.hostedemail.com [216.40.44.107]) by kanga.kvack.org (Postfix) with ESMTP id 4CFCB6B0036 for ; Fri, 16 Apr 2021 02:01:16 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id F11D3181C9BBB for ; Fri, 16 Apr 2021 06:01:15 +0000 (UTC) X-FDA: 78037182510.14.7B3A07C Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf18.hostedemail.com (Postfix) with ESMTP id 88CC92000267 for ; Fri, 16 Apr 2021 06:01:16 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1618552874; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CcxZJXIn600KKHi4Ii9DOy7PKS3jJv9awLf/Br93sWI=; b=HOinFmk+SPJG00P75hIszwIpHFu1+7CmEVsIDNQN+nU6+l+AXkEDrqcjCN4Ox86I1hnp84 KGZ7CTwfby81UyAS/CP52O55HcwHjF7uNjPkdu95Mdrxa03xulABq+oBD5jqPSgidiTf1U zKmtdmsiC9czyO3qleb2tnj/2OvDhKI= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 239F2AFEA; Fri, 16 Apr 2021 06:01:14 +0000 (UTC) Date: Fri, 16 Apr 2021 08:01:08 +0200 From: Michal Hocko To: Muchun Song Cc: guro@fb.com, hannes@cmpxchg.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com Subject: Re: [PATCH v2 5/8] mm: memcontrol: rename lruvec_holds_page_lru_lock to page_matches_lruvec Message-ID: References: <20210416051407.54878-1-songmuchun@bytedance.com> <20210416051407.54878-6-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210416051407.54878-6-songmuchun@bytedance.com> X-Rspamd-Queue-Id: 88CC92000267 X-Stat-Signature: uyzs31mmgjt9nakab3f5qqygnn57asqu X-Rspamd-Server: rspam02 Received-SPF: none (suse.com>: No applicable sender policy available) receiver=imf18; identity=mailfrom; envelope-from=""; helo=mx2.suse.de; client-ip=195.135.220.15 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618552876-307325 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 Fri 16-04-21 13:14:04, Muchun Song wrote: > 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 Thanks > --- > 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; > -- > 2.11.0 -- Michal Hocko SUSE Labs