From patchwork Thu May 27 09:33: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: 12283871 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 1CD70C47089 for ; Thu, 27 May 2021 09:34:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BE350613E6 for ; Thu, 27 May 2021 09:34:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE350613E6 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 3A6DB6B0078; Thu, 27 May 2021 05:34:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32C686B008A; Thu, 27 May 2021 05:34:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D376E6B008C; Thu, 27 May 2021 05:34:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0224.hostedemail.com [216.40.44.224]) by kanga.kvack.org (Postfix) with ESMTP id 8D9916B0078 for ; Thu, 27 May 2021 05:34:56 -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 30DDAA8D6 for ; Thu, 27 May 2021 09:34:56 +0000 (UTC) X-FDA: 78186501792.38.538252E Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf10.hostedemail.com (Postfix) with ESMTP id 5667A40B8CFE for ; Thu, 27 May 2021 09:34:48 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id 22so119720pfv.11 for ; Thu, 27 May 2021 02:34:55 -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=A6BVXsaS11IAfMyHtJiAg5Ol68mjN6vT4RM+MpSdQtA=; b=szBVqK4TJXUoZMJ5L2aPdAKI91Hi8jBSP6ql9PZS4s3V23KtjKAziLLp0qpU5VOQSg DKG+rubBXkdzsRQf86Z6YhUxEJV9qloQuQLLub0EE5XLIs0PYzvUMVfunjUPP45EugxZ QZ5VQ6AySA+Zbk1di5M8YWcwGO6VrLXNIxt99S8DYxdDtNUhIVaG8viJ6H3nKdLIoQlz WoDF0OiQ3xyficaDKjxcITXwmSguyfk5+KUMPK3vAO65L046nMt2ZBTutnVwSOxNNcfx 5J/CWPaSTo7VIho+yY4MTvQmjXWYhF0PeCXDG7d5aARD+CNTQ4sQrBRSnxSahrSdg3EM 5acw== 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=A6BVXsaS11IAfMyHtJiAg5Ol68mjN6vT4RM+MpSdQtA=; b=szUPo5f1dkaKPoA2zTaudp3zuKkno6qPt2QKvtyatFgM9HrKbP3LXxIUbd53DIIUUp 2mZETjEAzocqdwiV2ggxwVFWuvPwTSDLqHf08DY9HZFyFVW7AW26FfOXuMsw+bRkio0o 5avU9fp7mAD6HHdC3YXtxxKNchVlaqxJWZr6+1iNrqSuwUlQbWmMBR87wwM8FJUUQlg2 ot4FLKXE8aHXFfr8hJKyli6hZG1JspbL84EubhZSpUTv/FqgyxjKoCvp+KawNYMtUhyk Tt9wv48z4v/TICVnDr3+yLypr+9Nt5BJgcmDLt4GFOvZZGqlrsYJv4BHOh6OQSQUlu22 Y/mQ== X-Gm-Message-State: AOAM533qagCiqguZCpJc7n0nM6UeUd6Iovxcs2c0XhyQqTzHTijZbPpC E6ZK+LkMM0HVz/SerNMyzs70qA== X-Google-Smtp-Source: ABdhPJyf5GyjKjc67XHYiDY5BLcexKS9X52KNX4XLqz3/n1TTECE4ihpT7tVtQG1w2c3JGNf4AqI7A== X-Received: by 2002:a63:e709:: with SMTP id b9mr2849946pgi.153.1622108094821; Thu, 27 May 2021 02:34:54 -0700 (PDT) Received: from localhost.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id a9sm1418917pfl.57.2021.05.27.02.34.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 May 2021 02:34:54 -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: [RFC PATCH v4 11/12] mm: lru: add VM_BUG_ON_PAGE to lru maintenance function Date: Thu, 27 May 2021 17:33:35 +0800 Message-Id: <20210527093336.14895-12-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210527093336.14895-1-songmuchun@bytedance.com> References: <20210527093336.14895-1-songmuchun@bytedance.com> MIME-Version: 1.0 Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=szBVqK4T; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf10.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Stat-Signature: 46yiau4xzcxaearo57gskpdq77towbp3 X-Rspamd-Queue-Id: 5667A40B8CFE X-Rspamd-Server: rspam02 X-HE-Tag: 1622108088-333728 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 = page_lru(page); + 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(struct page *page, { enum lru_list lru = page_lru(page); + 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 731a8f5a4128..5c30dffce768 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2063,7 +2063,6 @@ static unsigned int move_pages_to_lru(struct list_head *list) continue; } - 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;