From patchwork Thu Mar 30 13:40:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13194191 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 C26AEC6FD1D for ; Thu, 30 Mar 2023 13:41:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47B256B007E; Thu, 30 Mar 2023 09:41:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42D856B0080; 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 27E33900002; Thu, 30 Mar 2023 09:41:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 131F46B007E for ; Thu, 30 Mar 2023 09:41:40 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B73D8160F97 for ; Thu, 30 Mar 2023 13:41:39 +0000 (UTC) X-FDA: 80625677118.24.E3CD9F0 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf21.hostedemail.com (Postfix) with ESMTP id 46AC11C001F for ; Thu, 30 Mar 2023 13:41:35 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf21.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=1680183696; 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=jEnN6sQShKpyDIfHL89cAUPTseGoSUSDQgcWk1SCPzc=; b=MBpPWlsO3KP8iDu08MFrB+B+P1KBl5xslm7Ph2jTfKEGSGZjRG2fZZ6oHmPqJNqKZyFkvG /sjPreVPSkTzo+mDOxJ2UO6XJuS26Bp1lToFEQ3JA2MF2ZkQIbW+gmWItnU7xY8O9EKmG5 OzAG8L+PdvlRvGXzO+yutQxzbrZ+/nY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf21.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=1680183696; a=rsa-sha256; cv=none; b=gkA67E8aXLE0Rg6xfMAC71nW2QgTNt2UW42QxlQhenXpEwK4a9BUgZNInjotW8YJuB+lqr vNtrsnR0iWDO9RFMi6UaUx7CaCRVx5DlHvDUO5L6dlP5orDlAgXCHoufbflqK25+CjA22N 7EOwP86YXqbq2WviqCJpEPysYiIsjQA= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PnPd04wmDz17QYv; Thu, 30 Mar 2023 21:38:12 +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:28 +0800 From: Peng Zhang To: , , , , CC: , , , , , ZhangPeng Subject: [PATCH v4 1/6] userfaultfd: convert mfill_atomic_pte_copy() to use a folio Date: Thu, 30 Mar 2023 21:40:40 +0800 Message-ID: <20230330134045.375163-2-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-Queue-Id: 46AC11C001F X-Stat-Signature: kippi41bzzhbagoccb9u7y5godxmek8b X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1680183695-902959 X-HE-Meta: U2FsdGVkX1/W2NNrLTdIJF/ekTJLQ46p1iqEmqTdC9+IydqbM4QT8g6man1efaPb81IydiEvYe9/nOS1kxlUyJAC7teL9ZxhS/z1IiSwcPWtPhhIAYAWwf52jd1f5nuzDu3EZB11KWjDgVYPX/gSTbxoKkWaeSjDBrIh0OeP3pzVJ+55h1DwStZKcHZJDsJG3a/inhYmdeStvB03radCe1JuNDF384g88AXHeKFmh3LnAuf8rvJjuibN9xaiUkVfWfL7vRShxjVjH6NPus9MpoJfnlAgIfTFaqv53M06oIna3iIcfJwStk4//3DHdsDNGlvGNfxz99p3GfTOCNuinj4RZad7tTcHS30bpYXhYOSFXhA5FDPc9TMx+jdvY+181VPv9+ZI0j05Jj/CZkIY5jDI1mMRlPf40cbtQwI2UYSK8PpEfHIWzOQUXPAXv+PPfIEqa5dumEsOEbP1k0zmSRPH+5L01opr2f8vN6HG4las0JJvCeaoPNkEPXI+suoakNuDbHJKOFBTZRB0IDc2N2t9l/4Wz3mVHs5h3lc2EM1/y5EvPUDT2o4t/OjWGPqE7Wa1hRefFWYhPKJ7QKwlzFAFgedaH48JCw/yY1axSh2N8TskpXm3ytn7uKKT6p/eCgWwMS2ouyyxbb3eTqtxX/yQbgkb3hwnfvuh+J/Col6lfjg1z1ZOvi56t6azp2qHrlwPr7UyUXwBpDgJZHD1ewhVsxUEjx06yHqrMSWi4cO/YwtDgdwlkbvLDqkXOSwDoaBRFqE67R2l66ZmvOS1DdOh8ENl1YDw4FajHAfKXMyQbykxOqB5FOQcg2kI+p2BRMuQn364sHO4gAwPFPjV/jEd8nKiZTSEBPKB/spFWyJMcRI08dEipQFNJZycfEeQbjxJCtSZiHypIeWnz/7vjq6znBreE3jkPiBmEpBbgt4tYG2L2HRTiuGuud+NUQzdFwptAb85tdg2fMsIiio CdWB0KGG zRwoRiZgwov1HnJZUCY5vWWRfLmpHNN4UqncQqT1qDw2H/Mn865FDUV8ArWUvPtegPrPlnzgmsaInb6PK8akds7Y65S8Vqivrd4wldutx9yf6bc55l09h3nUGYnpaVRDvg2twZSyyC86Y6H3tna39pakGHFZfhWrGiCmpH+nkj3R/Lztqtz6I98Xzy5dNhC0e2NoYa+97Ay9YhMt0aaMw8duiI86Ogavo38D/QGK6IF5nkuNpiz3wnVP0+cbNYLVcsviyQzEQ6RntPQK8D7DiN+Fnkg== 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 Call vma_alloc_folio() directly instead of alloc_page_vma(). Add an assertion that this is a single-page folio and removes several calls to compound_head(). Signed-off-by: ZhangPeng Reviewed-by: Sidhartha Kumar --- mm/userfaultfd.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 7f1b5f8b712c..efa9e1d681ee 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -137,15 +137,15 @@ static int mfill_atomic_pte_copy(pmd_t *dst_pmd, { void *page_kaddr; int ret; - struct page *page; + struct folio *folio; if (!*pagep) { ret = -ENOMEM; - page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, dst_vma, dst_addr); - if (!page) + folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, dst_vma, dst_addr, false); + if (!folio) goto out; - page_kaddr = kmap_local_page(page); + page_kaddr = kmap_local_folio(folio, 0); /* * The read mmap_lock is held here. Despite the * mmap_lock being read recursive a deadlock is still @@ -171,36 +171,37 @@ static int mfill_atomic_pte_copy(pmd_t *dst_pmd, /* fallback to copy_from_user outside mmap_lock */ if (unlikely(ret)) { ret = -ENOENT; - *pagep = page; + *pagep = &folio->page; /* don't free the page */ goto out; } - flush_dcache_page(page); + flush_dcache_folio(folio); } else { - page = *pagep; + folio = page_folio(*pagep); + VM_BUG_ON_FOLIO(folio_test_large(folio), folio); *pagep = NULL; } /* - * The memory barrier inside __SetPageUptodate makes sure that + * The memory barrier inside __folio_mark_uptodate makes sure that * preceding stores to the page contents become visible before * the set_pte_at() write. */ - __SetPageUptodate(page); + __folio_mark_uptodate(folio); ret = -ENOMEM; - if (mem_cgroup_charge(page_folio(page), dst_vma->vm_mm, GFP_KERNEL)) + if (mem_cgroup_charge(folio, dst_vma->vm_mm, GFP_KERNEL)) goto out_release; ret = mfill_atomic_install_pte(dst_pmd, dst_vma, dst_addr, - page, true, flags); + &folio->page, true, flags); if (ret) goto out_release; out: return ret; out_release: - put_page(page); + folio_put(folio); goto out; }