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: <17698a8b-b917-fd83-98a6-20ea0d8059b5@oracle.com>
Date:   Thu, 30 Mar 2023 10:18:16 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.9.0
Subject: Re: [PATCH v4 3/6] userfaultfd: convert copy_huge_page_from_user() to
 copy_folio_from_user()
Content-Language: en-US
To:     Peng Zhang <zhangpeng362@huawei.com>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
        willy@infradead.org, mike.kravetz@oracle.com
Cc:     vishal.moola@gmail.com, muchun.song@linux.dev,
        wangkefeng.wang@huawei.com, sunnanyong@huawei.com
References: <20230330134045.375163-1-zhangpeng362@huawei.com>
 <20230330134045.375163-4-zhangpeng362@huawei.com>
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
In-Reply-To: <20230330134045.375163-4-zhangpeng362@huawei.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?MTRoWVRIMnRDYkk3dnF6WWl0VzM5akhvSHNpMWc5Ykw5UkVMRTFwbzM3L2pX?=
 =?utf-8?B?NEphTDJMYi8wSjVSMlpIeUhSYVprR1RSQ1UzSVhWbmVhdVJ0R0s1ei96ODBF?=
 =?utf-8?B?NnhETWhkTHNxWnpBUjYxSytJM0hwdmVhbGVmcVRRcWFaSDcwVzl1dElCS3dT?=
 =?utf-8?B?T0RWWDF3VU5OcWNvS25VeDM4aWdOR3VRR2IvVW1LeGRLaDhNRjhSVTlsY2FF?=
 =?utf-8?B?R2lSSWpNSHBzT2ZFdnVmYWU5SEdWYklDUDVPb1NMWFFENll5M0FzV2tDQ1VN?=
 =?utf-8?B?cHpPZDJnUlg2RU85RElVd29yZ1lXd1EwK1l2S01kcUlhN0RjakQ1cVZQKyt5?=
 =?utf-8?B?UlQyZWk2aTVqS3F3cTBHSHN3NEJrcXJvbVpEM3dQVEFLMHdKUCt4S2QxWDJt?=
 =?utf-8?B?U1pRdUYrTGE5aS9TVTRqUlhWSHlWZGZVc2FhYUxZMDFkcGkrejJxMjJqYk1i?=
 =?utf-8?B?cWpxRkErYVpMeW5ra2RzSlZlQ0d2bWlBQlBUc3l3RmhvL1hoSTc4NDJ0K0xL?=
 =?utf-8?B?ajViajBsMmxQREdaNHhPZDdiVXZ0VWtwdHB6bDdhdDBKYWtBYmVRM1BKM0c2?=
 =?utf-8?B?V2Z1dHZwUXVvNTRyenZlaEdvTURmeGNEUzkrM0Fab04xaHk1SVZDVWx0TUxJ?=
 =?utf-8?B?MU5veit3ZzlCcXoxbGhDS1I3VHUyUU40N20wek9mdmhJM1lkd1R2M2ZINEJp?=
 =?utf-8?B?MmFFYVdkSmUwRVZJVU9sc0VuWExxZUJ3YkJHKzk0VTNyTHRuNkJVT0xmZjZS?=
 =?utf-8?B?K0VvL3NGWVZ5MlRUU2gwUDd4bWZBQjZnN1N6aGszSW5TaDlPWFpuWC9CUkFJ?=
 =?utf-8?B?K3BrL3JoZ0MxNm11b1ZFUnE5cWdOUHFuZlp5ZkEzdnZMVmxVYXkyY1ZSNUdo?=
 =?utf-8?B?U0Zic2o1VzdYNmd4M1k4U1F5WHB3SzdUQ0l4TURuUGFCN2xJY3kyNU8vTDZr?=
 =?utf-8?B?d3ZZUGdTOXd0ZDNsZVVHQldJVVlFdlJ2RktyZEhycVA0aFVqMzRHNHZPRDNC?=
 =?utf-8?B?Q2U0eXlaSDZQdGs1eHBHSTMxOERFK3pRSEZLNGsycExHZ0FRRmdKVzFyTFpI?=
 =?utf-8?B?aURGbXd5a2IvSWtPWGNhWVpzUFRIM3RzZWxCTVQrK29pYWt3YUVFSFlDZ1g1?=
 =?utf-8?B?cjY3WEk5MVJNL25QM1RmK3dsc0d4ZlZMR2xIOGxnUXliM212eE0xUjZ0WDJJ?=
 =?utf-8?B?Tmk3S3dURnY3MTF5NWcvWTAwR3lwdjB5TXZOQitZS0RYNS9XQ21QMXJOaStj?=
 =?utf-8?B?enZFa3RwTEs3MFlRQ1FYa3VYWmRZTmFFSmJLNWZJSll4dnVGcFdWN1J5YkR2?=
 =?utf-8?B?cHlidnBaVEdvdDNCMzJhU1ZZeVY1MFhEN0o2ak1RU1VEV1BCQjJpRnk4NnVr?=
 =?utf-8?B?ZmIvbW1OYmNqd0ZHQWxrNkJrV2Y1MUpTcDVXdFl1YXBsUzJHYnhqWHBhSVVH?=
 =?utf-8?B?cllndGZqaU5SSDNRQm1wRUNoaEFvaWZLc2hPT0ttaDNmZlNKb2lLMll1c0FC?=
 =?utf-8?B?aXZnNHdQSUdxK2RrM3BHb2oxa3FWdWdhYWxMNlU1d09YMWJZLzdyNldDT2hQ?=
 =?utf-8?B?ekZLbDlwc29QL0xnUjVmL0xnS0RiOUE1dnFFZWF2ZlZ1K0UzcDZVdkdWWHlB?=
 =?utf-8?B?ckJhdys0ZWppMzhuUE4wUzlWM2V0SWdBYTI2UktkRmVzZUJ3d3E0cU1Ed1dk?=
 =?utf-8?B?MTBMRkhjc3c3M3NzWlNnSHkxejRTdXYzWWF0aXZaTmtEYmRsZUJaajNHU0dt?=
 =?utf-8?B?bVloRnZLNndEcXliS21PdWdnKzNmWVcvcWk2dnBQek8yY3lKaWhCbkZyOEFY?=
 =?utf-8?B?TEI0V3lPSElUNC95bmN0dFZWTWtzRElMSFBlNUJuYllyTmh2dnZrVG5YWDZF?=
 =?utf-8?B?WmtrV3ZXek1vUzc2eEhOcUZUSHBxaXdrcUp4TEJLRzM3ZGJyOUd3Vk82N1Ez?=
 =?utf-8?B?WHBlSy9ENEJkdnFkZldxZFdlNlExaGUzekZSdWZoNllZZnpsOWUyQk1OU01U?=
 =?utf-8?B?YmJRMkRCU0V2VXE3WnRPTXd1T1E2b3dXNlZ3cVZKNGpSWjc3NDVoOHMwSnY3?=
 =?utf-8?B?SUxEekUrejhzQ3h2ZzFDazhqazhVSkg0cHVpU0JFNlVycmFVSnB0Z2dCNE4x?=
 =?utf-8?B?RTNteVJuZG1oUjJ3UUhqWWFWbHRUY2NqTzNINkNHc2o3dmVJVS9LenplMHFW?=
 =?utf-8?B?TEE9PQ==?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?RXdkUUZxdGU0QTZUL1JOdkYveGNuL3VsYU5KUEVweVZ2RmdhTFFpT080MDNv?=
 =?utf-8?B?K2dqT2tnRytzZHFMREJIL1hYV3E2dlNtb2luWHpTUmJBZU1PNzJ3NkNIcUdk?=
 =?utf-8?B?aUNrTzM1YXEwVm40WkdpQUs1VzRLK3c2SzZpWDE1Y2NtVjhqZ0g2aEQveHo4?=
 =?utf-8?B?RWZVRW5yQnNOSi8vOCtTWXlscXFmeTBtYTFxUzRsSXI2K005SmJBZXV3SVRJ?=
 =?utf-8?B?a1Yyc1FoQktGemFtL0dESVdpNVU1MXBtT3YvWk5za2NwN2M1dTZzdWJpNVNj?=
 =?utf-8?B?cGk3dnBXZzROUEV0R2J1ZzRtd1BBTjMrQk5hcms1U24zTG0wT1hnTGM1blVn?=
 =?utf-8?B?RmhvUXFEMEtZZ2JUUUxxaDVXL09RMGZFeDlSekFqR1FwcW5VK1c3bEJKY0tW?=
 =?utf-8?B?RG5lQURpUzk5RUdNWndXVmxROGx3UUlQTCtGd3Q4VnB6YTVjNXF1VGdOVHNH?=
 =?utf-8?B?N05Ma1BkREF0Y2didzlXK2xXZkRWbUxEZ0syV1lOWGlxTFRMV1Z4T1MydEF6?=
 =?utf-8?B?ZFhKSXI2U2dyWWlIK1ArSWk3OVFGeXdicGxUdFJaRFFkUTZKY0kvN202M1Rw?=
 =?utf-8?B?VXNXVVlLaUdWSzZCTjBndVBHdE54dVRCd24yRGNZZzRWOFljdUg4T3g5N3ln?=
 =?utf-8?B?YmFUTU1jcnlkNnlZcURqejhEZTNRUEFicDFGK2dBRVlSQ2YyZXNyYitZNitx?=
 =?utf-8?B?djFIMXgzdVBmTm94cUQySzl1NzQvVlFXNkorRVQ5N2MxYmNYOVQ1VEU1RHVK?=
 =?utf-8?B?WHlWYmcvcC8yZDBxZmY2OGYrRWhyVTV6UFgzaitVaDYzUVZMZm5hRDVkZW1N?=
 =?utf-8?B?VHZVUVZNK2NQNFZvU1c5eWpoM1hnMDhDQW9NRDdWVlhvQ1FaL3dYazJlU1ZX?=
 =?utf-8?B?dFdlbU5iQ1hyRVRzT1pjbGtEU0xDazFMRVJSWmJENVNrQzFlS1hqWXFvbHRY?=
 =?utf-8?B?RG9aZ0czZEUvRUhoU3BDN1llKzJwMHRwamZqSmEvSmpGdHI2RHNqeVNDK2p5?=
 =?utf-8?B?Ynp5eGo1c0pLSFFjVFN6YkY3aUFTSXIrZnFwYmxmSzJpamlUUlNjSmFKKzNs?=
 =?utf-8?B?cEFUTGQxVTNSTTg2QXQzN1dzWTlrV1R3czJLUTVFU0pCQVF2Mml4OWtmbUc1?=
 =?utf-8?B?bEhEZ2VoTC8wM1lrSTVsQWlnMUlmb3d4MWxhMjdYYmRGeXZPamhHeURBUXhF?=
 =?utf-8?B?b2htUmZhSjJ0QnpWMUEyWEppV2VpMmM2ZUJ5SDlVN1h3WEVMZEdqQytOa3Z6?=
 =?utf-8?B?Vjg3ZUkxRHZaWFRBZmdldmxvSzJoMjZySzhKZVBQZC9Xejd6dz09?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4d3b2df8-36d4-4259-706b-08db3142c212
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2023 17:18:19.9279
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wzT5UCbrMGluRlw7L/aMFxuignBYRTaletA2tOprcYx9S/jhnL+SyNEQxqsNIg3CzSbt/vr5fsJnpCusjNLY/Vk3OsXv4+V/X6kbdr25iYI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4534
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-30_10,2023-03-30_03,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0
 malwarescore=0 mlxlogscore=999 adultscore=0 phishscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2303300137
