From patchwork Wed Aug 2 15:14:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13338367 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 B44F6C04FDF for ; Wed, 2 Aug 2023 15:15:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA1502801AE; Wed, 2 Aug 2023 11:14:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A526F2801AA; Wed, 2 Aug 2023 11:14:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F3C22801AE; Wed, 2 Aug 2023 11:14:30 -0400 (EDT) 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 6B0842801AA for ; Wed, 2 Aug 2023 11:14:30 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3639A80F10 for ; Wed, 2 Aug 2023 15:14:30 +0000 (UTC) X-FDA: 81079511100.11.0E3C27A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 5FD921C000D for ; Wed, 2 Aug 2023 15:14:28 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XVrKAxvc; spf=none (imf21.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=1690989268; 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=5NeY2tinWPOPcN8XQpBKoS8mG0qewPWY+zZNL+PQrqQ=; b=JvZK737qpz67+XYIQm2cu7QNvrmga7A4q4FhlSv9jrK9ZgENmkeGxg4RU8hBcHb+VA1ugO uwbeAVwHd+QeCbTxTH0Qx/rNjAax0nhah0Fco4xAY2cViT3n8SnfW9kIVjwSaz+eh1tA23 XvD5Ug735CwAqG44M2cjGS4Ctr6LZYU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690989268; a=rsa-sha256; cv=none; b=uDlJwo7MLQYmS4dX7pCtdbb9MuWwl9HhQp8bcn+XibodCdCWmZYVEnphUIK8DCghcaORUa dyPUFRRDsq6JPLaie5V8YoxN7836FSErJ2vfSIPn3/6SnnFK32GWkO2VlEyjbK7zmnILak XNb6rEwrnsLNtn+So/3tvA9RTLiM7d8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XVrKAxvc; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=5NeY2tinWPOPcN8XQpBKoS8mG0qewPWY+zZNL+PQrqQ=; b=XVrKAxvc+jVqKyFmXERMoGt5Kw vwMb2okt9L3PZTtcfHLjMcidaiM+dInPYZKdG4RiJ2S/xU98gNNb2jGRpaNTjy9O86mit4xeStfPE HfvMOauWiFKc0COw3Ih0gBrxzH+kFievJLj/HlmbMsbL2AIbUm3Gxu+wgfYQgl8zj2eZtpXk/aPxz LjHbHXgwtrWqmIXLIcq92sAkVI0DYUuRVt6PWgiZ1PvWmB0g+2XooTtKdfyEuz47yzGQTceO0MBC3 RqwrDg+VgVmAmZwR5sucETkA33L69LiobG2TgpntFFGR7dtgBl2CiJHwFQwBxCzO4a0U/tf0RNk/H A4xEcWPA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qRDYC-00Ffly-6k; Wed, 02 Aug 2023 15:14:12 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: Yin Fengwei , linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v6 36/38] mm: Convert do_set_pte() to set_pte_range() Date: Wed, 2 Aug 2023 16:14:04 +0100 Message-Id: <20230802151406.3735276-37-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230802151406.3735276-1-willy@infradead.org> References: <20230802151406.3735276-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5FD921C000D X-Rspam-User: X-Stat-Signature: 4szi8ff9ss8a1wsecbho6k4i1gk3fuj9 X-Rspamd-Server: rspam03 X-HE-Tag: 1690989268-18031 X-HE-Meta: U2FsdGVkX18dg8mbfR4DdM1Em3xkBVuXAQAiUknHmLVku2d5AEvWiueSUrtgfBiv4Bjhg/Is2fI4dWGt/4dtQo1EIqrskoZiNN/Dj71DV3b6f2JBdcZb6axDsNWw1MlCEw+6XCIuuG+2OCXKHOf5A5DnawNQoBmuwsmaCllTVJnjzIQ2W/u6QBRzJp2M4qMYVZhQyAoVQqLo2OKdby3kWX9bkKYwn0aChhJyCKywfAwTZOB89+4pkkgCT71SwBNmIvEmBO4d9HlS4+UJYfJqqICR4OwK+8m2GfHptnijdYhcyB9+2aOui/3VaRTm8ZpXvOX00fpHOkNqg/sCwNelIconXVUeGGpHE5Wx40kj27PeayIKlppCiWaoo2hrZj2xs4/hbgDI4BtMxH26xv981HIV7ra2wufA2+Qq5zH288dIidcIvDxAsCFwahqegRBMcL/D0QOU8UDQIA0jZ/ul9PRQT2xTp/oKFi7l6q4lCZKiM92qpMVocilRROfa1ENIB7f+5myJBHskJgA07sySJ2Np9KHaSu3tlfJ76I3aakMlsQWhWifvvGUPxsaO6+n9Usg30BezWGa/RQ5vx4kJVAK73n1JXN7MitHaqtsNlC8TObj0qcxF2hwF6NKoK9S2ynUAvxzvPjb058COfvGNYucjrmau7EPgKxZgVa++BG8dqv+/IjW/TyYCQRAhR7XUvFJd7K96Isxty9U+QgrVotiOkBw9OsR7qYWRnVUx5dRr2qwFqCzCve4aEiWXc/FYGN+5ifDpFqDkgTfSIeejGyAILFlZnpmg0onDxUHodFQqdiW5rZznAZX4HqdADm34dMEw9P/Pbi78J0k0vKUW1gSscLo2YCIPGjmOHMwi+ugsIOtDg1WtwsdR+BwB7FnSQtn5YmhQvebIV+kAuucKM5QVsCfwE8cL8g7WSoK8N757Py4m1fgY4E0WD9nnG/TO2P/aWaj2dQ5l+vc9+Fd DZmO1JmO 1nbpD8dGRgWLdG9g0FLHJ9DlDsM9NSCx2OVbI8OD3aQ6AXA/NScKIaIV80WIe59cggpYOji7vOkktI399nH/TPxEWPf9jsXQfbEr0FmHwEURN6P2UWkUGL5qgGWXfKVjXEm+6CSKfXzIA5C6hrpNC3gx7j3IHEPMxlGaHaNxIj2e0J2876ZgB8pPTLB5KiURWSPls53bWns5PgEmmo3iX9UczvLxPVUrwvjR19Z91wG/7wqFqVUVEJWjk8A== 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 | 37 +++++++++++++++++---------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst index 89c5ec9e3392..cd032f2324e8 100644 --- a/Documentation/filesystems/locking.rst +++ b/Documentation/filesystems/locking.rst @@ -670,7 +670,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 the RCU lock held 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 2fbc6c631764..19493d6a2bb8 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1346,7 +1346,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 9dc15af7ab5b..2e7050461a87 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3506,8 +3506,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 e25edd4c24b8..621716109627 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4465,15 +4465,24 @@ 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) +/** + * set_pte_range - Set a range of PTEs to point to pages in a folio. + * @vmf: Fault decription. + * @folio: The folio that contains @page. + * @page: The first page to create a PTE for. + * @nr: The number of PTEs to create. + * @addr: The first address to create a PTE for. + */ +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 = vmf_orig_pte_uffd_wp(vmf); bool write = vmf->flags & FAULT_FLAG_WRITE; - bool prefault = vmf->address != addr; + bool prefault = in_range(vmf->address, addr, nr * PAGE_SIZE); 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()) @@ -4487,14 +4496,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(vmf, vma, addr, vmf->pte, nr); } static bool vmf_pte_changed(struct vm_fault *vmf) @@ -4562,11 +4575,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);