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 CF914C05027 for ; Fri, 3 Feb 2023 13:14:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D6B76B007B; Fri, 3 Feb 2023 08:14:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 689556B007D; Fri, 3 Feb 2023 08:14:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5017D6B007E; Fri, 3 Feb 2023 08:14:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 404896B007B for ; Fri, 3 Feb 2023 08:14:54 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0C809C0320 for ; Fri, 3 Feb 2023 13:14:54 +0000 (UTC) X-FDA: 80426025708.14.C9263A1 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by imf23.hostedemail.com (Postfix) with ESMTP id E4EFD140008 for ; Fri, 3 Feb 2023 13:14:51 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=lc0oBJb6; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 192.55.52.93 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=1675430092; 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=r8as/7WUg8SJEFL5i5iWeYfV/HZE3qGURoLJ0Rfb5RA=; b=GsQi7P1qaxe7AL0oGX1g6ykXiZts6f0B+k3yEiGtpxhOGEz3zXhPBoMSp9UNQaGtDaMwRG vms7st2h5VPJHOgmSVSB9abHKOJdHEfB7FNvTDjq6tf5aBQaNkeXP7DfZAbZb0TnfutiSd MwmwP9K6bNKsRR2FCJyK4xz9Kj40mPA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=lc0oBJb6; spf=pass (imf23.hostedemail.com: domain of fengwei.yin@intel.com designates 192.55.52.93 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=1675430092; a=rsa-sha256; cv=none; b=ElX4/ThWj+GgNBTkV11Ydl1cc0A/Iqegz3IWnLH+ZXRZspAUPl9+mKruC6T4SfRMr1e7oB olCdriYmiHM1xq7Kqw2eDpRsgI2dAmlHf23/TujD0gkKl5NoGo3Er4rz0YqqdqBLdPcy+7 9l5FGe4+s+tVVqbFVMVrAg80itvp/fk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675430092; x=1706966092; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=87aulzXqZlhIUbrzeU7vi/mx61DwZU61Oxk0IZoKp2I=; b=lc0oBJb6/7DyN9fpifuA83/ikqYaNxWQY0B+fUYG7E+djAH9OXv21cPs sOEuDukQqOutKtuS+lqspXAxHusY4bWY7M4uz3SFCdCzLkqmcGbYf2Z8q 1yezMFaFzsGBBU/XIW0pbalrd+girRmPaQSyKa1dMxahWNxN6OitYmznk MkBATVl9vrWy4r/aXlv5k5GL2jw+FroP8KSKF1OSfy2HE3X+ZtlcJdI+a ebsSb+8t6/zhN0ZF7BaS3E5R2Vg2lMAk+xKx/OSbIidX9JBa5jX84Hjkt SSb3k7RBLclDh9ibbnJ9KPt/brR2ViZmbxNNQTc/eRM9cetvV+epuglfY Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10609"; a="326441893" X-IronPort-AV: E=Sophos;i="5.97,270,1669104000"; d="scan'208";a="326441893" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2023 05:14:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10609"; a="667641950" X-IronPort-AV: E=Sophos;i="5.97,270,1669104000"; d="scan'208";a="667641950" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by fmsmga007.fm.intel.com with ESMTP; 03 Feb 2023 05:14:48 -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 v3 3/4] mm: add do_set_pte_range() Date: Fri, 3 Feb 2023 21:16:35 +0800 Message-Id: <20230203131636.1648662-4-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230203131636.1648662-1-fengwei.yin@intel.com> References: <20230203131636.1648662-1-fengwei.yin@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: cs9fde7wp4mrndbwq5fh3849e3jnpwi5 X-Rspam-User: X-Rspamd-Queue-Id: E4EFD140008 X-Rspamd-Server: rspam06 X-HE-Tag: 1675430091-10528 X-HE-Meta: U2FsdGVkX1/qj1jlG2JlLOg5yJDsm9tuz4b43stPggdyt16QM3hZ48tUPXMvjKzEqBi1bkk0KchHaRLch6bWLwC6CV5V/RdNddrsY1b6tq+qrV6wEgiEvpRSchVJ3P8WarcWfptQuMXHtlsSGxNEje36Yeh0arv1myVmr7VXmIU2fGlVovGUcMG/9tcs/5YHr0V5QBwoYGxjF+2bWertEmh5lGq7JMR9jQ0j63/BaY+vys0z87kWcKmKXWSOsjjloGskr9fOqEj4fHZsjfummsmjY7nu3syaTg/v8kW87BLiXz0z9PcMG6UTxz8upj/FrBkfkJdLTt7ykfO1YTivELCcet4MrLH0QfaCT12oWXeGsWhIUgnqTyeAvh2cuLBJX/vZrBWsxMnUmgfRFRa4raKCnkYe6U/DRUaTHRqo015EF1usvvHcg0gRq5MuBCnCP6KrA6rJvNXdkXKNr5S8E11SOyvunY1VYCUOnvIi84BOx3OeBN0lnfwmnuzY+38T0uX+Y2pSZfSNPxzpMmjhH5dnJPalASwdNYA1SOIZNbYTMfUmrMLo1y/QyedWgueTlu7qIGWbXU0eDrC6Nt/3F+cDlew7GkHTYZF2nvxl2169UxZ0DPLU5TndXO2h5tSmfnn2RK2E2eeqXWhJcarb031UdvxPkwzfhrFD0iFALV7cVtdpODzUgl4QicQxDHGCnUrwN7J+eCg6N/N0O6BK8jMOYv7E3Upbq6AZcqlPjhATfWnQNIyLyJM51wIQl5omPAIX5ls5kuMd0xaJpRr4cOxLfPJKMX+c4Ubzw3X+SIY+epzs40ZZswvYVz1hT0CQJoi7ieuJe5asQugUdOmmvV3esb7s9nLR2S9BGxMlCpTCySsRdU0MoW8Dd71fqqjN84MiTuGBs2JFcl9XtCEqDnLnPNVRNIdkxDhJRyMZURMw7LTLQpX/ceyp2LsRHa4s8DzJ86fHiULyUdUY29V MyD355e6 //NpLLuLg5Z30f5hEdZUEGFwcfq8aYQJ1AIx1cnglCaSQJ133mtpdZd+x19gGg6hzJT01V6irnCwWjxp9DzzV+/2RG2K16zx22W6jF3T2cxL5sCYYfhwQSp1NV4x6gaaSxmYO772eFYZfBNJJOgQZFNAIqtMqrDf2A9+KnsrlGK9nCPpbTUFvMo7nHlMHxLSYOIHdDoxa0DIfmzQEVB2I++3Epg== 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 | 59 ++++++++++++++++++++++++++++++---------------- 3 files changed, 42 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 f444684db9f2..74046a3a0ff5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3386,7 +3386,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..3754b2ef166a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4257,36 +4257,58 @@ 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); + } - 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 +4383,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