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 516DBC369D5 for ; Mon, 28 Apr 2025 12:05:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7AC656B002B; Mon, 28 Apr 2025 08:05:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75D2C6B00B2; Mon, 28 Apr 2025 08:05:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FE666B00B3; Mon, 28 Apr 2025 08:05:21 -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 3D7346B002B for ; Mon, 28 Apr 2025 08:05:21 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2A0DD5F943 for ; Mon, 28 Apr 2025 12:05:22 +0000 (UTC) X-FDA: 83383322484.19.8A26E04 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 83DC1C0002 for ; Mon, 28 Apr 2025 12:05:20 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1745841920; a=rsa-sha256; cv=none; b=FQQa7nbdeA9KEY1VFKVKbM7kTfX81VCp8X+oIzKXVtcsX2Od8TvZUKFBO3lKcsRxqSjatL BKbAV5lUx9bYDOqfGA27rQVahBlo1lOztDPZf2X76+mQ6amGqQDbkNyfCAFgJ9x4/1PHUC U1Y53cZYg87bKxGr5+GP0C35Mwct59U= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.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=1745841920; 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=hk3Fuo4sS3jURPSWm0bATaQtJopVXWGT6l4Dx2WthNir3lCaTRI1qC6i9VZD/VLyGnZo8O KhGxocMNixLW9BIaK4WTJd47ryngqev/fKNSm4CMTpWhCqO2XP6B4VjqKhJokQySQUu2yW 9HmB7+GZ87H5YFJC3hv+z9e9XgaKmOc= 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 5C4D122C7; Mon, 28 Apr 2025 05:05:13 -0700 (PDT) Received: from K4MQJ0H1H2.arm.com (unknown [10.163.78.210]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 73D993F66E; Mon, 28 Apr 2025 05:05:09 -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 4/7] arm64: Add batched version of ptep_modify_prot_start Date: Mon, 28 Apr 2025 17:34:11 +0530 Message-Id: <20250428120414.12101-5-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-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 83DC1C0002 X-Stat-Signature: c6oqrjpdqrgz9oes3ok3fas9qxrwdh95 X-Rspam-User: X-HE-Tag: 1745841920-191222 X-HE-Meta: U2FsdGVkX1/wDR4j/i6tDJqGTc/5echBSDF4n/jYM5LuadxJnKF1Lf09/EeoLls+08R21hoXBgd7QsiZ2PIIuGLdl36LsohNCjlshvEIb8VvD9zDZlIDVoPqhYSTK/iRk0g9pmmwffmZs2RD3lzhNPCZHz8ZSrBwxT6zzauD6pwFa9rJR2uJLp1ICpTUJwOfDElCAgB/jEVUqBDX8xNa2NpLovRCSTkRIvJ3wlN0HuUdkARNfmwajuMQGF2ZiPHMSb+vzOVYYbgS7trnJ/crb01Zdtpa16AKpBCdN3z/FBHhK8Hj8We10YSFZBeEehQbCwovpWdpVt8SdtWWDNcaPaE5s+ON7pmcOZezIEgno9VXCoyYhDlxPy+136SYO8sV8KKt/ouBkt9bwpmw1COYRsDn92gfX+qKduQVD2X3tAoo5tzQZnDp0o9vZ9OSbtFW4GUsJt4bD2a44018QvPDyfkofuB3lsrem6j/T/0W/I8YJadPCXnMwCCq9Csc/zrTha4Xc+AqzMr+UaSAvInardDwDjTCQ+iAI0gdV0bf/pSojJmlKGJ8aPGwIv8M3YcmzdEZhwEfK55yOwmW1VuHfVWoQzwVBnV93/EzlvZryTcjsOX3HkJRVODXMYWmKYPLHshljW7Mkm+CqjuMsGlfCazgQEED/7bKtUl+0MtpTivTcZnkHMUAgFFbm7gWbC4RDZz1h8KInCei3P1z6eW19ahY04yL040Wgc7lKeb+NVXxdrMh3cs3Bwuugsct1qOrfHUzKVm8gZPxIKtWYY8eS50HOGFQqxtc35RyLxy+wn7L/d3coLETCkq5hTmf32NPQb+Fn6KjB/szwXzax6pbcz00WlH1lqw50cv/8UA0H0+OE6rueAsYfeV6F1zYUKcuTm+be+WzZOpVC6fqwAduRTlZSd3ySDUQ7f673jClu2Xdqa+77uYAW4txUngCxImuzcheSDh8qhMZGCEGdFN Z/CvA7PP 7SkPe0j45JFqEV/8WhDhZlH2Dcew1KryXpcyCctldwNH/vs7ZOfRNtPFHHKa1OmBaiOKfEJ9pD7grss/bWBIe+dXWXUE/h3/SXuYv0j3oiGmTl+FEpyOtUgCjVc4VhQmAxjY87uF44/455mukUBhC/VBDomXon/cA9hLOY1oXNOplCUY+vgCZhxRgrQMndBBUAcths3kRlVgXo3Q= 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