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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4968FC71155 for ; Mon, 16 Jun 2025 11:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=uobnrZ+MS08ofep1n0N6S+GEVHPJ522p6PLXdqs0keI=; b=CT8McTatgLUJ5FNbSkZeJLUoLy WjggE/7vYt4vhfGP6FD7YGljcYHRLUIpyp7C2ipyCARjRuHjFoc3FrHKJeMbCF6ceqkgtMSlhC7SS oca6tndLipKQXwdL/7LbEcrRaeB5DdgCpmPNN54FR/NV+fpAi2DOivvFNlH9NATM6I8DfZWVtvMvl rFQdT8amWK50mUzrOnHzwXBPgqnS4PuCtmgrIJLZ2Ib+s2V17B70apoEI9hR/xNk/lb3NLrRjPftk q6NeFLix8jNneXgfCVP9QTC3My00L3KfO0T+XFKjvpysb4VGzvN05zD2FPRoBwfFqhd29v/6xyIxi vMG7fXbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uR8EN-00000004EXA-0xKt; Mon, 16 Jun 2025 11:42:27 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uR79U-0000000451s-1aqo for linux-arm-kernel@lists.infradead.org; Mon, 16 Jun 2025 10:33:21 +0000 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 6F94B150C; Mon, 16 Jun 2025 03:32:56 -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 2417F3F58B; Mon, 16 Jun 2025 03:33:13 -0700 (PDT) From: Dev Jain To: catalin.marinas@arm.com, will@kernel.org Cc: anshuman.khandual@arm.com, quic_zhenhuah@quicinc.com, ryan.roberts@arm.com, kevin.brodsky@arm.com, yangyicong@hisilicon.com, joey.gouly@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, david@redhat.com, Dev Jain Subject: [PATCH v3] arm64: Enable vmalloc-huge with ptdump Date: Mon, 16 Jun 2025 16:03:10 +0530 Message-Id: <20250616103310.17625-1-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250616_033320_510569_1B36B7A5 X-CRM114-Status: GOOD ( 20.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org arm64 disables vmalloc-huge when kernel page table dumping is enabled, because an intermediate table may be removed, potentially causing the ptdump code to dereference an invalid address. We want to be able to analyze block vs page mappings for kernel mappings with ptdump, so to enable vmalloc-huge with ptdump, synchronize between page table removal in pmd_free_pte_page()/pud_free_pmd_page() and ptdump pagetable walking. We use mmap_read_lock and not write lock because we don't need to synchronize between two different vm_structs; two vmalloc objects running this same code path will point to different page tables, hence there is no race. For pud_free_pmd_page(), we isolate the PMD table to avoid taking the lock 512 times again via pmd_free_pte_page(). We implement the locking mechanism using static keys, since the chance of a race is very small. Observe that the synchronization is needed to avoid the following race: CPU1 CPU2 take reference of PMD table pud_clear() pte_free_kernel() walk freed PMD table and similar race between pmd_free_pte_page and ptdump_walk_pgd. Therefore, there are two cases: if ptdump sees the cleared PUD, then we are safe. If not, then the patched-in read and write locks help us avoid the race. To implement the mechanism, we need the static key access from mmu.c and ptdump.c. Note that in case !CONFIG_PTDUMP_DEBUGFS, ptdump.o won't be a target in the Makefile, therefore we cannot initialize the key there, as is being done, for example, in the static key implementation of hugetlb-vmemmap. Therefore, include asm/cpufeature.h, which includes the jump_label mechanism. Declare the key there and define the key to false in mmu.c. No issues were observed with mm-selftests. No issues were observed while parallelly running test_vmalloc.sh and dumping the kernel pagetable through sysfs in a loop. v2->v3: - Use static key mechanism v1->v2: - Take lock only when CONFIG_PTDUMP_DEBUGFS is on - In case of pud_free_pmd_page(), isolate the PMD table to avoid taking the lock 512 times again via pmd_free_pte_page() Signed-off-by: Dev Jain --- arch/arm64/include/asm/cpufeature.h | 1 + arch/arm64/mm/mmu.c | 51 ++++++++++++++++++++++++++--- arch/arm64/mm/ptdump.c | 5 +++ 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index c4326f1cb917..3e386563b587 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -26,6 +26,7 @@ #include #include +DECLARE_STATIC_KEY_FALSE(ptdump_lock_key); /* * CPU feature register tracking * diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 8fcf59ba39db..e242ba428820 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -41,11 +41,14 @@ #include #include #include +#include #define NO_BLOCK_MAPPINGS BIT(0) #define NO_CONT_MAPPINGS BIT(1) #define NO_EXEC_MAPPINGS BIT(2) /* assumes FEAT_HPDS is not used */ +DEFINE_STATIC_KEY_FALSE(ptdump_lock_key); + enum pgtable_type { TABLE_PTE, TABLE_PMD, @@ -1267,8 +1270,9 @@ int pmd_clear_huge(pmd_t *pmdp) return 1; } -int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr) +static int __pmd_free_pte_page(pmd_t *pmdp, unsigned long addr, bool lock) { + bool lock_taken = false; pte_t *table; pmd_t pmd; @@ -1279,15 +1283,29 @@ int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr) return 1; } + /* See comment in pud_free_pmd_page for static key logic */ table = pte_offset_kernel(pmdp, addr); pmd_clear(pmdp); __flush_tlb_kernel_pgtable(addr); + if (static_branch_unlikely(&ptdump_lock_key) && lock) { + mmap_read_lock(&init_mm); + lock_taken = true; + } + if (unlikely(lock_taken)) + mmap_read_unlock(&init_mm); + pte_free_kernel(NULL, table); return 1; } +int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr) +{ + return __pmd_free_pte_page(pmdp, addr, true); +} + int pud_free_pmd_page(pud_t *pudp, unsigned long addr) { + bool lock_taken = false; pmd_t *table; pmd_t *pmdp; pud_t pud; @@ -1301,15 +1319,40 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr) } table = pmd_offset(pudp, addr); + /* + * Isolate the PMD table; in case of race with ptdump, this helps + * us to avoid taking the lock in __pmd_free_pte_page(). + * + * Static key logic: + * + * Case 1: If ptdump does static_branch_enable(), and after that we + * execute the if block, then this patches in the read lock, ptdump has + * the write lock patched in, therefore ptdump will never read from + * a potentially freed PMD table. + * + * Case 2: If the if block starts executing before ptdump's + * static_branch_enable(), then no locking synchronization + * will be done. However, pud_clear() + the dsb() in + * __flush_tlb_kernel_pgtable will ensure that ptdump observes an + * empty PUD. Thus, it will never walk over a potentially freed + * PMD table. + */ + pud_clear(pudp); + __flush_tlb_kernel_pgtable(addr); + if (static_branch_unlikely(&ptdump_lock_key)) { + mmap_read_lock(&init_mm); + lock_taken = true; + } + if (unlikely(lock_taken)) + mmap_read_unlock(&init_mm); + pmdp = table; next = addr; end = addr + PUD_SIZE; do { - pmd_free_pte_page(pmdp, next); + __pmd_free_pte_page(pmdp, next, false); } while (pmdp++, next += PMD_SIZE, next != end); - pud_clear(pudp); - __flush_tlb_kernel_pgtable(addr); pmd_free(NULL, table); return 1; } diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index 421a5de806c6..f75e12a1d068 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -25,6 +25,7 @@ #include #include +#include #define pt_dump_seq_printf(m, fmt, args...) \ ({ \ @@ -311,7 +312,9 @@ void ptdump_walk(struct seq_file *s, struct ptdump_info *info) } }; + static_branch_enable(&ptdump_lock_key); ptdump_walk_pgd(&st.ptdump, info->mm, NULL); + static_branch_disable(&ptdump_lock_key); } static void __init ptdump_initialize(void) @@ -353,7 +356,9 @@ bool ptdump_check_wx(void) } }; + static_branch_enable(&ptdump_lock_key); ptdump_walk_pgd(&st.ptdump, &init_mm, NULL); + static_branch_disable(&ptdump_lock_key); if (st.wx_pages || st.uxn_pages) { pr_warn("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n", -- 2.30.2