Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Message-ID: <0ec525a5-5ee5-4254-9c4b-340fc9de0db0@intel.com>
Date:   Fri, 8 Dec 2023 09:40:52 +0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH RFC 08/39] mm/memory: page_add_file_rmap() ->
 folio_add_file_rmap_[pte|pmd]()
Content-Language: en-US
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>,
        Ryan Roberts <ryan.roberts@arm.com>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        Muchun Song <muchun.song@linux.dev>,
        Peter Xu <peterx@redhat.com>
References: <20231204142146.91437-1-david@redhat.com>
 <20231204142146.91437-9-david@redhat.com>
From:   "Yin, Fengwei" <fengwei.yin@intel.com>
In-Reply-To: <20231204142146.91437-9-david@redhat.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cldZaVg5N0NpSTdSTkxOa0NWM1VVMkVmUVEvYjZBVVdDclpBZ01OcXVtOHVV?=
 =?utf-8?B?K3JiYmU5aGtxd1lMam84YjNqOUhuU1h0RStEai9lZUVaR2FEd2ZsdkxVZVhk?=
 =?utf-8?B?cmNVSUU2Z3hWcmNnTERqeGpsTUJHUWp5OEJhZ29kQzBiSlJQMm5Dc0J2NVlz?=
 =?utf-8?B?OEluZG1MbzNMUXNXeE9qN0xzVnVERk52UEJCc0J6clFlRkdNVi9hWUtRYlZt?=
 =?utf-8?B?TEtDK29kWmY3S0NKbTZpWFA3THpWbm0xQ3JTRk5QOUNmclZFUEtVTitWQzZl?=
 =?utf-8?B?ck1abnFOcHdjWWNCa2liYmNReENKb0RTdzM5TlgyRXJxWW5JVk5wdUcyUllC?=
 =?utf-8?B?bDZ6cklabkRUbENpY3VFSGNqZTViTCtkSWIrR0ltcUN2SkdSV3JVQ1dEK2kv?=
 =?utf-8?B?NHprc3U4UTVYcmxhNEZtRDI1MHB2WkN0MitMVmVZUlN4VGMzem5adUdweFlv?=
 =?utf-8?B?MW9uSkd2MWhLd3ZJejNHWFltOFdHWnljWlFIQngwbE1wSktsdjdDclRGZWFq?=
 =?utf-8?B?alVqa21JNXVVREVmZHVPWlZYV01iaEJ6d1d1cnhXdVo2SDNrTlVzMWxPOUhC?=
 =?utf-8?B?ZmNFQzJmSzdwamZOTFljL0dpOWJENkJvYzN0akpWSHpxL0lCaFlGMXBPblhj?=
 =?utf-8?B?VklkbWJrRzk0YlhsMWhyV3hUK29TSEozaWJFd2VTeEh2OTlzZXVTbEpUVDF6?=
 =?utf-8?B?d0tjNHExbWY4akVkc2EwY09tNGVuNmhONVVBMDFwWjNPL0ZKcXdNbmlla3I2?=
 =?utf-8?B?ZW9UaW10eEFlV1ViZytpTXBZYlM1alFEN1ppNmQ4VGdWblpFYWVTMjhwNTVK?=
 =?utf-8?B?SzlHL1NIUUp4K2I4aDFMTDRCcnF3YjNwY2dWQ0hxb0diT0taRVh6WUppTlVv?=
 =?utf-8?B?VUNMMXZzeFJlQ3ZjaTZEYzlLd2FNNW9kRC9mdmFLYzVEUjg5aVJxNFhtMVNz?=
 =?utf-8?B?cWZDREFPV3pLWm9ybDFXWExOU1hCemhaSDlUUGUyZVhySEFKaEtZM1poYXVk?=
 =?utf-8?B?ZGkxUEhsT2cwZlQ5cWsxOXNxSG9FRGxnaGtVdjJUcjE5dmh4WnlBZnJyUk44?=
 =?utf-8?B?Yk9MUm1WZi9tUEZEZzIzN2ZZNHkrejYzV01SV0h6SkNqa3VUSWd2WTRoMlIv?=
 =?utf-8?B?MVp2SHlSL1V3RVNTUVNWU1RsQ0RHTDJYMURIRnd5L2JrWU95MmhjMnNEVDI5?=
 =?utf-8?B?MXptcGJvdzJKeWRvaGFXeUpyM05JcXBOODJBeTNUZEMrcnZHY0VRYzg1b0Zy?=
 =?utf-8?B?cUU5cjVvY2pYYXRleDkybFFoVTdUOWx0OTRnYndObWZhaWpUYytDZi8zRytZ?=
 =?utf-8?B?NUlLemdyQlNyNkowYlpVVTFqNzhEbGI1SFVydHJiOWJzQ0RzUVJwSVViZGZn?=
 =?utf-8?B?TGVZUXF0enp6azR3SE5IbnJzR3NkNUZLUGx3NHFJdHR1dFRrQzYyQmlWeXQx?=
 =?utf-8?B?THVweHJrRHNib0dsbFBleHRBOFVwUzF3U1RweU04alc1SFJtU1FLQ1p6cjkx?=
 =?utf-8?B?dS82TERSVWVyL0VTZDVSdDZYaHgvVndWTjJ3MDcxRXBjbWJ6c2xGRWlzSjQy?=
 =?utf-8?B?NTY2MEVRVjNOVzdqUFRHSVJYZEJjdjdlMVdhejJtemdBM0t6djU3Sk5wK2c5?=
 =?utf-8?B?L2VYTFI1MHNtMDFkT0cycDluNXhISDN2VFZWMk5VZ2VJNGl3cTFkSlRQVFht?=
 =?utf-8?B?cU90WVZhUVhhM3BwQkh2czFyMEtubWFKTHVNbUsvM25BMlpiZ0ZtK1hIejc4?=
 =?utf-8?B?RDNPOUwyb09NenZvaXdIelNQV1ZjL2ZzVDhMS2VaeUgyNkZ1NHA2ZFBlWGNK?=
 =?utf-8?B?K3lSSEdZVjJJUEE5QWVydXJ0dzVHUnhFaVRqYnpNYkxORlJQQ0tjNktOZGxI?=
 =?utf-8?B?R3lqL1hwYTVnd0xkSHRpYktBWHpFT1lWOXByNWxuQ0JRTFJ3NEpnUElOWWRS?=
 =?utf-8?B?REYxcWVBbm1DYWhqSUVvMHlFS0x0ZURXOXd2NGNzMDZiUFIzMG1DUVVmUnF0?=
 =?utf-8?B?QmFHZVZJSWdJVkt4bjhVbDZGeGIzV25nbjZlZXFzT3pGcG5mdkxod2k5YThM?=
 =?utf-8?B?aDVXY28wbFhJYkVnZHRoYlFlWkFxQno4Z3FIRk1hVmRXamV1ekFqNllhMlJC?=
 =?utf-8?Q?EmU+eoWsCDQmJiA9Y482rqJNd?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 26292f66-0646-4944-909a-08dbf78ebafc
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4820.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2023 01:41:00.0768
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9/Co97M4jBC/++HTXryxMsnUdt0agrnfcazBt6C8sritFz1Nv+4JoBlfNoUw+RLjuBKAl1DIVizr+rHmrnSWtA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB8504
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 07 Dec 2023 17:41:20 -0800 (PST)


