From owner-p4-projects@FreeBSD.ORG Thu Aug 9 17:05:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CFB816A468; Thu, 9 Aug 2007 17:05:27 +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 5A88316A420 for ; Thu, 9 Aug 2007 17:05:27 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A70213C4B0 for ; Thu, 9 Aug 2007 17:05:27 +0000 (UTC) (envelope-from jbr@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 l79H5RXM076872 for ; Thu, 9 Aug 2007 17:05:27 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l79H5Q74076869 for perforce@freebsd.org; Thu, 9 Aug 2007 17:05:26 GMT (envelope-from jbr@FreeBSD.org) Date: Thu, 9 Aug 2007 17:05:26 GMT Message-Id: <200708091705.l79H5Q74076869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 124960 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: Thu, 09 Aug 2007 17:05:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=124960 Change 124960 by jbr@jbr_bob on 2007/08/09 17:05:23 The page allocation has been moved Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#9 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/exec.h#2 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#6 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#9 (text+ko) ==== @@ -445,6 +445,8 @@ goto exec_fail_dealloc; } + exec_map_sysshm(imgp); + /* * Special interpreter operation, cleanup and loop up to try to * activate the interpreter. @@ -902,6 +904,18 @@ } } +int +exec_map_sysshm(imgp) + struct image_params *imgp; +{ + vm_map_t map = &imgp->proc->p_vmspace->vm_map; + vm_offset_t *addr = &imgp->proc->p_sysent->sv_sysshm; + + vm_map_sysshm(map, addr, 42); + + return(0); +} + /* * Destroy old address space, and allocate a new stack * The new stack is only SGROWSIZ large because it is grown @@ -918,7 +932,7 @@ vm_offset_t stack_addr; vm_map_t map; u_long ssiz; - + imgp->vmspace_destroyed = 1; imgp->sysent = sv; @@ -969,11 +983,6 @@ vmspace->vm_ssize = sgrowsiz >> PAGE_SHIFT; vmspace->vm_maxsaddr = (char *)sv->sv_usrstack - ssiz; - /* Allocate memory shared between process and kernel */ - error = vm_map_sysshm(map, &(sv->sv_sysshm), 42); - if (error) - return (error); - return (0); } ==== //depot/projects/soc2007/jbr-syscall/src/sys/sys/exec.h#2 (text+ko) ==== @@ -74,6 +74,8 @@ int exec_map_first_page(struct image_params *); void exec_unmap_first_page(struct image_params *); +int exec_map_sysshm(struct image_params *); + int exec_register(const struct execsw *); int exec_unregister(const struct execsw *); ==== //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#6 (text+ko) ==== @@ -2993,11 +2993,14 @@ size = round_page(size); - *addr = round_page((vm_offset_t) - curthread->td_proc->p_vmspace->vm_daddr); - -/* error = vm_map_find(map, NULL, 0, addr, size, TRUE, VM_PROT_NONE, */ -/* VM_PROT_ALL, 0); */ + PROC_LOCK(curthread->td_proc); + *addr = round_page((vm_offset_t) + curthread->td_proc->p_vmspace->vm_daddr) + + lim_cur(curthread->td_proc, RLIMIT_DATA); + PROC_UNLOCK(curthread->td_proc); + + error = vm_map_find(map, NULL, 0, addr, size, TRUE, VM_PROT_NONE, + VM_PROT_ALL, 0); return (error); }