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 55F5EC636D4 for ; Tue, 7 Feb 2023 19:49:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E3D516B010F; Tue, 7 Feb 2023 14:49:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DEE916B0110; Tue, 7 Feb 2023 14:49:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C904F6B0112; Tue, 7 Feb 2023 14:49:50 -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 B72096B010F for ; Tue, 7 Feb 2023 14:49:50 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8A9C7AB154 for ; Tue, 7 Feb 2023 19:49:50 +0000 (UTC) X-FDA: 80441536140.13.AC1305D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id D70F7C0017 for ; Tue, 7 Feb 2023 19:49:48 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HHpeaWbP; spf=none (imf28.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=1675799389; a=rsa-sha256; cv=none; b=OgwmJgkipCb4z4ekupQ6Ood7q+J6pFCE8sJbFHfIZPD/UqBqYvjg1+AHG3M79f9sOUqu2h 5tUyGQmqdpLO/pI4tRJWLkcDQwHRG9rnFSxwHYp09N48tB4W1wox2Ws9blnaZtJjS7j+YP bzI9TDYCQ722B7cL+e1A83YIePmufHg= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HHpeaWbP; spf=none (imf28.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=1675799389; 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=F40oIATo9rCV1BRwMZ5Hk4sakjKgHGGGz9UmCl1t1Xo=; b=iEF6/H3s6I/rbOMRBKZxY7H0oU5HZsoKq0ai6iN3VgTTRXoXaEI9iY+9kA4cTrDHZGxPAf peHLxroiu68ZC37m4vM+U0or+pH2W/t9DFrAPbDYnAEtbiDRLp8G8tFwopujwvUz8qYHvU eZpotNOFshCTM6fz4EIAYOWxvmckSxk= 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=F40oIATo9rCV1BRwMZ5Hk4sakjKgHGGGz9UmCl1t1Xo=; b=HHpeaWbPuZ6SY90brAJcdeS99b DoX71Snz48HKnqqF3abdRQupNeCW0qGpUWnVxsfyGvruMnlXct/020uSDmxvi31pFJPq/ojCIs7Ao 2E9kArVSMF25ZJLaZhJhxeoit2OxTe4jpKJh8WaoB+6SSdvcziptWAzsNpJNGmYlon+M0onJcatwC 3B3cnuAaXhwE3STP1MdxLqQlRqjAw6t0yp3b4NH9NQMSiDN3exu9ZOwpPB77k0ugYF9VXyYQsY201 kcj6azlv5jj1N+2kHhF1K/0OZ3WkpUt6N145WaH1DFjpCpmx1hy6QSpMZohdB9yliTHYs5JZ+GTCx Rh1/ujzw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pPTyG-000Vsv-PL; Tue, 07 Feb 2023 19:49:40 +0000 From: "Matthew Wilcox (Oracle)" To: Yin Fengwei , linux-mm@kvack.org Cc: david@redhat.com, dave.hansen@intel.com, tim.c.chen@intel.com, ying.huang@intel.com, Matthew Wilcox Subject: [PATCH v5 4/5] mm: Convert do_set_pte() to set_pte_range() Date: Tue, 7 Feb 2023 19:49:34 +0000 Message-Id: <20230207194937.122543-5-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230207194937.122543-1-willy@infradead.org> References: <20230207194937.122543-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: D70F7C0017 X-Rspamd-Server: rspam01 X-Stat-Signature: nigriwfp8qnx5qzp1i4arkptyyoj59u6 X-HE-Tag: 1675799388-81633 X-HE-Meta: U2FsdGVkX1/JT2MD1Im/7rWurw3tPr9tBlHTrELZ3cogZIY32g1PWKRdGXgerQSMDyxZ2LKpcu2micTm8CQoRHVtdexF/12mogNpGTmwYPognIpY4BZ98Xr694GoJW+iSDDDD/ven+WiSgNTx8QKfo+tEyL5oUfMM07SArPgglnd9Y4v4bmdpf1y2+a4SRDiaIC7RVSlT5ehA5nITWV9ivFyKqDN4Fw7QeHachX16P9PBrm6lbzGGamWQN8GhiDFdi0s3dlHUsCSedonZpiC8R4ecHazLVEmcFm6DbLB4eVdUDJIkFI9chix8SVDxrMROLRbvAz0LRhwH3u3QJY/lNh5M9SAZQTnVK8XQibkxjJhQysGQgEC6r5rM7XqCsHxYkPWNi5jxbPnBG12jhyLbvUBWs5kLrnVxIx1ZgaDGEsY/cX4nK5SXFI0aQLhGK2p6D36h1NcDLKb6hbFWFOvnNlh1Wu4WyS6gXTVfcQF1+HxY7qbqI2Hq8Ir11zNR2g2H5z4CcmqoHtXp23Vty2kbKkY0W0YBwcpz9o6kNmCupUbrttmAtG+RS3xXyRq9eZsvWpHIgdl7FMoRLdc971eCElmrZdDp86OwqT53gq4yoyBH4eXDtuMYhaNqx4bqWZLF48liI/JMbgklqipuOjtB4TEKYjSvfwZU+HOreyEKVqqTrdYXQSXI7pyE+A8JbhcsnGtQ+We4Y/fxSYRJV0WX7tcN/UL9chmvjZQnfHraH64e3+VkizEQpFe/kXuyiGgPgXbS1UYHVSWIM7qFJj9gpNHrf+6UtNGeyJfHg2K+rYm3khSZBddBr7R/lWpGYyuUTOF1PBzbvz53dJEF4y9LHJkfEEibXpVmJCVUe5DkBDijabaZNsYx31R9lDr/7EsrWhahnqQ9enl87tJrURt0KIi3CGkPy6F4sZ6ZZ0/RT1VVOCT/dVCOihC1Os3qN8Q0Qov5JC34qAvbnRj4oC n5ZFkUuX EWV17KeO9geOnyVGbWi3Nujxy5nXWLcHXEG8RDsN/J2MyIWpq5DzoiPQOfCPrDOUuoJ+ZfCI3QIDYRxiecE7+LfiSaupKp3epr9jWeDMm8sbdFV8LY9vy/IG6EGW9wp1snAes1fUwzYh5aZueMwNHpLCtMFj4ESWWRussuyCqOQHAe7RNsb0Hu+4VDPqkQlUmTJV8aQXqqYhOrcIixmdROMpJibtQAJmpMtX5q6UcNl5QKIdeW026yo/e4q2GwT31abBXvO8rqWh7ymc= 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(). 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 | 31 ++++++++++++++++----------- 4 files changed, 23 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 d6f8f41514cc..b39493b5c49e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1161,7 +1161,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 9aa7a4fdc374..745f1eb2a87f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3375,8 +3375,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 7a04a1130ec1..f1cf47b7e3bb 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4257,15 +4257,18 @@ 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); bool write = vmf->flags & FAULT_FLAG_WRITE; bool prefault = vmf->address != addr; pte_t entry; + unsigned int i; - flush_icache_page(vma, page); + for (i = 0; i < nr; i++) + flush_icache_page(vma, page + i); entry = mk_pte(page, vma->vm_page_prot); if (prefault && arch_wants_old_prefaulted_pte()) @@ -4279,14 +4282,20 @@ 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 */ + for (i = 0; i < nr; i++) + update_mmu_cache(vma, addr + i * PAGE_SIZE, vmf->pte + i); + } static bool vmf_pte_changed(struct vm_fault *vmf) @@ -4359,11 +4368,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.35.1