From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D3A3C433EF for ; Wed, 5 Jan 2022 07:47:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9CDB6B0071; Wed, 5 Jan 2022 02:47:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B25DD6B0073; Wed, 5 Jan 2022 02:47:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 977C76B0074; Wed, 5 Jan 2022 02:47:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0229.hostedemail.com [216.40.44.229]) by kanga.kvack.org (Postfix) with ESMTP id 829A96B0071 for ; Wed, 5 Jan 2022 02:47:00 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 386FA181CC1D9 for ; Wed, 5 Jan 2022 07:47:00 +0000 (UTC) X-FDA: 78995452200.13.C379702 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.43]) by imf12.hostedemail.com (Postfix) with ESMTP id E16F040008 for ; Wed, 5 Jan 2022 07:46:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nuwMYyHSNhkJcUTdlOnjUB/BQw/htoysPB6kpptU9qXFxAZCPJ8m9LBJCdDKvdlNkgVEFxanx/grqL8NSVwHA7P/5q0Rt/y34qKt35UHZgMyrOMP+I7c8wcyFwgXjd3QBR0aP3CjSBNNYSXHkmip/t8xRgV/SRWsyIpgTU2ziApVTDnk3ZvT2zoMaYxq5g90rwxHA8Kdtt+UdZAGbk3SZsgt9H+TYNJma5x4vqfioxz8YJ1tbbruVKmiwOSV/4wb+37Sa8WtmSj1i1iqSyPuByZMkVJql3TiHrxpELg1fLX7TUiYv14NPGlRc8oBBDrqKZY1pGrMKYYZ1sN9aPRTzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ndwxetFrf3FR//uMLdghSIl/tx6Drz3TjS+NHnrQpPo=; b=Raohne9OFp1wMLVSBPel6SksUEps/vfXwh55HkLhxtwBzIIPoq1q6/gbF1Zo6BO7uDzADxkZObxJTBANMclf397blLgy6gUBIj96WiU0EcZNE5oak8b3E0unngnbtQ/NEgtcyfAsRzOm6I0iUtGSA5qiPwXfzsNrBcHFd3ugtbB1hHbohGxnmk8MLi3uVSqDUUpmTuclU6YFinCjoKXeyxkWG3QCaoiNXZh0hAb49lF2keWGuoZhB+oFuJzbr20+MPznWzu56K/VKdE3deKjAYwaUmUP8Y61WTejtbc3dH2aieIdJZPLexuOOxiAuxgpbYV9Ja1OYXn6zSHr2W5kEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ndwxetFrf3FR//uMLdghSIl/tx6Drz3TjS+NHnrQpPo=; b=cl7N6Vxo15cqnS4+G67grs8I1Hym1UvtUslfy6sfqg+JpXbW8QFxoDko1UAod1sZfKAcG6uKsxjx+Z2z9J1B7kdph0xDmCJnHzXus5m5eIl4Zjpf7OqeYJDjhUXMUlDQP6nGvAvPSE/NakXTpO+wjZICLCShPEf1B8BO4ZKxPqv+QnYdXzv9jyRwgvx0cKiej1hUh1mBNapKuuOsmlBKCcA4lmpENQFywOEaaHqIBgk64TIFKwlEfmhtAUyVmiPtc8Yf0HZwwY6HEO/Nm7pVHtxu+acvpg18wDfAmf/RgW7Ipu+dXbNRLpaBfyKEMIih3mX4MCFgtPB/ch2WhlZAig== Received: from BY5PR12MB4130.namprd12.prod.outlook.com (2603:10b6:a03:20b::16) by BY5PR12MB4130.namprd12.prod.outlook.com (2603:10b6:a03:20b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Wed, 5 Jan 2022 07:46:57 +0000 Received: from BY5PR12MB4130.namprd12.prod.outlook.com ([fe80::8496:16fd:65c5:4af7]) by BY5PR12MB4130.namprd12.prod.outlook.com ([fe80::8496:16fd:65c5:4af7%4]) with mapi id 15.20.4844.015; Wed, 5 Jan 2022 07:46:57 +0000 Message-ID: Date: Tue, 4 Jan 2022 23:46:55 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [PATCH 10/17] gup: Convert gup_hugepte() to use a folio Content-Language: en-US To: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Cc: Andrew Morton References: <20220102215729.2943705-1-willy@infradead.org> <20220102215729.2943705-11-willy@infradead.org> From: John Hubbard In-Reply-To: <20220102215729.2943705-11-willy@infradead.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BYAPR01CA0043.prod.exchangelabs.com (2603:10b6:a03:94::20) To BY5PR12MB4130.namprd12.prod.outlook.com (2603:10b6:a03:20b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a2f2ef5-e32c-42ef-9dec-08d9d01f8c94 X-MS-TrafficTypeDiagnostic: BY5PR12MB4130:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wV5Xb+KKuD8Td330RudDdzpGqDpO9LtbCi0B/d8q4QpQh7wsQd96jT/v2/JjfDOdoGfrP0t1j0PLxlpClUVR1Z5OM7oJ57uMjAZTYfvnLvG+jxq497guy8NHotC3GNi+os1+wOmZjmaZW8pSiUXOtzNbSB+6Y03jws4RD5pUXfp8tcVhpWqiconcbhUZ6savH2OrjMqe0/8FHuCL2JNIWXz2+hdeinLfhSISmZDdgDTcmA1EPAEBXqkNdWn5/phsYaf42iajDslzpRFib/S3qShQe2qD410Vr11DvUTksxcxoUmr/AHxAdLPcVMNzaMHY10FoMnj9+1BuJfWk0iyQDx/JiQkR5vUtMIws/79I6RAUbcLFWgSuib9aUilQHMn/9GhIofy101HfHcskrpmGG1dS8r1mMv0AuFTx3ALriajYe83/STdnxZQDpkLWiMvB3U+recgWnGlCKJUieXZXS3sTnkPyV5rS6p33AT5PKsktxG6RlPPdfo86FzDs1aGM2eonqKZKte5i5hRMJ23PN96Fozk/xb/C3J9RVycItld7wnQ2RU9ism5pMPN8GqNm1eI7jU/oJ4yI1ZVJI7va2AOQbCl+oFAj0AsNkWCQpTb+m+iHUWDMA2Xn9OKmwqH8nClQ/quWCUXJ95mA8Ytpijaq5mDjGh3W9GY1092QmfDgtDJVvLIbEZlzAAD5K7pHcdVj0w7h7YrJf3M87N0dGxmqYV/FCTb3X8bprcFWls= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR12MB4130.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(6486002)(38100700002)(26005)(83380400001)(86362001)(6506007)(2906002)(6512007)(2616005)(8676002)(53546011)(31686004)(4326008)(316002)(508600001)(5660300002)(66556008)(31696002)(66946007)(186003)(66476007)(36756003)(8936002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UEY0dk9GdmFKYkNHc3lWais1Zi9rVlJYL1RvVmlYcTBzUlMrNTlqS3IxT29R?= =?utf-8?B?NEI2a3dielc3RUt1Vk02bjVSZy95SXJrYmJuUlQ1c2d6K2gvYTVId3FHTkxC?= =?utf-8?B?ZUZMdFBPQnYxVHZFUFNvWkNLVXgrMHFDS1BCVmFCa2N5c3RReWpLbjFBaEp6?= =?utf-8?B?bVZCcmdZV2lpelR6NGtXTDhYazJuMGtVL3JPYVV3Y1V6US8vRGdESnJqaDBN?= =?utf-8?B?QU1HN0FESGtzOHF5ZGhodGVRR3oweWh4eTJGcGZDZi94Zk5iakNHOEc5VHNu?= =?utf-8?B?NlI5VFdrUWxNK3pHUEcrS3krd0N6ME9VbTVGYmMvK2ljbDhocmNWdWM5Z1NC?= =?utf-8?B?MjQvUlZBb09tcDFjRWtmNjc1NnNRenkvaXhTTnFaZ0ZQVHFGblRIaDdMNEFk?= =?utf-8?B?aGFzbTZDd2dhRzNzV1h3aGUzRDhUeHJlWGVrVDJSeGgvenpmTGhjTkJIbWdT?= =?utf-8?B?dEs3QXRLUnF5R21JWnFwVDJHVXVPcDA2bldvMGlhbldLZWN1a3B2ZFZwL3RJ?= =?utf-8?B?d3lZbzNEYmhCdFI2eEoxcy85VHpCcEZPY0RybENwWDZFYlZObTg2TGZEQ3pK?= =?utf-8?B?TjRuQ2Y1OExnOUJtaWRGc1RhQW1KZ0tEMGpOa1drazhBVkw1ckVUMVQ2R2hK?= =?utf-8?B?b1dSZkttdHArMUp6M29xUUJha21CQ0FwdmtpT2IvU2dhUEswYm9rdFp0V2lI?= =?utf-8?B?emFpQnhHQ0g4SkhhY3FFQStiT2hYZTg2K0dKQ3IyU0JOUGJNakxwLzlsbDVz?= =?utf-8?B?ZGwrcTZOQWtZc3lwTjZFd2txM0kzeWFFeEJuWnYxQlc2Q3Z1NlRldHpDa1NY?= =?utf-8?B?bWhyc2RkdmFISVZQcnlLejl1V1NQeitucDRRRytTYlBWY0h4MlBHd1hLSnh3?= =?utf-8?B?L0FGNzNXclZRNEJvS2d3MDhsNFhNbWlUZlBpTlF6THJ3aldHT2tPVnJ4ZTk2?= =?utf-8?B?NjJWZE9kcW0wVXc5eGd1UUNFNUlFajVOeHc4R3pLc00vNEVTemVBRFZYSVFY?= =?utf-8?B?WCtPeklBUGh6NjN0eDRvUXMxazRFWVgwczkwc1poRXJDUnQvaCtZNy9Lc2J3?= =?utf-8?B?T1ZNTlpUV0p1OTRUTitpM2d3ZXpDQ0NuclFZSjZFL0pySFNDVkZqd1JXR0E4?= =?utf-8?B?ekVFbnlKbmJKdmVGcTNvQWdmQ1RjY3dMeE9kdkI4WGpuNy9kNHI0eGVmSnZ1?= =?utf-8?B?eDBhZEI1YnZxSjJNaFNjekZPeDRmek0zNWEyakN2VGZQK25aS3ZYcVFGWjN2?= =?utf-8?B?dEZjajdIL2dJS3hBUHN0M2t3b3lKbzI2ZW90MTBHbkRCaDdlYlBDUDVPYzRr?= =?utf-8?B?c3FoVTc4dkc2ZlV2WHMwcmlSS0VaTTZrT0pQNzBZR1AzQzkzZmVnVU5kclFy?= =?utf-8?B?ZllYbTdLdmZSdGJjQ0hDUGZ6VlZPazVUbDk3bmtNZmNDbnlFRWlUZFczQlph?= =?utf-8?B?SWxHN3BlRndvL2xBdFV0YXFmd0U2cDBOeFl2QWVGKzgrWU9JMlJ0OWVrRGcr?= =?utf-8?B?d3JuZU9paEdEeVRVbVh2c3pkRDVhSWRuTi9nVmJpU282R0oyd0NablJmV1p6?= =?utf-8?B?MFlqTUhRekJQU2x0OXFDRUdHei9HQVNHV0E0M0NVMDhNR2tzZWx1T29wT0U0?= =?utf-8?B?K3R6TzJGMFZ3Q1kwbHp0VkFQMXEyTmRFdE9UODQ2SHJJMExUeGlnczJkc21o?= =?utf-8?B?dmFEc21yVW03Zlc2Qi9IenV2RThmMWtmMEF6QkVRNXNIalc3RWZUaEJsMnBB?= =?utf-8?B?M29mdGNvUnJ6dSt3RXpTN213bVI1SjNSMWdudGx1N3dwWG04VityalFkZngw?= =?utf-8?B?Q2xLOVloVHZwUXE3T29SNDYzZytSWk1ZQzhFWW5tV3hJN2hPcG5MVzdrL0h4?= =?utf-8?B?cEdoYmxGckxXMm10elBNUVdmc0g3M2pKOXBFcVVIeWN6NFl3VlZ5aS8xWWRK?= =?utf-8?B?OUhzUExaa2lmK1hjTGJSKzg0dlZoMzQ1TnRXZm9uRFptUDY1ZzhoVDYvUExJ?= =?utf-8?B?K1lzQkN6YU5UWnRJYlJHZzlEUzFTU2JsSkUxRGxsQTltdTFDTVprUFd6VlVE?= =?utf-8?B?WmZtK1o4R2ZXV1h0K0pHZjNWZVJwNm1XSDRsSWFMM2ViSUV5YTRlbldFQjA0?= =?utf-8?B?S0lzdUVkUnNzd0NWd0FUU05vdmdkclpzai9XcW1GNFJUSEl5RkRrQTRhQkpv?= =?utf-8?Q?Ww5g12I0FlznoJQ0d1G9FZQ=3D?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a2f2ef5-e32c-42ef-9dec-08d9d01f8c94 X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4130.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 07:46:57.1999 (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: qrN9BQ3mo0Z+WHbB/DjyuX5/hu8q3qSvvQ+OCOagtQENBZnlYJQufS/0xD2od4DdkWiyy6jBO3o4zIZdT1ekNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4130 X-Rspamd-Queue-Id: E16F040008 X-Stat-Signature: z9jntf3xf6moejpr733yz474srhx8cxk Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=cl7N6Vxo; dmarc=pass (policy=reject) header.from=nvidia.com; spf=none (imf12.hostedemail.com: domain of jhubbard@nvidia.com has no SPF policy when checking 40.107.244.43) smtp.mailfrom=jhubbard@nvidia.com X-Rspamd-Server: rspam11 X-HE-Tag: 1641368793-736217 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 1/2/22 13:57, Matthew Wilcox (Oracle) wrote: > There should be little to no effect from this patch; just removing > uses of some old APIs. > > While I'm looking at this, take the opportunity to use nth_page() > instead of doing the arithmetic ourselves in case hugetlbfs pages > are ever allocated across memmap boundaries. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > mm/gup.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > Reviewed-by: John Hubbard thanks, -- John Hubbard NVIDIA > diff --git a/mm/gup.c b/mm/gup.c > index d8535f9d5622..1c7fb668b46d 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -2435,7 +2435,7 @@ static int record_subpages(struct page *page, unsigned long addr, > int nr; > > for (nr = 0; addr != end; addr += PAGE_SIZE) > - pages[nr++] = page++; > + pages[nr++] = nth_page(page, nr); > > return nr; > } > @@ -2453,7 +2453,8 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, > struct page **pages, int *nr) > { > unsigned long pte_end; > - struct page *head, *page; > + struct page *page; > + struct folio *folio; > pte_t pte; > int refs; > > @@ -2469,21 +2470,20 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, > /* hugepages are never "special" */ > VM_BUG_ON(!pfn_valid(pte_pfn(pte))); > > - head = pte_page(pte); > - page = head + ((addr & (sz-1)) >> PAGE_SHIFT); > + page = nth_page(pte_page(pte), (addr & (sz - 1)) >> PAGE_SHIFT); > refs = record_subpages(page, addr, end, pages + *nr); > > - head = try_grab_compound_head(head, refs, flags); > - if (!head) > + folio = try_grab_folio(page, refs, flags); > + if (!folio) > return 0; > > if (unlikely(pte_val(pte) != pte_val(*ptep))) { > - put_compound_head(head, refs, flags); > + gup_put_folio(folio, refs, flags); > return 0; > } > > *nr += refs; > - SetPageReferenced(head); > + folio_set_referenced(folio); > return 1; > } >