Commit 1e5de182 authored by Akinobu Mita's avatar Akinobu Mita Committed by Ingo Molnar
Browse files

x86: Introduce GDT_ENTRY_INIT() 



GDT_ENTRY_INIT is static initializer of desc_struct.

We already have similar macro GDT_ENTRY() but it's static
initializer for u64 and it cannot be used for desc_struct.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
LKML-Reference: <20090718151219.GD11294@localhost.localdomain>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 57594742

arch/x86/include/asm/desc_defs.h

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ struct desc_struct { 
	};

} __attribute__((packed));



#define GDT_ENTRY_INIT(flags, base, limit) { { { \

		.a = ((limit) & 0xffff) | (((base) & 0xffff) << 16), \

		.b = (((base) & 0xff0000) >> 16) | (((flags) & 0xf0ff) << 8) | \

			((limit) & 0xf0000) | ((base) & 0xff000000), \

	} } }



enum {

	GATE_INTERRUPT = 0xE,

	GATE_TRAP = 0xF,

arch/x86/include/asm/lguest.h

+3 −2
Original line number Diff line number Diff line
@@ -91,8 +91,9 @@ static inline void lguest_set_ts(void) 
}



/* Full 4G segment descriptors, suitable for CS and DS. */

#define FULL_EXEC_SEGMENT ((struct desc_struct){ { {0x0000ffff, 0x00cf9b00} } })

#define FULL_SEGMENT ((struct desc_struct){ { {0x0000ffff, 0x00cf9300} } })

#define FULL_EXEC_SEGMENT \

	((struct desc_struct)GDT_ENTRY_INIT(0xc09b, 0, 0xfffff))

#define FULL_SEGMENT ((struct desc_struct)GDT_ENTRY_INIT(0xc093, 0, 0xfffff))



#endif /* __ASSEMBLY__ */

arch/x86/include/asm/stackprotector.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 * head_32 for boot CPU and setup_per_cpu_areas() for others.

 */

#define GDT_STACK_CANARY_INIT						\

	[GDT_ENTRY_STACK_CANARY] = { { { 0x00000018, 0x00409000 } } },

	[GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),



/*

 * Initialize the stackprotector canary value.

arch/x86/kernel/apm_32.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue); 
static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);

static struct apm_user *user_list;

static DEFINE_SPINLOCK(user_list_lock);

static struct desc_struct bad_bios_desc = { { { 0, 0x00409200 } } };

static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092, 0, 0);



static const char driver_version[] = "1.16ac";	/* no spaces */

arch/x86/kernel/cpu/common.c

+20 −20
Original line number Diff line number Diff line
@@ -71,45 +71,45 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { 
	 * TLS descriptors are currently at a different place compared to i386.

	 * Hopefully nobody expects them at a fixed place (Wine?)

	 */

	[GDT_ENTRY_KERNEL32_CS]		= { { { 0x0000ffff, 0x00cf9b00 } } },

	[GDT_ENTRY_KERNEL_CS]		= { { { 0x0000ffff, 0x00af9b00 } } },

	[GDT_ENTRY_KERNEL_DS]		= { { { 0x0000ffff, 0x00cf9300 } } },

	[GDT_ENTRY_DEFAULT_USER32_CS]	= { { { 0x0000ffff, 0x00cffb00 } } },

	[GDT_ENTRY_DEFAULT_USER_DS]	= { { { 0x0000ffff, 0x00cff300 } } },

	[GDT_ENTRY_DEFAULT_USER_CS]	= { { { 0x0000ffff, 0x00affb00 } } },

	[GDT_ENTRY_KERNEL32_CS]		= GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),

	[GDT_ENTRY_KERNEL_CS]		= GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),

	[GDT_ENTRY_KERNEL_DS]		= GDT_ENTRY_INIT(0xc093, 0, 0xfffff),

	[GDT_ENTRY_DEFAULT_USER32_CS]	= GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),

	[GDT_ENTRY_DEFAULT_USER_DS]	= GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),

	[GDT_ENTRY_DEFAULT_USER_CS]	= GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),

