Message-ID: <b38acb21-b8d4-bbe4-9bbb-8c7202ab6f1c@intel.com>
Date:   Tue, 21 Mar 2023 09:58:31 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.9.0
Subject: Re: [PATCH v4 35/36] mm: Convert do_set_pte() to set_pte_range()
To:     Matthew Wilcox <willy@infradead.org>
CC:     Ryan Roberts <ryan.roberts@arm.com>, <linux-arch@vger.kernel.org>,
        <will@kernel.org>, <linux-mm@kvack.org>,
        <linux-kernel@vger.kernel.org>
References: <20230315051444.3229621-1-willy@infradead.org>
 <20230315051444.3229621-36-willy@infradead.org>
 <6dd5cdf8-400e-8378-22be-994f0ada5cc2@arm.com>
 <b39f4816-2064-e402-4e02-908f40c396d4@intel.com>
 <2fa5a911-8432-2fce-c6e1-de4e592219d8@arm.com>
 <ZBNXcmOrrOS4Rydg@casper.infradead.org>
 <b2c00aab-82ad-ea7a-df9d-c816b216b0f1@intel.com>
 <ZBPiOgYDLYBmVwOc@casper.infradead.org>
 <483fd440-df7b-fab3-b138-f3789f2dc078@intel.com>
 <ZBho6Q6Xq/YqRmBT@casper.infradead.org>
