From patchwork Mon Jul 10 20:43:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13307631 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 17771EB64DA for ; Mon, 10 Jul 2023 20:44:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0EDE18E0021; Mon, 10 Jul 2023 16:44:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 09D758E001B; Mon, 10 Jul 2023 16:44:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0B2F8E0021; Mon, 10 Jul 2023 16:44:05 -0400 (EDT) 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 CD4498E001B for ; Mon, 10 Jul 2023 16:44:05 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9BE51AFD38 for ; Mon, 10 Jul 2023 20:44:05 +0000 (UTC) X-FDA: 80996879250.20.F03D9E1 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id DD58E140016 for ; Mon, 10 Jul 2023 20:44:03 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=sIIIXaBA; dmarc=none; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689021844; 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=WrqzHXPjiFBpxLGjYvBy8RYTw/0aGQBc23U0HQPGcW8=; b=enSs4bwahQSE4jnpVlKYZP0g+USFYZvnd9BGBf9I4PkQPxZnjuPupnB9u1ni+mqLLaQ3yJ G+iKOj98Rt2lpbIxD3/2c6IRgWEUT2niRCYx8ex1LIDEE8Gcp1rNQLjjMDGNKURhUoYf1j tsmQDxeZmNp/KCixfzs7XFWt+gwIZzc= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=sIIIXaBA; dmarc=none; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689021844; a=rsa-sha256; cv=none; b=Wwe7vsmkTVayL0lbR0SlEu6QINqy85q7RTPImLSzOu1ExpAVrAZ4+rnL+G+sy8WaBYHaz+ NMhx8sAHy4l5LIvjhMcZMiqUzyYGdmQtI8HL9H9Vxqr8VExU9HGD/U2PAbt00Xt2ClEqPb cR6CmODTSmDLo/nm9iWvYFt58RDUGOU= 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=WrqzHXPjiFBpxLGjYvBy8RYTw/0aGQBc23U0HQPGcW8=; b=sIIIXaBAvEZhZh4uxJnWMQ5+Pc npP0DZ6HmpXBCr26kwW6ZIWEIYBFLBKcCXU9TqGQNOXKmiqEN+jKNSC8Z9HX/cPYfE7m02dacuYud wKh6ttMmQBuM/rIifVS2Pz+d0ohGhEqc3T2T0iJTuUH7KQi8v/ym+tGS9rOCyaeXObjgR3QqJOHxm 8vIsImmc1dsWvnj/nSgi/1LxdYBySXkzS4DtzFU2k+ESBlnDRke/Ba9/+XMiz+v+soCRM0C5X4N3V tTqXfiq7fdOrx9OF8KiFD8hBxpdxBn9jN5+qDoBsFptNWgNjIxDZgn9D7oQBpla75++vL/cMKYYnN 6r8rSi/Q==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qIxjV-00EurW-Bs; Mon, 10 Jul 2023 20:43:45 +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 v5 36/38] mm: Convert do_set_pte() to set_pte_range() Date: Mon, 10 Jul 2023 21:43:37 +0100 Message-Id: <20230710204339.3554919-37-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230710204339.3554919-1-willy@infradead.org> References: <20230710204339.3554919-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: DD58E140016 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 64ifkdzdpma48d1nyqg16kwrmxjszoxw X-HE-Tag: 1689021843-36633 X-HE-Meta: U2FsdGVkX19Y8RhnrhbUX+QZUxEmrm5mMLfhbUr7Fld6HF/l1A8kf87rBmbtCP5ZdBtcjpfm629eOkiMzMny0YAk503tmXeRr55wSLVxm+vbl81371t4a9Negb+XzeGsRoDQNw2HcLok1EuibzTTwmWstkDGcohwmvJfBcRfNrPiS3A8j83o/7BGzd8INyNkTk62YcjaN7dYbFgki1hNyKcpMO4Ywd/4tpRQHKfacAcX34cuz7i17AKkw4gn/cRxN1lWf5ls38r5m/xUi1/zmlQWj/SeEZKaSLCHh+x1AOQjyu/o5AAJt4SZ5hvWI2VSTsUClV/fizBbcpcY4Yvr9OlWi0xtO6rwof+e4obfsae0VQSdsfvSQuWWIp4czoODLkUrV/W9pe4CSjKonwfar5JNDJlllLDlTs2omBUcmqaGXG2ZhHIwb7+Gv5SK8/Nx7/B6RbcdijABMhGPOWEl/Fs2/cUE/j4SRJ1JPQtk8byuLumWEklSUjy5CQmxNDWbqzYDx+fkET29BrD+tsT1GFIyYmcDd77pWlex0CAypLk+aE6sTF46cNGwSYXAGoG5qbj7szZOl1x5GunfJJSLshh2RMErcJbOikViO3FXYmtsUkdAfauESkbFsqlBWD1JThMFWnpbQHu99rzydoHS/hh2ZVltFIPaL4F+47rmkt/O/FKT5mfQjwJotFAl5GpRODnvc9XT1vMIO3rIUuUbnCs7CeOgUalHJnvphF/8RfvYv5lmhvcPcOTSi790Np3aIJgCMBURUP9biVCx2buQyOHBpAqGlqtkYpBXt3cHAN2c3kkx9EJnxAM0SscUbWu7eo2MXox4rx4NP7u2rZENlV12urKRNGPW22YCBrc5ymnim3qCmP1xcHYI/zvZEi0/8TqneRsvZ+aVisO63SJSvBBRUlp5PttflowjchvlrBbp3qlL9hkNl903vNppc9tJr8S+jtCOa8Hj1MylEdP 8r7lE326 U35Ja17ygZ7fPn/VsY91r9neo3/8dLIP7jDFnAXmj5w8UD60rgFArmTBYqPrpxLw6x/d9p2lHSPLsjmLqAsIRla69ja7vZLpLODAlH9iFQef6fsLo/I4tAw8Tw1cLll5m+FsCqhaU3uP2gtFQrBkt6l0YuYJvU98Z9O21mAnNdDzhLsKscrlE/Lyf7f0AkyxM8mZkpQIhI3MxXzka5OteViYw2nJ8URZoEvbUF3l+V4fOUNhnl2yrR6LdgA== 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 ed148919e11a..211a03053992 100644 --- a/Documentation/filesystems/locking.rst +++ b/Documentation/filesystems/locking.rst @@ -661,7 +661,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 9687b48dfb1b..525a7e16850a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1314,7 +1314,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 bdc1e0b811bf..c06e9d331416 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3501,8 +3501,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 ebb4138acdb2..e712e5fda56e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4323,15 +4323,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()) @@ -4345,14 +4354,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) @@ -4420,11 +4433,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);