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

Commit 59c58ceb authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/gdt: Get rid of the get_*_gdt_*_vaddr() helpers 



There's a single caller that is only there because it's passing a
pointer into a function (vmcs_writel()) that takes an unsigned long.
Let's just cast it in place rather than having a bunch of trivial
helpers.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Garnier <thgarnie@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/46108fb35e1699252b1b6a85039303ff562c9836.1490218061.git.luto@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 23b2a4dd

arch/x86/include/asm/desc.h

+0 −20
Original line number Diff line number Diff line
@@ -53,22 +53,12 @@ static inline struct desc_struct *get_cpu_gdt_rw(unsigned int cpu) 
	return per_cpu(gdt_page, cpu).gdt;

}



static inline unsigned long get_cpu_gdt_rw_vaddr(unsigned int cpu)

{

	return (unsigned long)get_cpu_gdt_rw(cpu);

}



/* Provide the current original GDT */

static inline struct desc_struct *get_current_gdt_rw(void)

{

	return this_cpu_ptr(&gdt_page)->gdt;

}



static inline unsigned long get_current_gdt_rw_vaddr(void)

{

	return (unsigned long)get_current_gdt_rw();

}



/* Get the fixmap index for a specific processor */

static inline unsigned int get_cpu_gdt_ro_index(int cpu)

{
@@ -82,22 +72,12 @@ static inline struct desc_struct *get_cpu_gdt_ro(int cpu) 
	return (struct desc_struct *)__fix_to_virt(idx);

}



static inline unsigned long get_cpu_gdt_ro_vaddr(int cpu)

{

	return (unsigned long)get_cpu_gdt_ro(cpu);

}



/* Provide the current read-only GDT */

static inline struct desc_struct *get_current_gdt_ro(void)

{

	return get_cpu_gdt_ro(smp_processor_id());

}



static inline unsigned long get_current_gdt_ro_vaddr(void)

{

	return (unsigned long)get_current_gdt_ro();

}



/* Provide the physical address of the GDT page. */

static inline phys_addr_t get_cpu_gdt_paddr(unsigned int cpu)

{

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -2264,7 +2264,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
	}



	if (!already_loaded) {

		unsigned long gdt = get_current_gdt_ro_vaddr();

		void *gdt = get_current_gdt_ro();

		unsigned long sysenter_esp;



		kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
@@ -2275,7 +2275,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
		 */

		vmcs_writel(HOST_TR_BASE,

			    (unsigned long)this_cpu_ptr(&cpu_tss));

		vmcs_writel(HOST_GDTR_BASE, gdt);   /* 22.2.4 */

		vmcs_writel(HOST_GDTR_BASE, (unsigned long)gdt);   /* 22.2.4 */



		/*

		 * VM exits change the host TR limit to 0x67 after a VM