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 50962C4332F for ; Fri, 10 Nov 2023 19:44:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346555AbjKJToy (ORCPT ); Fri, 10 Nov 2023 14:44:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346215AbjKJTom (ORCPT ); Fri, 10 Nov 2023 14:44:42 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F5EE37FC1 for ; Fri, 10 Nov 2023 10:20:09 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 462A6C116AC; Fri, 10 Nov 2023 18:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1699640409; bh=REFMYZT0uQ2HjaLHp186le4yRHywAjT7q1cAmc+oWUc=; h=Date:To:From:Subject:From; b=etl6P67ogsJ0vhQpFZkEvpvYCez9zeLswY0cBzaAzaxa5ftEljRNdD5QJ/aIs1t/g nsu8jllSxp3Jl3+1suycyxhFZMRLSVsrN7QeQAKTh9I+JU3YKLWO2OvxEHJ3Lf3nf/ 93BLY9ILzaGALyMro3mhg8hGHcXdCG0x0o/6K16c= Date: Fri, 10 Nov 2023 10:20:08 -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-use-a-folio-in-stable_page_flags.patch removed from -mm tree Message-Id: <20231110182009.462A6C116AC@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: use a folio in stable_page_flags() has been removed from the -mm tree. Its filename was fs-proc-page-use-a-folio-in-stable_page_flags.patch This patch was dropped because it was nacked ------------------------------------------------------ From: Kefeng Wang Subject: fs/proc/page: use a folio in stable_page_flags() Date: Fri, 10 Nov 2023 11:33:19 +0800 Replace nine compound_head() calls with one page_folio(). Link: https://lkml.kernel.org/r/20231110033324.2455523-3-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang Cc: David Hildenbrand Cc: Gregory Price Cc: Matthew Wilcox (Oracle) Signed-off-by: Andrew Morton --- fs/proc/page.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) --- a/fs/proc/page.c~fs-proc-page-use-a-folio-in-stable_page_flags +++ a/fs/proc/page.c @@ -109,6 +109,7 @@ static inline u64 kpf_copy_bit(u64 kflag u64 stable_page_flags(struct page *page) { + struct folio *folio; u64 k; u64 u; @@ -119,6 +120,7 @@ u64 stable_page_flags(struct page *page) if (!page) return 1 << KPF_NOPAGE; + folio = page_folio(page); k = page->flags; u = 0; @@ -128,11 +130,11 @@ u64 stable_page_flags(struct page *page) * Note that page->_mapcount is overloaded in SLAB, so the * simple test in page_mapped() is not enough. */ - if (!PageSlab(page) && page_mapped(page)) + if (!folio_test_slab(folio) && folio_mapped(folio)) u |= 1 << KPF_MMAP; - if (PageAnon(page)) + if (folio_test_anon(folio)) u |= 1 << KPF_ANON; - if (PageKsm(page)) + if (folio_test_ksm(folio)) u |= 1 << KPF_KSM; /* @@ -152,11 +154,9 @@ u64 stable_page_flags(struct page *page) * to make sure a given page is a thp, not a non-huge compound page. */ else if (PageTransCompound(page)) { - struct page *head = compound_head(page); - - if (PageLRU(head) || PageAnon(head)) + if (folio_test_lru(folio) || folio_test_anon(folio)) u |= 1 << KPF_THP; - else if (is_huge_zero_page(head)) { + else if (is_huge_zero_page(&folio->page)) { u |= 1 << KPF_ZERO_PAGE; u |= 1 << KPF_THP; } @@ -170,7 +170,7 @@ u64 stable_page_flags(struct page *page) */ if (PageBuddy(page)) u |= 1 << KPF_BUDDY; - else if (page_count(page) == 0 && is_free_buddy_page(page)) + else if (folio_ref_count(folio) == 0 && is_free_buddy_page(page)) u |= 1 << KPF_BUDDY; if (PageOffline(page)) @@ -178,7 +178,7 @@ u64 stable_page_flags(struct page *page) if (PageTable(page)) u |= 1 << KPF_PGTABLE; - if (page_is_idle(page)) + if (folio_test_idle(folio)) u |= 1 << KPF_IDLE; u |= kpf_copy_bit(k, KPF_LOCKED, PG_locked); @@ -194,7 +194,7 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_ACTIVE, PG_active); u |= kpf_copy_bit(k, KPF_RECLAIM, PG_reclaim); - if (PageSwapCache(page)) + if (folio_test_swapcache(folio)) u |= 1 << KPF_SWAPCACHE; u |= kpf_copy_bit(k, KPF_SWAPBACKED, PG_swapbacked); _ Patches currently in -mm which might be from wangkefeng.wang@huawei.com are fs-proc-page-respect-folio-head-page-flag-placement.patch 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