Use descriptor's functions instead of inline assembly
PATCH 1/1 Use descriptor's functions instead of inline assembly
This patch provides a new set of functions for managing the descriptor tables that can be used instead of putting the raw assembly in .c files.
Remodeling of store_tr() suggested by Frederik Deweerdt.
arch/x86_64/kernel/head64.c +1 -1
@@ -70,7 +70,7 @@ void __init x86_64_start_kernel(char * real_mode_data)for (i =0 ; i <IDT_ENTRIES ; i++)set_intr_gate (i, early_idt_handler); - asmvolatile ("lidt %0" ::"m" (idt_descr)); +load_idt ((const struct desc_ptr *)&idt_descr);early_printk ("Kernel alive\n" );
arch/x86_64/kernel/reboot.c +2 -1
@@ -11,6 +11,7 @@#include <linux/sched.h> #include <asm/io.h> #include <asm/delay.h> +#include <asm/desc.h> #include <asm/hw_irq.h> #include <asm/system.h> #include <asm/pgtable.h>
@@ -132,7 +133,7 @@ void machine_emergency_restart(void) }case BOOT_TRIPLE : - __asm__ __volatile__("lidt (%0)" : :"r" (&no_idt)); +load_idt ((const struct desc_ptr *)&no_idt); __asm__ __volatile__("int3" ); reboot_type =BOOT_KBD ;
arch/x86_64/kernel/setup64.c +2 -2
@@ -224,8 +224,8 @@ void __cpuinit cpu_init (void)memcpy (cpu_gdt (cpu), cpu_gdt_table,GDT_SIZE ); cpu_gdt_descr[cpu].size =GDT_SIZE ; - asmvolatile ("lgdt %0" ::"m" (cpu_gdt_descr[cpu])); - asmvolatile ("lidt %0" ::"m" (idt_descr)); +load_gdt ((const struct desc_ptr *)&cpu_gdt_descr[cpu]); +load_idt ((const struct desc_ptr *)&idt_descr);memset (me->thread.tls_array,0 ,GDT_ENTRY_TLS_ENTRIES *8 );syscall_init ();
arch/x86_64/kernel/suspend.c +6 -5
@@ -32,9 +32,9 @@ void __save_processor_state(struct saved_context *ctxt)/* * descriptor tables */ - asmvolatile ("sgdt %0" :"=m" (ctxt->gdt_limit)); - asmvolatile ("sidt %0" :"=m" (ctxt->idt_limit)); - asmvolatile ("str %0" :"=m" (ctxt->tr)); +store_gdt ((struct desc_ptr *)&ctxt->gdt_limit); +store_idt ((struct desc_ptr *)&ctxt->idt_limit); +store_tr (ctxt->tr);/* XMM0..XMM15 should be handled by kernel_fpu_begin(). */ /*
@@ -91,8 +91,9 @@ void __restore_processor_state(struct saved_context *ctxt)* now restore the descriptor tables to their proper values * ltr is done i fix_processor_context(). */ - asmvolatile ("lgdt %0" ::"m" (ctxt->gdt_limit)); - asmvolatile ("lidt %0" ::"m" (ctxt->idt_limit)); +load_gdt ((const struct desc_ptr *)&ctxt->gdt_limit); +load_idt ((const struct desc_ptr *)&ctxt->idt_limit); +/* * segment registers
include/asm-x86_64/desc.h +29 -0
@@ -20,6 +20,15 @@ extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];#define load_LDT_desc () asm volatile("lldt %w0"::"r" (GDT_ENTRY_LDT*8))#define clear_LDT () asm volatile("lldt %w0"::"r" (0)) +static inline unsigned long __store_tr (void ) +{ +unsigned long tr; + asmvolatile ("str %w0" :"=r" (tr)); +return tr; +} + +#define store_tr (tr) (tr) = __store_tr() +/* * This is the ldt that every process will get unless we need * something other than this.
@@ -31,6 +40,16 @@ extern struct desc_ptr cpu_gdt_descr[];/* the cpu gdt accessor */ #define cpu_gdt (_cpu) ((struct desc_struct *)cpu_gdt_descr[_cpu].address) +static inline void load_gdt (const struct desc_ptr *ptr) +{ + asmvolatile ("lgdt %w0" ::"m" (*ptr)); +} + +static inline void store_gdt (struct desc_ptr *ptr) +{ + asm ("sgdt %w0" :"=m" (*ptr)); +} +static inline void _set_gate (void *adr,unsigned type,unsigned long func,unsigned dpl,unsigned ist) {struct gate_struct s;
@@ -71,6 +90,16 @@ static inline void set_system_gate_ist(int nr, void *func, unsigned ist)_set_gate (&idt_table[nr],GATE_INTERRUPT , (unsigned long ) func,3 , ist); } +static inline void load_idt (const struct desc_ptr *ptr) +{ + asmvolatile ("lidt %w0" ::"m" (*ptr)); +} + +static inline void store_idt (struct desc_ptr *dtr) +{ + asm ("sidt %w0" :"=m" (*dtr)); +} +static inline void set_tssldt_descriptor (void *ptr,unsigned long tss,unsigned type,unsigned size) {
Quoted 2 lines · * Glauber de Oliveira Costa ([email protected]) wrote:
This patch provides a new set of functions for managing the descriptor tables that can be used instead of putting the raw assembly in .c files.
Looks alright, some cleanups below
Quoted 9 lines
Remodeling of
store_tr()suggested by Frederik Deweerdt.Signed-off-by Glauber de Oliveira Costa <[email protected]>arch/x86_64/kernel/head64.c +0
-0
arch/x86_64/kernel/head64.c void __init x86_64_start_kernel(char * real_mode_data) · line 73
Quoted 5 lines
arch/x86_64/kernel/head64.c +1
-1@@ -70,7 +70,7 @@ void __init x86_64_start_kernel(char * real_mode_data)for (i =0 ; i <IDT_ENTRIES ; i++)set_intr_gate (i, early_idt_handler); - asmvolatile ("lidt %0" ::"m" (idt_descr)); +load_idt ((const struct desc_ptr *)&idt_descr);
No need for extra casting
Quoted 15 lines
arch/x86_64/kernel/head64.c +0
-0early_printk ("Kernel alive\n" );arch/x86_64/kernel/reboot.c +1
-0@@ -11,6 +11,7 @@#include <linux/sched.h> #include <asm/io.h> #include <asm/delay.h> +#include <asm/desc.h> #include <asm/hw_irq.h> #include <asm/system.h> #include <asm/pgtable.h>
arch/x86_64/kernel/reboot.c void machine_emergency_restart(void) · line 136
Quoted 5 lines
arch/x86_64/kernel/reboot.c +1
-1@@ -132,7 +133,7 @@ void machine_emergency_restart(void) }case BOOT_TRIPLE : - __asm__ __volatile__("lidt (%0)" : :"r" (&no_idt)); +load_idt ((const struct desc_ptr *)&no_idt);
same here, plus opportunity for cleanup
Quoted 8 lines
arch/x86_64/kernel/reboot.c +0
-0__asm__ __volatile__("int3" ); reboot_type =BOOT_KBD ;arch/x86_64/kernel/setup64.c +0
-0
arch/x86_64/kernel/setup64.c void __cpuinit cpu_init (void) · line 228
Quoted 7 lines
arch/x86_64/kernel/setup64.c +2
-2@@ -224,8 +224,8 @@ void __cpuinit cpu_init (void)memcpy (cpu_gdt (cpu), cpu_gdt_table,GDT_SIZE ); cpu_gdt_descr[cpu].size =GDT_SIZE ; - asmvolatile ("lgdt %0" ::"m" (cpu_gdt_descr[cpu])); - asmvolatile ("lidt %0" ::"m" (idt_descr)); +load_gdt ((const struct desc_ptr *)&cpu_gdt_descr[cpu]); +load_idt ((const struct desc_ptr *)&idt_descr);
same here
Quoted 7 lines
arch/x86_64/kernel/setup64.c +0
-0memset (me->thread.tls_array,0 ,GDT_ENTRY_TLS_ENTRIES *8 );syscall_init ();arch/x86_64/kernel/suspend.c +0
-0
arch/x86_64/kernel/suspend.c void __save_processor_state(struct saved_context *ctxt) · line 36
Quoted 8 lines
arch/x86_64/kernel/suspend.c +2
-3@@ -32,9 +32,9 @@ void __save_processor_state(struct saved_context *ctxt)/* * descriptor tables */ - asmvolatile ("sgdt %0" :"=m" (ctxt->gdt_limit)); - asmvolatile ("sidt %0" :"=m" (ctxt->idt_limit)); - asmvolatile ("str %0" :"=m" (ctxt->tr)); +store_gdt ((struct desc_ptr *)&ctxt->gdt_limit); +store_idt ((struct desc_ptr *)&ctxt->idt_limit);
same here, opportunity for cleanup
Quoted 21 lines
arch/x86_64/kernel/suspend.c +4
-2+store_tr (ctxt->tr);/* XMM0..XMM15 should be handled by kernel_fpu_begin(). */ /* @@ -91,8 +91,9 @@ void __restore_processor_state(struct saved_context *ctxt)* now restore the descriptor tables to their proper values * ltr is done i fix_processor_context(). */ - asmvolatile ("lgdt %0" ::"m" (ctxt->gdt_limit)); - asmvolatile ("lidt %0" ::"m" (ctxt->idt_limit)); +load_gdt ((const struct desc_ptr *)&ctxt->gdt_limit); +load_idt ((const struct desc_ptr *)&ctxt->idt_limit); +/* * segment registers include/asm-x86_64/desc.h +0
-0
include/asm-x86_64/desc.h extern struct desc_struct cpu_gdt_table[GDT_ENTRIES]; · line 28
Quoted 9 lines
include/asm-x86_64/desc.h +6
-0@@ -20,6 +20,15 @@ extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];#define load_LDT_desc () asm volatile("lldt %w0"::"r" (GDT_ENTRY_LDT*8))#define clear_LDT () asm volatile("lldt %w0"::"r" (0)) +static inline unsigned long __store_tr (void ) +{ +unsigned long tr; + asmvolatile ("str %w0" :"=r" (tr)); +return tr; +}
native_store_tr (although I've no objection to just fixing the interface)
arch/x86_64/kernel/head64.c +1 -1
@@ -70,7 +70,7 @@ void __init x86_64_start_kernel(char * rfor (i =0 ; i <IDT_ENTRIES ; i++)set_intr_gate (i, early_idt_handler); -load_idt ((const struct desc_ptr *)&idt_descr); +load_idt (&idt_descr);early_printk ("Kernel alive\n" );
arch/x86_64/kernel/reboot.c +2 -2
@@ -24,7 +24,7 @@void (*pm_power_off)(void );EXPORT_SYMBOL (pm_power_off); -static long no_idt[3 ]; +static struct desc_ptr no_idt; static enum { BOOT_TRIPLE = 't', BOOT_KBD = 'k'
@@ -133,7 +133,7 @@ void machine_emergency_restart(void) }case BOOT_TRIPLE : -load_idt ((const struct desc_ptr *)&no_idt); +load_idt (&no_idt); __asm__ __volatile__("int3" ); reboot_type =BOOT_KBD ;
arch/x86_64/kernel/setup64.c +2 -2
@@ -224,8 +224,8 @@ void __cpuinit cpu_init (void)memcpy (cpu_gdt (cpu), cpu_gdt_table,GDT_SIZE ); cpu_gdt_descr[cpu].size =GDT_SIZE ; -load_gdt ((const struct desc_ptr *)&cpu_gdt_descr[cpu]); -load_idt ((const struct desc_ptr *)&idt_descr); +load_gdt (&cpu_gdt_descr[cpu]); +load_idt (&idt_descr);memset (me->thread.tls_array,0 ,GDT_ENTRY_TLS_ENTRIES *8 );syscall_init ();
arch/x86_64/kernel/suspend.c +4 -4
@@ -32,8 +32,8 @@ void __save_processor_state(struct saved/* * descriptor tables */ -store_gdt ((struct desc_ptr *)&ctxt->gdt_limit); -store_idt ((struct desc_ptr *)&ctxt->idt_limit); +store_gdt (&ctxt->gdt); +store_idt (&ctxt->idt);store_tr (ctxt->tr);/* XMM0..XMM15 should be handled by kernel_fpu_begin(). */
@@ -91,8 +91,8 @@ void __restore_processor_state(struct sa* now restore the descriptor tables to their proper values * ltr is done i fix_processor_context(). */ -load_gdt ((const struct desc_ptr *)&ctxt->gdt_limit); -load_idt ((const struct desc_ptr *)&ctxt->idt_limit); +load_gdt (&ctxt->gdt); +load_idt (&ctxt->idt);/*
include/asm-x86_64/desc.h +2 -2
@@ -20,14 +20,14 @@ extern struct desc_struct cpu_gdt_table[#define load_LDT_desc () asm volatile("lldt %w0"::"r" (GDT_ENTRY_LDT*8))#define clear_LDT () asm volatile("lldt %w0"::"r" (0)) -static inline unsigned long __store_tr (void ) +static inline unsigned long native_store_tr (void ) {unsigned long tr; asmvolatile ("str %w0" :"=r" (tr));return tr; } -#define store_tr (tr) (tr) = __store_tr() +#define store_tr (tr) (tr) = native_store_tr()/* * This is the ldt that every process will get unless we need
arch/x86_64/kernel/machine_kexec.c +3 -9
@@ -119,11 +119,8 @@ static void set_idt(void *newidt, u16 li/* x86-64 supports unaliged loads & stores */ curidt.size = limit; curidt.address = (unsigned long )newidt; - - __asm__ __volatile__ ( -"lidtq %0\n" - : :"m" (curidt) - ); + +load_idt (&curidt); };
@@ -135,10 +132,7 @@ static void set_gdt(void *newgdt, u16 li curgdt.size = limit; curgdt.address = (unsigned long )newgdt; - __asm__ __volatile__ ( -"lgdtq %0\n" - : :"m" (curgdt) - ); +load_gdt (&curgdt); };static void load_segments (void )
include/asm-x86_64/suspend.h +2 -6
@@ -18,12 +18,8 @@ struct saved_context {unsigned long gs_base, gs_kernel_base, fs_base;unsigned long cr0, cr2, cr3, cr4, cr8;unsigned long efer; -u16 gdt_pad; -u16 gdt_limit; -unsigned long gdt_base; -u16 idt_pad; -u16 idt_limit; -unsigned long idt_base; +struct desc_ptr gdt; +struct desc_ptr idt;u16 ldt;u16 tss;unsigned long tr;