MIPS: KVM: Add missing disable FPU hazard barriers (4ac33429) · Commits · 戴 / test

Add the necessary hazard barriers after disabling the FPU in kvm_lose_fpu(), just to be safe. Signed-off-by:

James Hogan <james.hogan@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Radim KrÄmÃ¡Å™" <rkrcmar@redhat.com> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/mips/kvm/mips.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1556,8 +1556,10 @@ void kvm_lose_fpu(struct kvm_vcpu *vcpu)

		/* Disable MSA & FPU */
		disable_msa();
		if (vcpu->arch.fpu_inuse & KVM_MIPS_FPU_FPU)
		if (vcpu->arch.fpu_inuse & KVM_MIPS_FPU_FPU) {
		clear_c0_status(ST0_CU1 \| ST0_FR);
		disable_fpu_hazard();
		}
		vcpu->arch.fpu_inuse &= ~(KVM_MIPS_FPU_FPU \| KVM_MIPS_FPU_MSA);
		} else if (vcpu->arch.fpu_inuse & KVM_MIPS_FPU_FPU) {
		set_c0_status(ST0_CU1);
		@@ -1568,6 +1570,7 @@ void kvm_lose_fpu(struct kvm_vcpu *vcpu)

		/* Disable FPU */
		clear_c0_status(ST0_CU1 \| ST0_FR);
		disable_fpu_hazard();
		}
		preempt_enable();
		}

Admin message