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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED61FC4332F for ; Fri, 10 Nov 2023 18:59:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235869AbjKJS7Q (ORCPT ); Fri, 10 Nov 2023 13:59:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235877AbjKJS7C (ORCPT ); Fri, 10 Nov 2023 13:59:02 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B57A44BC1 for ; Fri, 10 Nov 2023 10:21:21 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B014C433B7; Fri, 10 Nov 2023 18:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1699640410; bh=oD6e8kF246Ue7E9nBxYYxwyr3zcBHu+YJ91Lpw5S+Kc=; h=Date:To:From:Subject:From; b=UvIWBe2bTgrGf2GpHSr7hGtzBCFCAl7bE6DBjOnGfLOQQgEuGUo30WpEE63ubgKt6 iMilwgnBOMyRrLFEbBsDkpUjN/LsQLukzm3BRtiTF7BDa+f/7uQFyL+NcyIa4V77Ly RuMydETzgIaaTl5F14aIsiLJ3yHLX90Vhou052xM= Date: Fri, 10 Nov 2023 10:20:09 -0800 To: mm-commits@vger.kernel.org, willy@infradead.org, gregory.price@memverge.com, david@redhat.com, wangkefeng.wang@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: [nacked] fs-proc-page-respect-folio-head-page-flag-placement.patch removed from -mm tree Message-Id: <20231110182010.3B014C433B7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: fs/proc/page: respect folio head-page flag placement has been removed from the -mm tree. Its filename was fs-proc-page-respect-folio-head-page-flag-placement.patch This patch was dropped because it was nacked ------------------------------------------------------ From: Kefeng Wang Subject: fs/proc/page: respect folio head-page flag placement Date: Fri, 10 Nov 2023 11:33:20 +0800 kpageflags reads page-flags directly from the page, even when the respective flag is only updated on the headpage of a folio. Since most flags are stored in head flags, make k = folio->flags, and add new p = page->flags used for per-page flags. Based upon a patch by Gregory Price. Link: https://lkml.kernel.org/r/20231110033324.2455523-4-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang Suggested-by: Matthew Wilcox Cc: Gregory Price Cc: David Hildenbrand Signed-off-by: Andrew Morton --- fs/proc/page.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/fs/proc/page.c~fs-proc-page-respect-folio-head-page-flag-placement +++ a/fs/proc/page.c @@ -110,8 +110,7 @@ static inline u64 kpf_copy_bit(u64 kflag u64 stable_page_flags(struct page *page) { struct folio *folio; - u64 k; - u64 u; + u64 k, p, u; /* * pseudo flag: KPF_NOPAGE @@ -121,7 +120,8 @@ u64 stable_page_flags(struct page *page) return 1 << KPF_NOPAGE; folio = page_folio(page); - k = page->flags; + k = folio->flags; + p = page->flags; u = 0; /* @@ -202,7 +202,7 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_MLOCKED, PG_mlocked); #ifdef CONFIG_MEMORY_FAILURE - u |= kpf_copy_bit(k, KPF_HWPOISON, PG_hwpoison); + u |= kpf_copy_bit(p, KPF_HWPOISON, PG_hwpoison); #endif #ifdef CONFIG_ARCH_USES_PG_UNCACHED @@ -211,13 +211,13 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_RESERVED, PG_reserved); u |= kpf_copy_bit(k, KPF_MAPPEDTODISK, PG_mappedtodisk); - u |= kpf_copy_bit(k, KPF_PRIVATE, PG_private); - u |= kpf_copy_bit(k, KPF_PRIVATE_2, PG_private_2); - u |= kpf_copy_bit(k, KPF_OWNER_PRIVATE, PG_owner_priv_1); + u |= kpf_copy_bit(p, KPF_PRIVATE, PG_private); + u |= kpf_copy_bit(p, KPF_PRIVATE_2, PG_private_2); + u |= kpf_copy_bit(p, KPF_OWNER_PRIVATE, PG_owner_priv_1); u |= kpf_copy_bit(k, KPF_ARCH, PG_arch_1); #ifdef CONFIG_ARCH_USES_PG_ARCH_X - u |= kpf_copy_bit(k, KPF_ARCH_2, PG_arch_2); - u |= kpf_copy_bit(k, KPF_ARCH_3, PG_arch_3); + u |= kpf_copy_bit(p, KPF_ARCH_2, PG_arch_2); + u |= kpf_copy_bit(p, KPF_ARCH_3, PG_arch_3); #endif return u; _ Patches currently in -mm which might be from wangkefeng.wang@huawei.com are mm-huge_memory-use-more-folio-api-in-__split_huge_page_tail.patch mm-task_mmu-use-a-folio-in-smaps_account.patch mm-task_mmu-use-a-folio-in-clear_refs_pte_range.patch page_idle-kill-page-idle-and-young-wrapper.patch