diff mbox series

[02/56] KVM: arm64: Allow ARM64_PTR_AUTH when ARM64_VHE=n

Message ID	20200805175700.62775-3-maz@kernel.org (mailing list archive)
State	Mainlined
Commit	dfb0589c8fff9dde809b9013335a6b8019b299b8
Headers	show Return-Path: <SRS0=mC2f=BP=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9870D22CA1 From: Marc Zyngier <maz@kernel.org> To: Paolo Bonzini <pbonzini@redhat.com> Subject: [PATCH 02/56] KVM: arm64: Allow ARM64_PTR_AUTH when ARM64_VHE=n Date: Wed, 5 Aug 2020 18:56:06 +0100 Message-Id: <20200805175700.62775-3-maz@kernel.org> In-Reply-To: <20200805175700.62775-1-maz@kernel.org> References: <20200805175700.62775-1-maz@kernel.org> MIME-Version: 1.0 summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender Precedence: list Cc: Mark Rutland <mark.rutland@arm.com>, Peng Hao <richard.peng@oppo.com>, kernel-team@android.com, Gavin Shan <gshan@redhat.com>, kvm@vger.kernel.org, Will Deacon <will@kernel.org>, Quentin Perret <qperret@google.com>, Catalin Marinas <catalin.marinas@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Christoffer Dall <christoffer.dall@arm.com>, Eric Auger <eric.auger@redhat.com>, Alexander Graf <graf@amazon.com>, Andrew Scull <ascull@google.com>, James Morse <james.morse@arm.com>, David Brazdil <dbrazdil@google.com>, Alexandru Elisei <alexandru.elisei@arm.com>, kvmarm@lists.cs.columbia.edu, Julien Thierry <julien.thierry.kdev@gmail.com>, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
Series	[01/56] KVM: arm64: Enable Address Authentication at EL2 if available \| expand [01/56] KVM: arm64: Enable Address Authentication at EL2 if available [02/56] KVM: arm64: Allow ARM64_PTR_AUTH when ARM64_VHE=n [03/56] KVM: arm64: Allow PtrAuth to be enabled from userspace on non-VHE systems [04/56] KVM: arm64: Check HCR_EL2 instead of shadow copy to swap PtrAuth registers [05/56] KVM: arm64: Simplify PtrAuth alternative patching [06/56] KVM: arm64: Allow in-atomic injection of SPIs [07/56] arm64: kvm: Remove kern_hyp_va from get_vcpu_ptr [08/56] KVM: arm64: Drop the target_table[] indirection [09/56] KVM: arm64: Tolerate an empty target_table list [10/56] KVM: arm64: Move ACTLR_EL1 emulation to the sys_reg_descs array [11/56] KVM: arm64: Remove target_table from exit handlers [12/56] KVM: arm64: Remove the target table [13/56] KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe [14/56] KVM: arm64: Move __smccc_workaround_1_smc to .rodata [15/56] KVM: arm64: Add build rules for separate VHE/nVHE object files [16/56] KVM: arm64: Use build-time defines in has_vhe() [17/56] KVM: arm64: Handle calls to prefixed hyp functions [18/56] KVM: arm64: Build hyp-entry.S separately for VHE/nVHE [19/56] KVM: arm64: Move hyp-init.S to nVHE [20/56] KVM: arm64: Duplicate hyp/tlb.c for VHE/nVHE [21/56] KVM: arm64: Split hyp/switch.c to VHE/nVHE [22/56] KVM: arm64: Split hyp/debug-sr.c to VHE/nVHE [23/56] KVM: arm64: Split hyp/sysreg-sr.c to VHE/nVHE [24/56] KVM: arm64: Duplicate hyp/timer-sr.c for VHE/nVHE [25/56] KVM: arm64: Compile remaining hyp/ files for both VHE/nVHE [26/56] KVM: arm64: Remove __hyp_text macro, use build rules instead [27/56] KVM: arm64: Lift instrumentation restrictions on VHE [28/56] KVM: arm64: vgic-its: Change default outer cacheability for {PEND, PROP}BASER [29/56] KVM: arm64: Drop long gone function parameter documentation [30/56] KVM: arm64: Rename HSR to ESR [31/56] arm64: Detect the ARMv8.4 TTL feature [32/56] arm64: Document SW reserved PTE/PMD bits in Stage-2 descriptors [33/56] arm64: Add level-hinted TLB invalidation helper [34/56] KVM: arm64: Factor out stage 2 page table data from struct kvm [35/56] KVM: arm64: Use TTL hint in when invalidating stage-2 translations [36/56] KVM: arm64: Introduce accessor for ctxt->sys_reg [37/56] KVM: arm64: hyp: Use ctxt_sys_reg/__vcpu_sys_reg instead of raw sys_regs access [38/56] KVM: arm64: sve: Use __vcpu_sys_reg() instead of raw sys_regs access [39/56] KVM: arm64: pauth: Use ctxt_sys_reg() instead of raw sys_regs access [40/56] KVM: arm64: debug: Drop useless vpcu parameter [41/56] KVM: arm64: Make struct kvm_regs userspace-only [42/56] KVM: arm64: Move ELR_EL1 to the system register array [43/56] KVM: arm64: Move SP_EL1 to the system register array [44/56] KVM: arm64: Disintegrate SPSR array [45/56] KVM: arm64: Move SPSR_EL1 to the system register array [46/56] KVM: arm64: timers: Rename kvm_timer_sync_hwstate to kvm_timer_sync_user [47/56] KVM: arm64: timers: Move timer registers to the sys_regs file [48/56] KVM: arm64: Don't use has_vhe() for CHOOSE_HYP_SYM() [49/56] KVM: arm64: Make nVHE ASLR conditional on RANDOMIZE_BASE [50/56] KVM: arm64: Substitute RANDOMIZE_BASE for HARDEN_EL2_VECTORS [51/56] KVM: arm64: Ensure that all nVHE hyp code is in .hyp.text [52/56] KVM: arm: Add trace name for ARM_NISV [53/56] KVM: arm64: Rename kvm_vcpu_dabt_isextabt() [54/56] KVM: arm64: Handle data and instruction external aborts the same way [55/56] KVM: arm64: Don't skip cache maintenance for read-only memslots [56/56] KVM: arm64: Move S1PTW S2 fault logic out of io_mem_abort()

Commit Message

Marc Zyngier Aug. 5, 2020, 5:56 p.m. UTC

We currently prevent PtrAuth from even being built if KVM is selected,
but VHE isn't. It is a bit of a pointless restriction, since we also
check this at run time (rejecting the enabling of PtrAuth for the
vcpu if we're not running with VHE).

Just drop this apparently useless restriction.

Acked-by: Andrew Scull <ascull@google.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/Kconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 31380da53689..d719ea9c596d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1516,7 +1516,6 @@  menu "ARMv8.3 architectural features"
 config ARM64_PTR_AUTH
 	bool "Enable support for pointer authentication"
 	default y
-	depends on !KVM || ARM64_VHE
 	depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC
 	# GCC 9.1 and later inserts a .note.gnu.property section note for PAC
 	# which is only understood by binutils starting with version 2.33.1.
@@ -1543,8 +1542,7 @@  config ARM64_PTR_AUTH
 
 	  The feature is detected at runtime. If the feature is not present in
 	  hardware it will not be advertised to userspace/KVM guest nor will it
-	  be enabled. However, KVM guest also require VHE mode and hence
-	  CONFIG_ARM64_VHE=y option to use this feature.
+	  be enabled.
 
 	  If the feature is present on the boot CPU but not on a late CPU, then
 	  the late CPU will be parked. Also, if the boot CPU does not have