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=-16.6 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,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 F244CC433EF for ; Thu, 16 Sep 2021 13:53:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A5D8161241 for ; Thu, 16 Sep 2021 13:53:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A5D8161241 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 415366B0073; Thu, 16 Sep 2021 09:53:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C46A6B0082; Thu, 16 Sep 2021 09:53:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28BF16B0083; Thu, 16 Sep 2021 09:53:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0132.hostedemail.com [216.40.44.132]) by kanga.kvack.org (Postfix) with ESMTP id 1C11A6B0073 for ; Thu, 16 Sep 2021 09:53:21 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D8BA82D3AD for ; Thu, 16 Sep 2021 13:53:20 +0000 (UTC) X-FDA: 78593578560.38.D26A534 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf22.hostedemail.com (Postfix) with ESMTP id 933261904 for ; Thu, 16 Sep 2021 13:53:20 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id e7so6224331pgk.2 for ; Thu, 16 Sep 2021 06:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QjeJQ0YTKzcUeZcg+zZ6AwSMvoUSpJAhbMH1V05RNeQ=; b=K1bHsyfWmH1qaHSYncFdFlHW5oAkrOJ7QNUWKGjw16s2Qr0IaVNZdV4PghIUXDGXbb /iu2WOu4QbtPdWZUiQh1puLHVJ6B2KIw1+BwIwfDrnfF2r3C6oc8tuGcE+mvKSDA9H3j LnT2Z/HWp/uDMuN2xuOMHhmsU/k4AzOQa1Wa1HvLcx7p/RQfKNNkAmLB+EpSeeKkBo8A 1IYPpQbt62PZl6HBaMJqVdcgDJibZDVVkhpS+adIkaBKwSTRnOmN/xWP+uTs9pAy0C7r dx+IO7ME2oOHvedSlamFnXcjyLMuFlRd4/BcUUx5mAKPsNfQYI90EiUi9qGVcLyG8IR/ gzgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QjeJQ0YTKzcUeZcg+zZ6AwSMvoUSpJAhbMH1V05RNeQ=; b=ieTITkLPGCcGgCz0bv/HTjaLrjlyyuIVcIGhYc41IlE4QSFx4eDon+iyASsCOLvUBE gYEvWInnjjHUXklD4sZr7yn9Y6AMf0GHZ4hRs+mddrsSPL/wY/ZVjtz5uNmjQQFaZ0fc 41Bd5x+FE6wqZ3UdipUu8WN8R5ESrtSMVoLs9xFpdzIQQuNl9Q+j6PzA2Y6wr0vjkUn6 HgYwUViHa4oUk9oWY6ORDX30v7njMUeJy9HHVfLDJdpYGzAdhT6WI1YodwToepMwT45U S9e7sgkdmg/XiSMWsucwUQHojgkt8tXFXABwYaghD20MQjIJDcfEbDkF20yTqyqRFML4 2wnQ== X-Gm-Message-State: AOAM532UiJcFlsEuprNw8myaebIPrYLFtMP3+/aXT5VrstZstJXowohk GbFB0Dh7sBIXlWyvv494e6cdlg== X-Google-Smtp-Source: ABdhPJzkDf5eikgx9JbA3X/pRE/Z7u02fZ0xZpmaQ8o3VN8/kee21C1WAfd6LGjOPlCFJhJVj4KrYg== X-Received: by 2002:a63:af4b:: with SMTP id s11mr5072323pgo.185.1631800399729; Thu, 16 Sep 2021 06:53:19 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.226]) by smtp.gmail.com with ESMTPSA id o9sm3617443pfh.217.2021.09.16.06.53.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Sep 2021 06:53:19 -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, fam.zheng@bytedance.com, bsingharora@gmail.com, shy828301@gmail.com, alexs@kernel.org, smuchun@gmail.com, zhengqi.arch@bytedance.com, Muchun Song Subject: [PATCH v2 12/13] mm: lru: add VM_BUG_ON_PAGE to lru maintenance function Date: Thu, 16 Sep 2021 21:47:47 +0800 Message-Id: <20210916134748.67712-13-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210916134748.67712-1-songmuchun@bytedance.com> References: <20210916134748.67712-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 933261904 X-Stat-Signature: 7ibxad6bf5x7u6npmt1wwnyxojhwbjfr Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=K1bHsyfW; spf=pass (imf22.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-HE-Tag: 1631800400-10705 Content-Transfer-Encoding: quoted-printable 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: We need to make sure that the page is deleted from or added to the correct lruvec list. So add a VM_BUG_ON_PAGE() to catch invalid users. Signed-off-by: Muchun Song --- include/linux/mm_inline.h | 6 ++++++ mm/vmscan.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 355ea1ee32bd..1ca1e2ab8565 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -84,6 +84,8 @@ static __always_inline void add_page_to_lru_list(struct= page *page, { enum lru_list lru =3D page_lru(page); =20 + VM_BUG_ON_PAGE(!page_matches_lruvec(page, lruvec), page); + update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); list_add(&page->lru, &lruvec->lists[lru]); } @@ -93,6 +95,8 @@ static __always_inline void add_page_to_lru_list_tail(s= truct page *page, { enum lru_list lru =3D page_lru(page); =20 + VM_BUG_ON_PAGE(!page_matches_lruvec(page, lruvec), page); + update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); list_add_tail(&page->lru, &lruvec->lists[lru]); } @@ -100,6 +104,8 @@ static __always_inline void add_page_to_lru_list_tail= (struct page *page, static __always_inline void del_page_from_lru_list(struct page *page, struct lruvec *lruvec) { + VM_BUG_ON_PAGE(!page_matches_lruvec(page, lruvec), page); + list_del(&page->lru); update_lru_size(lruvec, page_lru(page), page_zonenum(page), -thp_nr_pages(page)); diff --git a/mm/vmscan.c b/mm/vmscan.c index 6878a6bff2f8..f38ec21babf3 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2199,7 +2199,6 @@ static unsigned int move_pages_to_lru(struct list_h= ead *list) continue; } =20 - VM_BUG_ON_PAGE(!page_matches_lruvec(page, lruvec), page); add_page_to_lru_list(page, lruvec); nr_pages =3D thp_nr_pages(page); nr_moved +=3D nr_pages; --=20 2.11.0