d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide private per-CPU GDTs on amd64. This is required at least for the

Browse Source 
linux CB_GS32BIT to work.

Noted by:	nox
Reviewed by:	peter
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2008-09-08 09:55:51 +00:00
parent 7b1608fde1
commit 1772c3e9bb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/amd64/amd64/mp_machdep.c
View File

@ -436,7 +436,8 @@ init_secondary(void)
{
struct pcpu *pc;
u_int64_t msr, cr0;
int cpu, gsel_tss;
int cpu, gsel_tss, x;
struct region_descriptor ap_gdt;
/* Set by the startup code for us to use */
cpu = bootAP;
@ -447,11 +448,17 @@ init_secondary(void)
common_tss[cpu].tss_iobase = sizeof(struct amd64tss);
common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE];
/* Prepare private GDT */
gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu];
ssdtosyssd(&gdt_segs[GPROC0_SEL],
(struct system_segment_descriptor *)&gdt[GPROC0_SEL]);
lgdt(&r_gdt); /* does magic intra-segment return */
(struct system_segment_descriptor *)&gdt[NGDT * cpu + GPROC0_SEL]);
for (x = 0; x < NGDT; x++) {
if (x != GPROC0_SEL && x != (GPROC0_SEL + 1))
ssdtosd(&gdt_segs[x], &gdt[NGDT * cpu + x]);
}
ap_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1;
ap_gdt.rd_base = (long) &gdt[NGDT * cpu];
lgdt(&ap_gdt); /* does magic intra-segment return */
/* Get per-cpu data */
pc = &__pcpu[cpu];

3
sys/amd64/amd64/trap.c
View File

@ -692,7 +692,8 @@ trap_fatal(frame, eva)
code = frame->tf_err;
type = frame->tf_trapno;
sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)], &softseg);
sdtossd(&gdt[NGDT * PCPU_GET(cpuid) + IDXSEL(frame->tf_cs & 0xffff)],
&softseg);
if (type <= MAX_TRAP_MSG)
msg = trap_msg[type];