svn commit: r235608 - in stable/8/sys: amd64/amd64 i386/conf
i386/i386 pc98/pc98
John Baldwin
jhb at FreeBSD.org
Fri May 18 14:29:55 UTC 2012
Author: jhb
Date: Fri May 18 14:29:54 2012
New Revision: 235608
URL: http://svn.freebsd.org/changeset/base/235608
Log:
MFC 217886,218389:
Set td_kstack_pages for thread0.
Modified:
stable/8/sys/amd64/amd64/machdep.c
stable/8/sys/i386/i386/machdep.c
stable/8/sys/pc98/pc98/machdep.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
stable/8/sys/i386/conf/XENHVM (props changed)
Modified: stable/8/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/machdep.c Fri May 18 14:12:17 2012 (r235607)
+++ stable/8/sys/amd64/amd64/machdep.c Fri May 18 14:29:54 2012 (r235608)
@@ -1545,12 +1545,14 @@ hammer_time(u_int64_t modulep, u_int64_t
struct nmi_pcpu *np;
u_int64_t msr;
char *env;
+ size_t kstack0_sz;
thread0.td_kstack = physfree + KERNBASE;
- bzero((void *)thread0.td_kstack, KSTACK_PAGES * PAGE_SIZE);
- physfree += KSTACK_PAGES * PAGE_SIZE;
- thread0.td_pcb = (struct pcb *)
- (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ thread0.td_kstack_pages = KSTACK_PAGES;
+ kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE;
+ bzero((void *)thread0.td_kstack, kstack0_sz);
+ physfree += kstack0_sz;
+ thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1;
/*
* This may be done better later if it gets more high level
@@ -1692,8 +1694,8 @@ hammer_time(u_int64_t modulep, u_int64_t
initializecpucache();
/* make an initial tss so cpu can get interrupt stack on syscall! */
- common_tss[0].tss_rsp0 = thread0.td_kstack + \
- KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb);
+ common_tss[0].tss_rsp0 = thread0.td_kstack +
+ kstack0_sz - sizeof(struct pcb);
/* Ensure the stack is aligned to 16 bytes */
common_tss[0].tss_rsp0 &= ~0xFul;
PCPU_SET(rsp0, common_tss[0].tss_rsp0);
Modified: stable/8/sys/i386/i386/machdep.c
==============================================================================
--- stable/8/sys/i386/i386/machdep.c Fri May 18 14:12:17 2012 (r235607)
+++ stable/8/sys/i386/i386/machdep.c Fri May 18 14:29:54 2012 (r235608)
@@ -2508,6 +2508,7 @@ init386(first)
{
unsigned long gdtmachpfn;
int error, gsel_tss, metadata_missing, x, pa;
+ size_t kstack0_sz;
struct pcpu *pc;
struct callback_register event = {
.type = CALLBACKTYPE_event,
@@ -2519,8 +2520,9 @@ init386(first)
};
thread0.td_kstack = proc0kstack;
- thread0.td_pcb = (struct pcb *)
- (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ thread0.td_kstack_pages = KSTACK_PAGES;
+ kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE;
+ thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1;
/*
* This may be done better later if it gets more high level
@@ -2671,7 +2673,7 @@ init386(first)
/* make an initial tss so cpu can get interrupt stack on syscall! */
/* Note: -16 is so we can grow the trapframe if we came from vm86 */
PCPU_SET(common_tss.tss_esp0, thread0.td_kstack +
- KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16);
+ kstack0_sz - sizeof(struct pcb) - 16);
PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL));
gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL),
@@ -2734,11 +2736,13 @@ init386(first)
{
struct gate_descriptor *gdp;
int gsel_tss, metadata_missing, x, pa;
+ size_t kstack0_sz;
struct pcpu *pc;
thread0.td_kstack = proc0kstack;
- thread0.td_pcb = (struct pcb *)
- (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ thread0.td_kstack_pages = KSTACK_PAGES;
+ kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE;
+ thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1;
/*
* This may be done better later if it gets more high level
@@ -2930,7 +2934,7 @@ init386(first)
/* make an initial tss so cpu can get interrupt stack on syscall! */
/* Note: -16 is so we can grow the trapframe if we came from vm86 */
PCPU_SET(common_tss.tss_esp0, thread0.td_kstack +
- KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16);
+ kstack0_sz - sizeof(struct pcb) - 16);
PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL));
gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
PCPU_SET(tss_gdt, &gdt[GPROC0_SEL].sd);
Modified: stable/8/sys/pc98/pc98/machdep.c
==============================================================================
--- stable/8/sys/pc98/pc98/machdep.c Fri May 18 14:12:17 2012 (r235607)
+++ stable/8/sys/pc98/pc98/machdep.c Fri May 18 14:29:54 2012 (r235608)
@@ -2088,11 +2088,13 @@ init386(first)
{
struct gate_descriptor *gdp;
int gsel_tss, metadata_missing, x, pa;
+ size_t kstack0_sz;
struct pcpu *pc;
thread0.td_kstack = proc0kstack;
- thread0.td_pcb = (struct pcb *)
- (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+ thread0.td_kstack_pages = KSTACK_PAGES;
+ kstack0_sz = thread0.td_kstack_pages * PAGE_SIZE;
+ thread0.td_pcb = (struct pcb *)(thread0.td_kstack + kstack0_sz) - 1;
/*
* This may be done better later if it gets more high level
@@ -2262,7 +2264,7 @@ init386(first)
/* make an initial tss so cpu can get interrupt stack on syscall! */
/* Note: -16 is so we can grow the trapframe if we came from vm86 */
PCPU_SET(common_tss.tss_esp0, thread0.td_kstack +
- KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16);
+ kstack0_sz - sizeof(struct pcb) - 16);
PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL));
gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
PCPU_SET(tss_gdt, &gdt[GPROC0_SEL].sd);
More information about the svn-src-stable-8
mailing list