Message-ID: <2f400a3b-d58b-9bd4-df8f-eb3de06ade2a@nvidia.com>
Date:   Mon, 10 Jan 2022 23:41:31 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.1
Subject: Re: [PATCH v2 25/28] gup: Convert compound_next() to gup_folio_next()
Content-Language: en-US
To:     "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org
Cc:     Christoph Hellwig <hch@infradead.org>,
        William Kucharski <william.kucharski@oracle.com>,
        linux-kernel@vger.kernel.org, Jason Gunthorpe <jgg@ziepe.ca>
References: <20220110042406.499429-1-willy@infradead.org>
 <20220110042406.499429-26-willy@infradead.org>
From:   John Hubbard <jhubbard@nvidia.com>
In-Reply-To: <20220110042406.499429-26-willy@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?cWdYNnBjRTE5M2hjNU55YkZ3cEttMTdrdG16Rld6SWdsVjFPclpuMko1T3k5?=
 =?utf-8?B?ZUtkZDQ2aWUwY0I2OWhQRktSMlBmNFVXblhUU3pNK1FMSmxFaHlxSnVKZFdC?=
 =?utf-8?B?Zk91WTYydkhvcjM1N1BJV0JFS296RTd3UjdBakJYOHVsVGo3eXoyUXR5UVp4?=
 =?utf-8?B?cU5EU2s0ODEyNlROM2w3amR0SGlGRFllV3ViVFl3LzAwVUdMelRHeHp3a2NF?=
 =?utf-8?B?cDRlRG0zMzFVSUQ5K0llVktpOW5BdXRDNHdvdVFhKzJuVWZyUmlrUmhnTmtN?=
 =?utf-8?B?MzJGOWo5dDZyNlpGMU56c2JYTmFYMllydnU5RDlkUUNnOWYyZTYzaGFDQTVk?=
 =?utf-8?B?VlFFQXhaUmxHc3p4aFJtOWdUNnBURUhtODZlYWJjZmc2Q3h1YnNMUG1zM05q?=
 =?utf-8?B?aUJXYTN0QXVXcXdoWFFHRVlCeHM0T2dhZExJL1ZVQjhSRVd4Zi91UGtyelNr?=
 =?utf-8?B?SFZYNTJlNU44bUwycGcxODFTUmtPbVBkTjI0M3J1Njc5cUphdUlzYzVRNVRZ?=
 =?utf-8?B?TkV6Mk0wbWlWT2N5VUxyMHIzb2ZDWEtwTmN4YU5OSzZ5cDgvbDdFbFg4TG9u?=
 =?utf-8?B?bXRnMnFUZHlxbXBKS293RGd5ZENLbGI0MlZad2dHQm9NWDRwcXpxdld5cEZR?=
 =?utf-8?B?dFdrM21ubUh5akpxOFh1UlpZNG1oeGc2Vk5raHl6UFZkQVE3WTYyV3RlMUZN?=
 =?utf-8?B?M1dVQmJXK3dTVTUzMnh5ZDVNbG1EakU0RWloa0g1VGFobjAvMVpQczR6cmZS?=
 =?utf-8?B?MnlNMGtoOGNiUU0xVWdrTStoZ1VwQ2tlc3pablJuL056N1R3SWJ4RE4zVWNP?=
 =?utf-8?B?WFg5Y0oyNWdSSDJmZXNGVnhoUDNkUTZsRUs1ZlQxaHJrK056aE5hdUF6UWsv?=
 =?utf-8?B?dDlFVGZzbXUvZllxSDdEY0ZNWkhkMlg5SDhoL2hmY2s5eDV2WkJiMndzUDlz?=
 =?utf-8?B?YVpzdmM2ekNvOUx2b1R5ZnFFVWVVb0tHSm5EMHlJbi9kWGFUL1BrT2xMRzlp?=
 =?utf-8?B?TnM3L0RGSnZYVzdNNnY4c3J1TmZNcW9jSHlCZEl3eEZpemtEQVVTUGNxby9t?=
 =?utf-8?B?QnhUOVg1QTB3QXZHVjRMcEx1S0ZlRldXclZZZEZUYTVEUGx0M0lzK1pWbzJq?=
 =?utf-8?B?OHVRRWZkMmViTlVKYlhFamhheE9PTGFqQjYyL2VuMjE4RjF4MGs5dmFYbThK?=
 =?utf-8?B?R1gxbS9xOXNNS1c0ZW5xLzBwSUU1dkV1eFAreUVvUWZaQlpWNjByaHBNdE1W?=
 =?utf-8?B?TTAwNTN0cEYzaXhlV1RGaXJ4UFh4WUw5enhyRFd5UFo1Vm16YjdLWHdTaDVE?=
 =?utf-8?B?N3l6OGwzeEh1OGNJMWJMSVF0QTBOcGNPNGVFUDh4MWdLMnVVMmVUNTVpOUp3?=
 =?utf-8?B?WGFwUE4zZ0F0bkxyZ3Qxb0IvQzc4ejgxeEpLK2FPSDdTMlA3WTFadTBpdHlM?=
 =?utf-8?B?Y0pldU1ZWjQ3NDg3OTdtaDFMcVJSYUkvejVPK1puMDhoK2pjbDhXb2FpelVr?=
 =?utf-8?B?a3pnRWRsc0pwMXNqdCtJQ2pTaGlWOXlEVDJIUXRzRDFUb0RVSnJvOFZQd3Bu?=
 =?utf-8?B?QjZjWk5vSGc2TWxGTjJWWlh2UHF0USt2K0RVWThhcWJScUJMR0pWTmVFOGRk?=
 =?utf-8?B?UjhqTXdoR2tGS1BJZlI0NUx6cmpRZm9jaXpSZmhaQis5Q1VPV2luMDJvcUp2?=
 =?utf-8?B?MWhLN0I1TGpqN2FJS1NQYWRzMDc5dlZ5ak9hUG1mR3B4MDd1Tm9XdHJIdXZq?=
 =?utf-8?B?RURsdzNKaXcvOTRVWkFnTUpyckpOTmE4YktlUFdUdXhlZy80dkhmTkxaYnNT?=
 =?utf-8?B?S3AwKzBUZUhtYmpJaTJ4VjlCcFFKNlNzSFJNVFg4NGlWYmNGUFVYZ1Fhb3dM?=
 =?utf-8?B?ellVVldPcTJ3b1FnNlpITzNTTXU0U3Y4c3Izb0NvNlhKTXNsaC9KNDFIa1F0?=
 =?utf-8?B?LzBWbW1mdUxsbURTSzkvZkRDZk42L2ZEa3dpc08ya29zTStZc0V2azhDMHFI?=
 =?utf-8?B?YXBSMDRsNDZOYmhMRElHTVd6V1R5NUkzTnZUbWpTSjRXVzNrZEkrNnl5czAw?=
 =?utf-8?B?dlRLVTNWQVlSM3FGQkdFc1VSYitmVVAwSENTRzRSalRNRmkrdUcwdXd4SGhr?=
 =?utf-8?B?R1YvSGp1MWMzNm05Y2kwUWU3WURtckwrcGxMWFcrbDFZcXVDMkI0cjBJSlo4?=
 =?utf-8?Q?y1PFsUL10fxzxHbTfrdvtTA=3D?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9578cb91-0bbb-4908-9888-08d9d4d5ca0e
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4130.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 07:41:33.3961
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eTZSVZ0zhXY5GpHcpS8o9MY3+3xaTSoNxWD4B6ZAuA2whb/X0fuHizMiXAiy99xx4nLKDmxRc0SlOXKde5yNng==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4115
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 1/9/22 20:24, Matthew Wilcox (Oracle) wrote:
> Convert both callers to work on folios instead of pages.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>   mm/gup.c | 41 ++++++++++++++++++++++-------------------
>   1 file changed, 22 insertions(+), 19 deletions(-)

