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=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL 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 554C3C47080 for ; Tue, 1 Jun 2021 21:17:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ECF00613B1 for ; Tue, 1 Jun 2021 21:17:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECF00613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8B2C36B006E; Tue, 1 Jun 2021 17:17:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 88A6A6B0070; Tue, 1 Jun 2021 17:17:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7517E6B0071; Tue, 1 Jun 2021 17:17:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0119.hostedemail.com [216.40.44.119]) by kanga.kvack.org (Postfix) with ESMTP id 4712F6B006E for ; Tue, 1 Jun 2021 17:17:23 -0400 (EDT) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id CADEEAF73 for ; Tue, 1 Jun 2021 21:17:22 +0000 (UTC) X-FDA: 78206415924.36.D9CFDC7 Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by imf09.hostedemail.com (Postfix) with ESMTP id 3DF956000149 for ; Tue, 1 Jun 2021 21:17:15 +0000 (UTC) Received: by mail-ot1-f53.google.com with SMTP id i14-20020a9d624e0000b029033683c71999so615464otk.5 for ; Tue, 01 Jun 2021 14:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=N5uDhAxv0tIiSHDRiUFgmqD1xsYzRonX2XfRezH0zjg=; b=a1cxj0Qb2Q7mg06own49b3QWEpgT9CNesL748Sfwr3Zrrj4UjUtL2WJgo6VgXQxgbS lrbQiptZ2tK7nUNk37VezWPZSWUiMaAUlk+uTTw/hPjg5Y3p3cYWJVsnbJ96yp3bvusy CKSc0qiKTPR8TnTS4bu4h93yFsgOl1yLnwLe2lwDJ7JFP9AOVkETS0KajI/aQev92JOG IDlBqAqXQdEYoYBuyfXjtAeb7LQOmGhLtmQLXlTjffAY/EgAUU0AnSTa1aXgXxasaJZW ssE7zY9Xn9wUp05yYAVSsQ9iJ2yiUUYLpbHdnhuiz+LD3DR/vXyQvxaeM6UhS2Y8ROrq SsFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=N5uDhAxv0tIiSHDRiUFgmqD1xsYzRonX2XfRezH0zjg=; b=fduiDw2NN8jq1BxhNrzsco795DpD4P2Sem9yxqvvXTqRqXg8PcaGw4EiJjWPPzjZ4w eRQlGMo6z/+VDwCthaVkbO7r3Jy2Tmf4J9TlfZGS2OUSI5wbahhxHaG0zg5L7jWKKyda o0IXUhUAruM0lwBbVJnXB2d19WkRggOHPl5jrc4OLro/NTMzTp10PaCjUk24Q2X9MyZg wWZNHH4RaQ+sddk8mGAXyRPQbxLKnRdjcawb+L+GmEK/hBvgu55XFkHgB0lKAuZh1nSt bUC0qqFmEoORRPXJ2wqKdgoA+vQiW6weSbOxlVtyZy3ml6YUu3T/nPJiNYcdyjfixRFq NyQw== X-Gm-Message-State: AOAM532amq/4HHJSLG+aFjvSSZRH19YAiO0P1vxA8nv0+bEryilktR2l RXGr/a6x/rLHhIPItaFIs2owCw== X-Google-Smtp-Source: ABdhPJyFME7J7rL15FKaFRQawXTQiSK6pOg1sR2ou3YK3BC2tZQp+lfGEuFuRUcHe8NOh8jr4EVr0g== X-Received: by 2002:a05:6830:1e54:: with SMTP id e20mr23511882otj.227.1622582241799; Tue, 01 Jun 2021 14:17:21 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id l23sm3708287oie.52.2021.06.01.14.17.20 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Tue, 01 Jun 2021 14:17:21 -0700 (PDT) Date: Tue, 1 Jun 2021 14:17:19 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Andrew Morton cc: Hugh Dickins , "Kirill A. Shutemov" , Yang Shi , Wang Yugui , Matthew Wilcox , Naoya Horiguchi , Alistair Popple , Ralph Campbell , Zi Yan , Miaohe Lin , Minchan Kim , Jue Wang , Peter Xu , Jan Kara , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] mm/thp: remap_page() is only needed on anonymous THP In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=a1cxj0Qb; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of hughd@google.com designates 209.85.210.53 as permitted sender) smtp.mailfrom=hughd@google.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 3DF956000149 X-Stat-Signature: hfgec1rawp6yrxot7nx1xkhte5nizhwy X-HE-Tag: 1622582235-539043 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: THP splitting's unmap_page() only sets TTU_SPLIT_FREEZE when PageAnon, and migration entries are only inserted when TTU_MIGRATION (unused here) or TTU_SPLIT_FREEZE is set: so it's just a waste of time for remap_page() to search for migration entries to remove when !PageAnon. Fixes: baa355fd3314 ("thp: file pages support for split_huge_page()") Signed-off-by: Hugh Dickins --- mm/huge_memory.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 305f709a7aca..e4a83e310452 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2354,6 +2354,7 @@ static void unmap_page(struct page *page) VM_BUG_ON_PAGE(!PageHead(page), page); + /* If TTU_SPLIT_FREEZE is ever extended to file, update remap_page() */ if (PageAnon(page)) ttu_flags |= TTU_SPLIT_FREEZE; @@ -2368,6 +2369,10 @@ static void unmap_page(struct page *page) static void remap_page(struct page *page, unsigned int nr) { int i; + + /* If TTU_SPLIT_FREEZE is ever extended to file, remove this check */ + if (!PageAnon(page)) + return; if (PageTransHuge(page)) { remove_migration_ptes(page, page, true); } else { -- 2.32.0.rc0.204.g9fa02ecfa5-goog