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 87FE0C6FD1D for ; Wed, 15 Mar 2023 05:32:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25E128E0005; Wed, 15 Mar 2023 01:32:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20F9E8E0001; Wed, 15 Mar 2023 01:32:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AE438E0005; Wed, 15 Mar 2023 01:32:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id EE9C48E0001 for ; Wed, 15 Mar 2023 01:32:36 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AD9E0AB7E5 for ; Wed, 15 Mar 2023 05:32:36 +0000 (UTC) X-FDA: 80570012712.03.F3791A0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id E7F37100010 for ; Wed, 15 Mar 2023 05:32:34 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=S8RSPV+L; spf=none (imf05.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=1678858355; 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=Qw0Yc4WVV1Zo/whVBkY4SGQKG5WI2G272Aisa/gvvD0=; b=kdf3m3oKGIYTtbWEOrNTCKjbeF6BmweriPZ3OjOgR4bUj0z1plavPyqSXRKZXSeN1lJt/+ hb0JRVzGIZ53xzB991uy/NwFrQEGsJFLHM4D4zvMuxsizc0GEkmNrwjQMR1bTaQiDcPdnr qJG5GuLi7UiN/7R2QOMHNDPMtODpND8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=S8RSPV+L; spf=none (imf05.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=1678858355; a=rsa-sha256; cv=none; b=dET/y3K8E33q5vjbAgRxvTRBr98HQJed4PUugLtqMbfg21PEUOFcCRqmX7f4mPd5AjrXV0 RbyK0ITOjsv7DpWvMB3g5sAbzJyC9Hgg7agat9+PF6RyPPQQH1/xi40/BT2yEzQibX7mU6 fUZuRB1ZolASa8ITrm9yyBynUKq3SoA= 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=Qw0Yc4WVV1Zo/whVBkY4SGQKG5WI2G272Aisa/gvvD0=; b=S8RSPV+LjPHtyJ+ZmGK5RpjWsO x9RMGY+gK6PDYY8ah5J55iodIm8ajJ9dYMel7Bzxl0mHem3mk6/MyBwozsoPXmw/vg7mDV7Fcbk4m zcoB1S8IuxVNd1FylJEl3kWT6+26QRF0BEtLTgseAZVqrUVwUeFY3d8otRcJCL5gTtENArL4nzm59 6aH5mtUGvrKj3wUMHEEX9DkHcbUAttV07JpGgI7MtRsGuSCFWHqEUrIMsopV3MrUNu9axsQOALVo0 WAwGliINhd73W+rtpXo6yMbZFX1HB9yXcet4rCWEcArGnrTuopm70g434W9/f7XXHL+snwmJkgzOn T0hOfrfw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTO-00DYE9-Qm; Wed, 15 Mar 2023 05:14:50 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: Yin Fengwei , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v4 35/36] mm: Convert do_set_pte() to set_pte_range() Date: Wed, 15 Mar 2023 05:14:43 +0000 Message-Id: <20230315051444.3229621-36-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: ns3pk9wcj9ysrxf47jtw5syuy7jb8ij9 X-Rspamd-Queue-Id: E7F37100010 X-HE-Tag: 1678858354-694462 X-HE-Meta: U2FsdGVkX18QIa+O7MEr1DV1tie+WSgM8giYiduNmZi2YFX01OVoVWqePbYgv99AbhCmVZkyKnTq+UnqK0B9eOd64CoDwM/mFWpChhKWywFR6L2Ms725pMwGGzh++Txz8V7T9F7LK2hKqbx/omQn/iigfLeO0vHazsV8dk414owzrJrYIUbfq50gA9Lm6j02OTqKts8GJwPRmazwzKaVu5xws5snOJZ3sNhI2fe8Im7AEEkUx+Lp5OCwkxUH7BlmxlqCan4DKqnM97a4hZd1j5/Ix18fR7fBVtu2s34d0Isk8kVU6v2rzrzK3MQ4jVm48HPzLBuSbNjrpwnlGQJz5KwqH1B8Ah6zvgpQdYohGr+Ad4F2Hf+rQMsk8pnNlVMZxGuiMgbDjxV/adPKhe7kh4jsm+OYrTck9qNFfU90D8vKpAUBYCZD5alvVEJrRuT3A+M+feRa5oav9LrlT1uiYy2zPg+e8VhsU025/GHemRdx7kfR9SXFlBhTECJCuIQFfapx/ZU9OQFw+mRCNgepYYlS226zVBTWPuZTLPqHrewASPv8uRjPSd/UtlmBpMkCwDQEhEwRKG8Hf55Umjmzb14KHwshBz7Zxv71hxeHv3Z9o1GFEFNjHQueMMplt6qG6hn4WFMj3F8brFSDqHRtnSJU7VOk9Ra9momeeP5qJRfMxniOwWDLCL55uzwK9V9qP37Qu3OjQYYSlhkWjaDHdSSCI1rfsvN3Od2ybpvzwNsf6r84WM+XWGrAXtfTDs7RP8jE+eqykdlBds/5f8si+1uso+JwXFBOtWQS4Y942toEnzcFIYW1F/5WbwiCkXZIOqwMgTDcsLUawbOGXGb+E1neGuL63Z80ZkQF9v7NFxj/Yc256C1A6I3t7U+A9jcXSVqkBF+n96wBkRiT8pO/gQI/TM6g363s0DVSLepnFVr9lgNh18+AP04S4UxZZq89yzqItGPpnYimCWzAVtu xk1O2jrh yd7njasKAlw+8mxr2/SaFHNJJ7EEdlHoznF/qGTCW9TAM3ewgr3sYvtzVegyDg6EfrKkCpzknYrLP7tHe2DkZAjLeLLgtW68HW5+0JUl0w6c1kyE6u+EpGI2SKk7CDZKMWVZzjbqRFO0OneaXu17jxA27QlPUEj1GmpvrA2+c3MJNQ5VSevgEPxfGcLAw2xlEgdAK6cbDyAcyCW9wxaEtBiFbW8pHw811F34TVGT+DkJQa+TFa/pBUebkgo8Iu/WNGRw4glcYkgGROqw= 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 ee755bb4e1c1..81788c985a8c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1299,7 +1299,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 6e2b0778db45..e2317623dcbf 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3504,8 +3504,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 6aa21e8f3753..9a654802f104 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4274,7 +4274,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 = vmf_orig_pte_uffd_wp(vmf); @@ -4282,7 +4283,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()) @@ -4296,14 +4297,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) @@ -4376,11 +4381,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); -- 2.39.2