From owner-p4-projects@FreeBSD.ORG Wed Aug 8 14:19:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB60016A41B; Wed, 8 Aug 2007 14:19:33 +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 7AB1F16A419 for ; Wed, 8 Aug 2007 14:19:33 +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 6652813C461 for ; Wed, 8 Aug 2007 14:19:33 +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 l78EJXJQ070712 for ; Wed, 8 Aug 2007 14:19:33 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l78EJWQM070706 for perforce@freebsd.org; Wed, 8 Aug 2007 14:19:32 GMT (envelope-from jbr@FreeBSD.org) Date: Wed, 8 Aug 2007 14:19:32 GMT Message-Id: <200708081419.l78EJWQM070706@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 124900 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: Wed, 08 Aug 2007 14:19:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=124900 Change 124900 by jbr@jbr_bob on 2007/08/08 14:19:22 readded sysctl Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#7 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysctl.h#2 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#7 (text+ko) ==== @@ -86,6 +86,7 @@ static int sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS); static int sysctl_kern_usrstack(SYSCTL_HANDLER_ARGS); +static int sysctl_kern_usrsysshm(SYSCTL_HANDLER_ARGS); static int sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS); static int do_execve(struct thread *td, struct image_args *args, struct mac *mac_p); @@ -99,6 +100,9 @@ SYSCTL_PROC(_kern, KERN_USRSTACK, usrstack, CTLTYPE_ULONG|CTLFLAG_RD, NULL, 0, sysctl_kern_usrstack, "LU", ""); +SYSCTL_PROC(_kern, KERN_USRSYSSHM, usrsysshm, CTLTYPE_ULONG|CTLFLAG_RD, + NULL, 0, sysctl_kern_usrsysshm, "LU", ""); + SYSCTL_PROC(_kern, OID_AUTO, stackprot, CTLTYPE_INT|CTLFLAG_RD, NULL, 0, sysctl_kern_stackprot, "I", ""); @@ -145,6 +149,25 @@ } static int +sysctl_kern_usrsysshm(SYSCTL_HANDLER_ARGS) +{ + struct proc *p; + int error; + + p = curproc; +#ifdef SCTL_MASK32 + if (req->flags & SCTL_MASK32) { + unsigned int val; + val = (unsigned int)p->p_sysent->sv_sysshm; + error = SYSCTL_OUT(req, &val, sizeof(val)); + } else +#endif + error = SYSCTL_OUT(req, &p->p_sysent->sv_sysshm, + sizeof(p->p_sysent->sv_sysshm)); + return error; +} + +static int sysctl_kern_stackprot(SYSCTL_HANDLER_ARGS) { struct proc *p; ==== //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysctl.h#2 (text+ko) ==== @@ -393,6 +393,7 @@ #define KERN_HOSTUUID 36 /* string: host UUID identifier */ #define KERN_ARND 37 /* int: from arc4rand() */ #define KERN_MAXID 38 /* number of valid kern ids */ +#define KERN_USRSYSSHM 39 /* int: address of sysshm page */ #define CTL_KERN_NAMES { \ { 0, 0 }, \ @@ -431,6 +432,7 @@ { "logsigexit", CTLTYPE_INT }, \ { "iov_max", CTLTYPE_INT }, \ { "hostuuid", CTLTYPE_STRING }, \ + { "usrsysshm", CTLTYPE_INT }, \ } /*