From patchwork Mon Feb 27 17:57:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13154057 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 127C5C64ED8 for ; Mon, 27 Feb 2023 17:58:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2A5A280003; Mon, 27 Feb 2023 12:58:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A6582280001; Mon, 27 Feb 2023 12:58:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E3EA280003; Mon, 27 Feb 2023 12:58:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5A066280001 for ; Mon, 27 Feb 2023 12:58:03 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 303BFC05F6 for ; Mon, 27 Feb 2023 17:58:03 +0000 (UTC) X-FDA: 80513830446.12.DA9739D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 71432160021 for ; Mon, 27 Feb 2023 17:58:01 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Z+LTDLwh; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677520681; 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=KIqr0aCyEx062KWcG5/83cpLc+JVw8Xr3v2+CmV2f1Y=; b=giEvvENTqzLxnIWj3nivYPQbQ2+2ofFxG31EmsfwkftSK7HowPGs822PTEhl9UwWCy7x87 b0sE004qOnQB1DfXB4PV04+0BlDOEadl4Xdi+gb90T8W0CfMVm91sZob6Li8vaTFvai1kM 0eH9KAkMf1ujIQdKl5PBJNMcDeJrZAs= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Z+LTDLwh; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677520681; a=rsa-sha256; cv=none; b=0c5ZAzlmEocuox4wXxclHAr62s+usbWuhN1wAO5L6s08aw7De38D4cw3i51aXfn7cq0jSs FqndVfUlcvDtlWyvIrp2UMtkWgG5TlfYjWete35yQcW2wG4LY39gLVHxp3YI16r7wGeRnO sWgbdVpy5GJHB4+MulKWPwXLTaG6rro= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=KIqr0aCyEx062KWcG5/83cpLc+JVw8Xr3v2+CmV2f1Y=; b=Z+LTDLwhpAZ/LkkSshP8BqtWK9 GvCUh7zVNB81K/zHb5r0xh1tkiEtDL5DreJSd1vCmZ+maVisyV8moAdHcgLIQoro0xeJocCxxMW1h 07/DUg6/HwBtfR/neV/6yqEpoe3wregTwCbWK7EGLcIKIsJaciJFuojA2bu3n14aS74+T8hK2me4a fMvBszqIFtN7LIGzg+5oi2IX/RHE6efwb390UdznnyX2n0l3j1Yw7TXm9d05dYkrF1NUexScZkmCq xBk97OIeLHpx6Jn73c+8aALQudr3eC/cX+YBdYLvA3cSoT0uHJV5xwZA/Vg2jyfxeKviCh1ObIVJQ nkxHUeeg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhkw-000IZB-V5; Mon, 27 Feb 2023 17:57:47 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: Yin Fengwei , linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v2 29/30] mm: Convert do_set_pte() to set_pte_range() Date: Mon, 27 Feb 2023 17:57:40 +0000 Message-Id: <20230227175741.71216-30-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230227175741.71216-1-willy@infradead.org> References: <20230227175741.71216-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: kbmifg8rbtaf4dqximstf9r36nr5upr1 X-Rspamd-Queue-Id: 71432160021 X-HE-Tag: 1677520681-212646 X-HE-Meta: U2FsdGVkX19lU9G8JrRje8QTFsMo0F95ru7Vx/OI63Dpd5mQNlkWvj/9O/DUvoMjEuDnWpld0noUR9FQMb/MxKgexopwGJ7CFrSvdzo7XscHRnjQhYU+4Vx4k19+kdsQPdCK7hMG9a5JZA+p4otZ+44nh31lbOfrlcKzEEY1gmMXd7Dg5ComjTgPuZBkllj835dqbtjQ0Twlc7CbkQ2AGE51EOZPjPbbAZq+OErCuHVJuHGp8UQq7sI18q/KvJas/bVLXAjTXEWMnPc9ZfO6sTUp8LBCPaOIWCWOYKGfkIsRFRhxoeG7GBgCuYAobsRMzt9aGUnzDT5A/BzE8BuHq6LpSjiTmz5h1vZ6KOJDHmf5Clt/gdnyMOmK/HdXBwck6KIMpW64v2WOO5sBzgLdv+j3B74ckWfYiOKbJxvbnmYVo82nfk6DJ35Hyh6ghuiLSMJhZuS3oDX1PCSoRKVQdbvagBGZzwiCNddPvk8CJuVbgWQ7XcIdYCN/woUGJbRWnRcoM7CpmXMoMMhbxrgoB3ntYoHH8EH4b2vDPTR5Q8C1Mt1FuMRfd14c5FquGp2jnn4/WWJ4M8kZL9pwV4TIAVQwSL5R08fdAOoIZn4jKjNfZmXGxYh8/7wYcvDe6o+7zJt/4IWSWvYGLrrvJuoQh71Ak32y9bmzv/6YuOTep9YrG1POXpY/I7eiAeU1q0s21koTa9dRynpGOnML/cz7mpUBKkqMcda6gmjP7p186mW02QsGvXp2Y0fvAG+HOMyEzkSgNbc0u5HgbaHf4xnI8S55JV3IEeILXxJ1jCRo00GWS/P0upyHzM9xC8tvcKCqZOHw0rjHxsY4s8QvdLI0NfyqBEM5RR0GnavMkMc4u3GxFV2HkzmrOrBlMDkA9nrJ1KTCC02N8VWXOXJUM58z0TXcOTQXtFwyt9n5F8W8wUfgEwGsiHy+OJIdq40GDQBQoPqJRb0lFrNYX91oPYB ky0fXU1p Gus60vFyMiZrXgD0z3D0wp8J0ZRsAfZJrDZCrGf+7qCWH2syG7pqQnTg7KzRrFWqQfsHHFM6ch4Um3uXcHkZ8EQ9SyH2l9y6tO6CRIDtGkY54vcb5ADocx3ct9S5BGWfAEBQUB1YQRFhJUtOuLDnT/pBO7Y92IWpWXRKl80HMV61iliIx0xW2i/6p9qaySuMq4hB0NO94cu/iz2FRWzE6uO4T8wIV0F3OLPsNMNpbEyFuTmYV81DuL9Ucxv2gE8vY2mVCmALc2ViX/BM= 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: Yin Fengwei set_pte_range() allows to setup page table entries for a specific range. It takes advantage of batched rmap update for large folio. It now takes care of calling update_mmu_cache_range(). Signed-off-by: Yin Fengwei Signed-off-by: Matthew Wilcox (Oracle) --- Documentation/filesystems/locking.rst | 2 +- include/linux/mm.h | 3 ++- mm/filemap.c | 3 +-- mm/memory.c | 27 +++++++++++++++------------ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst index 7de7a7272a5e..922886fefb7f 100644 --- a/Documentation/filesystems/locking.rst +++ b/Documentation/filesystems/locking.rst @@ -663,7 +663,7 @@ locked. The VM will unlock the page. Filesystem should find and map pages associated with offsets from "start_pgoff" till "end_pgoff". ->map_pages() is called with page table locked and must not block. If it's not possible to reach a page without blocking, -filesystem should skip it. Filesystem should use do_set_pte() to setup +filesystem should skip it. Filesystem should use set_pte_range() to setup page table entry. Pointer to entry associated with the page is passed in "pte" field in vm_fault structure. Pointers to entries for other offsets should be calculated relative to "pte". diff --git a/include/linux/mm.h b/include/linux/mm.h index 1f79667824eb..568ebe7058d4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1168,7 +1168,8 @@ 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 set_pte_range(struct vm_fault *vmf, struct folio *folio, + struct page *page, unsigned int nr, unsigned long addr); 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 db86e459dde6..07ebd90967a3 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3507,8 +3507,7 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, ret = VM_FAULT_NOPAGE; ref_count++; - do_set_pte(vmf, page, addr); - update_mmu_cache(vma, addr, vmf->pte); + set_pte_range(vmf, folio, page, 1, addr); } 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 bfa3100ec5a3..b09c03e4fadb 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4256,7 +4256,8 @@ 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 set_pte_range(struct vm_fault *vmf, struct folio *folio, + struct page *page, unsigned int nr, unsigned long addr) { struct vm_area_struct *vma = vmf->vma; bool uffd_wp = pte_marker_uffd_wp(vmf->orig_pte); @@ -4264,7 +4265,7 @@ void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) bool prefault = vmf->address != addr; pte_t entry; - flush_icache_page(vma, page); + flush_icache_pages(vma, page, nr); entry = mk_pte(page, vma->vm_page_prot); if (prefault && arch_wants_old_prefaulted_pte()) @@ -4278,14 +4279,18 @@ void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr) entry = pte_mkuffd_wp(entry); /* copy-on-write page */ if (write && !(vma->vm_flags & VM_SHARED)) { - inc_mm_counter(vma->vm_mm, MM_ANONPAGES); - page_add_new_anon_rmap(page, vma, addr); - lru_cache_add_inactive_or_unevictable(page, vma); + add_mm_counter(vma->vm_mm, MM_ANONPAGES, nr); + VM_BUG_ON_FOLIO(nr != 1, folio); + folio_add_new_anon_rmap(folio, vma, addr); + folio_add_lru_vma(folio, vma); } else { - inc_mm_counter(vma->vm_mm, mm_counter_file(page)); - page_add_file_rmap(page, vma, false); + add_mm_counter(vma->vm_mm, mm_counter_file(page), nr); + folio_add_file_rmap_range(folio, page, nr, vma, false); } - set_pte_at(vma->vm_mm, addr, vmf->pte, entry); + set_ptes(vma->vm_mm, addr, vmf->pte, entry, nr); + + /* no need to invalidate: a not-present page won't be cached */ + update_mmu_cache_range(vma, addr, vmf->pte, nr); } static bool vmf_pte_changed(struct vm_fault *vmf) @@ -4358,11 +4363,9 @@ vm_fault_t finish_fault(struct vm_fault *vmf) /* Re-check under ptl */ 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); + struct folio *folio = page_folio(page); + set_pte_range(vmf, folio, page, 1, vmf->address); ret = 0; } else { update_mmu_tlb(vma, vmf->address, vmf->pte);