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 B710DC5B543 for ; Tue, 10 Jun 2025 03:51:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5180E6B008A; Mon, 9 Jun 2025 23:51:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F02C6B008C; Mon, 9 Jun 2025 23:51:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42D9C6B0092; Mon, 9 Jun 2025 23:51:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 294526B008A for ; Mon, 9 Jun 2025 23:51:12 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A25CD1A070B for ; Tue, 10 Jun 2025 03:51:11 +0000 (UTC) X-FDA: 83538115542.16.07D48C5 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf03.hostedemail.com (Postfix) with ESMTP id F305520003 for ; Tue, 10 Jun 2025 03:51:09 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; spf=pass (imf03.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749527470; 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; bh=J19g4BOkYQfv2aNBdOzsBKs2gnbyssLOg5BL8EBLWDU=; b=KJvmnOryxbZpzoUPyIGeCM6X8siQbyn1KVzrlCyQDwPyBE/Jfg5lKXaa3mdcWdWKw6TbYL jabe1eMDeQ3xACNj8bQ7D5F9+DNtdgiZdZ5zqr8lV2UnTav9isjE3X7kXTUyfaiXAK5DAi Jw4DudOnrsPHveqwHlSWC6gfI5IuQsY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; spf=pass (imf03.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749527470; a=rsa-sha256; cv=none; b=xVox2NkWWXI3hKHHX40AhiH0Kv4Ns4bXXA21UHBp9j/AM3JvZUmo1p8UbuIcrB02M9BKRk FCRogVi4mBz+zgLqW//6VW54M5bu80cdMoj+FzT12sEejTA8MeDzeUryXSEZf8d3g/RY0G RkzKWN7rwCeSCqtkRvX1XScWLjzbCqE= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0ED402680; Mon, 9 Jun 2025 20:50:50 -0700 (PDT) Received: from MacBook-Pro.blr.arm.com (MacBook-Pro.blr.arm.com [10.164.18.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7D4493F59E; Mon, 9 Jun 2025 20:51:02 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org Cc: Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, vbabka@suse.cz, jannh@google.com, pfalcato@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org, david@redhat.com, peterx@redhat.com, ryan.roberts@arm.com, mingo@kernel.org, libang.li@antgroup.com, maobibo@loongson.cn, zhengqi.arch@bytedance.com, baohua@kernel.org, anshuman.khandual@arm.com, willy@infradead.org, ioworker0@gmail.com, yang@os.amperecomputing.com, baolin.wang@linux.alibaba.com, ziy@nvidia.com, hughd@google.com, Dev Jain Subject: [PATCH v4 2/2] mm: Optimize mremap() by PTE batching Date: Tue, 10 Jun 2025 09:20:43 +0530 Message-Id: <20250610035043.75448-3-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250610035043.75448-1-dev.jain@arm.com> References: <20250610035043.75448-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: F305520003 X-Stat-Signature: ecu5ajf714qaquen8tctshberfqw54n1 X-Rspam-User: X-HE-Tag: 1749527469-495677 X-HE-Meta: U2FsdGVkX1/kSM58tZ/yr/hTzmXEgPZyutex8iHPlHnbcKakfC3kuY/v0jzWt1F/wuGY2NMm2uT+smz9IuWSkQX6/XsEvK9imyU+kVv7Py5P5Mpg4P+x85hYhY9hGAhH+S2y4FRVehrfEl9VrC4MhJ3pHLZ2VM10Q2fdKMTxMYmi+MGSIm8c8lZNN9ASLDTYLzZsKaE28pr8dIr1vVhCntzAo/sZMUwnBTnvs/GEQSOG+uWQu5tELoEbLLLKKbyyn6xDofJnv3T+I90DgWz/NFy50aYdLJV9rRp2j79t1Jjzyksp02mopzs7+9Ax0VWbzTNg/R36lzwsg0Qm/GVuST0k2IY9EUxadclwZ+ksVXtM4fl7qDDJdX248hBGnLInp426DrQAVTkkPlJs77ZooAf7z4eNZC6WiKMNCR5oZ4hGp0wczbx1ENso/9rt/97apKV5KoYeLgeGCSLSJRwODOd9nrwWbb1YgjZnTwkg4osQ55RHHxYX1tbmESdxb+FW2u1Z02ynzmiGQx7/p04iRD4H1aXNq29By66PeKcFGNEDsHsxGGKJdOhnYK+SlJARXgHhWlS8hR+j2mDmeBB9YIk0UtBNF/kV7/9AhtbT/5l6PNDMtY9QS91pBJkg9WU/ep4ToG7K9Cr3mPwVOoYIz/hLh/8wBVj7Dj9w1trGkdIo8JTVfhmh3z2R7QBiSHw1Md2qzLd5myDLzLAy4PWuyY12kPG6ZqfqGxb8nVUYld4rT49fBlmjGsJd0UYUSiDllcLzJXbQTmS3RsKmH/T+73aXfAJDV/rCk6aS49zzSfIa7luoH7K9+TP6KLbISWG/VWkgva1nKX9yGpj6yemPPodxl+XzwxFHWNahZBxT3DfLaKC74PoR4TZfb9ECdH/5oJfiZvHHTWlwpYwzGon+sQ6KYYTpy3awuL+Got+wfjjdlVocW4uk9udVroHnp0lfu/+YkdtU/Pfe+76+i1c EuM9LfBG GV/ch39yPuhMcqcIl5SVbUuOxu6/gjC1OUaJPxnycaFaSubUK5ECS7rstsuxdPvVIjJ9FXKDPQ2fALG96jitLZXGgzeXjJ1gNqHFf3cXtifEVxr79rjFnLA8+P8HqIYS/jqQXi0OMBqwVmAQ4g/KIyVtYgw== 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: List-Subscribe: List-Unsubscribe: Use folio_pte_batch() to optimize move_ptes(). On arm64, if the ptes are painted with the contig bit, then ptep_get() will iterate through all 16 entries to collect a/d bits. Hence this optimization will result in a 16x reduction in the number of ptep_get() calls. Next, ptep_get_and_clear() will eventually call contpte_try_unfold() on every contig block, thus flushing the TLB for the complete large folio range. Instead, use get_and_clear_full_ptes() so as to elide TLBIs on each contig block, and only do them on the starting and ending contig block. For split folios, there will be no pte batching; nr_ptes will be 1. For pagetable splitting, the ptes will still point to the same large folio; for arm64, this results in the optimization described above, and for other arches (including the general case), a minor improvement is expected due to a reduction in the number of function calls. Signed-off-by: Dev Jain --- mm/mremap.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 180b12225368..18b215521ada 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -170,6 +170,23 @@ static pte_t move_soft_dirty_pte(pte_t pte) return pte; } +static int mremap_folio_pte_batch(struct vm_area_struct *vma, unsigned long addr, + pte_t *ptep, pte_t pte, int max_nr) +{ + const fpb_t flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + struct folio *folio; + + if (max_nr == 1) + return 1; + + folio = vm_normal_folio(vma, addr, pte); + if (!folio || !folio_test_large(folio)) + return 1; + + return folio_pte_batch(folio, addr, ptep, pte, max_nr, flags, NULL, + NULL, NULL); +} + static int move_ptes(struct pagetable_move_control *pmc, unsigned long extent, pmd_t *old_pmd, pmd_t *new_pmd) { @@ -177,7 +194,7 @@ static int move_ptes(struct pagetable_move_control *pmc, bool need_clear_uffd_wp = vma_has_uffd_without_event_remap(vma); struct mm_struct *mm = vma->vm_mm; pte_t *old_ptep, *new_ptep; - pte_t pte; + pte_t old_pte, pte; pmd_t dummy_pmdval; spinlock_t *old_ptl, *new_ptl; bool force_flush = false; @@ -185,6 +202,8 @@ static int move_ptes(struct pagetable_move_control *pmc, unsigned long new_addr = pmc->new_addr; unsigned long old_end = old_addr + extent; unsigned long len = old_end - old_addr; + int max_nr_ptes; + int nr_ptes; int err = 0; /* @@ -236,14 +255,16 @@ static int move_ptes(struct pagetable_move_control *pmc, flush_tlb_batched_pending(vma->vm_mm); arch_enter_lazy_mmu_mode(); - for (; old_addr < old_end; old_ptep++, old_addr += PAGE_SIZE, - new_ptep++, new_addr += PAGE_SIZE) { + for (; old_addr < old_end; old_ptep += nr_ptes, old_addr += nr_ptes * PAGE_SIZE, + new_ptep += nr_ptes, new_addr += nr_ptes * PAGE_SIZE) { VM_WARN_ON_ONCE(!pte_none(*new_ptep)); - if (pte_none(ptep_get(old_ptep))) + nr_ptes = 1; + max_nr_ptes = (old_end - old_addr) >> PAGE_SHIFT; + old_pte = ptep_get(old_ptep); + if (pte_none(old_pte)) continue; - pte = ptep_get_and_clear(mm, old_addr, old_ptep); /* * If we are remapping a valid PTE, make sure * to flush TLB before we drop the PTL for the @@ -255,8 +276,12 @@ static int move_ptes(struct pagetable_move_control *pmc, * the TLB entry for the old mapping has been * flushed. */ - if (pte_present(pte)) + if (pte_present(old_pte)) { + nr_ptes = mremap_folio_pte_batch(vma, old_addr, old_ptep, + old_pte, max_nr_ptes); force_flush = true; + } + pte = get_and_clear_full_ptes(mm, old_addr, old_ptep, nr_ptes, 0); pte = move_pte(pte, old_addr, new_addr); pte = move_soft_dirty_pte(pte); @@ -269,7 +294,7 @@ static int move_ptes(struct pagetable_move_control *pmc, else if (is_swap_pte(pte)) pte = pte_swp_clear_uffd_wp(pte); } - set_pte_at(mm, new_addr, new_ptep, pte); + set_ptes(mm, new_addr, new_ptep, pte, nr_ptes); } } -- 2.30.2