[PATCH 1/2] kvm: use get_desc_base() and get_desc_limit()

[PATCH 1/2] kvm: use get_desc_base() and get_desc_limit()

[Akinobu Mita]

Use get_desc_base() and get_desc_limit() to get the base address and
limit in desc_struct.

Cc: Avi Kivity <avi@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
 arch/x86/kvm/x86.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fe5474a..38d9b53 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -132,8 +132,7 @@ unsigned long segment_base(u16 selector)
 		table_base = segment_base(ldt_selector);
 	}
 	d = (struct desc_struct *)(table_base + (selector & ~7));
-	v = d->base0 | ((unsigned long)d->base1 << 16) |
-		((unsigned long)d->base2 << 24);
+	v = get_desc_base(d);
 #ifdef CONFIG_X86_64
 	if (d->s == 0 && (d->type == 2 || d->type == 9 || d->type == 11))
 		v |= ((unsigned long)((struct ldttss_desc64 *)d)->base3) << 32;
@@ -3617,11 +3616,8 @@ static void kvm_set_segment(struct kvm_vcpu *vcpu,
 static void seg_desct_to_kvm_desct(struct desc_struct *seg_desc, u16 selector,
 				   struct kvm_segment *kvm_desct)
 {
-	kvm_desct->base = seg_desc->base0;
-	kvm_desct->base |= seg_desc->base1 << 16;
-	kvm_desct->base |= seg_desc->base2 << 24;
-	kvm_desct->limit = seg_desc->limit0;
-	kvm_desct->limit |= seg_desc->limit << 16;
+	kvm_desct->base = get_desc_base(seg_desc);
+	kvm_desct->limit = get_desc_limit(seg_desc);
 	if (seg_desc->g) {
 		kvm_desct->limit <<= 12;
 		kvm_desct->limit |= 0xfff;
@@ -3700,11 +3696,7 @@ static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,
 static u32 get_tss_base_addr(struct kvm_vcpu *vcpu,
 			     struct desc_struct *seg_desc)
 {
-	u32 base_addr;
-
-	base_addr = seg_desc->base0;
-	base_addr |= (seg_desc->base1 << 16);
-	base_addr |= (seg_desc->base2 << 24);
+	u32 base_addr = get_desc_base(seg_desc);
 
 	return vcpu->arch.mmu.gva_to_gpa(vcpu, base_addr);
 }
@@ -3993,7 +3985,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
 		}
 	}
 
-	if (!nseg_desc.p || (nseg_desc.limit0 | nseg_desc.limit << 16) < 0x67) {
+	if (!nseg_desc.p || get_desc_limit(&nseg_desc) < 0x67) {
 		kvm_queue_exception_e(vcpu, TS_VECTOR, tss_selector & 0xfffc);
 		return 1;
 	}
-- 
1.6.0.6

[PATCH 2/2] kvm: use kvm_get_gdt() and kvm_read_ldt()

[Akinobu Mita]

Use kvm_get_gdt() and kvm_read_ldt() to reduce inline assembly code.

Cc: Avi Kivity <avi@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
 arch/x86/kvm/svm.c |    6 +++---
 arch/x86/kvm/x86.c |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 71510e0..c7c6234 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -263,7 +263,7 @@ static void svm_hardware_enable(void *garbage)
 
 	struct svm_cpu_data *svm_data;
 	uint64_t efer;
-	struct desc_ptr gdt_descr;
+	struct descriptor_table gdt_descr;
 	struct desc_struct *gdt;
 	int me = raw_smp_processor_id();
 
@@ -283,8 +283,8 @@ static void svm_hardware_enable(void *garbage)
 	svm_data->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1;
 	svm_data->next_asid = svm_data->max_asid + 1;
 
-	asm volatile ("sgdt %0" : "=m"(gdt_descr));
-	gdt = (struct desc_struct *)gdt_descr.address;
+	kvm_get_gdt(&gdt_descr);
+	gdt = (struct desc_struct *)gdt_descr.base;
 	svm_data->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS);
 
 	rdmsrl(MSR_EFER, efer);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 38d9b53..8d32333 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -122,13 +122,12 @@ unsigned long segment_base(u16 selector)
 	if (selector == 0)
 		return 0;
 
-	asm("sgdt %0" : "=m"(gdt));
+	kvm_get_gdt(&gdt);
 	table_base = gdt.base;
 
 	if (selector & 4) {           /* from ldt */
-		u16 ldt_selector;
+		u16 ldt_selector = kvm_read_ldt();
 
-		asm("sldt %0" : "=g"(ldt_selector));
 		table_base = segment_base(ldt_selector);
 	}
 	d = (struct desc_struct *)(table_base + (selector & ~7));
-- 
1.6.0.6

Re: [PATCH 1/2] kvm: use get_desc_base() and get_desc_limit()

[Marcelo Tosatti]

On Sat, Jul 18, 2009 at 11:58:32PM +0900, Akinobu Mita wrote:
> Use get_desc_base() and get_desc_limit() to get the base address and
> limit in desc_struct.
> 
> Cc: Avi Kivity <avi@redhat.com>
> Cc: kvm@vger.kernel.org
> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
> ---

Applied both, thanks.

>  arch/x86/kvm/x86.c |   18 +++++-------------
>  1 files changed, 5 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index fe5474a..38d9b53 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -132,8 +132,7 @@ unsigned long segment_base(u16 selector)
>  		table_base = segment_base(ldt_selector);
>  	}
>  	d = (struct desc_struct *)(table_base + (selector & ~7));
> -	v = d->base0 | ((unsigned long)d->base1 << 16) |
> -		((unsigned long)d->base2 << 24);
> +	v = get_desc_base(d);
>  #ifdef CONFIG_X86_64
>  	if (d->s == 0 && (d->type == 2 || d->type == 9 || d->type == 11))
>  		v |= ((unsigned long)((struct ldttss_desc64 *)d)->base3) << 32;
> @@ -3617,11 +3616,8 @@ static void kvm_set_segment(struct kvm_vcpu *vcpu,
>  static void seg_desct_to_kvm_desct(struct desc_struct *seg_desc, u16 selector,
>  				   struct kvm_segment *kvm_desct)
>  {
> -	kvm_desct->base = seg_desc->base0;
> -	kvm_desct->base |= seg_desc->base1 << 16;
> -	kvm_desct->base |= seg_desc->base2 << 24;
> -	kvm_desct->limit = seg_desc->limit0;
> -	kvm_desct->limit |= seg_desc->limit << 16;
> +	kvm_desct->base = get_desc_base(seg_desc);
> +	kvm_desct->limit = get_desc_limit(seg_desc);
>  	if (seg_desc->g) {
>  		kvm_desct->limit <<= 12;
>  		kvm_desct->limit |= 0xfff;
> @@ -3700,11 +3696,7 @@ static int save_guest_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,
>  static u32 get_tss_base_addr(struct kvm_vcpu *vcpu,
>  			     struct desc_struct *seg_desc)
>  {
> -	u32 base_addr;
> -
> -	base_addr = seg_desc->base0;
> -	base_addr |= (seg_desc->base1 << 16);
> -	base_addr |= (seg_desc->base2 << 24);
> +	u32 base_addr = get_desc_base(seg_desc);
>  
>  	return vcpu->arch.mmu.gva_to_gpa(vcpu, base_addr);
>  }
> @@ -3993,7 +3985,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
>  		}
>  	}
>  
> -	if (!nseg_desc.p || (nseg_desc.limit0 | nseg_desc.limit << 16) < 0x67) {
> +	if (!nseg_desc.p || get_desc_limit(&nseg_desc) < 0x67) {
>  		kvm_queue_exception_e(vcpu, TS_VECTOR, tss_selector & 0xfffc);
>  		return 1;
>  	}
> -- 
> 1.6.0.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html