From patchwork Tue Sep 12 14:16:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13381802 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 48E63CA0EEB for ; Tue, 12 Sep 2023 14:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=T7a0Psm0WaGnjoltSJwokKaaQgS2FwPz68/PXk9kLfY=; b=ju0rW+VHISuxxI5KX1cQk7OO8o rBfuYz+a4LzFNT32mY23sOsmsm60GrmEsDxoavZhMb7lEj76Nutc1X1ccxLU2zgl+s0E82ui0T0PJ ukUFe4VcQZUjBdAmlV6ePJGRc/6IRIpQsxdrVZfuaRkFUQm0AA6r8hqM2ci353wKnNp4v2FyLcUvA XrW5ts47aZPb8Vt/gWsHGNVgY35YoBqVqPcPHJPTZFjhS4uGR/JvR2EpraYIrcrp1Q+3pMZqhI5rr 0sAWCxDSVa3+0TWBqavVjPYeZ+dlJTOJtgR4luNOJCzKA+R0uMim6YuKulIaEu0U4jC9k9xmZmwuK 2ew7/Dww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg4FM-003Y2e-0e; Tue, 12 Sep 2023 14:20:08 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qg4E8-003Wzk-35 for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 14:19:10 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-58d9e327d3aso61945467b3.3 for ; Tue, 12 Sep 2023 07:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694528331; x=1695133131; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aLPqD5n9wVyy6M59tP+XXcO5gA8PIr1yOKAAodK2KXs=; b=F6+KzdWGCadlrLlKks4IlJ5GfTOofMwc0rVkjuhJYklyv1O5Bm26PLl/2tRWNfTj43 1gzVQbCk8ZKKnK1e72PYhCfchWY0vPe7EyjIuH7J35ZgLbCapmoMvNsfw9tr1q6wbYcu gJmNXvEy7eryy8jY85sE+xoN+fUkewxqPYx7883Xg9m1Yj4S8xTAvtqjWFfDDdKvWKmQ HMtfAq8vS2/cBgQhIjbypG+yju1Ge777FfUsy2DAjF8Va/+dPpbcO8GPHmkCtIGIX+Yj 2uAvRuxCGkYQwDIfhP1d/+mXOOR71wgmA+oMoMneuorySiT2daJfzwx4Yke95AzAjmiG d28A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694528331; x=1695133131; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aLPqD5n9wVyy6M59tP+XXcO5gA8PIr1yOKAAodK2KXs=; b=PiDCMqQw+5MXFIkbKhaWwz3/ZBJFxIoHA+MuikQ0gyynJiB2oAWu3xSCU7UQZdXR1i bdoIc1NEXJD9bXzprJhRkBhi0sSb3wl9XuFVL7VS6ChpF9TkxehuiFVYQEuvM3eRi29H zwaYTzaTRnlpBl1HTMkjgIjIYunEhxrCJveVNMEQVrC4wz+ETjbv8xdjGgvzBxg7JhN4 UwiSbK/4sPypNbgpYQisxOWyuwSkrOimyLg7jTLMlu/igTL6tXg/8Lb3adEo826vXmVP AixFn+uR3eUw5djKBshrUsHRdA6CtacSv0uBicCc6c3WILTblCTABr25vEfoO/0Ssh4F +7wQ== X-Gm-Message-State: AOJu0YzL/VFN9yP+U8WJDswDkDhJ3aYqm92sQfewKLNAcFA6Y25TSDII SzpUrTiYfDxfZY5Gbmb6eFit7GT3my54tbA6lkUyjYgKmN8YQnqLW4ukayOSM0MxXGukXVwRpvL ogII6bnPmDXMG/lHF+WTkvkbPaTe9i8nzVV/wg436pLE0K0wA0yjNqaxezP/BSspxjkkL7y99hD k= X-Google-Smtp-Source: AGHT+IETHWFelk6Mub34hbl75oMBkoJ65akYwAcLu4qq51tBseIZYkZ98qMqGR2LU1JqHBfdJjkCSmc1 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:6902:1682:b0:d7b:8d0c:43f1 with SMTP id bx2-20020a056902168200b00d7b8d0c43f1mr306276ybb.9.1694528331394; Tue, 12 Sep 2023 07:18:51 -0700 (PDT) Date: Tue, 12 Sep 2023 14:16:29 +0000 In-Reply-To: <20230912141549.278777-63-ardb@google.com> Mime-Version: 1.0 References: <20230912141549.278777-63-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=3756; i=ardb@kernel.org; h=from:subject; bh=PA9RNauLEmhgmumF9kAUNop/3oYCQfl1LaCcmXQBZZk=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZWhaP8hlSlMZ+Jn17Pv0N2ls3jduZRTonPezgqqmX2aS yS2riCro5SFQYyDQVZMkUVg9t93O09PlKp1niULM4eVCWQIAxenAExk6nmG32yZGYcerLre2fHq 3fMvBdqqLvmFxyYcLH6rpsO/4KXpgypGhjv/u32t2j4U7Ev//PhmhTE/t1dY+cQbm0N0FExik69 68QIA X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230912141549.278777-102-ardb@google.com> Subject: [PATCH v4 39/61] arm64: Revert "mm: provide idmap pointer to cpu_replace_ttbr1()" From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook , Joey Gouly X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_071853_016438_649AC1B9 X-CRM114-Status: GOOD ( 15.48 ) 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 From: Ard Biesheuvel This reverts commit 1682c45b920643c, which is no longer needed now that we create the permanent kernel mapping directly during early boot. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/mmu_context.h | 13 ++++--------- arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/kernel/suspend.c | 2 +- arch/arm64/mm/kasan_init.c | 4 ++-- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index bea13dc4469f..e1eacba3f757 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -108,18 +108,13 @@ static inline void cpu_uninstall_idmap(void) cpu_switch_mm(mm->pgd, mm); } -static inline void __cpu_install_idmap(pgd_t *idmap) +static inline void cpu_install_idmap(void) { cpu_set_reserved_ttbr0(); local_flush_tlb_all(); cpu_set_idmap_tcr_t0sz(); - cpu_switch_mm(lm_alias(idmap), &init_mm); -} - -static inline void cpu_install_idmap(void) -{ - __cpu_install_idmap(idmap_pg_dir); + cpu_switch_mm(lm_alias(idmap_pg_dir), &init_mm); } /* @@ -150,7 +145,7 @@ static inline void cpu_install_ttbr0(phys_addr_t ttbr0, unsigned long t0sz) * Atomically replaces the active TTBR1_EL1 PGD with a new VA-compatible PGD, * avoiding the possibility of conflicting TLB entries being allocated. */ -static inline void cpu_replace_ttbr1(pgd_t *pgdp, pgd_t *idmap) +static inline void cpu_replace_ttbr1(pgd_t *pgdp) { typedef void (ttbr_replace_func)(phys_addr_t); extern ttbr_replace_func idmap_cpu_replace_ttbr1; @@ -174,7 +169,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp, pgd_t *idmap) replace_phys = (void *)__pa_symbol(idmap_cpu_replace_ttbr1); - __cpu_install_idmap(idmap); + cpu_install_idmap(); /* * We really don't want to take *any* exceptions while TTBR1 is diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index c91f658b175e..0014645c5417 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -3381,7 +3381,7 @@ subsys_initcall_sync(init_32bit_el0_mask); static void __maybe_unused cpu_enable_cnp(struct arm64_cpu_capabilities const *cap) { - cpu_replace_ttbr1(lm_alias(swapper_pg_dir), idmap_pg_dir); + cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); } /* diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c index 0fbdf5fe64d8..7c2391851db6 100644 --- a/arch/arm64/kernel/suspend.c +++ b/arch/arm64/kernel/suspend.c @@ -55,7 +55,7 @@ void notrace __cpu_suspend_exit(void) /* Restore CnP bit in TTBR1_EL1 */ if (system_supports_cnp()) - cpu_replace_ttbr1(lm_alias(swapper_pg_dir), idmap_pg_dir); + cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); /* * PSTATE was not saved over suspend/resume, re-enable any detected diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 856bda5fa19d..82798dcd6323 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -220,7 +220,7 @@ static void __init kasan_init_shadow(void) */ memcpy(tmp_pg_dir, swapper_pg_dir, sizeof(tmp_pg_dir)); dsb(ishst); - cpu_replace_ttbr1(lm_alias(tmp_pg_dir), idmap_pg_dir); + cpu_replace_ttbr1(lm_alias(tmp_pg_dir)); clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END); @@ -256,7 +256,7 @@ static void __init kasan_init_shadow(void) PAGE_KERNEL_RO)); memset(kasan_early_shadow_page, KASAN_SHADOW_INIT, PAGE_SIZE); - cpu_replace_ttbr1(lm_alias(swapper_pg_dir), idmap_pg_dir); + cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); } static void __init kasan_init_depth(void)