X-Proofpoint-GUID: -2HDH8TEortFK78k_Zh3NFjYRCtnyrBM
X-Proofpoint-ORIG-GUID: -2HDH8TEortFK78k_Zh3NFjYRCtnyrBM
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable
        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 3/30/23 6:40 AM, Peng Zhang wrote:
> From: ZhangPeng <zhangpeng362@huawei.com>
> 
> Replace copy_huge_page_from_user() with copy_folio_from_user().
> copy_folio_from_user() does the same as copy_huge_page_from_user(), but
> takes in a folio instead of a page. Convert page_kaddr to kaddr in
> copy_folio_from_user() to do indenting cleanup.
> 
> Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
> ---
>   include/linux/mm.h |  7 +++----
>   mm/hugetlb.c       |  5 ++---
>   mm/memory.c        | 26 ++++++++++++--------------
>   mm/userfaultfd.c   |  6 ++----
>   4 files changed, 19 insertions(+), 25 deletions(-)
> 
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index e249208f8fbe..cf4d773ca506 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -3682,10 +3682,9 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
>   				unsigned long addr_hint,
>   				struct vm_area_struct *vma,
>   				unsigned int pages_per_huge_page);
> -extern long copy_huge_page_from_user(struct page *dst_page,
> -				const void __user *usr_src,
> -				unsigned int pages_per_huge_page,
> -				bool allow_pagefault);
> +long copy_folio_from_user(struct folio *dst_folio,
> +			   const void __user *usr_src,
> +			   bool allow_pagefault);
>   
>   /**
>    * vma_is_special_huge - Are transhuge page-table entries considered special?
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 7e4a80769c9e..aade1b513474 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -6217,9 +6217,8 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte,
>   			goto out;
>   		}
>   
> -		ret = copy_huge_page_from_user(&folio->page,
> -						(const void __user *) src_addr,
> -						pages_per_huge_page(h), false);
> +		ret = copy_folio_from_user(folio, (const void __user *) src_addr,
> +					   false);
>   
>   		/* fallback to copy_from_user outside mmap_lock */
>   		if (unlikely(ret)) {
> diff --git a/mm/memory.c b/mm/memory.c
> index c47b8991410a..9d59dad319b3 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -5854,35 +5854,33 @@ void copy_user_huge_page(struct page *dst, struct page *src,
>   	process_huge_page(addr_hint, pages_per_huge_page, copy_subpage, &arg);
>   }
>   
> -long copy_huge_page_from_user(struct page *dst_page,
> -				const void __user *usr_src,
> -				unsigned int pages_per_huge_page,
> -				bool allow_pagefault)
> +long copy_folio_from_user(struct folio *dst_folio,
> +			   const void __user *usr_src,
> +			   bool allow_pagefault)
>   {
> -	void *page_kaddr;
> +	void *kaddr;
>   	unsigned long i, rc = 0;
> -	unsigned long ret_val = pages_per_huge_page * PAGE_SIZE;
> +	unsigned int nr_pages = folio_nr_pages(dst_folio);
> +	unsigned long ret_val = nr_pages * PAGE_SIZE;
>   	struct page *subpage;
>   
> -	for (i = 0; i < pages_per_huge_page; i++) {
> -		subpage = nth_page(dst_page, i);
> -		page_kaddr = kmap_local_page(subpage);
> +	for (i = 0; i < nr_pages; i++) {
> +		subpage = folio_page(dst_folio, i);
> +		kaddr = kmap_local_page(subpage);
>   		if (!allow_pagefault)
>   			pagefault_disable();
> -		rc = copy_from_user(page_kaddr,
> -				usr_src + i * PAGE_SIZE, PAGE_SIZE);
> +		rc = copy_from_user(kaddr, usr_src + i * PAGE_SIZE, PAGE_SIZE);
>   		if (!allow_pagefault)
>   			pagefault_enable();
> -		kunmap_local(page_kaddr);
> +		kunmap_local(kaddr);
>   
>   		ret_val -= (PAGE_SIZE - rc);
>   		if (rc)
>   			break;
>   
> -		flush_dcache_page(subpage);
> -
>   		cond_resched();
>   	}
> +	flush_dcache_folio(dst_folio);
>   	return ret_val;
>   }
>   #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
> diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
> index efa9e1d681ee..b453a4d2a0d3 100644
> --- a/mm/userfaultfd.c
> +++ b/mm/userfaultfd.c
> @@ -422,10 +422,8 @@ static __always_inline ssize_t mfill_atomic_hugetlb(
>   			mmap_read_unlock(dst_mm);
>   			BUG_ON(!page);
>   
> -			err = copy_huge_page_from_user(page,
> -						(const void __user *)src_addr,
> -						vma_hpagesize / PAGE_SIZE,
> -						true);
> +			err = copy_folio_from_user(page_folio(page),
> +						   (const void __user *)src_addr, true);
>   			if (unlikely(err)) {
>   				err = -EFAULT;
>   				goto out;

Reviewed-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>