Message-ID: <75588728-df1a-f081-70ee-fa0470d08047@nvidia.com>
Date:   Mon, 10 Jan 2022 23:38:44 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.1
Subject: Re: [PATCH v2 24/28] gup: Convert gup_huge_pgd() to use a folio
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-25-willy@infradead.org>
From:   John Hubbard <jhubbard@nvidia.com>
In-Reply-To: <20220110042406.499429-25-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?bUJ0S051NFVWTVlyVlRBczJtMHB2L0dOa3p6ODB5bTcrUmk2Y0JpaHRMVXBa?=
 =?utf-8?B?QkRsMGx0dFJ4ajc3SXNCZ2RDeU1wMmhlM3dMMFJTbmFyTXFGZGxjaDRqc2dW?=
 =?utf-8?B?Y1I5eWY4WDYzeEp1dVdoU2xaUTNCVFFLcWZQUzlReHdMT2lTQjhEak84blpT?=
 =?utf-8?B?QXJwY2QycWlxMWxxQ2h3T2JMaVdGUEswTm1TdEx1WVNJU3lydDlhWXJGN1VM?=
 =?utf-8?B?dkRXeDRzWExZaGJYZTMyNWxhWnl4VWtSc3NvcUdXRmg5dG5YVWo1SzBxdkhO?=
 =?utf-8?B?dUQvdThDN2hIN2lJenFwajlNYjdlVU1Nck9kSFhiUjlDc21EWnh3MUtoTTJC?=
 =?utf-8?B?S0RYbUNWZVI3djNxZDdXSWEwd0tGUmQ3Y3ROQ3Z5RXgxbXpkd08vUzRSYjIw?=
 =?utf-8?B?TGErUXg0QXUyVXlzRmQxNXRxSnZlbWlxMnVrUCs5UE1US29TRG9YdEIzVUVo?=
 =?utf-8?B?TDRCblRIK0s0T0dOcWVJWFNKV0w0cmV6TDMxZElxTHg5QTFhSGNzd202bklW?=
 =?utf-8?B?UnM2NDN1RDhTU3pqR24rUUQrNEl6bE5BUFhqb3BoWWtwZ0QvWE9YaUNOSFZI?=
 =?utf-8?B?UEhKelZvQjcwNUFxT0N2UGVJTXFnTDBuNzlOWkFCTDJtajFScmtlSmRvbXFs?=
 =?utf-8?B?NGVjVHVqWTkwTnVxeGtUbTNnWW0waThBalhpRWNVcmFzZVQ4UjRhY2JRYmdm?=
 =?utf-8?B?eWtteGZFMEozRUNOZUp5Nk4yM294TlRCN2FYQzc4RC9YdUU3RjZCM1pvcVBO?=
 =?utf-8?B?WDJEZzVOS3JzREprRzc1cUNDeldCaXQ5TG1lTDJEUEtIUGtXaVZFUytCcG9k?=
 =?utf-8?B?TXBNRk1NODViSEE0cUczSlZLRmd6VUlEK3NxOGc0YVoxdGNXaWM2U21JUVlz?=
 =?utf-8?B?VmpScFE3SkxsY1hJWVBMb2xuUU5nM0phSjhpbWFZV2trcVowZWpjZHhOSktq?=
 =?utf-8?B?dlFTU1JCZzVINzNxd2pmOENmVHJFQ2tRbGFUMnRPR2JCbVRpcUtDN0lFVG1S?=
 =?utf-8?B?NU90UTNyYzR6ekxTWlZhUnM4YU5vaGJPa3FBMHlhekdXNE16MXZ3Tk5jZDE5?=
 =?utf-8?B?NEphcnJHV1dWbUE0eGhsMGtEVnJ5R1dpVVIycFZRWERGUVNUamlTVzNWU0sr?=
 =?utf-8?B?dXBBeWZvQ2MremRKeXhHTmtySW0zSjBSVTRlV2tRVmhycFhVRzFQUGRDSzdG?=
 =?utf-8?B?UkNabGJxdG5GZmZpVUp5RXdwandXN3F1WjlwTjJ6Z201TUtkQnpqOTI3NGcr?=
 =?utf-8?B?M2ZyNWEyT0RjMjh4MytQbTdIZ09OakFDRVRjN1VDV1FLaFloS2RxNCtoQmtY?=
 =?utf-8?B?S0RCd0dhdmZzcjBSNFFwaXlFMHdhaXRLL2QwNW8wWnQyNDRxZldycXRVK1Bm?=
 =?utf-8?B?MFUxWHpCZTY3NnRnT1o5SVhCdUd5UldxUE5NRjJrVmVRMU0xaTdpcGw2YklL?=
 =?utf-8?B?NXRDNm9vSkFSTEpxeXlZQ3ZtRmExQUd1ZjZaN1dzNXUxUWhKQWZ2eEZBTXda?=
 =?utf-8?B?NndmKy9XZ2d4NW5WSHd6ZU9GVkdrbFNZQVorNUFNbnFYOGJxZnFQYjk5bEQ3?=
 =?utf-8?B?K2cvcExDNTBmQTB3c1k5b3g3V3lWUjMxcExBb1paMml0TGRHMmNEOG5wUVFI?=
 =?utf-8?B?czRNRXVEZmRtV3VnT3VhdWIrWFdRUnc3cCt6M0JRSmxCb0VZdHIvUzhvQTBJ?=
 =?utf-8?B?ckZ4T0pQQmNFWWdURUFHRTRMR0I2ZHlUNVRtbU54ZU5YRnExMnFSUlNCZFdx?=
 =?utf-8?B?cFpRKzFBWEErc1kxMllrd29ObnhJdzdyOFlhZi9hODhiMlpzMERtVXR5alVX?=
 =?utf-8?B?VkxFNkRNOUR0aEJiVUFMVmh5YlhYeGliekpweU9kZGRxZkRaTmI0N2ZGdStN?=
 =?utf-8?B?QlRzUU1uYVJkMkY2OEJsQjhSelJCTEZHck9UT0hwNXRyOXlhUXdsWTU5Wjkv?=
 =?utf-8?B?UjlOM1VhWktaTkV6YzVBNG1aMDYvb0FQMHdrZ2t6dVhWZldzTThIbnBncFNF?=
 =?utf-8?B?QzEyVjhpQm5ZVTl4NXdWYVBlTnM1M0RjWTdLeXVxdDU3UHZzcnVsM2t4U2Jz?=
 =?utf-8?B?VE93Vjk3TDVxQjFRYUZOenhJREhINlhkSEhLNXBUT1J4a1lsZXdseCtCcmNp?=
 =?utf-8?B?YjAyMmNZTko0dzFldTUyTXozT0tFT05MSkFwL0NEdTRXaHFjMTlpUWJkSjhu?=
 =?utf-8?Q?56q85fmb1fD6YJY/V4+L5zc=3D?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a6eeac28-d23c-4c23-5144-08d9d4d56634
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:38:45.8556
 (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: qbyUZQOszkVKNSK7SjaSPDVRfb02KZXKMHchleo14B5pD9M0CH9XmwBm5G9bL9i8ttfRPO7tsc+ANwG4kxoX9w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3873
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:
> Use the new folio-based APIs.  This was the last user of
> try_grab_compound_head(), so remove it.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>   mm/gup.c | 17 ++++++-----------
>   1 file changed, 6 insertions(+), 11 deletions(-)

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


thanks,
-- 
John Hubbard
NVIDIA

> 
> diff --git a/mm/gup.c b/mm/gup.c
> index 7b7bf8361558..b5786e83c418 100644
> --- a/mm/gup.c
> +++ b/mm/gup.c
> @@ -146,12 +146,6 @@ struct folio *try_grab_folio(struct page *page, int refs, unsigned int flags)
>   	return NULL;
>   }
>   
> -static inline struct page *try_grab_compound_head(struct page *page,
> -		int refs, unsigned int flags)
> -{
> -	return &try_grab_folio(page, refs, flags)->page;
> -}
> -
>   static void gup_put_folio(struct folio *folio, int refs, unsigned int flags)
>   {
>   	if (flags & FOLL_PIN) {
> @@ -2563,7 +2557,8 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr,
>   			struct page **pages, int *nr)
>   {
>   	int refs;
> -	struct page *head, *page;
> +	struct page *page;
> +	struct folio *folio;
>   
>   	if (!pgd_access_permitted(orig, flags & FOLL_WRITE))
>   		return 0;
> @@ -2573,17 +2568,17 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr,
>   	page = nth_page(pgd_page(orig), (addr & ~PGDIR_MASK) >> PAGE_SHIFT);
>   	refs = record_subpages(page, addr, end, pages + *nr);
>   
> -	head = try_grab_compound_head(pgd_page(orig), refs, flags);
> -	if (!head)
> +	folio = try_grab_folio(page, refs, flags);
> +	if (!folio)
>   		return 0;
>   
>   	if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) {
> -		put_compound_head(head, refs, flags);
> +		gup_put_folio(folio, refs, flags);
>   		return 0;
>   	}
>   
>   	*nr += refs;
> -	SetPageReferenced(head);
> +	folio_set_referenced(folio);
>   	return 1;
>   }
>