From owner-p4-projects@FreeBSD.ORG Sun Feb 3 18:46:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B300516A46C; Sun, 3 Feb 2008 18:46:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78DC716A419 for ; Sun, 3 Feb 2008 18:46:03 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD53513C4EA for ; Sun, 3 Feb 2008 18:46:02 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m13Ik2mI036074 for ; Sun, 3 Feb 2008 18:46:02 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m13Ik24f036071 for perforce@freebsd.org; Sun, 3 Feb 2008 18:46:02 GMT (envelope-from cognet@freebsd.org) Date: Sun, 3 Feb 2008 18:46:02 GMT Message-Id: <200802031846.m13Ik24f036071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 134734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Feb 2008 18:46:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=134734 Change 134734 by cognet@cognet-mips on 2008/02/03 18:45:26 Wicked bad evil naughty cognet. the cpu_switch() code uses an hardcoded KSTACK_PAGES of 2, so just map the relevant entries. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#14 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#14 (text+ko) ==== @@ -143,11 +143,11 @@ td2->td_frame->v1 = 1; td2->td_frame->a3 = 0; - if (!(pte = pmap_segmap(kernel_pmap, (vm_offset_t)td2->td_kstack))) + if (!(pte = pmap_segmap(kernel_pmap, td2->td_md.md_realstack))) panic("cpu_fork: invalid segmap"); - pte += ((vm_offset_t)td2->td_kstack >> PGSHIFT) & (NPTEPG - 1); + pte += ((vm_offset_t)td2->td_md.md_realstack >> PGSHIFT) & (NPTEPG - 1); - for (i = 0; i < KSTACK_PAGES; i++) { + for (i = 0; i < KSTACK_PAGES - 1; i++) { td2->td_md.md_upte[i] = *pte & ~(PG_RO|PG_WIRED); pte++; } @@ -230,11 +230,11 @@ * part of the thread struct so cpu_switch() can quickly map in * the pcb struct and kernel stack. */ - if (!(pte = pmap_segmap(kernel_pmap, (vm_offset_t)td->td_kstack))) + if (!(pte = pmap_segmap(kernel_pmap, td->td_md.md_realstack))) panic("cpu_thread_swapin: invalid segmap"); - pte += ((vm_offset_t)td->td_kstack >> PGSHIFT) & (NPTEPG - 1); + pte += ((vm_offset_t)td->td_md.md_realstack >> PGSHIFT) & (NPTEPG - 1); - for (i = 0; i < KSTACK_PAGES; i++) { + for (i = 0; i < KSTACK_PAGES - 1; i++) { td->td_md.md_upte[i] = *pte & ~(PG_RO|PG_WIRED); pte++; } @@ -260,9 +260,9 @@ (td->td_kstack_pages - 1) * PAGE_SIZE) - 1; td->td_frame = &td->td_pcb->pcb_regs; - if (!(pte = pmap_segmap(kernel_pmap, (vm_offset_t)td->td_kstack))) + if (!(pte = pmap_segmap(kernel_pmap, td->td_md.md_realstack))) panic("cpu_thread_alloc: invalid segmap"); - pte += ((vm_offset_t)td->td_kstack >> PGSHIFT) & (NPTEPG - 1); + pte += ((vm_offset_t)td->td_md.md_realstack >> PGSHIFT) & (NPTEPG - 1); for (i = 0; i < KSTACK_PAGES; i++) { td->td_md.md_upte[i] = *pte & ~(PG_RO|PG_WIRED);