Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <f6f16c66-0771-4c61-449b-5278f277a7e2@nvidia.com>
Date:   Fri, 5 Aug 2022 00:35:08 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.12.0
Subject: Re: [PATCH v2 1/2] mm/gup.c: Don't pass gup_flags to
 check_and_migrate_movable_pages()
Content-Language: en-US
To:     Alistair Popple <apopple@nvidia.com>, linux-mm@kvack.org
Cc:     akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
        "Sierra Guiza, Alejandro (Alex)" <alex.sierra@amd.com>,
        Chaitanya Kulkarni <kch@nvidia.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Felix Kuehling <Felix.Kuehling@amd.com>,
        Jason Gunthorpe <jgg@nvidia.com>,
        Logan Gunthorpe <logang@deltatee.com>,
        Miaohe Lin <linmiaohe@huawei.com>,
        Muchun Song <songmuchun@bytedance.com>,
        Ralph Campbell <rcampbell@nvidia.com>,
        David Hildenbrand <david@redhat.com>
References: <3e20a542e756bbc0f66435c9344ff674f3ff7ac7.1659680600.git-series.apopple@nvidia.com>
From:   John Hubbard <jhubbard@nvidia.com>
In-Reply-To: <3e20a542e756bbc0f66435c9344ff674f3ff7ac7.1659680600.git-series.apopple@nvidia.com>
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?VnNDQUJHNVRxcGpVUVJGdG42QXczVkN0cHBVcklra2g4dVBVaHArR09XK1p1?=
 =?utf-8?B?Mktpcjk1d29xSFhjNFR0Q3J3UzBDVll4OWNMOE5FeVJHc2VJUWFiU09vQy9w?=
 =?utf-8?B?TE1ZUng4bnI5Y1VKckYyamcySUZtL2VhWEpyVTM5K0had2xnNytmdEdCVlJV?=
 =?utf-8?B?UDdDT1Q5VnA3NmowODlmMWZwcmF1QW4reVRrR05vSUZZWXhKblVxQVZheFZR?=
 =?utf-8?B?cm9qdDRBejhmdDAvZUduaTdDLzVvdHM2Qi9kb0RpY29VanVQTUlqOU43bHYz?=
 =?utf-8?B?MkZoc0dzYk1CKzVWWWhKbkorQk1DOFg1WnArd3loaVdLUWJyL2tpQ1FOUXVi?=
 =?utf-8?B?Sk9PVGJYNlpBN3JRZ1A3T05GQ0dNazZ0Z0tSM1VwUnZEdUY3Q0xXeW5uZElM?=
 =?utf-8?B?cmVTN0R5VWxheWdrbXhJU0pOWk00SE92c1JvNTU1Wkx0SGtjZ3ptSXhLWlFV?=
 =?utf-8?B?eDlucnR6NnhSY09vTzBKQXZNSTVxYkx4Ly9LM2ZTWk1vMGZDQS85WExpM093?=
 =?utf-8?B?UnVjcmtnUkNLTWF2VndyTStHSW4xektKYy9hVWhHSHJ4a1JqeDBuUmNXK2RN?=
 =?utf-8?B?bWlXY0JKV1owSS9GSTR5UkM4WjNhcTY4QmMrTG9VOUp5alM0NitnNjhkYmg1?=
 =?utf-8?B?SW42WGlBaCszTkU4VXo1WThCQzVqZ3UzNEdqSU1raC81WU9GWnNld1F5aWJZ?=
 =?utf-8?B?bTZBUm56NEtTU2xFNzZkMlhvVm02aWQ1Z2FhRkx6MFBsTDF2VDdWTDJWMTcx?=
 =?utf-8?B?YlhkdUhNNGpSNlhGTWg3c2VEU2d6clA4b1B6MGcvcUFyU3M2TWdvMVdGTVdK?=
 =?utf-8?B?Z1ljSklnR2tWcHR0dm03NU81NEVhMm1FSjVoVTJPRHgrd2hjb2N3ZWJteWc5?=
 =?utf-8?B?d0N1czdVT2VvTTJIcnVNZDZ2TE9JLzdvNGtkaVVxZW9ZbC9aRmFmY1E2L1VE?=
 =?utf-8?B?SWxoTjFHcUorTFlWdnlwVUFPQk5aQk11OG9kdGNBZ21ZV2loWWRRblRqT1hh?=
 =?utf-8?B?Y21lakpDSHpuWHFPSmUrR2dRN25RM0FwYjFJVVNnK0NyUUZHc2J4R3FmTDRC?=
 =?utf-8?B?bUFWNzY2NkJxWmw3bFlXL1NhNWpROTBNMFd6K1MvZ0VOQWZHTjFMbUJkSkdV?=
 =?utf-8?B?a0VrYm5uL09yK0o3Y29kRlJjZ014QjFKcHcxQ1R3WGFudGE5UVlrQmI1Mkt1?=
 =?utf-8?B?WFFFRUl6TDBiQ2t2blFKUXRjQTV3aUFIZ1Y1THRScWlQUjFBd2NrTEZ6aVNk?=
 =?utf-8?B?WG5obHcwNTlRZ0kyaEhtdGNyejVpNFQ5MmFSWVZmY0I4TDFQR3pIeUFmell5?=
 =?utf-8?B?ZHhYUnVhd2piVkY2cWs0NDhsL3VGTUpaZFF2TGExbzczT3cycUI1cXlPWXdh?=
 =?utf-8?B?ZlZYZXByMVJEVllETFlZWDl5bWVKcVR2cUVDLzBjVE01SSt5Z2R3THZpR2cz?=
 =?utf-8?B?cGNoNkUvNEJnYnA4TktUUUwvb3YyUWFLTitkRlY2V3NDRkZ4eTFtZERuVDNM?=
 =?utf-8?B?cU9xY083STdWVWkveWNmWXVkdjM2QXVjdVFZcVFYZ0NoQjdSZ1d4VzZ1TXRo?=
 =?utf-8?B?eTRuc1B1WFF6Mm03d0RWUnA3bFZrZHl0V1NBaVhMS2dYZTlEdDBQUEZ4NDR1?=
 =?utf-8?B?Tk9iSnBCR091NWJ5ZXBQV29jdTc2WWZKRXVibFVmcEoxRHcybS8rbkhJempG?=
 =?utf-8?B?eWljUURtVWFmWHg4RWljQ2VVeEU5c2xwTHp2THpPTHQwTUswZEEydlN1Ynps?=
 =?utf-8?B?OCs4QXphcDVtcm5LWjlDaFkzRElTaTFEemVBbXpiUjl0ZHVnLzZYandwUUF1?=
 =?utf-8?B?VnJROHpFWFhhRmkyN2FDZXQzMU1OemwzZ0NLUEdsNjVqMDhvNGNRRlphQytX?=
 =?utf-8?B?dmFlZ0xkcHp0azhXUTVjR1VCMlVtY2RHdGRhQmYvOTFrVHRwZlNqZHY4cFUz?=
 =?utf-8?B?TGUyUm8yTUZ5eElJODNtL3VmSG1qZnFsZnpucmNGcUMvRHB1YkpzU0c3Lzh1?=
 =?utf-8?B?Q0hZOGdxTU12N1BCdjZSVmNWUnhnb3hIQ1o0TTMvRm5HM29WMUtxQlFwL0px?=
 =?utf-8?B?eW1IRmU1UXRicVpndG92YVEwb1YxRHNaNDZzcDZvbDhDblh4RGhNYzBVekR2?=
 =?utf-8?Q?gOBsL6vjPYfx4INdwzJODGug+?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7d3385c9-c25a-4961-2f56-08da76b5071a
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4130.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 07:35:10.9004
 (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: end0n3WPnJI+FxLo+z3MYLO/lXUHaIqg2FHBfgGXsZPxSHu/VpnuYmm0BhpXWUNAZ394SaT6G8zjpe8jykJ61Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4035
X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        SPF_NONE autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 8/4/22 23:29, Alistair Popple wrote:
> gup_flags is passed to check_and_migrate_movable_pages() so that it can
> call either put_page() or unpin_user_page() to drop the page reference.
> However check_and_migrate_movable_pages() is only called for
> FOLL_LONGTERM, which implies FOLL_PIN so there is no need to pass

heh, while verifying the above claim, I noticed that
__gup_longterm_locked() has been misnamed for some time now. That
function handles both FOLL_LONGTERM and !FOLL_LONGTERM. There's
always something...

Anyway, though, this patch is a good cleanup step, so:

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


thanks,
-- 
John Hubbard
NVIDIA

> gup_flags.
> 
> Signed-off-by: Alistair Popple <apopple@nvidia.com>
> ---
>   mm/gup.c | 21 ++++++++-------------
>   1 file changed, 8 insertions(+), 13 deletions(-)
> 
> diff --git a/mm/gup.c b/mm/gup.c
> index c6d060d..e26ccc0 100644
> --- a/mm/gup.c
> +++ b/mm/gup.c
> @@ -1907,8 +1907,7 @@ struct page *get_dump_page(unsigned long addr)
>    * Return negative error if migration fails.
>    */
>   static long check_and_migrate_movable_pages(unsigned long nr_pages,
> -					    struct page **pages,
> -					    unsigned int gup_flags)
> +					    struct page **pages)
>   {
>   	unsigned long isolation_error_count = 0, i;
>   	struct folio *prev_folio = NULL;
> @@ -1941,10 +1940,8 @@ static long check_and_migrate_movable_pages(unsigned long nr_pages,
>   			 * Migration will fail if the page is pinned, so convert
>   			 * the pin on the source page to a normal reference.
>   			 */
> -			if (gup_flags & FOLL_PIN) {
> -				get_page(&folio->page);
> -				unpin_user_page(&folio->page);
> -			}
> +			get_page(&folio->page);
> +			unpin_user_page(&folio->page);
>   
>   			ret = migrate_device_coherent_page(&folio->page);
>   			if (ret)
> @@ -1998,10 +1995,7 @@ static long check_and_migrate_movable_pages(unsigned long nr_pages,
>   		if (!pages[i])
>   			continue;
>   
> -		if (gup_flags & FOLL_PIN)
> -			unpin_user_page(pages[i]);
> -		else
> -			put_page(pages[i]);
> +		unpin_user_page(pages[i]);
>   	}
>   
>   	if (!list_empty(&movable_page_list)) {
> @@ -2023,8 +2017,7 @@ static long check_and_migrate_movable_pages(unsigned long nr_pages,
>   }
>   #else
>   static long check_and_migrate_movable_pages(unsigned long nr_pages,
> -					    struct page **pages,
> -					    unsigned int gup_flags)
> +					    struct page **pages)
>   {
>   	return nr_pages;
>   }
> @@ -2053,7 +2046,9 @@ static long __gup_longterm_locked(struct mm_struct *mm,
>   					     NULL, gup_flags);
>   		if (rc <= 0)
>   			break;
> -		rc = check_and_migrate_movable_pages(rc, pages, gup_flags);
> +
> +		WARN_ON_ONCE(!(gup_flags & FOLL_PIN));
> +		rc = check_and_migrate_movable_pages(rc, pages);
>   	} while (!rc);
>   	memalloc_pin_restore(flags);
>   
> 
> base-commit: 360614c01f81f48a89d8b13f8fa69c3ae0a1f5c7