Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c9ee829 authored by Marc Zyngier's avatar Marc Zyngier Committed by Greg Kroah-Hartman
Browse files

KVM: arm64: Allow AArch32 PSTATE.M to be restored as System mode 



commit dfe6d190f38fc5df5ff2614b463a5195a399c885 upstream.

It appears that we don't allow a vcpu to be restored in AArch32
System mode, as we *never* included it in the list of valid modes.

Just add it to the list of allowed modes.

Fixes: 0d854a60 ("arm64: KVM: enable initialization of a 32bit vcpu")
Cc: stable@vger.kernel.org
Acked-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20240524141956.1450304-3-maz@kernel.org


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e75faf01

arch/arm64/kvm/guest.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,7 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
		case PSR_AA32_MODE_SVC:

		case PSR_AA32_MODE_SVC:

		case PSR_AA32_MODE_ABT:

		case PSR_AA32_MODE_ABT:

		case PSR_AA32_MODE_UND:

		case PSR_AA32_MODE_UND:

		case PSR_AA32_MODE_SYS:

			if (!vcpu_el1_is_32bit(vcpu))

			if (!vcpu_el1_is_32bit(vcpu))

				return -EINVAL;

				return -EINVAL;

			break;

			break;