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

Commit 0299ca42 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Greg Kroah-Hartman
Browse files

x86/KVM/VMX: Separate the VMX AUTOLOAD guest/host number accounting 



commit 3190709335dd31fe1aeeebfe4ffb6c7624ef971f upstream

This allows to load a different number of MSRs depending on the context:
VMEXIT or VMENTER.

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 916f4623

arch/x86/kvm/vmx.c

+19 −10
Original line number Diff line number Diff line
@@ -2058,12 +2058,18 @@ static void clear_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr) 
	}

	i = find_msr(&m->guest, msr);

	if (i < 0)

		return;

		goto skip_guest;

	--m->guest.nr;

	--m->host.nr;

	m->guest.val[i] = m->guest.val[m->guest.nr];

	m->host.val[i] = m->host.val[m->host.nr];

	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, m->guest.nr);



skip_guest:

	i = find_msr(&m->host, msr);

	if (i < 0)

		return;



	--m->host.nr;

	m->host.val[i] = m->host.val[m->host.nr];

	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, m->host.nr);

}
@@ -2081,7 +2087,7 @@ static void add_atomic_switch_msr_special(struct vcpu_vmx *vmx, 
static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,

				  u64 guest_val, u64 host_val)

{

	int i;

	int i, j;

	struct msr_autoload *m = &vmx->msr_autoload;



	switch (msr) {
@@ -2117,21 +2123,24 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, 
	}



	i = find_msr(&m->guest, msr);

	if (i == NR_AUTOLOAD_MSRS) {

	j = find_msr(&m->host, msr);

	if (i == NR_AUTOLOAD_MSRS || j == NR_AUTOLOAD_MSRS) {

		printk_once(KERN_WARNING "Not enough msr switch entries. "

				"Can't add msr %x\n", msr);

		return;

	} else if (i < 0) {

	}

	if (i < 0) {

		i = m->guest.nr++;

		++m->host.nr;

		vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, m->guest.nr);

	}

	if (j < 0) {

		j = m->host.nr++;

		vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, m->host.nr);

	}



	m->guest.val[i].index = msr;

	m->guest.val[i].value = guest_val;

	m->host.val[i].index = msr;

	m->host.val[i].value = host_val;

	m->host.val[j].index = msr;

	m->host.val[j].value = host_val;

}



static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset)