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=-23.3 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_IN_DEF_DKIM_WL autolearn=unavailable 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 0A1B8C47095 for ; Wed, 9 Jun 2021 04:29:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA3AA6124B for ; Wed, 9 Jun 2021 04:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231509AbhFIEbA (ORCPT ); Wed, 9 Jun 2021 00:31:00 -0400 Received: from mail-qk1-f170.google.com ([209.85.222.170]:33354 "EHLO mail-qk1-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229638AbhFIEa6 (ORCPT ); Wed, 9 Jun 2021 00:30:58 -0400 Received: by mail-qk1-f170.google.com with SMTP id k4so22573478qkd.0 for ; Tue, 08 Jun 2021 21:28:49 -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 :mime-version; bh=PCG4uUwW8wS6xmpuPwkiV4oLkvnmo78CTRIwxQBRKgY=; b=ISnNRpCieQkW3oz7o/YjHabNZ0xWqccqSPmHG2RGMzDEDOX/VY1vdWkev1zuAu9bf4 CLBMxrS/rDZwTQBTqOikREGr5+eRpWpzswMhSU2FKiuUohrvuxpQQbpkKqLgnACpFngy wotrtTqMXRz2IeWNPzl82lj2T5/EugCK8bQ1l8yifOMTdDOtYr5PVIA3A6gIe1EonP0n jIdGAnfNvldffzBciY3ibTHeza+5sC+rNLcfxLUQ+8oJzpa+8/C30RtBUeju8jOv4WAl 3Sy5Kbu9hdOcMeLwP1ffxx4YX8lSWJ5uBZ4BzmkwrcffJTiGoA1jYlNtz8L5lTxQnLNR UkWg== 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:mime-version; bh=PCG4uUwW8wS6xmpuPwkiV4oLkvnmo78CTRIwxQBRKgY=; b=o6aKgYFNvy+m0Cd0z5VvQCnay7DFs1pKyMys9ZLaF9kNquZ+7rih7uB5gUpgsEoUxv bh6pt1hfqb4OKEzqWdoRcNDY4XqU4fT9aF5r7HxORiY5CC6oj7lM+626WDih1dUu6mHj 73L2m/z3m5OfRdKT1sX5pT289ioby7Q57PPWjrCPZTfAAfY9ssO4QUQNG6RaumoVKnEG ptyWBo2Fl7upeCc1djt+krjzDBlz0t5QIJwx1rIibsxmbREj+vnmpvV9DHSsZaCO9f7H drtuKNQbtd8dO6R0LJoCI8jGgAFPqvzxv64TEy0cFyrNS6cQ0AisD0+eArnkBj5y7AdF wAzg== X-Gm-Message-State: AOAM532GBrswRP17+R1n4vzcjqOOmG37tb5Tj/zLKNVIR8ECv36Rl69p OLaZK6Km63Zlm7DxTELzTz22JA== X-Google-Smtp-Source: ABdhPJxXZMNVnAh0LFgldc9dyfNSXHSfAHtXSYWJqsucG866iZ2oHmbpoSnB8lX2SgUmBPKcL7ZXYA== X-Received: by 2002:a37:911:: with SMTP id 17mr22703936qkj.436.1623212868622; Tue, 08 Jun 2021 21:27:48 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id h4sm12175706qti.0.2021.06.08.21.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 21:27:48 -0700 (PDT) Date: Tue, 8 Jun 2021 21:27:45 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.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 , Shakeel Butt , Oscar Salvador , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 09/10] mm/thp: remap_page() is only needed on anonymous THP In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Yang Shi Acked-by: Kirill A. Shutemov --- mm/huge_memory.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 6d2a0119fc58..319a1a078451 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2355,6 +2355,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; @@ -2366,6 +2367,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.26.2