From patchwork Thu Mar 30 13:40:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13194192 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 345C7C761A6 for ; Thu, 30 Mar 2023 13:41:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5A26900003; Thu, 30 Mar 2023 09:41:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B0AC2900002; Thu, 30 Mar 2023 09:41:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A99A900003; Thu, 30 Mar 2023 09:41:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8B063900002 for ; Thu, 30 Mar 2023 09:41:40 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4A0D8C0F36 for ; Thu, 30 Mar 2023 13:41:40 +0000 (UTC) X-FDA: 80625677160.16.412DD21 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf14.hostedemail.com (Postfix) with ESMTP id BF70A10000C for ; Thu, 30 Mar 2023 13:41:36 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.255 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=1680183698; 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=E35cqwRK5yY+181xYgcO5dDDmWMRjom4aSv6GskoIZE=; b=SNE+aOWL56az6KP4oFZHKSBwXCSf4VGy8NIU8UYl1BD6Vi9kKuk7Ob71cDs31gqkf6DYO0 0izX2e3tEUtgfKFTsxFP+Yf3d9IvFlc2qI02/nlf3uuenj9G6EChgGCadLUjtwr+dXrGaL cxUdYhZVmhOk8/bxqcsMXNZE+yITgsM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680183698; a=rsa-sha256; cv=none; b=QaXe7+8+GuL7PvsCFWsqtVmHMHn4sw3Li6rRx+JZ4YfXXAGcw7sIsSQiUeoicwZ7DGVDza JagLMP76AU51J8SnK1Oh1XM2HTnwYiaOFNm67+ihuk7SiDZqj0EVajcnzR8Di307cJAloe ilOBfIwYjXRCDYk9ewYqHI5a5aj3j5I= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PnPd40Cp3z17QWN; Thu, 30 Mar 2023 21:38:16 +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.21; Thu, 30 Mar 2023 21:41:32 +0800 From: Peng Zhang To: , , , , CC: , , , , , ZhangPeng Subject: [PATCH v4 5/6] mm: convert copy_user_huge_page() to copy_user_folio() Date: Thu, 30 Mar 2023 21:40:44 +0800 Message-ID: <20230330134045.375163-6-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230330134045.375163-1-zhangpeng362@huawei.com> References: <20230330134045.375163-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: BF70A10000C X-Rspam-User: X-Stat-Signature: h7i5w49pnmqow75kuwdy6hdo1i7q338i X-HE-Tag: 1680183696-983831 X-HE-Meta: U2FsdGVkX18rRts88X4IiG2Onfj1WFG67lllvBPaf+y4/KjNyw5btC1IM+tCpRqsyKU0JF5Fs5JqL53gHU3xeuiTwN6f+4Un7eMTOIuydhrqGD4rpbEzfWms7ZuW2Sqj4uaIwL1+Qbz9RO1GlUoOatU8Ui7pEMYJQHK2URk/WqXV22dDTHTLytmcF2WNBWCnzJrJhqfoBqxUs6DteuiL0BSbHRsokp7WHsjCwGwlxN4p0vLYa6eY8Os2mApNNFLwHrYunk3H1wsDxQHT47NbN0XcaMPTkuRRgPlWSpOtCkI8DxPmzSjzdwmP6GabTjmin9h8e2WffAMITLt3OO6WXvG8oVcgPpUOPQQPO1xLJMMuLPQvrdffj8h/iu9MKIbpF8lfwsmmugms/h9PVEFk8CdQNXPhVrNnSwetWkqUu2VZxK11DJl0ShCgox9hIEAE8GfbnKHnE0GiPoPWYcLN+vBOfqxHbM0Ov6J42B8kwOdxlWogew8MPKyjJf137Q8B3mVfviM/PVihMB33EFh06hDiafa5WioPd//vYeJ3yWQdsL7Xg8qeAeZSV4kXLyLDN5m7N5c/umes6gOFFyPJj9ShtYDDKQEsaDk0TNwODGwB48URgBb8NPrm6ebL+Zxlb0WFr1YfxhjwoNfd3/lWhOkeZmHMlWaxBQmhLM/JhjUwGgJSh/jKa4hAN6O1pUbuAtgaO6RyBzwhglz+9BS7fZIHWX7AahXclR80xSQCmKg67HDRmh0WHlKsila6jnug7/ej/MtT8wwSBsoiaQjAVv99Wr14dxWyPBfL/UglAkWj2cacv4XPCA4cHJpqpzjmhtS2QbjHZUIM86PXyhLVj2pBQOhZepob8Rw8tnt+/e+VfDPOROmBLxvGgUyJ0dPhv5MiPglRYPhzPVGUcThvHubiU5gaagctwo4g+8gB3DzHNZsQAHfN7R5eC4hz3nfZFJ5FNdmE9oP+FGxsNUK 4JeJwcay oo9bD/XzAyq97DlSedqKqIwVDe3UJGb+N3VuSXWzvktsgXDz2Ym/r7GDYWtWKH0cfA+wOQft2617quRPXrLJ34N2f305z9JRi8U094UezOjGMyLfNME7PtcKEPM80ag/f2Yf1ifwCzI4nGDXlFd7Kk3ZG8Sfzy8g8WAxC1y9V0eQtz1wcqaip+HzlYzIX54rvVUokJcfKqtAb1RdARaXGhd06vWYHSjH4CluP3yTPLEAeLJ1+34czBpWjAr4eEVG7tGAfK6cyD2TRRVF+PbFjZHR96A== 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_folio(). copy_user_folio() does the same as copy_user_huge_page(), but takes in folios instead of pages. Convert copy_user_gigantic_page() to take in folios. Signed-off-by: ZhangPeng --- include/linux/mm.h | 8 ++++---- mm/hugetlb.c | 12 ++++++------ mm/memory.c | 28 ++++++++++++++-------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index cf4d773ca506..7b8fb88fb14d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3678,10 +3678,10 @@ 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_folio(struct folio *dst, struct folio *src, + unsigned long addr_hint, + struct vm_area_struct *vma, + unsigned int pages_per_huge_page); 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..fc3017a6a818 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5097,8 +5097,8 @@ 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_folio(new_folio, page_folio(ptepage), addr, dst_vma, + npages); put_page(ptepage); /* Install the new hugetlb folio if src pte stable */ @@ -5616,8 +5616,8 @@ 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_folio(new_folio, page_folio(old_page), address, vma, + pages_per_huge_page(h)); __folio_mark_uptodate(new_folio); mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm, haddr, @@ -6260,8 +6260,8 @@ 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_folio(folio, *foliop, dst_addr, dst_vma, + pages_per_huge_page(h)); folio_put(*foliop); *foliop = NULL; } diff --git a/mm/memory.c b/mm/memory.c index 9d59dad319b3..8bddbb927806 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5801,21 +5801,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); } } @@ -5833,15 +5833,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_folio(struct folio *dst, struct folio *src, + unsigned long addr_hint, struct vm_area_struct *vma, + unsigned int pages_per_huge_page) { 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, };