linux-kernel - Re: [PATCH RFC 09/39] mm/huge_memory: page_add_file_rmap() -> folio_add_file_rmap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2e6b0d17-4731-4c92-ab0d-6f01d1069963@intel.com>
Date:   Fri, 8 Dec 2023 09:41:45 +0800
From:   "Yin, Fengwei" <fengwei.yin@...el.com>
To:     David Hildenbrand <david@...hat.com>,
        <linux-kernel@...r.kernel.org>
CC:     <linux-mm@...ck.org>, Andrew Morton <akpm@...ux-foundation.org>,
        "Matthew Wilcox (Oracle)" <willy@...radead.org>,
        Hugh Dickins <hughd@...gle.com>,
        Ryan Roberts <ryan.roberts@....com>,
        Mike Kravetz <mike.kravetz@...cle.com>,
        Muchun Song <muchun.song@...ux.dev>,
        Peter Xu <peterx@...hat.com>
Subject: Re: [PATCH RFC 09/39] mm/huge_memory: page_add_file_rmap() ->
 folio_add_file_rmap_pmd()



On 12/4/2023 10:21 PM, David Hildenbrand wrote:
> Let's convert remove_migration_pmd() and while at it, perform some folio
> conversion.
> 
> Signed-off-by: David Hildenbrand <david@...hat.com>

Reviewed-by: Yin Fengwei <fengwei.yin@...el.com>

> ---
>   mm/huge_memory.c | 11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 4f542444a91f2..cb33c6e0404cf 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -3276,6 +3276,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,
>   
>   void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
>   {
> +	struct folio *folio = page_folio(new);
>   	struct vm_area_struct *vma = pvmw->vma;
>   	struct mm_struct *mm = vma->vm_mm;
>   	unsigned long address = pvmw->address;
> @@ -3287,7 +3288,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
>   		return;
>   
>   	entry = pmd_to_swp_entry(*pvmw->pmd);
> -	get_page(new);
> +	folio_get(folio);
>   	pmde = mk_huge_pmd(new, READ_ONCE(vma->vm_page_prot));
>   	if (pmd_swp_soft_dirty(*pvmw->pmd))
>   		pmde = pmd_mksoft_dirty(pmde);
> @@ -3298,10 +3299,10 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
>   	if (!is_migration_entry_young(entry))
>   		pmde = pmd_mkold(pmde);
>   	/* NOTE: this may contain setting soft-dirty on some archs */
> -	if (PageDirty(new) && is_migration_entry_dirty(entry))
> +	if (folio_test_dirty(folio) && is_migration_entry_dirty(entry))
>   		pmde = pmd_mkdirty(pmde);
>   
> -	if (PageAnon(new)) {
> +	if (folio_test_anon(folio)) {
>   		rmap_t rmap_flags = RMAP_COMPOUND;
>   
>   		if (!is_readable_migration_entry(entry))
> @@ -3309,9 +3310,9 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
>   
>   		page_add_anon_rmap(new, vma, haddr, rmap_flags);
>   	} else {
> -		page_add_file_rmap(new, vma, true);
> +		folio_add_file_rmap_pmd(folio, new, vma);
>   	}
> -	VM_BUG_ON(pmd_write(pmde) && PageAnon(new) && !PageAnonExclusive(new));
> +	VM_BUG_ON(pmd_write(pmde) && folio_test_anon(folio) && !PageAnonExclusive(new));
>   	set_pmd_at(mm, haddr, pvmw->pmd, pmde);
>   
>   	/* No need to invalidate - it was non-present before */