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 25CADC3DA6D for ; Mon, 19 May 2025 07:49:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CAB446B0082; Mon, 19 May 2025 03:49:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C5BBB6B0089; Mon, 19 May 2025 03:49:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B4BBD6B008A; Mon, 19 May 2025 03:49:09 -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 97EE36B0082 for ; Mon, 19 May 2025 03:49:09 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2C3ED121693 for ; Mon, 19 May 2025 07:49:12 +0000 (UTC) X-FDA: 83458881744.20.F1CC9F5 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf06.hostedemail.com (Postfix) with ESMTP id 83FB7180007 for ; Mon, 19 May 2025 07:49:10 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.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=1747640950; a=rsa-sha256; cv=none; b=L6qHX3HXlFEaXeFD1SjRIhhDnb3yyXdLfhblc4nN+uXf+obEbqtmP6dTaeaBRspf1rm63a kYCDM6YxviYSz4aWqKqtRUK9fWlnmKCaEEzOYyGk0sJ2UE4Rl9CybcA8UUpnNLqTWJgQ+h ++eH3lFQjtFOuX1qiFXY9mls7OlFyE0= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.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=1747640950; 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=l2s9SKuLgDwCzf4hMIH02LScsC9BGzEyAS0Ie7mUDjc=; b=PBRSsAI//JeVD0zA0Ie0DEAPY6wIRxqFUw1cnxhpvHG93MVTq3LzK4QraXEXlbUC9uHCwk K8aSpAY+Y7W1sA4OJldmiwUf8Y8r4ZIcsdAi+5/XaPQlGqG3QBj6oej2aqHfUkxrLkIW+4 rdXZUxlYWFeKA5fqiwlpj/qael5Ky7k= 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 D5B2D14BF; Mon, 19 May 2025 00:48:56 -0700 (PDT) Received: from K4MQJ0H1H2.blr.arm.com (unknown [10.164.18.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3537C3F6A8; Mon, 19 May 2025 00:49: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, hughd@google.com, yang@os.amperecomputing.com, ziy@nvidia.com, Dev Jain Subject: [PATCH v3 4/5] arm64: Add batched version of ptep_modify_prot_start Date: Mon, 19 May 2025 13:18:23 +0530 Message-Id: <20250519074824.42909-5-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250519074824.42909-1-dev.jain@arm.com> References: <20250519074824.42909-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 83FB7180007 X-Stat-Signature: 1qpd8aueuiwrspczbuutzt3jwj1jrtri X-HE-Tag: 1747640950-7072 X-HE-Meta: U2FsdGVkX19yiDMx3HTvd+a6BgrvkMpKGd8/Z+h5K9K4BWCl+Kb/l2500roBUII8dVAqQkmONqiqCXNklrNGoYMzVmgbGam4DHTnYM+kE0gNCyHsYYlvFNNxvokNrVjpws2peco6HSeVE1uStTHfHPxj196qTbkby56ZKyys4TdG0PkCc1GnNiO2cTEXkJW/gQgXFWhCJ5jtvWp9VN8tuxJF63ETBDg6O2n0yQNuMAfrwC4SzFgzLNPXqmE6t0PNsoySaOl5knJBBaFm2nfSDrY+6pmh5XDIX8yEBafAoytuDiVeIleNNuQ5DN/qvaHkhXYqO7FjW/kgBivCvAG7jnYasRMCkh11VJAvG7oyhfAdiJu/MRyiUiXMqIapGt2D35CF+nlONqkXXd+RIyfWcJU1AURI3HA1LdlQtPCe76DHCc81j4ygNze8YTMqk3T1mVlTZ+1Opf/RUTal+ezxA/VzvP5lTBPbdHQ6YoFYp5w1Jy78SIIhfxMsmu9rrUMt0oe0zP/CySxtUuGX67moazY3g6SWpWaEL40gE67ju8QoYvUVOBIt7TYPdTCgk0mCMh6OmvGRhtS6DsJ16VdhTdNakMlm4JDi0rveCuxFwN51WfdJ1y6GIY/zXPKC3HdZFm4HS63cxqtZdwE68awLX2PSJM7H/OC0ETC1ARUdEUnTZCBptlY4bVpVrfLcv8ACF6Lxl7HOXE8wmQpb+gAX4hBz9NoRSeBONuJJHo2H/1Dw5a1K+j1cBweVAFQETHz8ZyrYGFirRCEPoXvO87TJG/Jz5acVXqfAQliFkU2OeSMznvY2k+PS4HQiC1KIf1zISRmuakz/pYcDV95vQ7GhGC10a+pz45uNY/DyJrLNYzYNVR2TxORSMPYpHQcELdoGcON4Xc5LDxiyE5j43O7go5OaMc9fGD60hqaImKtiOwn1cbqh/IwquKYPm5QCAb2ju8jFH67VXI9C9Vq2a00 AeZ+vWgI IwlFu1Ff6rcqFMGLu/3V17w42FqxJSDRbingR5vPpSeqOCwuBCCQ4bfdcKRVpOaLYYdWmUoeOWbGlkPTby0zDV4vmFq0zBkIc8W4Zt6Zs6TavcRaYsoHioNYErmaZYB9X6UE39B3qBcKL+j0WKcx+c+W5rvKNTNzFj2qQtmZ7DYUdtZKjsu3plvFR49EjIliLiLA2WGgvJQZZU7I= 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(). This helper does a TLBI only for the starting and ending contpte block of the range, whereas the current implementation will call ptep_get_and_clear() for every contpte block, thus doing a TLBI on every contpte block. Therefore, we have a performance win. The arm64 definition of pte_accessible() allows us to batch around it in clear_flush_ptes(): #define pte_accessible(mm, pte) \ (mm_tlb_flush_pending(mm) ? pte_present(pte) : pte_valid(pte)) All ptes are obviously present in the folio batch, and they are also valid. 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 e40ed57e034d..41f4a8de5c28 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