From patchwork Tue Feb 28 21:37:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13155255 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 6D7A5C7EE33 for ; Tue, 28 Feb 2023 21:38:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23D576B009C; Tue, 28 Feb 2023 16:37:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EF4F6B009E; Tue, 28 Feb 2023 16:37:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 018366B009F; Tue, 28 Feb 2023 16:37:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DFE4E6B009C for ; Tue, 28 Feb 2023 16:37:58 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B6CC5C0CD8 for ; Tue, 28 Feb 2023 21:37:58 +0000 (UTC) X-FDA: 80518013436.16.7DE9D2C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 1872B100023 for ; Tue, 28 Feb 2023 21:37:56 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iach5zv0; spf=none (imf14.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=1677620277; 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=ARAoirNoaB9mRzIf53Xf1NK7jxsnUs5xL8l8fM8Dxdk=; b=iyvB+oJbFii/Qw5FeUw2yPacop9KB9F5rqUw2z0qXui6P6YxfRgQ+/ym4FBSz+hTymRC+v jlgYZjtL6uHfgtL19p5XF6ISz0BlGVE8DqSHThmQZxbaJcJm9VGIM0QfxXQA32TZfxP3Vf awj9Dl6M+emzTOQQR5Xa7JEJhUjPuD8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iach5zv0; spf=none (imf14.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=1677620277; a=rsa-sha256; cv=none; b=vUfiOrQMydf+OG3SxIio6vsuvGMiTo3VXVQ4Gf/yFQTVEFUOXBIXk9vtgOlwQ6ldZJpWh9 fQp3BNBXB+wjoCpn9X++Y+PDpRTBOnvPXQrGeaZxaSjCtSNFcz+yamukXfzwtD3BKJ/jfI b0+9UkiYjZAUK9wcpH1+L6UgDUAW/jg= 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=ARAoirNoaB9mRzIf53Xf1NK7jxsnUs5xL8l8fM8Dxdk=; b=iach5zv0eq0D8FR1a4k/lIomSV pgV0FW5stQQcTQhQVoCe85oCF2tR0Zj8sfrut3+8k6372kXxFNSJGDZXqRN6yULzdojt2xBYsywgS 2W16HPgDHLjhzw5IzkQd/GsCfjPEVBtahoYMJvuz3QmDMqduVxPv52jHKli8DXp+8luYU2PFlLrjP NW8YWzQyvpAsuN8eJgVE83fFbYYHWReM/TXWACNDFuh99uLt18q2UYlUwuvP/Nju2F0XapCddF62s wTnfVleI9HrGcxOq/8tdigu//t0DHMbg0I38uigDhK6n+RzFcj5KM+/ffMUcDNAoHFv8BnTtALLAF gfFtG2sg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pX7fL-0018rD-La; Tue, 28 Feb 2023 21:37:43 +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 v3 33/34] mm: Convert do_set_pte() to set_pte_range() Date: Tue, 28 Feb 2023 21:37:36 +0000 Message-Id: <20230228213738.272178-34-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230228213738.272178-1-willy@infradead.org> References: <20230228213738.272178-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1872B100023 X-Stat-Signature: hfwq6nz4xyk4b8cqx7diwtjjea5hb4ft X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677620276-695400 X-HE-Meta: U2FsdGVkX1/1wDnhEE8x2T0QupsLrDLgGcNB5QWq56hVXczrzshFCmrLrpl9tYctiwAzKJnELG+S3eOugrkkdg1qvN4K8QbTqHM2Q+e7vSfgmVLebWmWE6IiwZBc6salivuLwK19ELIxXkrdGcTxGuq9n4dBRDxBjGVmS+kh9hiTuwe09a2c6xLWzqY5n1T29injZPYrFDr9zqv55s8orUbrKhCQpX0qh+GTXrfhUgMgidb0Kh6NhGt3wXHZ29ss2WZA9y4bjA7H1KZXoUSHLabm7hiLQGjB4Q7onnC+rJmr98UOa2gnETDuWpgxL02QRQTVY3P/heyTSCKDmkjmIpEkSaFIernNWyhXjhk1ZYpTPMmE03NZpZCQj3SnhUnsUbWXohDSdiScf4uw8s92sxRVio7fODUBVF50lxQFChBDtBf+L52VbVCqcyg7I3+8h3dUbwPx8gqn3NvIyAa4POE+aJeoyqJUu1v9+OoAAa1HrfiAkk+4IVpV5RKiKCht+Xa+/Oh2td1kBmv6OmmEiCcgS3TAFDmJLseWnqC4J+P3k6j/oRHHUqFsvJEUX0U1axyksuwRElGvoE+53y4GytvGIQ9x+jw0x4stK6iXtmP+rb6mYdMB6bPg2PZMazZ8khpIebLFXieZG5sfeBVe9t1zx4ef5s+K5Q3Kwhb7rRBA1ox7rYicRV41P86gS65P/OxG/xGbK7wUaBx4cHYVNlGZuuPVpT+ehvLa69mA7vgprMiSsecDtmlqtnq3GpBEhlKjOBbC9I3BcEI7UG6+F0wG4mkNvKolU4l4ctvyPvKF+/J+nZlpsiR2NQkXsp9+N55FFNhmPMuj0ONR9bJb/DuUViE0wcwVdXmvHRbQa5Qa7rBe0a2ileiyFm6rNLMG8v/lH1dpor53RG0yVK/oQIFDuj1aLB58xMNsB6imozSpYrzhjqzsFRbLAdzwwbyI4mHHsQJxxBmDRL0t/W3 sbkBMtYH XliBpub/pQSLNigAzsjgenVU88PAsGp2VHXWO5k+CpjJVJhp45JRQG4mtH5DSRGVLOBztqVCY/Ra3fS5paKhgAou+6u/nHDW+quSLJhe7Y54DXFa8ce9I8IW4gjlRiyi8gVq1f4tMg4mDdrP5KXFbczV4mUVbdI6BYc5RJSL+KzvwDAezUgi8j/5ErjPi/xb7PCNJNnU1Q7hxdqERil4eQgmJxtnoFqgSW+UTN9dxxNXltKHqjOgr6AYMxO5cvaMQuqqvK6MR92d8xJM= 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 69e844d5f75c..efd17ff09315 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4255,7 +4255,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); @@ -4263,7 +4264,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()) @@ -4277,14 +4278,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) @@ -4357,11 +4362,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);