From owner-p4-projects@FreeBSD.ORG Mon Aug 21 04:34:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E0BB16A4E1; Mon, 21 Aug 2006 04:34:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEF6116A4DE for ; Mon, 21 Aug 2006 04:34:05 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9975543D46 for ; Mon, 21 Aug 2006 04:34:05 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7L4Y5to016204 for ; Mon, 21 Aug 2006 04:34:05 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7L4Y5jB016201 for perforce@freebsd.org; Mon, 21 Aug 2006 04:34:05 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 21 Aug 2006 04:34:05 GMT Message-Id: <200608210434.k7L4Y5jB016201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104652 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: Mon, 21 Aug 2006 04:34:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=104652 Change 104652 by cdjones@cdjones-impulse on 2006/08/21 04:33:12 Lay groundwork for new jail_set_resource_limits syscall. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_sysent.c#5 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.c#5 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#5 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.h#5 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.mk#5 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysproto.h#5 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/init_sysent.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.195.2.2 2006/03/17 01:47:32 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp */ @@ -485,4 +485,5 @@ { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl, AUE_NULL }, /* 453 = auditctl */ { SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL }, /* 454 = _umtx_op */ { SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL }, /* 455 = thr_new */ + { SYF_MPSAFE | AS(jail_set_resource_limits_args), (sy_call_t *)jail_set_resource_limits, AUE_NULL }, /* 456 = jail_set_resource_limits */ }; ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.181.2.2 2006/03/17 01:47:32 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp */ @@ -463,4 +463,5 @@ "auditctl", /* 453 = auditctl */ "_umtx_op", /* 454 = _umtx_op */ "thr_new", /* 455 = thr_new */ + "jail_set_resource_limits", /* 456 = jail_set_resource_limits */ }; ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/syscalls.master#5 (text+ko) ==== @@ -793,6 +793,8 @@ long id, void *uaddr, void *uaddr2); } 455 AUE_NULL MSTD { int thr_new(struct thr_param *param, \ int param_size); } +456 AUE_NULL MSTD { int jail_set_resource_limits(unsigned int jid, \ + int cpushares, int memlimit); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.178.2.2 2006/03/17 01:47:33 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp */ @@ -371,4 +371,5 @@ #define SYS_auditctl 453 #define SYS__umtx_op 454 #define SYS_thr_new 455 -#define SYS_MAXSYSCALL 456 +#define SYS_jail_set_resource_limits 456 +#define SYS_MAXSYSCALL 457 ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/syscall.mk#5 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.133.2.2 2006/03/17 01:47:33 rwatson Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp MIASM = \ syscall.o \ @@ -312,4 +312,5 @@ setaudit_addr.o \ auditctl.o \ _umtx_op.o \ - thr_new.o + thr_new.o \ + jail_set_resource_limits.o ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysproto.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.177.2.2 2006/03/17 01:47:33 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.2 2006/03/17 01:47:06 rwatson Exp */ @@ -1365,6 +1365,11 @@ char param_l_[PADL_(struct thr_param *)]; struct thr_param * param; char param_r_[PADR_(struct thr_param *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; +struct jail_set_resource_limits_args { + char jid_l_[PADL_(unsigned int)]; unsigned int jid; char jid_r_[PADR_(unsigned int)]; + char cpushares_l_[PADL_(int)]; int cpushares; char cpushares_r_[PADR_(int)]; + char memlimit_l_[PADL_(int)]; int memlimit; char memlimit_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1674,6 +1679,7 @@ int auditctl(struct thread *, struct auditctl_args *); int _umtx_op(struct thread *, struct _umtx_op_args *); int thr_new(struct thread *, struct thr_new_args *); +int jail_set_resource_limits(struct thread *, struct jail_set_resource_limits_args *); #ifdef COMPAT_43