* [PATCH v4] KVM: nVMX: Set segment infomation of L1 when L2 exits
@ 2013-07-15 7:21 Arthur Chunqi Li
2013-07-15 7:48 ` Gleb Natapov
0 siblings, 1 reply; 2+ messages in thread
From: Arthur Chunqi Li @ 2013-07-15 7:21 UTC (permalink / raw)
To: kvm; +Cc: gleb, pbonzini, jan.kiszka, Arthur Chunqi Li
When L2 exits to L1, segment infomations of L1 are not set correctly.
According to Intel SDM 27.5.2(Loading Host Segment and Descriptor
Table Registers), segment base/limit/access right of L1 should be
set to some designed value when L2 exits to L1. This patch fixes
this.
Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com>
---
arch/x86/kvm/vmx.c | 55 ++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 45 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 064d0be..85b302b 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7948,6 +7948,8 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
struct vmcs12 *vmcs12)
{
+ struct kvm_segment seg;
+
if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_EFER)
vcpu->arch.efer = vmcs12->host_ia32_efer;
else if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
@@ -8001,16 +8003,6 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
vmcs_writel(GUEST_SYSENTER_EIP, vmcs12->host_ia32_sysenter_eip);
vmcs_writel(GUEST_IDTR_BASE, vmcs12->host_idtr_base);
vmcs_writel(GUEST_GDTR_BASE, vmcs12->host_gdtr_base);
- vmcs_writel(GUEST_TR_BASE, vmcs12->host_tr_base);
- vmcs_writel(GUEST_GS_BASE, vmcs12->host_gs_base);
- vmcs_writel(GUEST_FS_BASE, vmcs12->host_fs_base);
- vmcs_write16(GUEST_ES_SELECTOR, vmcs12->host_es_selector);
- vmcs_write16(GUEST_CS_SELECTOR, vmcs12->host_cs_selector);
- vmcs_write16(GUEST_SS_SELECTOR, vmcs12->host_ss_selector);
- vmcs_write16(GUEST_DS_SELECTOR, vmcs12->host_ds_selector);
- vmcs_write16(GUEST_FS_SELECTOR, vmcs12->host_fs_selector);
- vmcs_write16(GUEST_GS_SELECTOR, vmcs12->host_gs_selector);
- vmcs_write16(GUEST_TR_SELECTOR, vmcs12->host_tr_selector);
if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT)
vmcs_write64(GUEST_IA32_PAT, vmcs12->host_ia32_pat);
@@ -8018,6 +8010,49 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
vmcs12->host_ia32_perf_global_ctrl);
+ /* Set L1 segment info according to Intel SDM
+ 27.5.2 Loading Host Segment and Descriptor-Table Registers */
+ memset(&seg, 0, sizeof(struct kvm_segment));
+ seg.base = 0;
+ seg.limit = 0xFFFFFFFF;
+ seg.selector = vmcs12->host_cs_selector;
+ seg.type = 11;
+ seg.present = 1;
+ if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
+ seg.l = 1;
+ else
+ seg.db = 1;
+ seg.s = 1;
+ seg.g = 1;
+ vmx_set_segment(vcpu, &seg, VCPU_SREG_CS);
+ memset(&seg, 0, sizeof(struct kvm_segment));
+ seg.base = 0;
+ seg.limit = 0xFFFFFFFF;
+ seg.type = 3;
+ seg.present = 1;
+ seg.s = 1;
+ seg.db = 1;
+ seg.g = 1;
+ seg.selector = vmcs12->host_ds_selector;
+ vmx_set_segment(vcpu, &seg, VCPU_SREG_DS);
+ seg.selector = vmcs12->host_es_selector;
+ vmx_set_segment(vcpu, &seg, VCPU_SREG_ES);
+ seg.selector = vmcs12->host_ss_selector;
+ vmx_set_segment(vcpu, &seg, VCPU_SREG_SS);
+ seg.selector = vmcs12->host_fs_selector;
+ seg.base = vmcs12->host_fs_base;
+ vmx_set_segment(vcpu, &seg, VCPU_SREG_FS);
+ seg.selector = vmcs12->host_gs_selector;
+ seg.base = vmcs12->host_gs_base;
+ vmx_set_segment(vcpu, &seg, VCPU_SREG_GS);
+ memset(&seg, 0, sizeof(struct kvm_segment));
+ seg.base = vmcs12->host_tr_base;
+ seg.limit = 0x67;
+ seg.selector = vmcs12->host_tr_selector;
+ seg.type = 11;
+ seg.present = 1;
+ vmx_set_segment(vcpu, &seg, VCPU_SREG_TR);
+
kvm_set_dr(vcpu, 7, 0x400);
vmcs_write64(GUEST_IA32_DEBUGCTL, 0);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v4] KVM: nVMX: Set segment infomation of L1 when L2 exits
2013-07-15 7:21 [PATCH v4] KVM: nVMX: Set segment infomation of L1 when L2 exits Arthur Chunqi Li
@ 2013-07-15 7:48 ` Gleb Natapov
0 siblings, 0 replies; 2+ messages in thread
From: Gleb Natapov @ 2013-07-15 7:48 UTC (permalink / raw)
To: Arthur Chunqi Li; +Cc: kvm, pbonzini, jan.kiszka
On Mon, Jul 15, 2013 at 03:21:54PM +0800, Arthur Chunqi Li wrote:
> When L2 exits to L1, segment infomations of L1 are not set correctly.
> According to Intel SDM 27.5.2(Loading Host Segment and Descriptor
> Table Registers), segment base/limit/access right of L1 should be
> set to some designed value when L2 exits to L1. This patch fixes
> this.
>
> Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com>
> ---
> arch/x86/kvm/vmx.c | 55 ++++++++++++++++++++++++++++++++++++++++++----------
> 1 file changed, 45 insertions(+), 10 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 064d0be..85b302b 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -7948,6 +7948,8 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
> static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
> struct vmcs12 *vmcs12)
> {
> + struct kvm_segment seg;
> +
> if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_EFER)
> vcpu->arch.efer = vmcs12->host_ia32_efer;
> else if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
> @@ -8001,16 +8003,6 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
> vmcs_writel(GUEST_SYSENTER_EIP, vmcs12->host_ia32_sysenter_eip);
> vmcs_writel(GUEST_IDTR_BASE, vmcs12->host_idtr_base);
> vmcs_writel(GUEST_GDTR_BASE, vmcs12->host_gdtr_base);
> - vmcs_writel(GUEST_TR_BASE, vmcs12->host_tr_base);
> - vmcs_writel(GUEST_GS_BASE, vmcs12->host_gs_base);
> - vmcs_writel(GUEST_FS_BASE, vmcs12->host_fs_base);
> - vmcs_write16(GUEST_ES_SELECTOR, vmcs12->host_es_selector);
> - vmcs_write16(GUEST_CS_SELECTOR, vmcs12->host_cs_selector);
> - vmcs_write16(GUEST_SS_SELECTOR, vmcs12->host_ss_selector);
> - vmcs_write16(GUEST_DS_SELECTOR, vmcs12->host_ds_selector);
> - vmcs_write16(GUEST_FS_SELECTOR, vmcs12->host_fs_selector);
> - vmcs_write16(GUEST_GS_SELECTOR, vmcs12->host_gs_selector);
> - vmcs_write16(GUEST_TR_SELECTOR, vmcs12->host_tr_selector);
>
> if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT)
> vmcs_write64(GUEST_IA32_PAT, vmcs12->host_ia32_pat);
> @@ -8018,6 +8010,49 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
> vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
> vmcs12->host_ia32_perf_global_ctrl);
>
> + /* Set L1 segment info according to Intel SDM
> + 27.5.2 Loading Host Segment and Descriptor-Table Registers */
> + memset(&seg, 0, sizeof(struct kvm_segment));
if you'll use C99 initialization you can drop this memsets and code
will be prettier:
seg = (struct kvm_segment) {
.base = 0,
.limit = 0xFFFFFFFF,
.selector = vmcs12->host_cs_selector
etc.
> + seg.base = 0;
> + seg.limit = 0xFFFFFFFF;
> + seg.selector = vmcs12->host_cs_selector;
> + seg.type = 11;
> + seg.present = 1;
> + if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
> + seg.l = 1;
> + else
> + seg.db = 1;
> + seg.s = 1;
> + seg.g = 1;
> + vmx_set_segment(vcpu, &seg, VCPU_SREG_CS);
> + memset(&seg, 0, sizeof(struct kvm_segment));
> + seg.base = 0;
> + seg.limit = 0xFFFFFFFF;
> + seg.type = 3;
> + seg.present = 1;
> + seg.s = 1;
> + seg.db = 1;
> + seg.g = 1;
> + seg.selector = vmcs12->host_ds_selector;
> + vmx_set_segment(vcpu, &seg, VCPU_SREG_DS);
> + seg.selector = vmcs12->host_es_selector;
> + vmx_set_segment(vcpu, &seg, VCPU_SREG_ES);
> + seg.selector = vmcs12->host_ss_selector;
> + vmx_set_segment(vcpu, &seg, VCPU_SREG_SS);
> + seg.selector = vmcs12->host_fs_selector;
> + seg.base = vmcs12->host_fs_base;
> + vmx_set_segment(vcpu, &seg, VCPU_SREG_FS);
> + seg.selector = vmcs12->host_gs_selector;
> + seg.base = vmcs12->host_gs_base;
> + vmx_set_segment(vcpu, &seg, VCPU_SREG_GS);
> + memset(&seg, 0, sizeof(struct kvm_segment));
> + seg.base = vmcs12->host_tr_base;
> + seg.limit = 0x67;
> + seg.selector = vmcs12->host_tr_selector;
> + seg.type = 11;
> + seg.present = 1;
> + vmx_set_segment(vcpu, &seg, VCPU_SREG_TR);
> +
> kvm_set_dr(vcpu, 7, 0x400);
> vmcs_write64(GUEST_IA32_DEBUGCTL, 0);
> }
> --
> 1.7.9.5
--
Gleb.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-15 7:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-15 7:21 [PATCH v4] KVM: nVMX: Set segment infomation of L1 when L2 exits Arthur Chunqi Li
2013-07-15 7:48 ` Gleb Natapov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox