| Message ID | 20240524141956.1450304-3-maz@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | KVM/arm64 fixes for AArch32 handling | expand |
On Fri, May 24, 2024 at 03:19:55PM +0100, Marc Zyngier wrote: > It appears that we don't allowed a vcpu to be restored in AArch32 s/allowed/allow/ > System mode, as we *never* included it in the list of valid modes. > > Just add it to the list of allowed modes. > > Fixes: 0d854a60b1d7 ("arm64: KVM: enable initialization of a 32bit vcpu") > Signed-off-by: Marc Zyngier <maz@kernel.org> > Cc: stable@vger.kernel.org > --- > arch/arm64/kvm/guest.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c > index d9617b11f7a8..11098eb7eb44 100644 > --- a/arch/arm64/kvm/guest.c > +++ b/arch/arm64/kvm/guest.c > @@ -251,6 +251,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_ABT: > case PSR_AA32_MODE_UND: > + case PSR_AA32_MODE_SYS: > if (!vcpu_el1_is_32bit(vcpu)) > return -EINVAL; > break; > -- > 2.39.2 >
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index d9617b11f7a8..11098eb7eb44 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -251,6 +251,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_ABT: case PSR_AA32_MODE_UND: + case PSR_AA32_MODE_SYS: if (!vcpu_el1_is_32bit(vcpu)) return -EINVAL; break;
It appears that we don't allowed 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: 0d854a60b1d7 ("arm64: KVM: enable initialization of a 32bit vcpu") Signed-off-by: Marc Zyngier <maz@kernel.org> Cc: stable@vger.kernel.org --- arch/arm64/kvm/guest.c | 1 + 1 file changed, 1 insertion(+)