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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 9BCFCC4727E for ; Mon, 28 Sep 2020 18:02:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 67A5F208D5 for ; Mon, 28 Sep 2020 18:02:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=sent.com header.i=@sent.com header.b="RIm6Hu50"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="S2bT/ZI0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727056AbgI1SCx (ORCPT ); Mon, 28 Sep 2020 14:02:53 -0400 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:44839 "EHLO wnew3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726788AbgI1SBT (ORCPT ); Mon, 28 Sep 2020 14:01:19 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 9BF05E79; Mon, 28 Sep 2020 13:55:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 28 Sep 2020 13:55:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=from :to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; s=fm1; bh=M3Z5iltvAqpPX zgr4nDP3SM4M0PVu4wUve2VkVgkarQ=; b=RIm6Hu50wQRzGwujXp7gxNqIZcVKi KpBjCp4WeVNao7jLnVzlYFRx/wq6Ony32NdgfgQuswGC92phH9PfzBvoCsvoqyxZ KND7r3CEXZOqnam2Kkl0QxdDGe3FQcpmCImJ7YkOgPLqErBwe1IQ033ZDdn8l36Z pcp8v78qe6g1cKLPFOTxeSnwNSvCwEBvOwTZbW32BXE7elOyHbIRQWVn9jBRh9yC l8Z7TiBLaLN2BTSsBI3yoreMaPfQEf0jYXen2dndh7zrCjO7mPbn5sPfVxunUhpd rw3r5DdVtQJIQ33GFJCQa3yC/Zw9kT7UzmMuu2XeU+34FAaLEjMbzMYbg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:reply-to:subject :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=M3Z5iltvAqpPXzgr4nDP3SM4M0PVu4wUve2VkVgkarQ=; b=S2bT/ZI0 ecspBpXxJ0fmgANiN86cZWhwvxMJoG724bYeA/5cCMMK9pe6O6vuIb96paQmfKLi Tbf3NccwNxQQbHQp0T5GYaRmGIeoZvos8t2GPlI41g37ie21tyF8OqeX/23jbiWA CHn36krd80hPd67dEpYjRqwwFFRdRez+JK2CgQmrcU8EwaCw/SHzrAjcj/jY41bH LwgH09D2ZYk0eO6IQtC9eQXYttV5k1o6dymMEj3aDKrD1odPZI49qXZAp31kMtkY dTPMvvgnMzFDSNri+kSIZ+9HZB3vx4CFYmobc2mq3CBvSLGKlLWegc1pyDwzddvm v+fPZp3vbVFv0A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdeigdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhhrggfgsedtkeertdertddtnecuhfhrohhmpegkihcujggr nhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeduhfffve ektdduhfdutdfgtdekkedvhfetuedufedtgffgvdevleehheevjefgtdenucfkphepuddv rdegiedruddtiedrudeigeenucevlhhushhtvghrufhiiigvpeduvdenucfrrghrrghmpe hmrghilhhfrhhomhepiihirdihrghnsehsvghnthdrtghomh X-ME-Proxy: Received: from nvrsysarch6.NVidia.COM (unknown [12.46.106.164]) by mail.messagingengine.com (Postfix) with ESMTPA id 88CE33064683; Mon, 28 Sep 2020 13:55:22 -0400 (EDT) From: Zi Yan To: linux-mm@kvack.org Cc: "Kirill A . Shutemov" , Roman Gushchin , Rik van Riel , Matthew Wilcox , Shakeel Butt , Yang Shi , Jason Gunthorpe , Mike Kravetz , Michal Hocko , David Hildenbrand , William Kucharski , Andrea Arcangeli , John Hubbard , David Nellans , linux-kernel@vger.kernel.org, Zi Yan Subject: [RFC PATCH v2 13/30] mm: rmap: add map_order to page_remove_anon_compound_rmap. Date: Mon, 28 Sep 2020 13:54:11 -0400 Message-Id: <20200928175428.4110504-14-zi.yan@sent.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200928175428.4110504-1-zi.yan@sent.com> References: <20200928175428.4110504-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zi Yan When PMD-mapped PUD THP is enabled by the upcoming commits, we can unmap a PMD-mapped PUD THP that should be counted as NR_ANON_THPS. The added map_order tells us about this situation. Signed-off-by: Zi Yan --- mm/rmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0d922e5fb38c..7fc0bf07b9bc 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1292,7 +1292,7 @@ static void page_remove_file_rmap(struct page *page, bool compound) clear_page_mlock(page); } -static void page_remove_anon_compound_rmap(struct page *page) +static void page_remove_anon_compound_rmap(struct page *page, int map_order) { int i, nr; @@ -1306,7 +1306,7 @@ static void page_remove_anon_compound_rmap(struct page *page) if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) return; - if (thp_nr_pages(page) == HPAGE_PMD_NR) + if (map_order == HPAGE_PMD_ORDER) __dec_lruvec_page_state(page, NR_ANON_THPS); else __dec_lruvec_page_state(page, NR_ANON_THPS_PUD); @@ -1357,7 +1357,7 @@ void page_remove_rmap(struct page *page, int map_order) } if (compound) { - page_remove_anon_compound_rmap(page); + page_remove_anon_compound_rmap(page, map_order); goto out; } -- 2.28.0