Commit cb24c61b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull vkm fixes from Paolo Bonzini:
 "Two simple but important bugfixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: MIPS: Fix build errors for 32bit kernel
  KVM: nVMX: fixes for preemption timer migration
parents d45f47a4 3d9fdc25

Documentation/virt/kvm/api.rst

+3 −2
Original line number Diff line number Diff line
@@ -4339,14 +4339,15 @@ Errors: 
#define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE 0x00000001



  struct kvm_vmx_nested_state_hdr {

	__u32 flags;

	__u64 vmxon_pa;

	__u64 vmcs12_pa;

	__u64 preemption_timer_deadline;



	struct {

		__u16 flags;

	} smm;



	__u32 flags;

	__u64 preemption_timer_deadline;

  };



  struct kvm_vmx_nested_state_data {

arch/mips/kvm/emulate.c

+4 −0
Original line number Diff line number Diff line
@@ -1722,6 +1722,7 @@ enum emulation_result kvm_mips_emulate_store(union mips_instruction inst, 
			  vcpu->arch.gprs[rt], *(u32 *)data);

		break;



#if defined(CONFIG_64BIT) && defined(CONFIG_KVM_MIPS_VZ)

	case sdl_op:

		run->mmio.phys_addr = kvm_mips_callbacks->gva_to_gpa(

					vcpu->arch.host_cp0_badvaddr) & (~0x7);
@@ -1815,6 +1816,7 @@ enum emulation_result kvm_mips_emulate_store(union mips_instruction inst, 
			  vcpu->arch.pc, vcpu->arch.host_cp0_badvaddr,

			  vcpu->arch.gprs[rt], *(u64 *)data);

		break;

#endif



#ifdef CONFIG_CPU_LOONGSON64

	case sdc2_op:
@@ -2002,6 +2004,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, 
		}

		break;



#if defined(CONFIG_64BIT) && defined(CONFIG_KVM_MIPS_VZ)

	case ldl_op:

		run->mmio.phys_addr = kvm_mips_callbacks->gva_to_gpa(

					vcpu->arch.host_cp0_badvaddr) & (~0x7);
@@ -2073,6 +2076,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, 
			break;

		}

		break;

#endif



#ifdef CONFIG_CPU_LOONGSON64

	case ldc2_op:

arch/x86/include/uapi/asm/kvm.h

+3 −2
Original line number Diff line number Diff line
@@ -408,14 +408,15 @@ struct kvm_vmx_nested_state_data { 
};



struct kvm_vmx_nested_state_hdr {

	__u32 flags;

	__u64 vmxon_pa;

	__u64 vmcs12_pa;

	__u64 preemption_timer_deadline;



	struct {

		__u16 flags;

	} smm;



	__u32 flags;

	__u64 preemption_timer_deadline;

};



struct kvm_svm_nested_state_data {

arch/x86/kvm/vmx/nested.c

+1 −0
Original line number Diff line number Diff line
@@ -6176,6 +6176,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu, 
			goto error_guest_mode;

	}



	vmx->nested.has_preemption_timer_deadline = false;

	if (kvm_state->hdr.vmx.flags & KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE) {

		vmx->nested.has_preemption_timer_deadline = true;

		vmx->nested.preemption_timer_deadline =