Reviewed-by: John Hubbard <jhubbard@nvidia.com>


thanks,
-- 
John Hubbard
NVIDIA

> 
> diff --git a/mm/gup.c b/mm/gup.c
> index b5786e83c418..0cf2d5fd8d2d 100644
> --- a/mm/gup.c
> +++ b/mm/gup.c
> @@ -220,20 +220,20 @@ static inline struct page *compound_range_next(unsigned long i,
>   	return page;
>   }
>   
> -static inline struct page *compound_next(unsigned long i,
> +static inline struct folio *gup_folio_next(unsigned long i,
>   		unsigned long npages, struct page **list, unsigned int *ntails)
>   {
> -	struct page *page;
> +	struct folio *folio;
>   	unsigned int nr;
>   
> -	page = compound_head(list[i]);
> +	folio = page_folio(list[i]);
>   	for (nr = i + 1; nr < npages; nr++) {
> -		if (compound_head(list[nr]) != page)
> +		if (page_folio(list[nr]) != folio)
>   			break;
>   	}
>   
>   	*ntails = nr - i;
> -	return page;
> +	return folio;
>   }
>   
>   /**
> @@ -261,17 +261,17 @@ static inline struct page *compound_next(unsigned long i,
>   void unpin_user_pages_dirty_lock(struct page **pages, unsigned long npages,
>   				 bool make_dirty)
>   {
> -	unsigned long index;
> -	struct page *head;
> -	unsigned int ntails;
> +	unsigned long i;
> +	struct folio *folio;
> +	unsigned int nr;
>   
>   	if (!make_dirty) {
>   		unpin_user_pages(pages, npages);
>   		return;
>   	}
>   
> -	for (index = 0; index < npages; index += ntails) {
> -		head = compound_next(index, npages, pages, &ntails);
> +	for (i = 0; i < npages; i += nr) {
> +		folio = gup_folio_next(i, npages, pages, &nr);
>   		/*
>   		 * Checking PageDirty at this point may race with
>   		 * clear_page_dirty_for_io(), but that's OK. Two key
> @@ -292,9 +292,12 @@ void unpin_user_pages_dirty_lock(struct page **pages, unsigned long npages,
>   		 * written back, so it gets written back again in the
>   		 * next writeback cycle. This is harmless.
>   		 */
> -		if (!PageDirty(head))
> -			set_page_dirty_lock(head);
> -		put_compound_head(head, ntails, FOLL_PIN);
> +		if (!folio_test_dirty(folio)) {
> +			folio_lock(folio);
> +			folio_mark_dirty(folio);
> +			folio_unlock(folio);
> +		}
> +		gup_put_folio(folio, nr, FOLL_PIN);
>   	}
>   }
>   EXPORT_SYMBOL(unpin_user_pages_dirty_lock);
> @@ -347,9 +350,9 @@ EXPORT_SYMBOL(unpin_user_page_range_dirty_lock);
>    */
>   void unpin_user_pages(struct page **pages, unsigned long npages)
>   {
> -	unsigned long index;
> -	struct page *head;
> -	unsigned int ntails;
> +	unsigned long i;
> +	struct folio *folio;
> +	unsigned int nr;
>   
>   	/*
>   	 * If this WARN_ON() fires, then the system *might* be leaking pages (by
> @@ -359,9 +362,9 @@ void unpin_user_pages(struct page **pages, unsigned long npages)
>   	if (WARN_ON(IS_ERR_VALUE(npages)))
>   		return;
>   
> -	for (index = 0; index < npages; index += ntails) {
> -		head = compound_next(index, npages, pages, &ntails);
> -		put_compound_head(head, ntails, FOLL_PIN);
> +	for (i = 0; i < npages; i += nr) {
> +		folio = gup_folio_next(i, npages, pages, &nr);
> +		gup_put_folio(folio, nr, FOLL_PIN);
>   	}
>   }
>   EXPORT_SYMBOL(unpin_user_pages);