MFp4:

  Bring in updated jail support from bz_jail branch.

This enhances the current jail implementation to permit multiple
addresses per jail. In addtion to IPv4, IPv6 is supported as well.
Due to updated checks it is even possible to have jails without
an IP address at all, which basically gives one a chroot with
restricted process view, no networking,..

SCTP support was updated and supports IPv6 in jails as well.

Cpuset support permits jails to be bound to specific processor
sets after creation.

Jails can have an unrestricted (no duplicate protection, etc.) name
in addition to the hostname. The jail name cannot be changed from
within a jail and is considered to be used for management purposes
or as audit-token in the future.

DDB 'show jails' command was added to aid debugging.

Proper compat support permits 32bit jail binaries to be used on 64bit
systems to manage jails. Also backward compatibility was preserved where
possible: for jail v1 syscalls, as well as with user space management
utilities.

Both jail as well as prison version were updated for the new features.
A gap was intentionally left as the intermediate versions had been
used by various patches floating around the last years.

Bump __FreeBSD_version for the afore mentioned and in kernel changes.

Special thanks to:
- Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches
  and Olivier Houchard (cognet) for initial single-IPv6 patches.
- Jeff Roberson (jeff) and Randall Stewart (rrs) for their
  help, ideas and review on cpuset and SCTP support.
- Robert Watson (rwatson) for lots and lots of help, discussions,
  suggestions and review of most of the patch at various stages.
- John Baldwin (jhb) for his help.
- Simon L. Nielsen (simon) as early adopter testing changes
  on cluster machines as well as all the testers and people
  who provided feedback the last months on freebsd-jail and
  other channels.
- My employer, CK Software GmbH, for the support so I could work on this.

Reviewed by:	(see above)
MFC after:	3 months (this is just so that I get the mail)
X-MFC Before:   7.2-RELEASE if possible

2 files changed, 23 insertions, 13 deletions

diff --git a/usr.bin/cpuset/cpuset.1 b/usr.bin/cpuset/cpuset.1
index ba06e48338379..e8f559372c549 100644
--- a/usr.bin/cpuset/cpuset.1
+++ b/usr.bin/cpuset/cpuset.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 11, 2008
+.Dd November 29, 2008
 .Dt CPUSET 1
 .Os
 .Sh NAME
@@ -43,10 +43,10 @@
 .Nm
 .Op Fl cr
 .Op Fl l Ar cpu-list
-.Op Fl p Ar pid | Fl r Ar tid | Fl s Ar setid
+.Op Fl j Ar jailid | Fl p Ar pid | Fl r Ar tid | Fl s Ar setid | Fl x Ar irq
 .Nm
 .Op Fl cgir
-.Op Fl p Ar pid | Fl r Ar tid | Fl s Ar setid
+.Op Fl j Ar jailid | Fl p Ar pid | Fl r Ar tid | Fl s Ar setid | Fl x Ar irq
 .Sh DESCRIPTION
 The
 .Nm
@@ -56,8 +56,8 @@ about processor binding, sets, and available processors in the system.
 .Pp
 .Nm
 requires a target to modify or query.
-The target may be specified as a command, process id, thread id, or a
-cpuset id.
+The target may be specified as a command, process id, thread id, a
+cpuset id, an irq or a jail id.
 Using
 .Fl g
 the target's set id or mask may be queried.
@@ -111,6 +111,8 @@ the id of the target.
 When used with the
 .Fl g
 option print the id rather than the valid mask of the target.
+.It Fl j Ar jailid
+Specifies a jail id as the target of the operation.
 .It Fl l Ar cpu-list
 Specifies a list of CPUs to apply to a target.
 Specification may include
@@ -124,6 +126,8 @@ The requested operation should reference the root set available via the
 target specifier.
 .It Fl t Ar tid
 Specifies a thread id as the target of the operation.
+.It Fl x Ar irq 
+Specifies an irq as the target of the operation.
 .El
 .Sh EXIT STATUS
 .Ex -std
diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c
index 5858a3d07ccc9..35b13afa0a4e7 100644
--- a/usr.bin/cpuset/cpuset.c
+++ b/usr.bin/cpuset/cpuset.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 int cflag;
 int gflag;
 int iflag;
+int jflag;
 int lflag;
 int pflag;
 int rflag;
@@ -153,7 +154,7 @@ printset(cpuset_t *mask)
 	printf("\n");
 }
 
-const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "irq" };
+const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "irq", "jail" };
 const char *levelnames[] = { NULL, " root", " cpuset", "" };
 
 static void
@@ -198,7 +199,7 @@ main(int argc, char *argv[])
 	level = CPU_LEVEL_WHICH;
 	which = CPU_WHICH_PID;
 	id = pid = tid = setid = -1;
-	while ((ch = getopt(argc, argv, "cgil:p:rs:t:x:")) != -1) {
+	while ((ch = getopt(argc, argv, "cgij:l:p:rs:t:x:")) != -1) {
 		switch (ch) {
 		case 'c':
 			if (rflag)
@@ -212,6 +213,11 @@ main(int argc, char *argv[])
 		case 'i':
 			iflag = 1;
 			break;
+		case 'j':
+			jflag = 1;
+			which = CPU_WHICH_JAIL;
+			id = atoi(optarg);
+			break;
 		case 'l':
 			lflag = 1;
 			parselist(optarg, &mask);
@@ -252,7 +258,7 @@ main(int argc, char *argv[])
 		if (argc || lflag)
 			usage();
 		/* Only one identity specifier. */
-		if (xflag + sflag + pflag + tflag > 1)
+		if (jflag + xflag + sflag + pflag + tflag > 1)
 			usage();
 		if (iflag)
 			printsetid();
@@ -266,7 +272,7 @@ main(int argc, char *argv[])
 	 * The user wants to run a command with a set and possibly cpumask.
 	 */
 	if (argc) {
-		if (pflag | rflag | tflag | xflag)
+		if (pflag | rflag | tflag | xflag | jflag)
 			usage();
 		if (sflag) {
 			if (cpuset_setid(CPU_WHICH_PID, -1, setid))
@@ -292,10 +298,10 @@ main(int argc, char *argv[])
 	if (!lflag && !sflag)
 		usage();
 	/* You can only set a mask on a thread. */
-	if (tflag && (sflag | pflag | xflag))
+	if (tflag && (sflag | pflag | xflag | jflag))
 		usage();
 	/* You can only set a mask on an irq. */
-	if (xflag && (pflag | sflag | tflag))
+	if (xflag && (jflag | pflag | sflag | tflag))
 		usage();
 	if (pflag && sflag) {
 		if (cpuset_setid(CPU_WHICH_PID, pid, setid))
@@ -325,8 +331,8 @@ usage(void)
 	fprintf(stderr,
 	    "       cpuset [-l cpu-list] [-s setid] -p pid\n");
 	fprintf(stderr,
-	    "       cpuset [-cr] [-l cpu-list] [-p pid | -t tid | -s setid | -x irq]\n");
+	    "       cpuset [-cr] [-l cpu-list] [-j jailid | -p pid | -t tid | -s setid | -x irq]\n");
 	fprintf(stderr,
-	    "       cpuset [-cgir] [-p pid | -t tid | -s setid | -x irq]\n");
+	    "       cpuset [-cgir] [-j jailid | -p pid | -t tid | -s setid | -x irq]\n");
 	exit(1);
 }