#else

	[GDT_ENTRY_KERNEL_CS]		= { { { 0x0000ffff, 0x00cf9a00 } } },

	[GDT_ENTRY_KERNEL_DS]		= { { { 0x0000ffff, 0x00cf9200 } } },

	[GDT_ENTRY_DEFAULT_USER_CS]	= { { { 0x0000ffff, 0x00cffa00 } } },

	[GDT_ENTRY_DEFAULT_USER_DS]	= { { { 0x0000ffff, 0x00cff200 } } },

	[GDT_ENTRY_KERNEL_CS]		= GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),

	[GDT_ENTRY_KERNEL_DS]		= GDT_ENTRY_INIT(0xc092, 0, 0xfffff),

	[GDT_ENTRY_DEFAULT_USER_CS]	= GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),

	[GDT_ENTRY_DEFAULT_USER_DS]	= GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),

	/*

	 * Segments used for calling PnP BIOS have byte granularity.

	 * They code segments and data segments have fixed 64k limits,

	 * the transfer segment sizes are set at run time.

	 */

	/* 32-bit code */

	[GDT_ENTRY_PNPBIOS_CS32]	= { { { 0x0000ffff, 0x00409a00 } } },

	[GDT_ENTRY_PNPBIOS_CS32]	= GDT_ENTRY_INIT(0x409a, 0, 0xffff),

	/* 16-bit code */

	[GDT_ENTRY_PNPBIOS_CS16]	= { { { 0x0000ffff, 0x00009a00 } } },

	[GDT_ENTRY_PNPBIOS_CS16]	= GDT_ENTRY_INIT(0x009a, 0, 0xffff),

	/* 16-bit data */

	[GDT_ENTRY_PNPBIOS_DS]		= { { { 0x0000ffff, 0x00009200 } } },

	[GDT_ENTRY_PNPBIOS_DS]		= GDT_ENTRY_INIT(0x0092, 0, 0xffff),

	/* 16-bit data */

	[GDT_ENTRY_PNPBIOS_TS1]		= { { { 0x00000000, 0x00009200 } } },

	[GDT_ENTRY_PNPBIOS_TS1]		= GDT_ENTRY_INIT(0x0092, 0, 0),

	/* 16-bit data */

	[GDT_ENTRY_PNPBIOS_TS2]		= { { { 0x00000000, 0x00009200 } } },

	[GDT_ENTRY_PNPBIOS_TS2]		= GDT_ENTRY_INIT(0x0092, 0, 0),

	/*

	 * The APM segments have byte granularity and their bases

	 * are set at run time.  All have 64k limits.

	 */

	/* 32-bit code */

	[GDT_ENTRY_APMBIOS_BASE]	= { { { 0x0000ffff, 0x00409a00 } } },

	[GDT_ENTRY_APMBIOS_BASE]	= GDT_ENTRY_INIT(0x409a, 0, 0xffff),

	/* 16-bit code */

	[GDT_ENTRY_APMBIOS_BASE+1]	= { { { 0x0000ffff, 0x00009a00 } } },

	[GDT_ENTRY_APMBIOS_BASE+1]	= GDT_ENTRY_INIT(0x009a, 0, 0xffff),

	/* data */

	[GDT_ENTRY_APMBIOS_BASE+2]	= { { { 0x0000ffff, 0x00409200 } } },

	[GDT_ENTRY_APMBIOS_BASE+2]	= GDT_ENTRY_INIT(0x409a, 0, 0xffff),



	[GDT_ENTRY_ESPFIX_SS]		= { { { 0x0000ffff, 0x00cf9200 } } },

	[GDT_ENTRY_PERCPU]		= { { { 0x0000ffff, 0x00cf9200 } } },

	[GDT_ENTRY_ESPFIX_SS]		= GDT_ENTRY_INIT(0xc092, 0, 0xfffff),

	[GDT_ENTRY_PERCPU]		= GDT_ENTRY_INIT(0xc092, 0, 0xfffff),

	GDT_STACK_CANARY_INIT

#endif

} };

CRA Git | Maintained and supported by SUSTech CRA and CCSE