From mboxrd@z Thu Jan 1 00:00:00 1970 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 5CEC5C61DA4 for ; Mon, 6 Feb 2023 14:08:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 103106B0075; Mon, 6 Feb 2023 09:08:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0644F8E0001; Mon, 6 Feb 2023 09:08:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6EA86B007B; Mon, 6 Feb 2023 09:08:39 -0500 (EST) 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 D0A5D6B0075 for ; Mon, 6 Feb 2023 09:08:39 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5ED4E1405FB for ; Mon, 6 Feb 2023 14:08:39 +0000 (UTC) X-FDA: 80437047558.26.C0777B5 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by imf05.hostedemail.com (Postfix) with ESMTP id 55C66100010 for ; Mon, 6 Feb 2023 14:08:37 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JBJ436BT; spf=pass (imf05.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675692517; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pI2YIm9uTJ/8F8zs14anm/Sl2oGn/9N/fgMyadsfGUY=; b=ulhzSx0EpSFsb9vTFwzahwOL+nddcsULZ3GSds26Y7fTHcIN+CfwObplW+pa8ebP1pLJG9 yRLPQ7do894OndMiwWJSPQ3G9tvD0Fs8ydQfvyVJyDJ5pkDLxd/xGQf19isDjCGEMNoFK5 lszWagCX1C1ePGJdbOnjLdTocVTeQmM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JBJ436BT; spf=pass (imf05.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675692517; a=rsa-sha256; cv=none; b=Mq/yvDi0/vkIO8l0WGeYRT4AdPh04u53JOAPdSLFiSTzpya+uLUrRm2XJIcRE5Rnro36nm Ll2GzwTpn2UcS6F0rxd68wVMh3qkplduFwXYi/+XUBnxsssCMfC9fyLJxpuqel1eKhAsjH jc3P3nsWi38ko8nqJUUT7BvCpILuPtw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675692517; x=1707228517; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OKmuIlDOdFniWnDZau9ulPpi76u0RTIHxirMDzA4a3A=; b=JBJ436BTLZ4oc6/mXv/Ph4pImKHetT0L/A9JA5r8FMxaX+3W1ACRMwof GU7N7p1mAfye3HZ/kBLVtoDCc6i+H/sCOss0tXxTmxZgS0Z8E+XwBw1DZ 82EgdzPr+B1Vw5EJaaDp/QaYEqlot+I/0smXd4hhj4TYn1aqg5uv3aSjY uTIq7zz6MK+f+dr3YUcnvx79yG0aDv4wWOM6z+zmDla2OKp4k5O1qjyXG 3FotOgqqWln6SmMKiSXZonlJRflrgn9gUK/ALxwHf9LCZGnTKJ8CAwxCb waF2AqIVU+APvR587GwinCoF1rt657WseCvZ25nwUaVKmpHSLJVAMMt7U w==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="312864285" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="312864285" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2023 06:04:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="911937888" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="911937888" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by fmsmga006.fm.intel.com with ESMTP; 06 Feb 2023 06:04:53 -0800 From: Yin Fengwei To: willy@infradead.org, david@redhat.com, linux-mm@kvack.org Cc: dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, fengwei.yin@intel.com Subject: [RFC PATCH v4 3/4] mm: add do_set_pte_range() Date: Mon, 6 Feb 2023 22:06:38 +0800 Message-Id: <20230206140639.538867-4-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230206140639.538867-1-fengwei.yin@intel.com> References: <20230206140639.538867-1-fengwei.yin@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 55C66100010 X-Rspam-User: X-Stat-Signature: tiep83s5cxsm3tt4mqg8o9nzmecxty1x X-HE-Tag: 1675692517-598466 X-HE-Meta: U2FsdGVkX1/VXPVnRS2gb0qkrK+0QYfQuCzwKmi4xV1zHBx+dZpdjLqT9Sb9A1Hhnw6d8ijfdVe2A1fbGXrXjY0ajg/+464kJGAetLq4JdDDAsej/zBHkr9P8fnnbTO5gDqTR1ng9QujzbeWVMaXQIettEYwlRiZlz2w7xAhwBqsvXi2IJ+rEB3dTWsLs1ileyVl386kyDnKVYIXZcpz2ZTx2PMlFeXlvHQ3oo7VMwlfD9Jipv5R//BsaiOvQ9UKiHCTV/zHc0mZZgfoa5vUq591QWWCdszcA9auI7ZaQfrOZ/JrHvA14ubLzZOWohFvExX2kPUX+DHVqroGoHkG1WQ5kCYVVZUOuNFVu6tmQNOdGM1LSbof29lYGXmHUVNEzdGwDW7lN9eJDRx8AZPgxCmvwOq/YBMZpspEiWwogB4eYVs8Sx8Pg4iJvlpORrAppJjDlVq2G2cVlyNyQvWHYnIoaTQtd7sOfXW+98DddbSOdHaA3BL4QpyjaEVTKRylySin1VfAl4cGhN5AV6xJ8xxbhufB0S0DpJFBEHdjF3HMbdTCbWQMigUfrJCyWj4QGSLl73EqmKfAfK5u384m9XInxCSxOD35dRe7uTxGODJHwWm8y5Gy/1WN1RQGGoEl6Wi51IXZ1VMbJmGb4WZX5vIPPBuN6TAiqxVJKTVQEKxwvas0r7IF82TuJQ8Z0WvxgCrDIQNvhSobt23PN0foFab+jT8bN3mfmZVenlpdw0BJ/jl2WBP1x2S9ItP7lXNSE4SHPH0IMK5r8GtxBbAcrtzjNuORMVnsgDGpU2X6IgifO9CenNAIzqOqM6/GRmj65B0YA4FdI89keFqu0/ebsYGZF3IPSVL0qFKNwMx8CNcGvvc1GeTXQQeY9vGXNgz5VauV6mLlHo1v6tYJ0E4eVfzeW535aznAnjcKUNHsBPOAMLaOjR94gBx7FmD5tBQKDZUsQD8GeNSyaNTuTnv Rikxi0E7 iA0/zjqmewz57tdBFEYdrQ9EwSh14YAESjfCTCyv+Ra2Q4hy2oPSPgzCqaWPjE4ZUoGlbJT7eqnZVSRTPK1swzrTgLodk9NuegJ9bDug0ewy21kqF4tnP6sRnEZjKcWK8UuCwTBTLl0l4f8XU8bKhVsA/jetlDJ7L82Ya95hbo0HM8drrr+sVH9Ov5rSJRWb7oqQuoZsVZCQvU+XCsXuoqmwSRQhCjzDpAAEu 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: do_set_pte_range() allows to setup page table entries for a specific range. It calls folio_add_file_rmap_range() to take advantage of batched rmap update for large folio. Signed-off-by: Yin Fengwei --- include/linux/mm.h | 3 +++ mm/filemap.c | 1 - mm/memory.c | 66 ++++++++++++++++++++++++++++++++-------------- 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index d6f8f41514cc..93192f04b276 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1162,6 +1162,9 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page); void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr); +void do_set_pte_range(struct vm_fault *vmf, struct folio *folio, + unsigned long addr, pte_t *pte, + unsigned long start, unsigned int nr); vm_fault_t finish_fault(struct vm_fault *vmf); vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf); diff --git a/mm/filemap.c b/mm/filemap.c index 1c37376fc8d5..6f110b9e5d27 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3376,7 +3376,6 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, ref_count++; do_set_pte(vmf, page, addr); - update_mmu_cache(vma, addr, vmf->pte); } while (vmf->pte++, page++, addr += PAGE_SIZE, ++count < nr_pages); /* Restore the vmf->pte */ diff --git a/mm/memory.c b/mm/memory.c index 7a04a1130ec1..51f8bd91d9f0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4257,36 +4257,65 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) } #endif -void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) +void do_set_pte_range(struct vm_fault *vmf, struct folio *folio, + unsigned long addr, pte_t *pte, + unsigned long start, unsigned int nr) { struct vm_area_struct *vma = vmf->vma; bool uffd_wp = pte_marker_uffd_wp(vmf->orig_pte); bool write = vmf->flags & FAULT_FLAG_WRITE; + bool cow = write && !(vma->vm_flags & VM_SHARED); bool prefault = vmf->address != addr; + struct page *page = folio_page(folio, start); pte_t entry; - flush_icache_page(vma, page); - entry = mk_pte(page, vma->vm_page_prot); + if (!cow) { + folio_add_file_rmap_range(folio, start, nr, vma, false); + add_mm_counter(vma->vm_mm, mm_counter_file(page), nr); + } else { + /* + * rmap code is not ready to handle COW with anonymous + * large folio yet. Capture and warn if large folio + * is given. + */ + VM_WARN_ON_FOLIO(folio_test_large(folio), folio); + } - if (prefault && arch_wants_old_prefaulted_pte()) - entry = pte_mkold(entry); - else - entry = pte_sw_mkyoung(entry); + do { + flush_icache_page(vma, page); + entry = mk_pte(page, vma->vm_page_prot); - if (write) - entry = maybe_mkwrite(pte_mkdirty(entry), vma); - if (unlikely(uffd_wp)) - entry = pte_mkuffd_wp(entry); - /* copy-on-write page */ - if (write && !(vma->vm_flags & VM_SHARED)) { + if (prefault && arch_wants_old_prefaulted_pte()) + entry = pte_mkold(entry); + else + entry = pte_sw_mkyoung(entry); + + if (write) + entry = maybe_mkwrite(pte_mkdirty(entry), vma); + if (unlikely(uffd_wp)) + entry = pte_mkuffd_wp(entry); + set_pte_at(vma->vm_mm, addr, pte, entry); + + /* no need to invalidate: a not-present page won't be cached */ + update_mmu_cache(vma, addr, pte); + } while (pte++, page++, addr += PAGE_SIZE, --nr > 0); +} + +void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) +{ + struct folio *folio = page_folio(page); + struct vm_area_struct *vma = vmf->vma; + bool cow = (vmf->flags & FAULT_FLAG_WRITE) && + !(vma->vm_flags & VM_SHARED); + + if (cow) { inc_mm_counter(vma->vm_mm, MM_ANONPAGES); page_add_new_anon_rmap(page, vma, addr); lru_cache_add_inactive_or_unevictable(page, vma); - } else { - inc_mm_counter(vma->vm_mm, mm_counter_file(page)); - page_add_file_rmap(page, vma, false); } - set_pte_at(vma->vm_mm, addr, vmf->pte, entry); + + do_set_pte_range(vmf, folio, addr, vmf->pte, + folio_page_idx(folio, page), 1); } static bool vmf_pte_changed(struct vm_fault *vmf) @@ -4361,9 +4390,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf) if (likely(!vmf_pte_changed(vmf))) { do_set_pte(vmf, page, vmf->address); - /* no need to invalidate: a not-present page won't be cached */ - update_mmu_cache(vma, vmf->address, vmf->pte); - ret = 0; } else { update_mmu_tlb(vma, vmf->address, vmf->pte); -- 2.30.2