From patchwork Mon Apr 10 13:39:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13206371 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 5C13AC77B70 for ; Mon, 10 Apr 2023 13:39:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9347D280002; Mon, 10 Apr 2023 09:39:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69A9528001E; 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 4E8DA28001C; Mon, 10 Apr 2023 09:39:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E95C6280002 for ; Mon, 10 Apr 2023 09:39:52 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BD864C093D for ; Mon, 10 Apr 2023 13:39:52 +0000 (UTC) X-FDA: 80665589424.02.FFCE0AE Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf26.hostedemail.com (Postfix) with ESMTP id E9597140016 for ; Mon, 10 Apr 2023 13:39:49 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.187 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=1681133990; 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=hS59T/jrR63Q23tmoAbSC9eegwDp5lDoYNJge6HCdug=; b=e/UaGRQUJMnjqsD9T4XOPFyLeqLKPrH0V6EsP/n7Lj6Gb3Q0q5VWta+/uCLAbx9EVzJRtV vhL6hngxhgr2Pb1ZzVfBADB3mJId67AkQRL7XdCoUKmP9PcX/WbfkDndAlmcQyiI4wlPH4 cgC3zTemB+cmDvDl8448P/g/Y0KJx5U= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681133990; a=rsa-sha256; cv=none; b=m0Vcyu7OI1wxglWXHqQ3YtOK/TrGBuhRQznstHiYjBy/4RGb7KD0MS1GMS7f/r5vYR/ddx wKMidO6VjYiVPQpfV75p7SO7QUkJ3wzv3sAOZ/ApjQYyS1WwjF0cfclT71CmV9/CbRwUie emzqTSUixPBLDJWaReFl0/Qe0R/LfDI= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Pw93d28PcznbVp; Mon, 10 Apr 2023 21:36:13 +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:44 +0800 From: Peng Zhang To: , , , , , , CC: , , , ZhangPeng Subject: [PATCH v6 6/6] userfaultfd: convert mfill_atomic() to use a folio Date: Mon, 10 Apr 2023 21:39:32 +0800 Message-ID: <20230410133932.32288-7-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-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E9597140016 X-Rspam-User: X-Stat-Signature: id8twpx7ouz5hfp3ni7js9xpiwbhitkx X-HE-Tag: 1681133989-891281 X-HE-Meta: U2FsdGVkX1+MnfoD1PsC0gVOmYoHLAMRpbQbaGpdsdext67pWVqd2aL8zfZx3qFplPW5DnrMgfeTI+yRcAvAXLU/CeslccMX/KzI5zbXlYnXgPeofvwxBfhYKZf4nP1TKVrld2Xj6GUBgDAOH//oTcZUsTqLIjPdNz0w1zeCvA+l8Cw59N8jrBfI/Eao8dpe9hPDTIx3LyX530z4eK+6P652kTCyiv4TAaSHZW62tdVKSY7VBU+1e7UQUnP1vBapdQ8EtwIhaljsaI0P2UIwDcpUI6+/eaWskRIA2Lw2XeK65o1peRtz0sRzxHcft4JC7GY2q8VSpo9yp5yDi8y+VIPO0FHtDpkRRAe0F7PIPuXqXmsQOz3CGpwZb0qehBxJNxPPLPMJJtu+dEFMLXIYTLYvoPQpS0YHoyeEFx9DDgE72gm0+QwSbyaJwY3cIbR2SD/sVjZkURtoSgf7cSSaFQxo76fOBAr14Ny+4DvOrjVZLXYLa92K68aDz1V1PWQLP+eOY7ZOVBVl4jKz3wLhkiUl7CXULE1ObNDm1HqXeRQfi2s0qvC4vtKDseD4Nbau8P8DJ29A5DM8ez+v5h6onPTtHrqHRi9clEgc20lnObnJapVc/ygiUQsfieDvJnpUXlXORhYoBEu//qiVw5JkHaj1tWIiNGVnQx5u/AhaPogiBUB9RrAWg/b4CK+K4Gca3CB8yALi3yTNuDlSzajwOVk5EspDXZfePeqvBbviFPtNB5qI15NreNgsbrYu1M2HJSz6s9Ps2t2+eH+VNaxgXQiAmuXf+7BGM2PH0eb/v5Uh8wix5jDznKiKZwEDy49VrR3mvYPKvDd7/GiSHHolIKUqBmWUZuuiAa6EmUGiuo0zFctkXD0yvOS1VGbRCTUWquFxfRd7UvPQGMq2AzHUY5cec6R0xBwTaqM3zT5XJPOyWHMy812CgeAAQlyIQWwjUyr9lWGhbn1+TPSZvhs iiuVrqbk oy8V0viWg8pVFtksLDBza9owmyz6OGO68QaSeJnfNdr+l47j4EmcRN0HCTUj7/0Ne+aFOWDHb+6xDfKAriWaO6JwjQOStT6lUdo29z1gf76fpjO4qu/m//JiYvuA65CZHZrEUiMfR0bxNgn+36VtNjejgGuhlEv6VLzcsO3sCovYDCKVKJRAN1cXsZ3GoukY1i30IlLtWumhbSlofPclRMLRsocKXbuwH28Qn1AvqdhUny6auGjVBbwfjaSn9qxpAK9Ul7QR989/qHOD4FuJEJeHGAfjqlEWbJOSh3twICsvCn1LQ14o89gHpWQ== 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 Convert mfill_atomic_pte_copy(), shmem_mfill_atomic_pte() and mfill_atomic_pte() to take in a folio pointer. Convert mfill_atomic() to use a folio. Convert page_kaddr to kaddr in mfill_atomic(). Signed-off-by: ZhangPeng Reviewed-by: Mike Kravetz --- include/linux/shmem_fs.h | 4 ++-- mm/shmem.c | 16 ++++++++-------- mm/userfaultfd.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 3bb8d21edbb3..9e151ba45068 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -158,10 +158,10 @@ extern int shmem_mfill_atomic_pte(pmd_t *dst_pmd, unsigned long dst_addr, unsigned long src_addr, uffd_flags_t flags, - struct page **pagep); + struct folio **foliop); #else /* !CONFIG_SHMEM */ #define shmem_mfill_atomic_pte(dst_pmd, dst_vma, dst_addr, \ - src_addr, flags, pagep) ({ BUG(); 0; }) + src_addr, flags, foliop) ({ BUG(); 0; }) #endif /* CONFIG_SHMEM */ #endif /* CONFIG_USERFAULTFD */ diff --git a/mm/shmem.c b/mm/shmem.c index 6c08f5a75d3a..9218c955f482 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2548,7 +2548,7 @@ int shmem_mfill_atomic_pte(pmd_t *dst_pmd, unsigned long dst_addr, unsigned long src_addr, uffd_flags_t flags, - struct page **pagep) + struct folio **foliop) { struct inode *inode = file_inode(dst_vma->vm_file); struct shmem_inode_info *info = SHMEM_I(inode); @@ -2566,14 +2566,14 @@ int shmem_mfill_atomic_pte(pmd_t *dst_pmd, * and now we find ourselves with -ENOMEM. Release the page, to * avoid a BUG_ON in our caller. */ - if (unlikely(*pagep)) { - put_page(*pagep); - *pagep = NULL; + if (unlikely(*foliop)) { + folio_put(*foliop); + *foliop = NULL; } return -ENOMEM; } - if (!*pagep) { + if (!*foliop) { ret = -ENOMEM; folio = shmem_alloc_folio(gfp, info, pgoff); if (!folio) @@ -2605,7 +2605,7 @@ int shmem_mfill_atomic_pte(pmd_t *dst_pmd, /* fallback to copy_from_user outside mmap_lock */ if (unlikely(ret)) { - *pagep = &folio->page; + *foliop = folio; ret = -ENOENT; /* don't free the page */ goto out_unacct_blocks; @@ -2616,9 +2616,9 @@ int shmem_mfill_atomic_pte(pmd_t *dst_pmd, clear_user_highpage(&folio->page, dst_addr); } } else { - folio = page_folio(*pagep); + folio = *foliop; VM_BUG_ON_FOLIO(folio_test_large(folio), folio); - *pagep = NULL; + *foliop = NULL; } VM_BUG_ON(folio_test_locked(folio)); diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 2f263afb823d..11cfd82c6726 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -133,13 +133,13 @@ static int mfill_atomic_pte_copy(pmd_t *dst_pmd, unsigned long dst_addr, unsigned long src_addr, uffd_flags_t flags, - struct page **pagep) + struct folio **foliop) { void *kaddr; int ret; struct folio *folio; - if (!*pagep) { + if (!*foliop) { ret = -ENOMEM; folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, dst_vma, dst_addr, false); @@ -171,15 +171,15 @@ static int mfill_atomic_pte_copy(pmd_t *dst_pmd, /* fallback to copy_from_user outside mmap_lock */ if (unlikely(ret)) { ret = -ENOENT; - *pagep = &folio->page; + *foliop = folio; /* don't free the page */ goto out; } flush_dcache_folio(folio); } else { - folio = page_folio(*pagep); - *pagep = NULL; + folio = *foliop; + *foliop = NULL; } /* @@ -470,7 +470,7 @@ static __always_inline ssize_t mfill_atomic_pte(pmd_t *dst_pmd, unsigned long dst_addr, unsigned long src_addr, uffd_flags_t flags, - struct page **pagep) + struct folio **foliop) { ssize_t err; @@ -493,14 +493,14 @@ static __always_inline ssize_t mfill_atomic_pte(pmd_t *dst_pmd, if (uffd_flags_mode_is(flags, MFILL_ATOMIC_COPY)) err = mfill_atomic_pte_copy(dst_pmd, dst_vma, dst_addr, src_addr, - flags, pagep); + flags, foliop); else err = mfill_atomic_pte_zeropage(dst_pmd, dst_vma, dst_addr); } else { err = shmem_mfill_atomic_pte(dst_pmd, dst_vma, dst_addr, src_addr, - flags, pagep); + flags, foliop); } return err; @@ -518,7 +518,7 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, pmd_t *dst_pmd; unsigned long src_addr, dst_addr; long copied; - struct page *page; + struct folio *folio; /* * Sanitize the command parameters: @@ -533,7 +533,7 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, src_addr = src_start; dst_addr = dst_start; copied = 0; - page = NULL; + folio = NULL; retry: mmap_read_lock(dst_mm); @@ -629,28 +629,28 @@ static __always_inline ssize_t mfill_atomic(struct mm_struct *dst_mm, BUG_ON(pmd_trans_huge(*dst_pmd)); err = mfill_atomic_pte(dst_pmd, dst_vma, dst_addr, - src_addr, flags, &page); + src_addr, flags, &folio); cond_resched(); if (unlikely(err == -ENOENT)) { - void *page_kaddr; + void *kaddr; mmap_read_unlock(dst_mm); - BUG_ON(!page); + BUG_ON(!folio); - page_kaddr = kmap_local_page(page); - err = copy_from_user(page_kaddr, + kaddr = kmap_local_folio(folio, 0); + err = copy_from_user(kaddr, (const void __user *) src_addr, PAGE_SIZE); - kunmap_local(page_kaddr); + kunmap_local(kaddr); if (unlikely(err)) { err = -EFAULT; goto out; } - flush_dcache_page(page); + flush_dcache_folio(folio); goto retry; } else - BUG_ON(page); + BUG_ON(folio); if (!err) { dst_addr += PAGE_SIZE; @@ -667,8 +667,8 @@ static __always_inline ssize_t mfill_atomic(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);