i386 Vmi system header
RFC PATCH 13/24 i386 Vmi system header
Fairly straightforward code motion in system.h into the sub-arch layer. Affected functionality include control register accessors, which are virtualizable but with great overhead due to the #GP cost; wbinvd, and most importantly, halt and interrupt control, which is non-virtualizable.
Since read_cr4_safe can never fault on a VMI kernel (P5+ processor is required for VMI), we can omit the fault fixup, which does not play well with the VMI inline assembler, and just call read_cr4() directly.
Note that shutdown_halt is unused, but provided in case there is really a use for it. See arch/i386/kernel/smp.c for a potential call site during AP shutdown.
include/asm-i386/system.h +3 -74
@@ -9,6 +9,8 @@#ifdef __KERNEL__ +#include <mach_system.h> +struct task_struct ;/* one of the stranger aspects of C forward declarations.. */ extern struct task_struct *FASTCALL (__switch_to (struct task_struct *prev,struct task_struct *next));
@@ -83,69 +85,8 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t"#define savesegment (seg, value) \ asm volatile("mov %%" #seg ",%0":"=rm" (value)) -/* -* Clear and set 'TS' bit respectively -*/ -#define clts () __asm__ __volatile__ ("clts") -#define read_cr0 () ({ \ - unsigned int __dummy; \ - __asm__ __volatile__( \ - "movl %%cr0,%0\n\t" \ - :"=r" (__dummy)); \ - __dummy; \ -}) -#define write_cr0 (x) \ - __asm__ __volatile__("movl %0,%%cr0": :"r" (x)); - -#define read_cr2 () ({ \ - unsigned int __dummy; \ - __asm__ __volatile__( \ - "movl %%cr2,%0\n\t" \ - :"=r" (__dummy)); \ - __dummy; \ -}) -#define write_cr2 (x) \ - __asm__ __volatile__("movl %0,%%cr2": :"r" (x)); - -#define read_cr3 () ({ \ - unsigned int __dummy; \ - __asm__ ( \ - "movl %%cr3,%0\n\t" \ - :"=r" (__dummy)); \ - __dummy; \ -}) -#define write_cr3 (x) \ - __asm__ __volatile__("movl %0,%%cr3": :"r" (x)); - -#define read_cr4 () ({ \ - unsigned int __dummy; \ - __asm__( \ - "movl %%cr4,%0\n\t" \ - :"=r" (__dummy)); \ - __dummy; \ -}) - -#define read_cr4_safe () ({ \ - unsigned int __dummy; \ -/* This could fault if %cr4 does not exist */ \ - __asm__("1: movl %%cr4, %0 \n" \ -"2: \n" \ -".section __ex_table,\"a\" \n" \ -".long 1b,2b \n" \ -".previous \n" \ - :"=r" (__dummy):"0" (0 )); \ - __dummy; \ -}) - -#define write_cr4 (x) \ - __asm__ __volatile__("movl %0,%%cr4": :"r" (x)); -#define stts () write_cr0(8 | read_cr0()) -#endif /* __KERNEL__ */ -#define wbinvd () \ - __asm__ __volatile__ ("wbinvd": : :"memory"); -static inline unsigned long get_limit (unsigned long segment) {unsigned long __limit;
@@ -518,16 +459,7 @@ struct alt_instr {#define set_wmb (var, value) do { var = value; wmb(); } while (0) -/* interrupt control.. */ -#define local_save_flags(x) do { typecheck(unsigned long,x); __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */); } while (0) -#define local_irq_restore(x) do { typecheck(unsigned long,x); __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory", "cc"); } while (0) -#define local_irq_disable () __asm__ __volatile__("cli": : :"memory") -#define local_irq_enable () __asm__ __volatile__("sti": : :"memory") -/* used in the idle loop; sti takes one instruction cycle to complete */ -#define safe_halt () __asm__ __volatile__("sti; hlt": : :"memory") -/* used when interrupts are already enabled or to shutdown the processor */ -#define halt () __asm__ __volatile__("hlt": : :"memory") - +#define local_irq_save (x) do { typecheck(unsigned long,x); local_save_flags(x); local_irq_disable(); } while (0)#define irqs_disabled () \ ({ \ unsigned long flags; \
@@ -535,9 +467,6 @@ struct alt_instr { !(flags & (1 <<9 )); \ }) -/* For spinlocks etc */ -#define local_irq_save(x) __asm__ __volatile__("pushfl ; popl %0 ; cli":"=g" (x): /* no input */ :"memory") -/* * disable hlt during certain critical i/o operations */
include/asm-i386/mach-vmi/mach_system.h +216 -0
216 lines not on this page · raw message
include/asm-i386/mach-default/mach_system.h +80 -0
80 lines not on this page · raw message