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 54DD7C3ABA8 for ; Tue, 29 Apr 2025 05:24:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07CB76B0012; Tue, 29 Apr 2025 01:24:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 02C6F6B0022; Tue, 29 Apr 2025 01:24:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5D8B6B0023; Tue, 29 Apr 2025 01:24:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C8DC06B0012 for ; Tue, 29 Apr 2025 01:24:33 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 391941A0CD6 for ; Tue, 29 Apr 2025 05:24:34 +0000 (UTC) X-FDA: 83385941268.23.34BD164 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf17.hostedemail.com (Postfix) with ESMTP id 9A17340004 for ; Tue, 29 Apr 2025 05:24:32 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf17.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=1745904272; a=rsa-sha256; cv=none; b=rdTiIP5jgPVG/8daZ4FyNAuGeGZ1/5cGqksSJZUrwJQadIYxSGvVjeoHGUGAbUBovYwULN emNnWQyq3c/kUTwab77PPXoVgpDDZwdt5r8gQ5qV1Qu8/kcI7k7tVfSTdn+7n1x6nkbIdR Uh2qah9w+T+RX/x+deras0CDwqKOYGs= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf17.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=1745904272; 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=SmTMNOeQjXDCVChUubdNwDHcMziBJ9gNz+o9RD2bflg=; b=n5ghF9xzfUuQg35I33ClhzTKtWsIuSqFLuICbO/CTZgQfbN6RLR28tgYcJBPlRhLcKZ7wn a2WENjtRdsilVpkhS0UbQl2ZZJ+thMPseQKIo92wRlr4lC3Fe68guVNoTFFlgb7x0v/G7x +4mA8RCPKB3E+1qX66DPhUlRMhL57Co= 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 148241515; Mon, 28 Apr 2025 22:24:25 -0700 (PDT) Received: from K4MQJ0H1H2.arm.com (unknown [10.163.78.253]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BED453F5A1; Mon, 28 Apr 2025 22:24:22 -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 4/7] arm64: Add batched version of ptep_modify_prot_start Date: Tue, 29 Apr 2025 10:53:33 +0530 Message-Id: <20250429052336.18912-5-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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 9A17340004 X-Stat-Signature: wkiydz8z41bpomfsf6pj458i3fg5rrs8 X-HE-Tag: 1745904272-608905 X-HE-Meta: U2FsdGVkX19dUGhNsGEqFl1ynem7w9Eo5eQFRDCtMF489IiKytKQfGkNcMhlC9HgZRKvCjID9Ox6/34/AD5MMImTcNmVeHRW1pYJ1yJXA3Q9qhMPlZRU0btnYkF5VrqxWF9OAuu3VDuixbR1KCHBQBwjqAwANt+7ecsFEnfytswfkay6zjBz/KIF4+GxVTHXPyUvEWiaQ8T5xy5SOJH/XdBoU0b6vhZt6UDOIpy8nMa05oRJ+X+FdBRqqNZFRGRXfwmb1KiSG5WfexAzjqZ707uMfBmClGBEqmL76E/nP3wDU9Af0YVSj8IhxDOGjCcGDWhsXnDe2/4rhgxJwbyCw0Qc9SSPtn29kkPv/L3DYEL+BDgfNQC0/Uw2x9g+KWTmeRolLRDRTr0z7nzLdO5EBGJ3mrXdaEx+RUHS4wUZDwiF1BlWHcjMUC9vp8b/IPXcdA1GJDIA7SEQmhXtEgHGukcdKdSNpPMZcVPWQ8rVIZOFVQgYqq3OQgSHX9q9MhKoPCqZAbviHio7ZJJ3OfNtyGE1wWmyjx1InReoYHwYrkrOIbMDmA/7E2TuQp6qoV/1JGd1tlomKzPLf4B31JT0EN7g7NjCK523s1EHiUhrDiAI00b3/8L5BKBk/XJxhJJGMbbaBHSd8IeWR9gZuUXKb5RMCmhRmdO3w445EhqfUPRe4wY/UJsagSExA6KH6D6ErtLJrJAa/jeCe7De57QAnQQdO8g4oHzC4keJTUruziCCQHsnGJMgYJzOWVFQmShm8ydOgEY1EY6RIdyX2fuqHMRXzqH47cV68hx1mKnbY7ntLKDtTskSgFj9PoAZjykEFrfJz21/0TccjeJR/uJLXvZxhjO4j92Wh1Rj670qL8YAaml4rMQPmw6b3RvRmVHGGK8VfcQhfYk6FqfavsAxCrtpepW/u9JFgzcunRn5Nawj0H61slQkJMsv5W03QrXC4NC0k/4QvOt7wyTdpXh 14x8dGAy iKvtYpJUu9WpxLI29XMxbRaVULdoc/22u377G25XzsHYw04iXAfJKemaTtf9SZzqw1ZKSgkJRnvfpOr0GnJWTqcsdDpBu7cBCgON4S30to55/fY0iPw9tb0qOpVPsUdq3rs62FPTosC1KZBkN7O0K3QrNJ2kqwIuoUEOqOYdGK3zRcFDybt5V49ZfEFlksmWTwGApIZ2psJGQJaE= 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: Override the generic definition to use get_and_clear_full_ptes(), so that we do a TLBI possibly only on the "contpte-edges" of the large PTE block, instead of doing it for every contpte block, which happens for ptep_get_and_clear(). Signed-off-by: Dev Jain --- arch/arm64/include/asm/pgtable.h | 5 +++++ arch/arm64/mm/mmu.c | 12 +++++++++--- include/linux/pgtable.h | 4 ++++ mm/pgtable-generic.c | 16 +++++++++++----- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 2a77f11b78d5..8872ea5f0642 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1553,6 +1553,11 @@ extern void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t old_pte, pte_t new_pte); +#define modify_prot_start_ptes modify_prot_start_ptes +extern pte_t modify_prot_start_ptes(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, + unsigned int nr); + #ifdef CONFIG_ARM64_CONTPTE /* diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 8fcf59ba39db..fe60be8774f4 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1523,7 +1523,8 @@ static int __init prevent_bootmem_remove_init(void) early_initcall(prevent_bootmem_remove_init); #endif -pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) +pte_t modify_prot_start_ptes(struct vm_area_struct *vma, unsigned long addr, + pte_t *ptep, unsigned int nr) { if (alternative_has_cap_unlikely(ARM64_WORKAROUND_2645198)) { /* @@ -1532,9 +1533,14 @@ pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte * in cases where cpu is affected with errata #2645198. */ if (pte_user_exec(ptep_get(ptep))) - return ptep_clear_flush(vma, addr, ptep); + return clear_flush_ptes(vma, addr, ptep, nr); } - return ptep_get_and_clear(vma->vm_mm, addr, ptep); + return get_and_clear_full_ptes(vma->vm_mm, addr, ptep, nr, 0); +} + +pte_t ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) +{ + return modify_prot_start_ptes(vma, addr, ptep, 1); } void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index ed287289335f..10cdb87ccecf 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -828,6 +828,10 @@ extern pte_t ptep_clear_flush(struct vm_area_struct *vma, pte_t *ptep); #endif +extern pte_t clear_flush_ptes(struct vm_area_struct *vma, + unsigned long address, + pte_t *ptep, unsigned int nr); + #ifndef __HAVE_ARCH_PMDP_HUGE_CLEAR_FLUSH extern pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma, unsigned long address, diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index 5a882f2b10f9..e238f88c3cac 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -90,17 +90,23 @@ int ptep_clear_flush_young(struct vm_area_struct *vma, } #endif -#ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH -pte_t ptep_clear_flush(struct vm_area_struct *vma, unsigned long address, - pte_t *ptep) +pte_t clear_flush_ptes(struct vm_area_struct *vma, unsigned long address, + pte_t *ptep, unsigned int nr) { struct mm_struct *mm = (vma)->vm_mm; pte_t pte; - pte = ptep_get_and_clear(mm, address, ptep); + pte = get_and_clear_full_ptes(mm, address, ptep, nr, 0); if (pte_accessible(mm, pte)) - flush_tlb_page(vma, address); + flush_tlb_range(vma, address, address + nr * PAGE_SIZE); return pte; } + +#ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH +pte_t ptep_clear_flush(struct vm_area_struct *vma, unsigned long address, + pte_t *ptep) +{ + return clear_flush_ptes(vma, address, ptep, 1); +} #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE -- 2.30.2