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 BE6FDC369DC for ; Mon, 28 Apr 2025 12:05:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 09DE26B00B1; Mon, 28 Apr 2025 08:05:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 048D76B00B3; Mon, 28 Apr 2025 08:04:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2AA26B00B2; Mon, 28 Apr 2025 08:04:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C11E66B00B0 for ; Mon, 28 Apr 2025 08:04:59 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B571816198C for ; Mon, 28 Apr 2025 12:05:00 +0000 (UTC) X-FDA: 83383321560.09.3529249 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id DC0061A0003 for ; Mon, 28 Apr 2025 12:04:58 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745841899; a=rsa-sha256; cv=none; b=0Wic/FSbTNmNN42cxRIm7BG+B//MJoznkaWT1gJ0Vwuqx1MviTFKTO4E8izMA2t2QfLC1R Mi1TZZbUjQhJoltDHIwO6/ASavvC2O7289CdAEHvkmTMsQhTQ9QWColRrjUx3boxPqtq50 8il2LTHYaS10KgpEU8VkRnAq1/6GlRI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745841899; 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=vjv22v1xGTt25bs3TKcd3H88s+e1Tagn0TixvBFl8wM=; b=YTdJicXmwxp6i7SkkowXzhBNqd4PzoXCNFHz4mgSBjsfn3izTtzfwkPb7jsXD/0I4f4fwp zMrYPHcotG38ZWblPuPFtdoq0xG8+GuxPv0ZW/wNdBTyPFkcSe/hpOBHeVktQa3owvny5R QF2+rCE4CIwwpI54TMupXJldqf/RIM8= 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 B16941762; Mon, 28 Apr 2025 05:04:51 -0700 (PDT) Received: from K4MQJ0H1H2.arm.com (unknown [10.163.78.210]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 939A63F7BD; Mon, 28 Apr 2025 05:04:48 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org Cc: ryan.roberts@arm.com, david@redhat.com, willy@infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, vbabka@suse.cz, jannh@google.com, anshuman.khandual@arm.com, peterx@redhat.com, joey.gouly@arm.com, ioworker0@gmail.com, baohua@kernel.org, kevin.brodsky@arm.com, quic_zhenhuah@quicinc.com, christophe.leroy@csgroup.eu, yangyicong@hisilicon.com, linux-arm-kernel@lists.infradead.org, namit@vmware.com, hughd@google.com, yang@os.amperecomputing.com, ziy@nvidia.com, Dev Jain Subject: [PATCH 2/7] mm: Optimize mprotect() by batch-skipping PTEs Date: Mon, 28 Apr 2025 17:34:09 +0530 Message-Id: <20250428120414.12101-3-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250428120414.12101-1-dev.jain@arm.com> References: <20250428120414.12101-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: DC0061A0003 X-Rspamd-Server: rspam04 X-Stat-Signature: pbh1dc53keu59j5qpcg8w3fiapempeow X-HE-Tag: 1745841898-258490 X-HE-Meta: U2FsdGVkX18FwU6Ydes9KdJZfEPkvdMscqpI6BfkQiCY1mA+RSaXodMRWhFtz75XSsZXFKkEek3QRA/JvtxNntXUgCwqJPvBPNuv7UiPA1nrcyt2LONRaO6EUFhA5gVV2/DYvWlraiX4VO9RwY4VQyvig0iB6c3S9R2VJ5s84gkL2jYabJFpSnjLXv5VJ68Bd5hoh7+iZroMxrC6MmtJi4O/ACxHUDRfi5eZAFpNgG16lvfU2D29ErvHEHg2S34WtOISYjgkXjOkp4wv4KOtI1y5PBhVV8Pavnue0wB+iaaDE+YtmFhdAg7g4xnQ1q16eKb9wA17XeMcBKMToHr3U/d8FSWgidwSkpofSFCCIo+CmNP5gby8r6A6t5Q3tyfFyVC8lRLti/qyqbGX1pvZyofssHFYs41hqKtb7OTYbIhCROkkpYFXFVILmNxruZdpqPZyTEw+KfJnrEicifgh370mAudQsgzaUHs1joiJC4Ze+bVLkXLTct32pUFQvYmY5cs0Sp09kNt5laJNpR61KuHHnOtZ9EePoNjYtuwg003lxBmLAsnGeYUhfo37lI04rY8c1+s/GrZI8SXRogPl2KJmHQ6M9UjWyMiqZtzL2uQMX/jHXP/NCVmWhcGdwLb/NlAU5zd23LwtxS8fzUCmIYBTXrwKsVXq+WWKwjPW3r0OSqoByhp9gcHgXFhJJiF9Xhx0GItV3xddMx4f+5kxZpU6KOs8D4GDrI2aWcCzyWN5BzhWU/HTdofk0Y1GyjMKL9rbv3ggendmuhwAe2bkNYkF9t0Q/5vGASvGCblwFuYrQj5g0lCa2A+6N/UjSJtiQnuFEKl97b0bMYbg5qPBihBBq0UHxkUZUJZD8UjGqfzdb/x35bOTgMlxzXqxnzMlbljJkUBGwyZwlPnnAhLHohsNwKyP0iLIpRLKrXrOKxy1hzIMrCZN64kPTWFuXaqqROL4hzfU2AEM4uoJGtQ uyGe9Q7D SnFFAnbLUXof1RPCUWGIlfUceblV1ac1/FeBVrIizWda1iq7wxJ3wT5cKMYtv4eykUCoC0k3aDHFMNCDt8l3Zij0XDwCHSP8veTu5D/AkSs1VbvSG+kMMzjVOU6hK7BL/bIKDwjE260SRHOTVt0YyJCm/QQ== 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: In case of prot_numa, there are various cases in which we can skip to the next iteration. Since the skip condition is based on the folio and not the PTEs, we can skip a PTE batch. Signed-off-by: Dev Jain --- mm/mprotect.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/mm/mprotect.c b/mm/mprotect.c index 8d635c7fc81f..33eabc995584 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -91,6 +91,9 @@ static bool prot_numa_skip(struct vm_area_struct *vma, struct folio *folio, bool toptier; int nid; + if (folio_is_zone_device(folio) || folio_test_ksm(folio)) + return true; + /* Also skip shared copy-on-write pages */ if (is_cow_mapping(vma->vm_flags) && (folio_maybe_dma_pinned(folio) || @@ -126,8 +129,10 @@ static bool prot_numa_skip(struct vm_area_struct *vma, struct folio *folio, } static bool prot_numa_avoid_fault(struct vm_area_struct *vma, - unsigned long addr, pte_t oldpte, int target_node) + unsigned long addr, pte_t *pte, pte_t oldpte, int target_node, + int max_nr, int *nr) { + const fpb_t flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; struct folio *folio; int ret; @@ -136,12 +141,16 @@ static bool prot_numa_avoid_fault(struct vm_area_struct *vma, return true; folio = vm_normal_folio(vma, addr, oldpte); - if (!folio || folio_is_zone_device(folio) || - folio_test_ksm(folio)) + if (!folio) return true; + ret = prot_numa_skip(vma, folio, target_node); - if (ret) + if (ret) { + if (folio_test_large(folio) && max_nr != 1) + *nr = folio_pte_batch(folio, addr, pte, oldpte, + max_nr, flags, NULL, NULL, NULL); return ret; + } if (folio_use_access_time(folio)) folio_xchg_access_time(folio, jiffies_to_msecs(jiffies)); @@ -159,6 +168,7 @@ static long change_pte_range(struct mmu_gather *tlb, bool prot_numa = cp_flags & MM_CP_PROT_NUMA; bool uffd_wp = cp_flags & MM_CP_UFFD_WP; bool uffd_wp_resolve = cp_flags & MM_CP_UFFD_WP_RESOLVE; + int nr; tlb_change_page_size(tlb, PAGE_SIZE); pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl); @@ -173,8 +183,10 @@ static long change_pte_range(struct mmu_gather *tlb, flush_tlb_batched_pending(vma->vm_mm); arch_enter_lazy_mmu_mode(); do { + nr = 1; oldpte = ptep_get(pte); if (pte_present(oldpte)) { + int max_nr = (end - addr) >> PAGE_SHIFT; pte_t ptent; /* @@ -182,8 +194,9 @@ static long change_pte_range(struct mmu_gather *tlb, * pages. See similar comment in change_huge_pmd. */ if (prot_numa && - prot_numa_avoid_fault(vma, addr, - oldpte, target_node)) + prot_numa_avoid_fault(vma, addr, pte, + oldpte, target_node, + max_nr, &nr)) continue; oldpte = ptep_modify_prot_start(vma, addr, pte); @@ -300,7 +313,7 @@ static long change_pte_range(struct mmu_gather *tlb, pages++; } } - } while (pte++, addr += PAGE_SIZE, addr != end); + } while (pte += nr, addr += nr * PAGE_SIZE, addr != end); arch_leave_lazy_mmu_mode(); pte_unmap_unlock(pte - 1, ptl); -- 2.30.2