Received-SPF: pass (google.com: domain of linux-kernel+bounces-3997-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <2edb0a15-a677-4e4e-b4f9-ba2d85bfaa46@arm.com>
Date: Mon, 18 Dec 2023 15:58:06 +0000
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v1 09/39] mm/huge_memory: page_add_file_rmap() ->
 folio_add_file_rmap_pmd()
Content-Language: en-GB
To: David Hildenbrand <david@redhat.com>, linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
 "Matthew Wilcox (Oracle)" <willy@infradead.org>,
 Hugh Dickins <hughd@google.com>, Yin Fengwei <fengwei.yin@intel.com>,
 Mike Kravetz <mike.kravetz@oracle.com>, Muchun Song <muchun.song@linux.dev>,
 Peter Xu <peterx@redhat.com>
References: <20231211155652.131054-1-david@redhat.com>
 <20231211155652.131054-10-david@redhat.com>
From: Ryan Roberts <ryan.roberts@arm.com>
In-Reply-To: <20231211155652.131054-10-david@redhat.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 11/12/2023 15:56, David Hildenbrand wrote:
> Let's convert remove_migration_pmd() and while at it, perform some folio
> conversion.
> 
> Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>

Reviewed-by: Ryan Roberts <ryan.roberts@arm.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 3a387c6f18b6..1f5634b2f374 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -3577,6 +3577,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;
> @@ -3588,7 +3589,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);
> @@ -3599,10 +3600,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))
> @@ -3610,9 +3611,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 */