Message-ID: <f0c4bd16-e8ec-fda6-108d-8a9848f0eadd@intel.com>
Date:   Tue, 21 Mar 2023 13:13:29 +0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [PATCH v4 35/36] mm: Convert do_set_pte() to set_pte_range()
Content-Language: en-US
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>
From:   Yin Fengwei <fengwei.yin@intel.com>
In-Reply-To: <ZBho6Q6Xq/YqRmBT@casper.infradead.org>
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?clZjZS9wNzlEUUplMzA3MzgxWTVaQjBOd2pZcXJlUXIyRmh4SUE0eEczSEZK?=
 =?utf-8?B?QVBhMUNTOWlBb01pYlJFOG12MHRycWs1WnpFMGx1RHZWNDZqekt5RDBZL2xI?=
 =?utf-8?B?RFhZOU1xNDRCRTRmSi83NXU0dHM0dldDY3FDOW51STh5WUkrQkVSZVNBaXov?=
 =?utf-8?B?cnlwWm5KQkFPenFPWFZacDVtZUpqa0RIZU5zc0VqNkRTSzdtS2hXbkliRmE1?=
 =?utf-8?B?cWVub3hrZVNGdldTNVpETnVsc09UbnFoSXlyZzBqZk9LS0taSE1oWkNGWk5K?=
 =?utf-8?B?UDZsMXVTdit0U1lLN1JsekNkTUcxR0ZROCt3WThqeHBRcmd2azhSWHlwb3BM?=
 =?utf-8?B?OXBadGFETHd2ZlppRkJTeFFLNm1kaWxqK0k0Vkw0dFBGM2FhbUZVRDI5WXZQ?=
 =?utf-8?B?N1pZRHVmaUdZZTZWUXdTcmhrRCt1WWlHWXhmVTRDZWxFRGZRZnhUVTBzblZN?=
 =?utf-8?B?S0JhWWc3SEoyb05KazRpTi9mT2hGcnpiMnRsOXA5TWpoS1k1WXRDUy9OeTlq?=
 =?utf-8?B?aUNtZWw0bzBKd1VVUEQ4cm1BcVorenhNL1p5ZGRWMldiQ0d2RXRNaVc0L3B4?=
 =?utf-8?B?K2JHSDUyVlJqY2lwZEZ1Z1dQTngyRkdPUHZWRGNzTjR1MTlUV1AvaTRnL0ky?=
 =?utf-8?B?d3hNSitFeXNLRnRzcHdjWElVQWtCWFhCSmNDNGZ3WGd3bytnTHF4NU1tQ0lz?=
 =?utf-8?B?bm5YV1RnYXhxL2Jkay9PSjJWN3MwUmdvSjd4UG4zMmk2aDJTK0ROczVOQXpn?=
 =?utf-8?B?ZWU2VXJjVXYrdHlpR0FVZ202N2xkTVEyRzlZaitEMHJZSUZiZFVnZlFCVm56?=
 =?utf-8?B?czBhd1FIelZ5SW1nNit0bXMzR3VqZzJnUHY5bXlWK09nTklWQk91bitPUzVQ?=
 =?utf-8?B?S2o0ZTNJMGVGNC9HMHVXMTMxUmFUSkdjSTN6em9ZQzVhNncvY2tjLzdsOERU?=
 =?utf-8?B?dzN4TnI4TllTdlgrVXR1bXU1d09WVUJya3cwTWtKaUs1RmdBVVVwcEpkS1U5?=
 =?utf-8?B?RUgwVXRreWNBQ09Sc1BTeGN1MnlndnBjQ1FFa3hDZ2pxT1ltTVUranBWRndU?=
 =?utf-8?B?czVrTFBKMERtZDBBelhUUDVDVkYxeTRUc0paNEllV2Fieno0alNpajc1aG9B?=
 =?utf-8?B?aVdSZ0cvT1NQSTJtMTZJWFJLb0dueVJwekhiYk9OdGxQNVpUcE5CNkN4ZUZj?=
 =?utf-8?B?aTgzUVVsV3h1V0VlMEZoL3poZGpkb2U3dGIrdUNTTFJCWkFCOU5ndzhEL0hq?=
 =?utf-8?B?TFJqRnBGRjFscDV0TkF3SkNqd20yNjI4andEMSt5WmZ5VGJ2MGlHSU9hVzlR?=
 =?utf-8?B?bTNHTEVMTUgwZEJtWHVqWUxpZytWZDU1THFka2hsazFLWllCTFFUMHJRT0Nw?=
 =?utf-8?B?bGt4eW5TK3NxcTdsTWNSeXNIUVNkamh1TURiSXhoaWdXcG9DYnVVUVhWTWUw?=
 =?utf-8?B?U3JqcWJ2U3A1UlVyT1RWSEZ0ZGJBRXJaanpscThkUUxLTW5xUGtNb0FhaVZ4?=
 =?utf-8?B?U09OWWtyRTNrWnFRcmYzUzhOOGVXMkwwYWxKRzhyaFdESUhqSytzYnl2cTVB?=
 =?utf-8?B?Ly9BSVFlSTF0bmZxdUpmeEVDckpZRFp4RmErUmlDN3BVYVRwbWlvbWNxb3Rv?=
 =?utf-8?B?bUxHNjFwT2E0Uy9MbnRycnZqWmRieVh5T2pPcWhPdzlsM3AyQjVZejg3MWpj?=
 =?utf-8?B?SndCY3B3TmlwVnZBQUs3d1Y0Zi9HMjZoaUYzSEZ1cHEvRGZIRGdFMFEvT0Q1?=
 =?utf-8?B?WUFmSXhEMFFpc3ViTVJCeXVCNmRIbUdxZEFPUDJua01qbC9XR0d3U2Jtam9p?=
 =?utf-8?B?U1dGMzNaeVpQU051UTNEWWNhMnVYWXRtOU9BcVEza0lWVEJQNk9uekxQdnU0?=
 =?utf-8?B?OWVub1QyREgwMituWmpnOXR6M1R3OFhtbjFkZFBaWXIyemZaSWJoWlN5ZEVT?=
 =?utf-8?B?bitVZ2RkWVVDSmN3cHJZQ1hpN2RQZGpUTThlejFnTjNhNHJITjVReDdEejcv?=
 =?utf-8?B?Q2FQS0VOeDR4dDJFU0lRbXczemJUOW54OXFRNjRrcUdHZjBzcU5uNlBSRTRG?=
 =?utf-8?B?Wk1tRWNPMHZOWG9xWXhaRXVYendybmYvMUxHZ01CcVJ3bU9YbWc1S2diYmlL?=
 =?utf-8?B?b0c3TG5oM1FVTCtFYnBycU0yejgzYmZjUU5LVmlKODFvcXZOUVdOTnRLWHlG?=
 =?utf-8?B?S2c9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: fad9b0ed-5526-49ed-0a51-08db29cb92f4
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4820.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2023 05:17:32.7842
 (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: uj+hPViEC6nIwTn5qf61VL4WiDfDktFxHuJbT1mHLczVEkV0vAdVH5c5TZ3rbZelDOTVOnDdzro+n0Fn2rilOw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7579
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 3/20/23 22:08, 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?
Yes. This works perfectly in my side. Thanks.

Regards
Yin, Fengwei

> 
> 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.