From patchwork Tue Mar 14 03:37:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13173595 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 CD487C74A5B for ; Tue, 14 Mar 2023 03:38:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AF6A6B0072; Mon, 13 Mar 2023 23:38:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9385E6B0075; Mon, 13 Mar 2023 23:38:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62B876B0074; Mon, 13 Mar 2023 23:38:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 48EEF6B0072 for ; Mon, 13 Mar 2023 23:38:31 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 08596120C98 for ; Tue, 14 Mar 2023 03:38:31 +0000 (UTC) X-FDA: 80566096422.07.A40853D Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf11.hostedemail.com (Postfix) with ESMTP id 880DB40004 for ; Tue, 14 Mar 2023 03:38:28 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.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=1678765109; 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=yWY1QIytE+V7prnHucih0lXV3rPUi7yY/plyFQgEOmw=; b=qASwiFbMj8mYBXuadaufSojjGtENJFFjoA7MfJNvYT1BwoFU9AWZD9cbg31kP6Odvi7qzY dlUNjYA6VWYszBSIgCrKoX3u8ZcX2/xuerZ4+PVQk+r9PKcZVcwq2JcjU7HIO0I74EoEJB W48N988FviU9uem/8RiPyrMFEomU7UE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.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=1678765109; a=rsa-sha256; cv=none; b=bGusWm0y2rs0ujJb6CdDI+YiRaTSavGYVsCl5aFRXwoyqx9SGbchFIsLD4zGeHo8q4yqwa FfGj/0yvBZySkWUmiUg3BHkMtHu+yXUhs/YI+7NCfMwasfz6TrrJ2lOkUm1LTiVdGFeOcN rtqMP4L9e6WpAiv7hllNRI91pcfGRuE= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PbK1l5Yc8zHx5T; Tue, 14 Mar 2023 11:36: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.21; Tue, 14 Mar 2023 11:38:21 +0800 From: Peng Zhang To: , CC: , , , , , , , ZhangPeng Subject: [PATCH 2/3] userfaultfd: convert __mcopy_atomic_hugetlb() to use a folio Date: Tue, 14 Mar 2023 03:37:33 +0000 Message-ID: <20230314033734.481904-3-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230314033734.481904-1-zhangpeng362@huawei.com> References: <20230314033734.481904-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 880DB40004 X-Stat-Signature: j33owmxfkcd4jaaupz1rsyy8xpi1pdyo X-Rspam-User: X-HE-Tag: 1678765108-568897 X-HE-Meta: U2FsdGVkX1+pb0JgFHpXfgCHGT3Sz2SXCjuWrdq+LKvdgHVpVEIX600cRXexNQyUTE02hzf+vfWTtVxLhD8Lu9ItSfv2YvqFAlNg4+ikPJ2puizhUJOecfSM1TOQ0CwZZerCNmxLfJcws5Y9thUL0Nk4CvgsDVXE0AA3oogZ7cC8gHAXkA8dCWvJA14gQbGeNWNMhIeC4dRtZ6cvpF3sYcTTlV0jFBQ1PPfJUuD3hY+lsmkVJiiFgQVJg/pttZ3yQRL2ImKVkwIO8Iae2p1ffejWxRKulW3kPqOfS3yJC/IrqDjYGIsTJz3yZiK/CxD5p3iSQ0GGVvpr+p68aesKpR7CS/waWS0ynZSNbNLXAgHvo116zyV7VJbbc7mLGcd77YRZYCWSeuFnM/0x4U60D8TpKXYAEXRzHEGl8pHt3cOSK6GssYFLD1EzHKSfW0leN/lT2fVXQlluwctTj+XAwO2a/tOzB0Yp/x0c8qXE0AKCWj7k6E7IgEw5R3nd1NHGBDhtf4A+QQlqRBxdRnlW4nJqj5JBBBfTvfAlwvw3wXS3iWaTaB9LAahtSXKuQgies+Opr19ACl7Gl9fqd/LQBCBuN7/wV4kmZbEhqiOqq6z0/+wCPJqsmNV6bmqjahpHM51+eX7eCXM8bIZu9AVaF/kektFM2dvBpxkusyskeAqXy5/udMB/8g0ItQrIe3tjJclMMpzA3imqGQPpY0yJk0Jriku1BGpBg2mt3qy/41PqiuwHYdK0rYpPU0fOph+ubJXoJvJ13vWtPk7YLKApCL/6NjMazwRqSWOEfTMK8frN1pdFpAq9OD3HAbhvjeqqeC2Ff+znK2kisYigYnHMZDevpQDWEc13KEkLlAP1ba+7BxTsaaZrJEPAeGW1IO1lKtg+sZSCQjdRjkDBHbX96AQP1E8fboMDYp6nGqunypAWjovDLqFok2vksAwaimuPkBidDjdG7NZrvX3wxmj e2tgQA0f epnNuHDRFEmnAvUYGn7mtYgSwLDzNnrc2bXEXGZeT+vVzvEYSiM/0jf2EOfaYi05VlY09R2phx+tqu2oRtF5IQ2lVbiBGdINldGfPQAUpAIBqNPP8DUAopPUOLooh1sRb14CLroYiLEg0pw/gqMPc83aZNcTeJwSWHhgb3S13oiueUV4rl3La9xBEdar0t2q14Lfx4TQjLlBfTnI8cND8zcub6/xnXTsb5n7gxNXCQzFLrQD3CDGdq5yqaq7C7vtSPOTWTRLR+oeU1Q5Lxk0oWFxy59MAHaE3P5Wl 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 Change copy_huge_page_from_user() to copy_large_folio_from_user(). Convert hugetlb_mcopy_atomic_pte() and __mcopy_atomic_hugetlb() to use a folio. Signed-off-by: ZhangPeng --- include/linux/hugetlb.h | 4 ++-- include/linux/mm.h | 3 +-- mm/hugetlb.c | 25 ++++++++++++------------- mm/memory.c | 18 ++++++++++-------- mm/userfaultfd.c | 20 +++++++++----------- 5 files changed, 34 insertions(+), 36 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 7c977d234aba..030252ce51bd 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -163,7 +163,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, pte_t *dst_pte, unsigned long dst_addr, unsigned long src_addr, enum mcopy_atomic_mode mode, - struct page **pagep, + struct folio **foliop, bool wp_copy); #endif /* CONFIG_USERFAULTFD */ bool hugetlb_reserve_pages(struct inode *inode, long from, long to, @@ -399,7 +399,7 @@ static inline int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, unsigned long dst_addr, unsigned long src_addr, enum mcopy_atomic_mode mode, - struct page **pagep, + struct folio **foliop, bool wp_copy) { BUG(); diff --git a/include/linux/mm.h b/include/linux/mm.h index 1f79667824eb..5eff770adbaa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3546,9 +3546,8 @@ 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, +extern long copy_large_folio_from_user(struct folio *dst_folio, const void __user *usr_src, - unsigned int pages_per_huge_page, bool allow_pagefault); /** diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 07abcb6eb203..20ce2b4e32b1 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6163,7 +6163,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, unsigned long dst_addr, unsigned long src_addr, enum mcopy_atomic_mode mode, - struct page **pagep, + struct folio **foliop, bool wp_copy) { bool is_continue = (mode == MCOPY_ATOMIC_CONTINUE); @@ -6185,7 +6185,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, if (!folio) goto out; folio_in_pagecache = true; - } else if (!*pagep) { + } else if (!*foliop) { /* If a page already exists, then it's UFFDIO_COPY for * a non-missing case. Return -EEXIST. */ @@ -6201,9 +6201,8 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, goto out; } - ret = copy_huge_page_from_user(&folio->page, - (const void __user *) src_addr, - pages_per_huge_page(h), false); + ret = copy_large_folio_from_user(folio, + (const void __user *) src_addr, false); /* fallback to copy_from_user outside mmap_lock */ if (unlikely(ret)) { @@ -6222,7 +6221,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, ret = -ENOMEM; goto out; } - *pagep = &folio->page; + *foliop = folio; /* Set the outparam pagep and return to the caller to * copy the contents outside the lock. Don't free the * page. @@ -6232,23 +6231,23 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm, } else { if (vm_shared && hugetlbfs_pagecache_present(h, dst_vma, dst_addr)) { - put_page(*pagep); + folio_put(*foliop); ret = -EEXIST; - *pagep = NULL; + *foliop = NULL; goto out; } folio = alloc_hugetlb_folio(dst_vma, dst_addr, 0); if (IS_ERR(folio)) { - put_page(*pagep); + folio_put(*foliop); ret = -ENOMEM; - *pagep = NULL; + *foliop = NULL; goto out; } - copy_user_huge_page(&folio->page, *pagep, dst_addr, dst_vma, + copy_user_huge_page(&folio->page, &((*foliop)->page), dst_addr, dst_vma, pages_per_huge_page(h)); - put_page(*pagep); - *pagep = NULL; + folio_put(*foliop); + *foliop = NULL; } /* diff --git a/mm/memory.c b/mm/memory.c index f456f3b5049c..737794b7a19f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5769,26 +5769,28 @@ 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, +long copy_large_folio_from_user(struct folio *dst_folio, const void __user *usr_src, - unsigned int pages_per_huge_page, bool allow_pagefault) { void *page_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; + struct folio *inner_folio; - for (i = 0; i < pages_per_huge_page; i++) { - subpage = nth_page(dst_page, i); + for (i = 0; i < nr_pages; i++) { + subpage = folio_page(dst_folio, i); + inner_folio = page_folio(subpage); if (allow_pagefault) - page_kaddr = kmap(subpage); + page_kaddr = kmap_local_folio(inner_folio, 0); else page_kaddr = kmap_atomic(subpage); rc = copy_from_user(page_kaddr, usr_src + i * PAGE_SIZE, PAGE_SIZE); if (allow_pagefault) - kunmap(subpage); + kunmap_local(page_kaddr); else kunmap_atomic(page_kaddr); @@ -5796,7 +5798,7 @@ long copy_huge_page_from_user(struct page *dst_page, if (rc) break; - flush_dcache_page(subpage); + flush_dcache_folio(inner_folio); cond_resched(); } diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 263191c37fb5..d7435a1a9d4b 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -324,7 +324,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, pte_t *dst_pte; unsigned long src_addr, dst_addr; long copied; - struct page *page; + struct folio *folio; unsigned long vma_hpagesize; pgoff_t idx; u32 hash; @@ -344,7 +344,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, src_addr = src_start; dst_addr = dst_start; copied = 0; - page = NULL; + folio = NULL; vma_hpagesize = vma_kernel_pagesize(dst_vma); /* @@ -413,7 +413,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, } err = hugetlb_mcopy_atomic_pte(dst_mm, dst_pte, dst_vma, - dst_addr, src_addr, mode, &page, + dst_addr, src_addr, mode, &folio, wp_copy); hugetlb_vma_unlock_read(dst_vma); @@ -423,12 +423,10 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, if (unlikely(err == -ENOENT)) { mmap_read_unlock(dst_mm); - BUG_ON(!page); + BUG_ON(!folio); - err = copy_huge_page_from_user(page, - (const void __user *)src_addr, - vma_hpagesize / PAGE_SIZE, - true); + err = copy_large_folio_from_user(folio, + (const void __user *) src_addr, true); if (unlikely(err)) { err = -EFAULT; goto out; @@ -438,7 +436,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, dst_vma = NULL; goto retry; } else - BUG_ON(page); + BUG_ON(folio); if (!err) { dst_addr += vma_hpagesize; @@ -455,8 +453,8 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, out_unlock: mmap_read_unlock(dst_mm); out: - if (page) - put_page(page); + if (folio) + folio_put(folio); BUG_ON(copied < 0); BUG_ON(err > 0); BUG_ON(!copied && !err);