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 300C6C54ED1 for ; Sat, 28 Jun 2025 11:35:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8CCD6B009C; Sat, 28 Jun 2025 07:35:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3DF06B009E; Sat, 28 Jun 2025 07:35:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7B306B00A8; Sat, 28 Jun 2025 07:35:39 -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 A7C2D6B009C for ; Sat, 28 Jun 2025 07:35:39 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 32DCE597B9 for ; Sat, 28 Jun 2025 11:35:39 +0000 (UTC) X-FDA: 83604604398.17.7C9A77D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf27.hostedemail.com (Postfix) with ESMTP id 8F00240009 for ; Sat, 28 Jun 2025 11:35:37 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf27.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=1751110537; a=rsa-sha256; cv=none; b=T4w9nzNacCl014wT6c8UmebjmLnh0Y2MdRb6E9JqBLtnIh/2G8vXUa3Fkn8zfCFDWZSI2K D4dQDAjVj4fWYYDwLp/+/wbzohuoulnmmhZ13O4uYl7fX3yyEx9V6nVK4nkzp5zkJne/Rw Y6McfbE/b7dA8PZOIQS4YPgyThZ5Few= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf27.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=1751110537; 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=V4dn6eClqZku968XieTCYkQsYAcGmcWWR4z8tKm4Ym8=; b=3KEF5fBOV5bY4PjMG8xUyKpPMMHSMwf5yqUkqLfqpS330Ua6znBLprAAZw5cpeDiMd97oF ZhSz+1oYGjAMhr75LjlsCiKSR94V1DNEcDCDBVkErX2BfNB+Ukdo/zK4sDte34NL7ocfWj WmBC9sFJLefEp4BcifE8HlpDhj5f+Ls= 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 CF0401BD0; Sat, 28 Jun 2025 04:35:19 -0700 (PDT) Received: from MacBook-Pro.blr.arm.com (MacBook-Pro.blr.arm.com [10.164.18.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id F31033F762; Sat, 28 Jun 2025 04:35:28 -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 v4 4/4] arm64: Add batched versions of ptep_modify_prot_start/commit Date: Sat, 28 Jun 2025 17:04:35 +0530 Message-Id: <20250628113435.46678-5-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250628113435.46678-1-dev.jain@arm.com> References: <20250628113435.46678-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 8F00240009 X-Stat-Signature: 3grd5yqsxahobhri8y4s1w6ymha6mkky X-Rspam-User: X-HE-Tag: 1751110537-806307 X-HE-Meta: U2FsdGVkX18JnA0+YlVQcc8iLZ5ovNsYRXIdd8W7UsN7Ydnfnk6csM9m7uhDOtYfM+5qr4HOLlhICG6ZnHYjhqvQBjnLXtu760SxkRsdMJbXfL2f72izBg3vcjR8vpc3jbAddmlOqAfaRe0IYkNixVgaDAFY0IxkmTsbHFpep8+9IuKOX/XllpDgbA0TgK99oRAcnpQv9eTm/njimvs55UfK5aCymr+/wQk4h6EcRfpq3UZBbMKJ3Xe2KXyfgukLn1ZdQn6qjPymuROGzyri+hchai8FN2lOgsYAZyIahtVhxMYfacmCCk6GjA5nyV9R95CNGjb/jXeAIctfGQlHRxBWZt4ZNVE7Mw1SHMY8N9cYNlEY3l9+O/iUJnKrG//XaIzS2qaQL6Y/zImPWG1hu6vBVfPdP9RavmziYmDHihQvsYAPMpQGiQrhMu7wjkSX2KsY0XsXWIY8EPd3KOizM8TX9pD7xDjzlrL7muWfnZRjBfxs6GBfaq4pQ8rC3kZWUf79uYntDCTekVVy7kQJov6r1nbMcdSorxYWAfewjt46w3G0FlldGMCQaS9XwzK6EfjgEpTPwbpEbhTLD6LXNzfcRqCrQVywtOFppFt2uK+7vaFxfV7edxB1gMAr37YIfGWGo3uX/8UaLa6zxxLRfPSMERq7K8F3ZApFguYng4rjFx6gB4PZLlkt4uOUw3jM/MA7GjQchz+EI10zBoHPnkz17WDoYFD2a4eOQVKnjW8AN0F/kotmtBxRdRtrv0YC564cejzYzoNqPsU15RVdGsamm6TiWIzB0gW3fMXDwJEkUZzNsiw9K9l4lEeTchzyQlaKxPjqPzSg+EXruymbyliXvw45CX2t 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 of modify_prot_start_ptes() 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 in the errata specific case: #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. Override the generic definition of modify_prot_commit_ptes() to simply use set_ptes() to map the new ptes into the pagetable. Signed-off-by: Dev Jain --- arch/arm64/include/asm/pgtable.h | 10 ++++++++++ arch/arm64/mm/mmu.c | 28 +++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index ba63c8736666..abd2dee416b3 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1643,6 +1643,16 @@ 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); + +#define modify_prot_commit_ptes modify_prot_commit_ptes +extern void modify_prot_commit_ptes(struct vm_area_struct *vma, unsigned long addr, + pte_t *ptep, pte_t old_pte, pte_t pte, + unsigned int nr); + #ifdef CONFIG_ARM64_CONTPTE /* diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 3d5fb37424ab..38325616f467 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -1524,24 +1525,41 @@ 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) { + pte_t pte = get_and_clear_full_ptes(vma->vm_mm, addr, ptep, nr, 0); + if (alternative_has_cap_unlikely(ARM64_WORKAROUND_2645198)) { /* * Break-before-make (BBM) is required for all user space mappings * when the permission changes from executable to non-executable * in cases where cpu is affected with errata #2645198. */ - if (pte_user_exec(ptep_get(ptep))) - return ptep_clear_flush(vma, addr, ptep); + if (pte_accessible(vma->vm_mm, pte) && pte_user_exec(pte)) + __flush_tlb_range(vma, addr, nr * PAGE_SIZE, + PAGE_SIZE, true, 3); } - return ptep_get_and_clear(vma->vm_mm, addr, ptep); + + return pte; +} + +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 modify_prot_commit_ptes(struct vm_area_struct *vma, unsigned long addr, + pte_t *ptep, pte_t old_pte, pte_t pte, + unsigned int nr) +{ + set_ptes(vma->vm_mm, addr, ptep, pte, nr); } void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t old_pte, pte_t pte) { - set_pte_at(vma->vm_mm, addr, ptep, pte); + modify_prot_commit_ptes(vma, addr, ptep, old_pte, pte, 1); } /* -- 2.30.2