On 12/4/2023 10:21 PM, David Hildenbrand wrote:
> Let's convert insert_page_into_pte_locked() and do_set_pmd(). While at it,
> perform some folio conversion.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>

Yes. I make sure my RB tag this time. :).

Regards
Yin, Fengwei

> ---
>   mm/memory.c | 14 ++++++++------
>   1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/mm/memory.c b/mm/memory.c
> index 15325587cff01..be7fe58f7c297 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -1845,12 +1845,14 @@ static int validate_page_before_insert(struct page *page)
>   static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte,
>   			unsigned long addr, struct page *page, pgprot_t prot)
>   {
> +	struct folio *folio = page_folio(page);
> +
>   	if (!pte_none(ptep_get(pte)))
>   		return -EBUSY;
>   	/* Ok, finally just insert the thing.. */
> -	get_page(page);
> +	folio_get(folio);
>   	inc_mm_counter(vma->vm_mm, mm_counter_file(page));
> -	page_add_file_rmap(page, vma, false);
> +	folio_add_file_rmap_pte(folio, page, vma);
>   	set_pte_at(vma->vm_mm, addr, pte, mk_pte(page, prot));
>   	return 0;
>   }
> @@ -4308,6 +4310,7 @@ static void deposit_prealloc_pte(struct vm_fault *vmf)
>   
>   vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page)
>   {
> +	struct folio *folio = page_folio(page);
>   	struct vm_area_struct *vma = vmf->vma;
>   	bool write = vmf->flags & FAULT_FLAG_WRITE;
>   	unsigned long haddr = vmf->address & HPAGE_PMD_MASK;
> @@ -4317,8 +4320,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page)
>   	if (!transhuge_vma_suitable(vma, haddr))
>   		return ret;
>   
> -	page = compound_head(page);
> -	if (compound_order(page) != HPAGE_PMD_ORDER)
> +	if (page != &folio->page || folio_order(folio) != HPAGE_PMD_ORDER)
>   		return ret;
>   
>   	/*
> @@ -4327,7 +4329,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page)
>   	 * check.  This kind of THP just can be PTE mapped.  Access to
>   	 * the corrupted subpage should trigger SIGBUS as expected.
>   	 */
> -	if (unlikely(PageHasHWPoisoned(page)))
> +	if (unlikely(folio_test_has_hwpoisoned(folio)))
>   		return ret;
>   
>   	/*
> @@ -4351,7 +4353,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page)
>   		entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma);
>   
>   	add_mm_counter(vma->vm_mm, mm_counter_file(page), HPAGE_PMD_NR);
> -	page_add_file_rmap(page, vma, true);
> +	folio_add_file_rmap_pmd(folio, page, vma);
>   
>   	/*
>   	 * deposit and withdraw with pmd lock held