Revert "kvm: x86: Use task structs fpu field for user" (ec269475) · Commits · 戴 / test

arch/x86/include/asm/kvm_host.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -607,15 +607,16 @@ struct kvm_vcpu_arch {

		/*
		* QEMU userspace and the guest each have their own FPU state.
		* In vcpu_run, we switch between the user, maintained in the
		* task_struct struct, and guest FPU contexts. While running a VCPU,
		* the VCPU thread will have the guest FPU context.
		* In vcpu_run, we switch between the user and guest FPU contexts.
		* While running a VCPU, the VCPU thread will have the guest FPU
		* context.
		*
		* Note that while the PKRU state lives inside the fpu registers,
		* it is switched out separately at VMENTER and VMEXIT time. The
		* "guest_fpu" state here contains the guest FPU context, with the
		* host PRKU bits.
		*/
		struct fpu user_fpu;
		struct fpu *guest_fpu;

		u64 xcr0;

+2 −2

Original line number	Diff line number	Diff line
		@@ -8270,7 +8270,7 @@ static void kvm_load_guest_fpu(struct kvm_vcpu *vcpu)
		{
		fpregs_lock();

		copy_fpregs_to_fpstate(&current->thread.fpu);
		copy_fpregs_to_fpstate(&vcpu->arch.user_fpu);
		/* PKRU is separately restored in kvm_x86_ops->run. */
		__copy_kernel_to_fpregs(&vcpu->arch.guest_fpu->state,
		~XFEATURE_MASK_PKRU);
		@@ -8287,7 +8287,7 @@ static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu)
		fpregs_lock();

		copy_fpregs_to_fpstate(vcpu->arch.guest_fpu);
		copy_kernel_to_fpregs(&current->thread.fpu.state);
		copy_kernel_to_fpregs(&vcpu->arch.user_fpu.state);

		fpregs_mark_activate();
		fpregs_unlock();