From patchwork Wed Apr 21 07:00:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12215569 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=-13.8 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,UNWANTED_LANGUAGE_BODY, 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 0E9FFC433ED for ; Wed, 21 Apr 2021 07:02:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B79236141C for ; Wed, 21 Apr 2021 07:02:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B79236141C 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 55C206B007E; Wed, 21 Apr 2021 03:02:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 51F656B0080; Wed, 21 Apr 2021 03:02:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CCB46B0081; Wed, 21 Apr 2021 03:02:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0143.hostedemail.com [216.40.44.143]) by kanga.kvack.org (Postfix) with ESMTP id 24A626B007E for ; Wed, 21 Apr 2021 03:02:21 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D161B180AE817 for ; Wed, 21 Apr 2021 07:02:20 +0000 (UTC) X-FDA: 78055480440.06.7626B6A Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf09.hostedemail.com (Postfix) with ESMTP id 9E8826000112 for ; Wed, 21 Apr 2021 07:02:15 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id 10so18937361pfl.1 for ; Wed, 21 Apr 2021 00:02:20 -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=KOblc09270R2YgCzxHlhlETixqfgTKHJT/cm7rGcYUo=; b=RF1ysiV28VxzaF1ysZc4wEH9jpvmcmRlh2M3QS/VhGtLEXHMz4izDOMjByfkMqCcZq cK919VxFqPTLk7y1j3W/Nlt32PGxgxmokZLs9CQjSyOAcLaPHd9qeHJYOcmottRzMzE+ A4BN3maC37t6kQulCaJwH2EKWnTGljZ0O31RLeAezhRx1VicEDeYIIxBE5AkMfZA/ufP +chI6py9LFmfkw42ZHkvzyyEuMIE8fcS8fsax34NGhhV7tlJX9gWnahJb2rMUI/3t8NO IVIRs2PfUYMy+y+pLzWvirk1F2q3Zeyq3zeMz+NZNKJJVZwtv3HwCoZYKjKP9IWGiVnD sCvg== 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=KOblc09270R2YgCzxHlhlETixqfgTKHJT/cm7rGcYUo=; b=fOVeCLfhqxqJva8gfA4SfEaO35c8J1e4U97ZVnNgTpwEapN0h62qe+zvuSzJY9g26o o6lSgQbd6D0eRA/Uz5qixnZGdaqUVDUTiLU/esbl+084iwKjS5YN5ODlSLCtfJlEF26N iyVHYv018nGYwSe4vL22jiBy3sdsLrOcZil/to+BO0ivbqNjbN7XMH4WrO+f7ubooiWo Pm/DB8UcXdDSrNhS4DTKCFWBcm5SdAQz+p+96whCXqH4DYS9Evk2Xc1c8hR4rX+vREMK ROpZ2iQicFw6HdSUtC8DRkXnqJb63lpGIw+wf6ZqeKkBReMVoG8DfkDnWIL3mg0LFBoG M8WA== X-Gm-Message-State: AOAM533hisgp6T69+NZ4DzMME+HjsWRaIOMmVLx+6pPqGPSV68TiwvlG QvRJJ3hB/ji2h3y48MH9CLFyzQ== X-Google-Smtp-Source: ABdhPJx7/71OWFCapSEQ0oUaHcpYmyXIj3bJgHdJlsg95On9aDQe2/EQzYcZB1U8cPGS1S5lmj8vlw== X-Received: by 2002:a62:bd13:0:b029:25f:cd51:7bb5 with SMTP id a19-20020a62bd130000b029025fcd517bb5mr13848048pff.74.1618988539521; Wed, 21 Apr 2021 00:02:19 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id c4sm929842pfb.94.2021.04.21.00.02.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Apr 2021 00:02: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, alex.shi@linux.alibaba.com, Muchun Song Subject: [RFC PATCH v3 11/12] mm: lru: add VM_BUG_ON_PAGE to lru maintenance function Date: Wed, 21 Apr 2021 15:00:58 +0800 Message-Id: <20210421070059.69361-12-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210421070059.69361-1-songmuchun@bytedance.com> References: <20210421070059.69361-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9E8826000112 X-Stat-Signature: 3fdaumqrghdks7fwizsufi5ii7hkncqi Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf09; identity=mailfrom; envelope-from=""; helo=mail-pf1-f170.google.com; client-ip=209.85.210.170 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618988535-596318 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 02d14a377b0e..924db107fad7 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2062,7 +2062,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;