Skip to content

Commit dfb0589

Browse files
author
Marc Zyngier
committed
KVM: arm64: Allow ARM64_PTR_AUTH when ARM64_VHE=n
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 <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
1 parent 4a95a1b commit dfb0589

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/arm64/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,6 @@ menu "ARMv8.3 architectural features"
15161516
config ARM64_PTR_AUTH
15171517
bool "Enable support for pointer authentication"
15181518
default y
1519-
depends on !KVM || ARM64_VHE
15201519
depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC
15211520
# GCC 9.1 and later inserts a .note.gnu.property section note for PAC
15221521
# which is only understood by binutils starting with version 2.33.1.
@@ -1543,8 +1542,7 @@ config ARM64_PTR_AUTH
15431542

15441543
The feature is detected at runtime. If the feature is not present in
15451544
hardware it will not be advertised to userspace/KVM guest nor will it
1546-
be enabled. However, KVM guest also require VHE mode and hence
1547-
CONFIG_ARM64_VHE=y option to use this feature.
1545+
be enabled.
15481546

15491547
If the feature is present on the boot CPU but not on a late CPU, then
15501548
the late CPU will be parked. Also, if the boot CPU does not have

0 commit comments

Comments
 (0)