Commit acd8bfaa authored Jan 06, 2026 by Mark Rutland Committed by Marc Zyngier Jan 07, 2026

KVM: arm64: Shuffle KVM_HOST_DATA_FLAG_* indices

There's a gap in the KVM_HOST_DATA_FLAG_* indices since the removal of
KVM_HOST_DATA_FLAG_HOST_SVE_ENABLED and
KVM_HOST_DATA_FLAG_HOST_SME_ENABLED in commits:

* 459f059b ("KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN")
* 407a99c4 ("KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN")

Shuffle the indices to remove the gap, as Oliver requested at the time of
the removals:

  https://lore.kernel.org/linux-arm-kernel/Z6qC4qn47ONfDCSH@linux.dev/



There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Fuad Tabba <tabba@google.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Will Deacon <will@kernel.org>
Tested-by: Fuad Tabba <tabba@google.com>
Reviewed-by: Fuad Tabba <tabba@google.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/20260106173707.3292074-3-mark.rutland@arm.com


Signed-off-by: Marc Zyngier <maz@kernel.org>

parent 334a1a1e

arch/arm64/include/asm/kvm_host.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -710,11 +710,11 @@ struct cpu_sve_state {
		struct kvm_host_data {
		#define KVM_HOST_DATA_FLAG_HAS_SPE 0
		#define KVM_HOST_DATA_FLAG_HAS_TRBE 1
		#define KVM_HOST_DATA_FLAG_TRBE_ENABLED 4
		#define KVM_HOST_DATA_FLAG_EL1_TRACING_CONFIGURED 5
		#define KVM_HOST_DATA_FLAG_VCPU_IN_HYP_CONTEXT 6
		#define KVM_HOST_DATA_FLAG_L1_VNCR_MAPPED 7
		#define KVM_HOST_DATA_FLAG_HAS_BRBE 8
		#define KVM_HOST_DATA_FLAG_TRBE_ENABLED 2
		#define KVM_HOST_DATA_FLAG_EL1_TRACING_CONFIGURED 3
		#define KVM_HOST_DATA_FLAG_VCPU_IN_HYP_CONTEXT 4
		#define KVM_HOST_DATA_FLAG_L1_VNCR_MAPPED 5
		#define KVM_HOST_DATA_FLAG_HAS_BRBE 6
		unsigned long flags;

		struct kvm_cpu_context host_ctxt;