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

Commit 6842ef0e authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: unify desc_struct 



This patch aims to make the access of struct desc_struct variables
equal across architectures. In this patch, I unify the i386 and x86_64
versions under an anonymous union, keeping the way they are accessed
untouched (a and b for 32-bit code, individual bit-fields for 64-bit).

This solution is not beautiful, but will allow us to integrate common
code that differed by the way descriptors were used. This is to be viewed
incrementally. There's simply too much code to be fixed at once.

In the future, goal is to set up in a single way of acessing
the desc_struct fields.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 746ef0cd

arch/x86/kernel/apm_32.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,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 const struct desc_struct	bad_bios_desc = { 0, 0x00409200 };

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



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

arch/x86/kernel/cpu/common.c

+21 −14
Original line number Diff line number Diff line
@@ -22,31 +22,38 @@ 
#include "cpu.h"



DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = {

	[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] = { { { 0x0000ffff, 0x00cf9a00 } } },

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

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

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

	/*

	 * 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.

	 */

	[GDT_ENTRY_PNPBIOS_CS32] = { 0x0000ffff, 0x00409a00 },/* 32-bit code */

	[GDT_ENTRY_PNPBIOS_CS16] = { 0x0000ffff, 0x00009a00 },/* 16-bit code */

	[GDT_ENTRY_PNPBIOS_DS] = { 0x0000ffff, 0x00009200 }, /* 16-bit data */

	[GDT_ENTRY_PNPBIOS_TS1] = { 0x00000000, 0x00009200 },/* 16-bit data */

	[GDT_ENTRY_PNPBIOS_TS2] = { 0x00000000, 0x00009200 },/* 16-bit data */

	/* 32-bit code */

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

	/* 16-bit code */

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

	/* 16-bit data */

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

	/* 16-bit data */

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

	/* 16-bit data */

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

	/*

	 * The APM segments have byte granularity and their bases

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

	 */

	[GDT_ENTRY_APMBIOS_BASE] = { 0x0000ffff, 0x00409a00 },/* 32-bit code */

	/* 32-bit code */

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

	/* 16-bit code */

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

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

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

	/* data */

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



	[GDT_ENTRY_ESPFIX_SS] = { 0x00000000, 0x00c09200 },

	[GDT_ENTRY_PERCPU] = { 0x00000000, 0x00000000 },

	[GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } },

	[GDT_ENTRY_PERCPU] = { { { 0x00000000, 0x00000000 } } },

} };

EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);

arch/x86/kernel/process_64.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static inline void set_32bit_tls(struct task_struct *t, int tls, u32 addr) 
		.limit_in_pages = 1,

		.useable = 1,

	};

	struct n_desc_struct *desc = (void *)t->thread.tls_array;

	struct desc_struct *desc = (void *)t->thread.tls_array;

	desc += tls;

	desc->a = LDT_entry_a(&ud);

	desc->b = LDT_entry_b(&ud);

arch/x86/kernel/traps_32.c

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ char ignore_fpu_irq = 0; 
 * F0 0F bug workaround.. We have a special link segment

 * for this.

 */

struct desc_struct idt_table[256] __attribute__((__section__(".data.idt"))) = { {0, 0}, };

struct desc_struct idt_table[256]

	__attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, };



asmlinkage void divide_error(void);

asmlinkage void debug(void);

include/asm-x86/desc_defs.h

+17 −8
Original line number Diff line number Diff line
@@ -11,17 +11,26 @@ 


#include <linux/types.h>



/*

 * FIXME: Acessing the desc_struct through its fields is more elegant,

 * and should be the one valid thing to do. However, a lot of open code

 * still touches the a and b acessors, and doing this allow us to do it

 * incrementally. We keep the signature as a struct, rather than an union,

 * so we can get rid of it transparently in the future -- glommer

 */

// 8 byte segment descriptor

struct desc_struct {

	union {

		struct { unsigned int a, b; };

		struct {

			u16 limit0;

			u16 base0;

			unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;

			unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;

} __attribute__((packed));

		};



struct n_desc_struct {

	unsigned int a,b;

	};

} __attribute__((packed));



enum {

	GATE_INTERRUPT = 0xE,