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 6BA8EC3ABA5 for ; Tue, 29 Apr 2025 05:24:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06F2A6B000D; Tue, 29 Apr 2025 01:24:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3CE06B000E; Tue, 29 Apr 2025 01:24:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E02DE6B0011; Tue, 29 Apr 2025 01:24:13 -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 C09F16B000D for ; Tue, 29 Apr 2025 01:24:13 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 485691A0CCA for ; Tue, 29 Apr 2025 05:24:14 +0000 (UTC) X-FDA: 83385940428.19.CC7458B Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf10.hostedemail.com (Postfix) with ESMTP id BB091C000B for ; Tue, 29 Apr 2025 05:24:12 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.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=1745904252; a=rsa-sha256; cv=none; b=6pqsHa4bKrepcIbCMPqKaJlQw7Tx7+cw/5025860mzGj/7QH+C1Nvz979II/6DC8NhS9cp YRUenPusXXsbKBth8xNiau34rsoy2eJq7PIdjZBRw0b2hfdCYofO4g51Gi20+b38Tx4zAs ktiqJk3fYabtJxfUYKEW2vS/sN0CW6U= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.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=1745904252; 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=cFptbWrugMSnsUfueEujJC/lhnkPWywZ7fbExUHiB58=; b=LbDNJ+NsSlN4jOVfUfddjpWYzIH5nwEZNMBYl1eq126EVACzpmQX/et0aCNtzZE/qqO0lz mw87SPzcnh9QMcxKpr491wt+odj6M1swmJWWp+pkwF1Rpm4TBqw4QTfjjmpVioy8wzjA1B f4Li17nDNHypkVqd8Iz70AFmFymbvqI= 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 12E031515; Mon, 28 Apr 2025 22:24:05 -0700 (PDT) Received: from K4MQJ0H1H2.arm.com (unknown [10.163.78.253]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 98F553F5A1; Mon, 28 Apr 2025 22:24:02 -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 v2 2/7] mm: Optimize mprotect() by batch-skipping PTEs Date: Tue, 29 Apr 2025 10:53:31 +0530 Message-Id: <20250429052336.18912-3-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250429052336.18912-1-dev.jain@arm.com> References: <20250429052336.18912-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: BB091C000B X-Stat-Signature: b91xh4yy5op7wpk5gcigmcz3jtim837m X-Rspam-User: X-HE-Tag: 1745904252-346564 X-HE-Meta: U2FsdGVkX1/0JQnP/ByJav9e1KM3l93l6MbUVchXH7GxUDK2Z/TwlS5XxQwmYbuZ7RCNbYxyuSSZwc1WSoGNjXwOGJ78E1k3d5sioXEnrXVHEN4f5FISDzLu3MbZ4KYYx70FLBSkraRBlCbIgp+68iCWEGoDxtN5i+O1H9O/eh76Oa/eFt9YSJ35JN++9x2hGfeOomEJ5E4FM/yNGk9kMfWi7PNe3rdBTRyt8iO5WIMOk9V3/wLPWAHadf5n8BRbe1taOsR1YG6IMbMPls//ZDVmE0KmnFTKa+b3QG+lZpGAJXHtdSGKuTez7VY4DueDsL4xf96nlUcoYXbtvlzFx6KTJCmoIWR3jkrftwnzdJA211yZtrwJHWkzz5THHdev6UIK7yfDWh6Ash1eBCGrb+hs50aJNhNTo2xA9mQr11PcQ8N0ma39WEj9RJqFUa4P86FiZq/FwFoWfdvzpmvYeINKy5C+lTx8OoczF7depxLfGFjn+Qz3vE8vzZFyos+Ss/H4oIN8fvDB1/KvlCfh40tw+flfRhuSc9E1qErSSwjdBhtFh3/2lLugfd+X4rRhtBhR+JWRFQwZBVGs2m1pQHns5cc4QQ/U2PQA23Xkm1jqOzwcLvrphewUgiqYgLn/z+jlQOnTF4PdLMgEB96nyUSJcDOhNB4BSrAqSD7GNcoJ5FLJS7AiqanKurfrwhY/R7M6wucY3LJHqLrfKkUTcnw6Kxe9wKQfSlvwKmcVFu9S1+2QNa+T/GBIIQStTSniZsTwsLrQ4Ey+ZDi9uB7r342dx8b2YgwWFYP2qpapXMBV2O1FY7VkXun9iXCsXg/WX8zRw85GyzlbU2yuXhfzm8eZmRrKbcQ6 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 70f59aa8c2a8..ec5d17af7650 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