Content-Language: en-US
From:   "Yin, Fengwei" <fengwei.yin@intel.com>
In-Reply-To: <ZBho6Q6Xq/YqRmBT@casper.infradead.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?elUzYmFTcWcwMmNVNFRtQ1BzenBqZ0lyMHhPSkpzYkYweFRzeDJYN1pKUVdL?=
 =?utf-8?B?TGdLS1RERUJPV3dtbW10aTk3VERYaE1XYjhHY1Mva3I0WUVOK0lHWDJBN3Rv?=
 =?utf-8?B?YXhnVWxkWWZraXN6VXRKN2NUQkRmOFVzZmx4YU1DTm9PNUVrRElWWVlha043?=
 =?utf-8?B?YTdoUFR4QU9vSHZHRXZiTWFaSjRYakh4OUVUMVMxRlBlRU5VVndxZVVtVGVq?=
 =?utf-8?B?OGk1a1E5aUduU3JHc2JYT1piN2JCWEtaYkZuakNkRGszZTMzT3Rtc1YrR29S?=
 =?utf-8?B?MG9oNHE5MTFIbWNrUzFGUWdzTGc4L2hlL2pzdmd2Slo2c29iRHpXdnZ1ZjFP?=
 =?utf-8?B?NzBtdm8zYkdLdnloa2N3N3BrR2JiSnhyT0x0aGVZbFhUaU1UZWtIUkloV05Q?=
 =?utf-8?B?d0dBVlpJR0t1VkVuRWo5V0xWdWljaTFkcGJsWTJoR21keGxOSUdNRlFHUWR5?=
 =?utf-8?B?Z1FpNnM5NERlTWFNK1MzQ3RLb1c4Q0JPaWc1OXQ4UjQvaWpoR24rWU1CR2Yz?=
 =?utf-8?B?WmtpbytaaGJDTldKWk5VT21oN20vcSsrKzFrMWZqTldEVmx5ODVaY1pSaFBI?=
 =?utf-8?B?Mjl1UkhDTG5QREhZSkM3cWdRMmJvZlhDdUJVREpBQjZXQ21GdllUL2w5QjZB?=
 =?utf-8?B?L3ZKcmZ3TVU4U2hmM1RFd0NOcElma0Y3aXZWMTdSdzZtSzgyZ0NRakh1akFk?=
 =?utf-8?B?MTVCQmlhNWl4TzlxNXQwWVpXeFcyZmpzMWJHUklaNXVQRHR6RlNPS3BadGJq?=
 =?utf-8?B?NHFQWlI1TjJyZnVZM2NWb012a0dGem84cU4rd1ljY3RxYTkveDR2MmFOeVJD?=
 =?utf-8?B?MFR6aSszWUNtRnhZMkdLS1VVeHFrNWd1dkZKZXJBb09jeGZlMElZQW4vWVBh?=
 =?utf-8?B?WFZnSE5QWXZvMEtoRndBYk1xSERtdkVreDNCZnN2M3I4WC9taFR5ZEN6VzFi?=
 =?utf-8?B?RGZMZ0dkdVBCck1oU3JVRTVKMXI4aFNHYktianYrMjBRM2dKR094RW1XZkIv?=
 =?utf-8?B?bytmRU5iUXdmbHlWWlIvOFI1YlY2dnBBV1prcklYdkk2ZFpyVitSK21kMUZr?=
 =?utf-8?B?WWVtUmVCVEk2TmErbHkvWnRzVDV1aWNrM2FZbDBnaXVHZFZ5Wm1aTTRtVzcx?=
 =?utf-8?B?S3QrWlhhaW1tK2RjR3dPVE1zRmptOUFnNFhwT2hoeUlhWDFqN296RjNSblVP?=
 =?utf-8?B?SkZiS3BhU0tGaGdJWHd3U25EU0p0RWhqSzBhZ2g5bFRBOWZNZU1lQmt6TjhM?=
 =?utf-8?B?R1JkQldKU05GNTlaMTk1VHhyN3IvU3A0NGoveW9IVlVsakp3ekc5WWFsR0JN?=
 =?utf-8?B?Z3NDMmRxTnBFeVc3UlNIeVN3LzRQczdwczlIdlNJRmJNa1V3RFBkQ3poUjFE?=
 =?utf-8?B?NUJjRWE5bHJlajNlNjdZam1nWWZzbVh3TzBtdnAxVkNPYzEvUTlVSGtYMU5D?=
 =?utf-8?B?UkpmWnJlQW5tSXpJUGpqTDBteGovWEdnemFOTTh4b1dacURhVlV1aVpBb1FR?=
 =?utf-8?B?ZkdjaXUzMUFDR0pkM0hRNGNzYzJUT0w1cXhHN1RFUXQzOVN2L2FTcm9rZno2?=
 =?utf-8?B?UGpib2k1K3hmczBSQUpCWGZDY1hMYzBxcmhZOEUzZHJtZXhSRmQ1dnErTklX?=
 =?utf-8?B?aHh3L2pHUzhoT0R2bWVsNnRxdiszWVh6ZXlkRWNyWU1TdzJ6b082akJyNko5?=
 =?utf-8?B?RWJZR0hDT00wUVBWeEtKek5KeE1VVTI0OTV6cGUrSkx2OXVOVVYreEFBL1RO?=
 =?utf-8?B?RFY5d0txVTFuam1HMmVyUzI5UllpMVZxOTZFemJtZUo4eCtrd1ZqUzF1ZitZ?=
 =?utf-8?B?ZVhFUWVWRm1QdWRHV1J3VHVaYUZqNURnYUpZQ01XVGFCMzFZN0Z5SVptK2E3?=
 =?utf-8?B?b21ONDJZM3JlbHphNHc5MkZwVUo1V2VJK1ZaNExsdDRKUk1CcWhwQWhQNC9E?=
 =?utf-8?B?eFNkKy90NnB6Y1dwVmtyS3M5SzdaajVZRzhFSVJpNE92a3FWYTErdGRqRC9q?=
 =?utf-8?B?S0ZId3B5N3o2Q3RrZzgwOW1DQ1FzdzRkYVJ0blFSSiszN1lIWEh1VVdjR0xr?=
 =?utf-8?B?bkF3cnMxQjlVY0w4Z1p0bUF5YWhtL3puUFFpRm5DMmtSZkZOaWk1MUJOd0Jw?=
 =?utf-8?Q?q2WFliI+JyT7Ti8NuElf/2HBn?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 6099d4bd-8db5-41cb-8d16-08db29afca1c
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4820.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2023 01:58:39.3847
 (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: iLgTUStFE+DBKB1MGkBrlaiw0StoAeHn1Oly9AJ7w+2PrdYRIGyn2XYhfJnOBD9tRlx8VN7WksNZw/ViVwgCkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4769
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 3/20/2023 10:08 PM, Matthew Wilcox wrote:
> On Mon, Mar 20, 2023 at 09:38:55PM +0800, Yin, Fengwei wrote:
>> Thanks a lot to Ryan for helping to test the debug patch I made.
>>
>> Ryan confirmed that the following change could fix the kernel build regression:
>> diff --git a/mm/filemap.c b/mm/filemap.c
>> index db86e459dde6..343d6ff36b2c 100644
>> --- a/mm/filemap.c
>> +++ b/mm/filemap.c
>> @@ -3557,7 +3557,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf,
>>
>>                 ret |= filemap_map_folio_range(vmf, folio,
>>                                 xas.xa_index - folio->index, addr, nr_pages);
>> -               xas.xa_index += nr_pages;
>> +               xas.xa_index += folio_test_large(folio) ? nr_pages : 0;
>>
>>                 folio_unlock(folio);
>>                 folio_put(folio);
>>
>> I will make upstream-able change as "xas.xa_index += nr_pages - 1;"
> 
> Thanks to both of you!
> 
> Really, we shouldn't need to interfere with xas.xa_index at all.
> Does this work?
I will give this a try and let you know the result.

> 
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 8e4f95c5b65a..e40c967dde5f 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -3420,10 +3420,10 @@ static bool filemap_map_pmd(struct vm_fault *vmf, struct folio *folio,
>  	return false;
>  }
>  
> -static struct folio *next_uptodate_page(struct folio *folio,
> -				       struct address_space *mapping,
> -				       struct xa_state *xas, pgoff_t end_pgoff)
> +static struct folio *next_uptodate_folio(struct xa_state *xas,
> +		struct address_space *mapping, pgoff_t end_pgoff)
>  {
> +	struct folio *folio = xas_next_entry(xas, end_pgoff);
>  	unsigned long max_idx;
>  
>  	do {
> @@ -3461,22 +3461,6 @@ static struct folio *next_uptodate_page(struct folio *folio,
>  	return NULL;
>  }
>  
> -static inline struct folio *first_map_page(struct address_space *mapping,
> -					  struct xa_state *xas,
> -					  pgoff_t end_pgoff)
> -{
> -	return next_uptodate_page(xas_find(xas, end_pgoff),
> -				  mapping, xas, end_pgoff);
> -}
> -
> -static inline struct folio *next_map_page(struct address_space *mapping,
> -					 struct xa_state *xas,
> -					 pgoff_t end_pgoff)
> -{
> -	return next_uptodate_page(xas_next_entry(xas, end_pgoff),
> -				  mapping, xas, end_pgoff);
> -}
> -
>  /*
>   * Map page range [start_page, start_page + nr_pages) of folio.
>   * start_page is gotten from start by folio_page(folio, start)
> @@ -3552,7 +3536,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf,
>  	int nr_pages = 0;
>  
>  	rcu_read_lock();
> -	folio = first_map_page(mapping, &xas, end_pgoff);
> +	folio = next_uptodate_folio(&xas, mapping, end_pgoff);
>  	if (!folio)
>  		goto out;
>  
> @@ -3574,11 +3558,11 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf,
>  
>  		ret |= filemap_map_folio_range(vmf, folio,
>  				xas.xa_index - folio->index, addr, nr_pages);
> -		xas.xa_index += nr_pages;
>  
>  		folio_unlock(folio);
>  		folio_put(folio);
> -	} while ((folio = next_map_page(mapping, &xas, end_pgoff)) != NULL);
> +		folio = next_uptodate_folio(&xas, mapping, end_pgoff);
> +	} while (folio);
>  	pte_unmap_unlock(vmf->pte, vmf->ptl);
>  out:
>  	rcu_read_unlock();
> 
>> Ryan and I also identify some other changes needed. I am not sure how to
>> integrate those changes to this series. Maybe an add-on patch after this
>> series? Thanks.
> 
> Up to you; I'm happy to integrate fixup patches into the current series
> or add on new ones.
Integrating to current series should be better. As it doesn't impact the
bisect operations. I will share the changes Ryan and I had after verify
the above change you proposed. Thanks.


Regards
Yin, Fengwei