From patchwork Mon Apr 10 13:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13206372 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 11336C76196 for ; Mon, 10 Apr 2023 13:39:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B86EF28001C; Mon, 10 Apr 2023 09:39:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE7F928001D; Mon, 10 Apr 2023 09:39:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8722128001C; Mon, 10 Apr 2023 09:39:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 55D4F280002 for ; Mon, 10 Apr 2023 09:39:53 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 17BA71C63E1 for ; Mon, 10 Apr 2023 13:39:53 +0000 (UTC) X-FDA: 80665589466.30.207E2A5 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf02.hostedemail.com (Postfix) with ESMTP id 9494980024 for ; Mon, 10 Apr 2023 13:39:49 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681133991; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nt9FAQe0bDKY4a/URFbns6J0a/vNtg4GEeDVTWeK9JY=; b=R8NiSmrdvEZr0uwAxkaYDq0bIiTVBZQ9KFGNOi2/UVX0JGCGQ9OI+lWrGC8ffhsjug2Esy uh6/3dRPH9nnlOMTwDKjzOqiz7gRT7U8XRPZA5L+QFPCBXWnvl9rHGb6ma9VjiHvw6zWx3 DVPLY2L8AKp2uSG06PJtJqQJyjH9K0M= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681133991; a=rsa-sha256; cv=none; b=yHmdGx258RJPuhYPmKMcVthpFCFhg8rp83fJRX/a287f5vVNEH3tVgtBeJpIQI106iCZn8 LEe9hNElRMkp2nFLEj2keQ1YcNhSmMmWzwmy2dKne4mGJBffa4F6JCSjQEOOlvhoVO7g3j +5w6/AdDmY2WYbmnqbjplY+oD1tw0RA= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Pw94l217rzKxqv; Mon, 10 Apr 2023 21:37:11 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 10 Apr 2023 21:39:43 +0800 From: Peng Zhang To: , , , , , , CC: , , , ZhangPeng Subject: [PATCH v6 5/6] mm: convert copy_user_huge_page() to copy_user_large_folio() Date: Mon, 10 Apr 2023 21:39:31 +0800 Message-ID: <20230410133932.32288-6-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230410133932.32288-1-zhangpeng362@huawei.com> References: <20230410133932.32288-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 9494980024 X-Stat-Signature: ro3hqgaqpz4p3f66sz5i1dxk1zhccar5 X-HE-Tag: 1681133989-808591 X-HE-Meta: U2FsdGVkX18wqhkhEaLYAND3AqOMPhzmiorVRxau2k+XrRxu4NGS1B5NXW8Kurc22GksjQagxc4QxVWZPfhc6iqGTOcYicA9efjADd/hnfqntOFh5eoLZybeIv9O3+yoJmN7pl/dXiBgTVBMe+1P70zEqyQId8vrP2JeJ7Eex3tF/hdGS9UzM0C5nWti8OU/9ZbZOnzK5BL/DMzyZHLd/NYt7atQ+u9oH9p5dYoYKy9NSUG7ZcD9AZNBeHJD+74oAMqF5ZH2tqSAuIs0yXsi3+P9a25Qq8ySE/gXStPcIRsHg5vzW0J5NjbouCHIuFh9mO9tY/osEn7IKkFwCGZgLSxjkV+76s7jQRGnYV541qI1TTecq5Eg0Xd6lQEiWwvoSIP/gLdRu792gzNnvJpQQqezWeeYoKK1bBdCTqQQl93mcccSt3YVHD7MK9A/QGEk/O2SxcJDMTKTo/uvYQIAMdg4EROflMEZ1nLqSH+68Q7DOn0NceMNJW80GJOvDtl8wM0I9MHNspiwu2LBR8jB1ys43UcS54Q92Y4gUwxNFlKtfJNxl7gpvUqw3YKAMn29zgvwda2HMTcAkw9XjHu0DsWC6S94rMosGhRvF7c9BaykzVBuX87Dbyi6/XPGQgll9abLsqZHJpCFIfl7gv+3RTI/P9MkRnJWPJ1Vf+QHLlGWcnGc8utcCOUUnx18URf+Cu83BZeaxZWNolrt3KWy6cZr+YbVEzqGOZiIRNs7uaROLZnteCBQDFUNPUI9w/c0BKnpxrzQsHxYXpOteLMuyUUiGH2VLBCtUExTWakl9AsPTbbQnfDsjrkNC7e4g09N6V1hfFBQ5iwCouJls1f2nbnxiMBa6A/1wymBRRNWd91sLFuwxnaGZFVwDuQzODV+QMcUHp69KJKirIrac2jy88CnnIqQWFxR06+oYnyaADy+N2uWU0Nhecr5UFOZr/tlaqj+kYBAR52bQX5OZXF LwqtpPx2 c7OwnUsDxpyVW2e9YwxWrEbYRiloNZF0CghdOG62xruoCysmkHZbaTAqCrEl0maKylixA2sS86h5jH0/AOnjfNDKNqEqrc4ruY6C16Lv7wPnzOI0qiX0B8ITMD2lWQJzg+T2XOyQMIQ4Gmfn1Wh6lsaWqBlchcCAKeK9Fwq95rvuB90ziERcYa/eA/oqhwdq3yQjmJDP+2hUh6gokMNrrk7TiKTxMqxVdhBV/js5cTy7VsR+zO5UvzaC8ErgWUfRf7GbgnYDrQZvAxgRO04d8T5T2WA0mqsyGcWYy 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: From: ZhangPeng Replace copy_user_huge_page() with copy_user_large_folio(). copy_user_large_folio() does the same as copy_user_huge_page(), but takes in folios instead of pages. Remove pages_per_huge_page from copy_user_large_folio(), because we can get that from folio_nr_pages(dst). Convert copy_user_gigantic_page() to take in folios. Signed-off-by: ZhangPeng --- include/linux/mm.h | 7 +++---- mm/hugetlb.c | 11 +++++------ mm/memory.c | 28 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index a978413b40a4..c8f05c3e1acb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3694,10 +3694,9 @@ extern const struct attribute_group memory_failure_attr_group; extern void clear_huge_page(struct page *page, unsigned long addr_hint, unsigned int pages_per_huge_page); -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); +void copy_user_large_folio(struct folio *dst, struct folio *src, + unsigned long addr_hint, + struct vm_area_struct *vma); long copy_folio_from_user(struct folio *dst_folio, const void __user *usr_src, bool allow_pagefault); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index c88f856ec2e2..f16b25b1a6b9 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5097,8 +5097,9 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, ret = PTR_ERR(new_folio); break; } - copy_user_huge_page(&new_folio->page, ptepage, addr, dst_vma, - npages); + copy_user_large_folio(new_folio, + page_folio(ptepage), + addr, dst_vma); put_page(ptepage); /* Install the new hugetlb folio if src pte stable */ @@ -5616,8 +5617,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma, goto out_release_all; } - copy_user_huge_page(&new_folio->page, old_page, address, vma, - pages_per_huge_page(h)); + copy_user_large_folio(new_folio, page_folio(old_page), address, vma); __folio_mark_uptodate(new_folio); mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm, haddr, @@ -6260,8 +6260,7 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte, *foliop = NULL; goto out; } - copy_user_huge_page(&folio->page, &(*foliop)->page, dst_addr, dst_vma, - pages_per_huge_page(h)); + copy_user_large_folio(folio, *foliop, dst_addr, dst_vma); folio_put(*foliop); *foliop = NULL; } diff --git a/mm/memory.c b/mm/memory.c index 021cab989703..f315c2198098 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5815,21 +5815,21 @@ void clear_huge_page(struct page *page, process_huge_page(addr_hint, pages_per_huge_page, clear_subpage, page); } -static void copy_user_gigantic_page(struct page *dst, struct page *src, - unsigned long addr, - struct vm_area_struct *vma, - unsigned int pages_per_huge_page) +static void copy_user_gigantic_page(struct folio *dst, struct folio *src, + unsigned long addr, + struct vm_area_struct *vma, + unsigned int pages_per_huge_page) { int i; - struct page *dst_base = dst; - struct page *src_base = src; + struct page *dst_page; + struct page *src_page; for (i = 0; i < pages_per_huge_page; i++) { - dst = nth_page(dst_base, i); - src = nth_page(src_base, i); + dst_page = folio_page(dst, i); + src_page = folio_page(src, i); cond_resched(); - copy_user_highpage(dst, src, addr + i*PAGE_SIZE, vma); + copy_user_highpage(dst_page, src_page, addr + i*PAGE_SIZE, vma); } } @@ -5847,15 +5847,15 @@ static void copy_subpage(unsigned long addr, int idx, void *arg) addr, copy_arg->vma); } -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) +void copy_user_large_folio(struct folio *dst, struct folio *src, + unsigned long addr_hint, struct vm_area_struct *vma) { + unsigned int pages_per_huge_page = folio_nr_pages(dst); unsigned long addr = addr_hint & ~(((unsigned long)pages_per_huge_page << PAGE_SHIFT) - 1); struct copy_subpage_arg arg = { - .dst = dst, - .src = src, + .dst = &dst->page, + .src = &src->page, .vma = vma, };