From nobody Wed Dec 17 07:51:30 2025 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E27223148B1 for ; Tue, 2 Dec 2025 09:36:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764668214; cv=none; b=r3HpCdu+5KNnUc2Hzv6yjEfRolXJcXEYMq145kWj0ocTvtxRmUYwvBHaiKZ2xYx4VZ/TCwY3/N9iszQHp15WBYIYr+18i+H01PWZRmDxKKkXnsSt2uUdQZwxRDM5JG5rXQ84jHHIT+MzOlaAa51kM433Q+wohQyZX6Fyp778scA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764668214; c=relaxed/simple; bh=ek7D7WWdzdNHwi3z0RHwq7enFv8emJtG2QTxZ3CR+Xc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dvHROi61NXPk6VRb8vdokXV3k+eOHd1KlCI748Ymr0iNF8S57K23n402cbLmQcoOg5tFxqMV0wehlUdhNUtiMAjDvfWwNcEwXqDoPeostHuQlTwSyssPMVFbvcd3LwHpZYvJZ6PTJ9sP30AHzHs5CV4dziIZjkt5+maPBNTORhM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=00oAlJwY; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="00oAlJwY" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-42e2e448d01so1470680f8f.1 for ; Tue, 02 Dec 2025 01:36:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764668210; x=1765273010; darn=vger.kernel.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=8fxxhnznzIueTel3yKlstqT1bPrMuYbkBI5UywqwoXg=; b=00oAlJwYiB9zd+pyaDCizPX8Dwbj8scLBNPFv7oVcUxCbe0HEAZDncp7bVbg2e2gTF sGouPDfeVHk2jqouZydHMIoOmqbTaYLRUQYNNgHcYE/GdHDY8y+rpcmtDh2ef1s+hFiS Op25AxmiAcuWOdVU0vAI1z1iGhpwGW5c5On4fiYs3TrHORnGIv1bf1+FX/dzxTmM08oD 9+RV8MdrpsvwBOsGmZydEMKRboywdZXOBzk4NdwOKBz3PhqycHYJAWSHERAdkDn5HAEV C/4RyL5sH3xbBDosh0VhEblhuQodMs+k4jSZYz6hNGfeSixB1Xc760cxkFqoM5mAAnyo 2AGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764668210; x=1765273010; 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=8fxxhnznzIueTel3yKlstqT1bPrMuYbkBI5UywqwoXg=; b=u6oBULm2haA8fQulMpHadKIOLeqqdczzrOlMrtFWGEM8fyqeHwmZzOHlTZ797wOyry Ru31zc1WhC7rGduZFMG0Pvhc24uxWlrg6BGqW7Mho37odz8MVU1lmc7VSvXluOgP7ULC DYrKPnFRO9pUSNPliyOn8KVgRDcyF5BKB3Xom5mMegfbPfryT/yHI3CXEB7P1nI6piXR 7rBCjNsT2Ig134HAG7LKHM1f1qK5cQjlUEWel0T489NCKSiWKAwvuBoOqUW2f9+LVuOl 1X22EtquiB4mmjcv0dClrJJMEKnEmkVAGN86wxQ1u1bLPi8qsfQ7nxnY55RF5W7ZlNOh gsRA== X-Forwarded-Encrypted: i=1; AJvYcCVdnhno2ZLt1YpYD1BrJ1aXfYxcm1NHhTtNKTPmCQoC4mg83+Zklb2S47dBg+c54NBIoKJ899mCpbtP1uM=@vger.kernel.org X-Gm-Message-State: AOJu0YxOZ7L0kgqji3iE3oENHnfmpHc2msbIYtTR+vjMJ6HGtgVXUVrj xcK68+SO0jZWZhTx63pdqJtWKKtCoiVAiiFbngQ22gzKpKKwacr9gQ7YqFhtgXGhYLbLoYtMyAZ YRId4/ymHQS2mxQh1X/S32w== X-Google-Smtp-Source: AGHT+IGx3bQWSZofBrdFOMRaetX7EUPUhwnK47vPVXktbmp6aDtO5sto+D5sF+Nx0ERLO9FQcYvKQkcuoOnaNO1J X-Received: from wrnp7.prod.google.com ([2002:adf:ce07:0:b0:42b:55b3:8bd0]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2210:b0:42b:4961:eb4c with SMTP id ffacd0b85a97d-42e0f1d57f9mr31211022f8f.1.1764668210085; Tue, 02 Dec 2025 01:36:50 -0800 (PST) Date: Tue, 2 Dec 2025 09:36:12 +0000 In-Reply-To: <20251202093623.2337860-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251202093623.2337860-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.107.ga0afd4fd5b-goog Message-ID: <20251202093623.2337860-20-vdonnefort@google.com> Subject: [PATCH v9 19/30] KVM: arm64: Add PKVM_DISABLE_STAGE2_ON_PANIC From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort , Kalesh Singh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On NVHE_EL2_DEBUG, when using pKVM, the host stage-2 is relaxed to grant the kernel access to the stacktrace, hypervisor bug table and text to symbolize addresses. This is unsafe for production. In preparation for adding more debug options to NVHE_EL2_DEBUG, decouple the stage-2 relaxation into a separate option. While at it, rename PROTECTED_NVHE_STACKTRACE into PKVM_STACKTRACE, following the same naming scheme as PKVM_DISABLE_STAGE2_ON_PANIC. Cc: Kalesh Singh Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 4f803fd1c99a..6498dec00fe9 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -43,9 +43,27 @@ menuconfig KVM =20 If unsure, say N. =20 +if KVM + +config PTDUMP_STAGE2_DEBUGFS + bool "Present the stage-2 pagetables to debugfs" + depends on DEBUG_KERNEL + depends on DEBUG_FS + depends on ARCH_HAS_PTDUMP + select PTDUMP + default n + help + Say Y here if you want to show the stage-2 kernel pagetables + layout in a debugfs file. This information is only useful for kernel de= velopers + who are working in architecture specific areas of the kernel. + It is probably not a good idea to enable this feature in a production + kernel. + + If in doubt, say N. + config NVHE_EL2_DEBUG bool "Debug mode for non-VHE EL2 object" - depends on KVM + default n help Say Y here to enable the debug mode for the non-VHE KVM EL2 object. Failure reports will BUG() in the hypervisor. This is intended for @@ -53,10 +71,23 @@ config NVHE_EL2_DEBUG =20 If unsure, say N. =20 -config PROTECTED_NVHE_STACKTRACE - bool "Protected KVM hypervisor stacktraces" - depends on NVHE_EL2_DEBUG +if NVHE_EL2_DEBUG + +config PKVM_DISABLE_STAGE2_ON_PANIC + bool "Disable the host stage-2 on panic" default n + help + Relax the host stage-2 on hypervisor panic to allow the kernel to + unwind and symbolize the hypervisor stacktrace. This however tampers + the system security. This is intended for local EL2 hypervisor + development. + + If unsure, say N. + +config PKVM_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on PKVM_DISABLE_STAGE2_ON_PANIC + default y help Say Y here to enable pKVM hypervisor stacktraces on hyp_panic() =20 @@ -66,21 +97,6 @@ config PROTECTED_NVHE_STACKTRACE =20 If unsure, or not using protected nVHE (pKVM), say N. =20 -config PTDUMP_STAGE2_DEBUGFS - bool "Present the stage-2 pagetables to debugfs" - depends on KVM - depends on DEBUG_KERNEL - depends on DEBUG_FS - depends on ARCH_HAS_PTDUMP - select PTDUMP - default n - help - Say Y here if you want to show the stage-2 kernel pagetables - layout in a debugfs file. This information is only useful for kernel de= velopers - who are working in architecture specific areas of the kernel. - It is probably not a good idea to enable this feature in a production - kernel. - - If in doubt, say N. - +endif # NVHE_EL2_DEBUG +endif # KVM endif # VIRTUALIZATION diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index cc7d5d1709cb..54aedf93c78b 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -539,7 +539,7 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, = u64 spsr, =20 /* All hyp bugs, including warnings, are treated as fatal. */ if (!is_protected_kvm_enabled() || - IS_ENABLED(CONFIG_NVHE_EL2_DEBUG)) { + IS_ENABLED(CONFIG_PKVM_DISABLE_STAGE2_ON_PANIC)) { struct bug_entry *bug =3D find_bug(elr_in_kimg); =20 if (bug) diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S index eef15b374abb..3092befcd97c 100644 --- a/arch/arm64/kvm/hyp/nvhe/host.S +++ b/arch/arm64/kvm/hyp/nvhe/host.S @@ -120,7 +120,7 @@ SYM_FUNC_START(__hyp_do_panic) =20 mov x29, x0 =20 -#ifdef CONFIG_NVHE_EL2_DEBUG +#ifdef PKVM_DISABLE_STAGE2_ON_PANIC /* Ensure host stage-2 is disabled */ mrs x0, hcr_el2 bic x0, x0, #HCR_VM diff --git a/arch/arm64/kvm/hyp/nvhe/stacktrace.c b/arch/arm64/kvm/hyp/nvhe= /stacktrace.c index 5b6eeab1a774..7c832d60d22b 100644 --- a/arch/arm64/kvm/hyp/nvhe/stacktrace.c +++ b/arch/arm64/kvm/hyp/nvhe/stacktrace.c @@ -34,7 +34,7 @@ static void hyp_prepare_backtrace(unsigned long fp, unsig= ned long pc) stacktrace_info->pc =3D pc; } =20 -#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +#ifdef CONFIG_PKVM_STACKTRACE #include =20 DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_sta= cktrace); @@ -134,11 +134,11 @@ static void pkvm_save_backtrace(unsigned long fp, uns= igned long pc) =20 unwind(&state, pkvm_save_backtrace_entry, &idx); } -#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +#else /* !CONFIG_PKVM_STACKTRACE */ static void pkvm_save_backtrace(unsigned long fp, unsigned long pc) { } -#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +#endif /* CONFIG_PKVM_STACKTRACE */ =20 /* * kvm_nvhe_prepare_backtrace - prepare to dump the nVHE backtrace diff --git a/arch/arm64/kvm/stacktrace.c b/arch/arm64/kvm/stacktrace.c index af5eec681127..9724c320126b 100644 --- a/arch/arm64/kvm/stacktrace.c +++ b/arch/arm64/kvm/stacktrace.c @@ -197,7 +197,7 @@ static void hyp_dump_backtrace(unsigned long hyp_offset) kvm_nvhe_dump_backtrace_end(); } =20 -#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +#ifdef CONFIG_PKVM_STACKTRACE DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); =20 @@ -225,12 +225,12 @@ static void pkvm_dump_backtrace(unsigned long hyp_off= set) kvm_nvhe_dump_backtrace_entry((void *)hyp_offset, stacktrace[i]); kvm_nvhe_dump_backtrace_end(); } -#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +#else /* !CONFIG_PKVM_STACKTRACE */ static void pkvm_dump_backtrace(unsigned long hyp_offset) { - kvm_err("Cannot dump pKVM nVHE stacktrace: !CONFIG_PROTECTED_NVHE_STACKTR= ACE\n"); + kvm_err("Cannot dump pKVM nVHE stacktrace: !CONFIG_PKVM_STACKTRACE\n"); } -#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +#endif /* CONFIG_PKVM_STACKTRACE */ =20 /* * kvm_nvhe_dump_backtrace - Dump KVM nVHE hypervisor backtrace. --=20 2.52.0.107.ga0afd4fd5b-goog