1 files changed, 23 insertions, 350 deletions

diff --git a/sys/kern/kern_vimage.c b/sys/kern/kern_vimage.c
index daa9b9f..328b2ba 100644
--- a/sys/kern/kern_vimage.c
+++ b/sys/kern/kern_vimage.c
@@ -36,14 +36,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
-#include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sx.h>
-#include <sys/priv.h>
-#include <sys/refcount.h>
 #include <sys/vimage.h>
 #ifdef DDB
 #include <ddb/ddb.h>
@@ -53,9 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <net/route.h>
 #include <net/vnet.h>
 
-MALLOC_DEFINE(M_VIMAGE, "vimage", "vimage resource container");
 MALLOC_DEFINE(M_VNET, "vnet", "network stack control block");
-MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block");
 
 static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head;
 static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head;
@@ -63,12 +58,6 @@ static void vnet_mod_complete_registration(struct vnet_modlink *);
 static int vnet_mod_constructor(struct vnet_modlink *);
 static int vnet_mod_destructor(struct vnet_modlink *);
 
-static struct vimage *vi_alloc(struct vimage *, char *);
-static int vi_destroy(struct vimage *);
-static struct vimage *vimage_get_next(struct vimage *, struct vimage *, int);
-static void vimage_relative_name(struct vimage *, struct vimage *,
-    char *, int);
-
 #define	VNET_LIST_WLOCK()						\
 	mtx_lock(&vnet_list_refc_mtx);					\
 	while (vnet_list_refc != 0)					\
@@ -77,82 +66,45 @@ static void vimage_relative_name(struct vimage *, struct vimage *,
 #define	VNET_LIST_WUNLOCK()						\
 	mtx_unlock(&vnet_list_refc_mtx);
 
-struct vimage_list_head vimage_head;
 struct vnet_list_head vnet_head;
-struct vprocg_list_head vprocg_head;
-struct vprocg vprocg_0;
 
 struct cv vnet_list_condvar;
 struct mtx vnet_list_refc_mtx;
 int vnet_list_refc = 0;
 
-static u_int last_vi_id = 0;
-static u_int last_vprocg_id = 0;
-
 struct vnet *vnet0;
 
 
 /*
- * Move an ifnet to or from another vnet, specified by the jail id.  If a
- * vi_req is passed in, it is used to find the interface and a vimage
- * containing the vnet (a vimage name of ".." stands for the parent vnet).
+ * Move an ifnet to or from another vnet, specified by the jail id.
  */
 int
-vi_if_move(struct thread *td, struct ifnet *ifp, char *ifname, int jid,
-    struct vi_req *vi_req)
+vi_if_move(struct thread *td, struct ifnet *ifp, char *ifname, int jid)
 {
 	struct ifnet *t_ifp;
 	struct prison *pr;
-	struct vimage *new_vip, *my_vip;
 	struct vnet *new_vnet;
 	int error;
 
-	if (vi_req != NULL) {
-		/* SIOCSIFVIMAGE */
-		pr = NULL;
-		/* Check for API / ABI version mismatch. */
-		if (vi_req->vi_api_cookie != VI_API_COOKIE)
-			return (EDOOFUS);
-
-		/* Find the target vnet. */
-		my_vip = TD_TO_VIMAGE(td);
-		if (strcmp(vi_req->vi_name, "..") == 0) {
-			if (IS_DEFAULT_VIMAGE(my_vip))
-				return (ENXIO);
-			new_vnet = my_vip->vi_parent->v_net;
-		} else {
-			new_vip = vimage_by_name(my_vip, vi_req->vi_name);
-			if (new_vip == NULL)
-				return (ENXIO);
-			new_vnet = new_vip->v_net;
-		}
-
-		/* Try to find the target ifnet by name. */
-		ifname = vi_req->vi_if_xname;
-		ifp = ifunit(ifname);
-		if (ifp == NULL)
-			return (ENXIO);
+	sx_slock(&allprison_lock);
+	pr = prison_find_child(td->td_ucred->cr_prison, jid);
+	sx_sunlock(&allprison_lock);
+	if (pr == NULL)
+		return (ENXIO);
+	prison_hold_locked(pr);
+	mtx_unlock(&pr->pr_mtx);
+	if (ifp != NULL) {
+		/* SIOCSIFVNET */
+		new_vnet = pr->pr_vnet;
 	} else {
-		sx_slock(&allprison_lock);
-		pr = prison_find_child(td->td_ucred->cr_prison, jid);
-		sx_sunlock(&allprison_lock);
-		if (pr == NULL)
+		/* SIOCSIFRVNET */
+		new_vnet = TD_TO_VNET(td);
+		CURVNET_SET(pr->pr_vnet);
+		ifp = ifunit(ifname);
+		CURVNET_RESTORE();
+		if (ifp == NULL) {
+			prison_free(pr);
 			return (ENXIO);
-		prison_hold_locked(pr);
-		mtx_unlock(&pr->pr_mtx);
-		if (ifp != NULL) {
-			/* SIOCSIFVNET */
-			new_vnet = pr->pr_vnet;
-		} else {
-			/* SIOCSIFRVNET */
-			new_vnet = TD_TO_VNET(td);
-			CURVNET_SET(pr->pr_vnet);
-			ifp = ifunit(ifname);
-			CURVNET_RESTORE();
-			if (ifp == NULL) {
-				prison_free(pr);
-				return (ENXIO);
-			}
 		}
 	}
 
@@ -175,215 +127,10 @@ vi_if_move(struct thread *td, struct ifnet *ifp, char *ifname, int jid,
 			sprintf(ifname, "%s", ifp->if_xname);
 		}
 	}
-	if (pr != NULL)
-		prison_free(pr);
+	prison_free(pr);
 	return (error);
 }
 
-/*
- * Interim userspace interface - will be replaced by jail soon.
- */
-
-int
-vi_td_ioctl(u_long cmd, struct vi_req *vi_req, struct thread *td)
-{
-	int error = 0;
-	struct vimage *vip = TD_TO_VIMAGE(td);
-	struct vimage *vip_r = NULL;
-
-	/* Check for API / ABI version mismatch. */
-	if (vi_req->vi_api_cookie != VI_API_COOKIE)
-		return (EDOOFUS);
-
-	error = priv_check(td, PRIV_REBOOT); /* XXX temp. priv abuse */
-	if (error)
-		return (error);
-
-	vip_r = vimage_by_name(vip, vi_req->vi_name);
-	if (vip_r == NULL && !(vi_req->vi_req_action & VI_CREATE))
-		return (ESRCH);
-	if (vip_r != NULL && vi_req->vi_req_action & VI_CREATE)
-		return (EADDRINUSE);
-	if (vi_req->vi_req_action == VI_GETNEXT) {
-		vip_r = vimage_get_next(vip, vip_r, 0);
-		if (vip_r == NULL)
-			return (ESRCH);
-	}
-	if (vi_req->vi_req_action == VI_GETNEXT_RECURSE) {
-		vip_r = vimage_get_next(vip, vip_r, 1);
-		if (vip_r == NULL)
-			return (ESRCH);
-	}
-
-	if (vip_r && !vi_child_of(vip, vip_r) && /* XXX delete the rest? */
-	    vi_req->vi_req_action != VI_GET &&
-	    vi_req->vi_req_action != VI_GETNEXT)
-		return (EPERM);
-
-	switch (cmd) {
-
-	case SIOCGPVIMAGE:
-		vimage_relative_name(vip, vip_r, vi_req->vi_name,
-		    sizeof (vi_req->vi_name));
-		vi_req->vi_proc_count = vip_r->v_procg->nprocs;
-		vi_req->vi_if_count = vip_r->v_net->ifcnt;
-		vi_req->vi_sock_count = vip_r->v_net->sockcnt;
-		break;
-
-	case SIOCSPVIMAGE:
-		if (vi_req->vi_req_action == VI_DESTROY) {
-			error = vi_destroy(vip_r);
-			break;
-		}
-
-		if (vi_req->vi_req_action == VI_SWITCHTO) {
-			struct proc *p = td->td_proc;
-			struct ucred *oldcred, *newcred;
-
-			/*
-			 * XXX priv_check()?
-			 * XXX allow only a single td per proc here?
-			 */
-			newcred = crget();
-			PROC_LOCK(p);
-			oldcred = p->p_ucred;
-			setsugid(p);
-			crcopy(newcred, oldcred);
-			refcount_release(&newcred->cr_vimage->vi_ucredrefc);
-			newcred->cr_vimage = vip_r;
-			refcount_acquire(&newcred->cr_vimage->vi_ucredrefc);
-			p->p_ucred = newcred;
-			PROC_UNLOCK(p);
-			sx_xlock(&allproc_lock);
-			oldcred->cr_vimage->v_procg->nprocs--;
-			refcount_release(&oldcred->cr_vimage->vi_ucredrefc);
-			P_TO_VPROCG(p)->nprocs++;
-			sx_xunlock(&allproc_lock);
-			crfree(oldcred);
-			break;
-		}
-
-		if (vi_req->vi_req_action & VI_CREATE) {
-			char *dotpos;
-
-			dotpos = strrchr(vi_req->vi_name, '.');
-			if (dotpos != NULL) {
-				*dotpos = 0;
-				vip = vimage_by_name(vip, vi_req->vi_name);
-				if (vip == NULL)
-					return (ESRCH);
-				dotpos++;
-				vip_r = vi_alloc(vip, dotpos);
-			} else
-				vip_r = vi_alloc(vip, vi_req->vi_name);
-			if (vip_r == NULL)
-				return (ENOMEM);
-		}
-	}
-	return (error);
-}
-
-int
-vi_child_of(struct vimage *parent, struct vimage *child)
-{
-
-	if (child == parent)
-		return (0);
-	for (; child; child = child->vi_parent)
-		if (child == parent)
-			return (1);
-	return (0);
-}
-
-struct vimage *
-vimage_by_name(struct vimage *top, char *name)
-{
-	struct vimage *vip;
-	char *next_name;
-	int namelen;
-
-	next_name = strchr(name, '.');
-	if (next_name != NULL) {
-		namelen = next_name - name;
-		next_name++;
-		if (namelen == 0) {
-			if (strlen(next_name) == 0)
-				return (top);	/* '.' == this vimage */
-			else
-				return (NULL);
-		}
-	} else
-		namelen = strlen(name);
-	if (namelen == 0)
-		return (NULL);
-	LIST_FOREACH(vip, &top->vi_child_head, vi_sibling) {
-		if (strlen(vip->vi_name) == namelen &&
-		    strncmp(name, vip->vi_name, namelen) == 0) {
-			if (next_name != NULL)
-				return (vimage_by_name(vip, next_name));
-			else
-				return (vip);
-		}
-	}
-	return (NULL);
-}
-
-static void
-vimage_relative_name(struct vimage *top, struct vimage *where,
-    char *buffer, int bufflen)
-{
-	int used = 1;
-
-	if (where == top) {
-		sprintf(buffer, ".");
-		return;
-	} else
-		*buffer = 0;
-
-	do {
-		int namelen = strlen(where->vi_name);
-
-		if (namelen + used + 1 >= bufflen)
-			panic("buffer overflow");
-
-		if (used > 1) {
-			bcopy(buffer, &buffer[namelen + 1], used);
-			buffer[namelen] = '.';
-			used++;
-		} else
-			bcopy(buffer, &buffer[namelen], used);
-		bcopy(where->vi_name, buffer, namelen);
-		used += namelen;
-		where = where->vi_parent;
-	} while (where != top);
-}
-
-static struct vimage *
-vimage_get_next(struct vimage *top, struct vimage *where, int recurse)
-{
-	struct vimage *next;
-
-	if (recurse) {
-		/* Try to go deeper in the hierarchy */
-		next = LIST_FIRST(&where->vi_child_head);
-		if (next != NULL)
-			return (next);
-	}
-
-	do {
-		/* Try to find next sibling */
-		next = LIST_NEXT(where, vi_sibling);
-		if (!recurse || next != NULL)
-			return (next);
-
-		/* Nothing left on this level, go one level up */
-		where = where->vi_parent;
-	} while (where != top->vi_parent);
-
-	/* Nothing left to be visited, we are done */
-	return (NULL);
-}
-
 
 /*
  * Kernel interfaces and handlers.
@@ -409,7 +156,7 @@ vnet_mod_register_multi(const struct vnet_modinfo *vmi, void *iarg,
 	if (vml_iter != NULL)
 		panic("registering an already registered vnet module: %s",
 		    vml_iter->vml_modinfo->vmi_name);
-	vml = malloc(sizeof(struct vnet_modlink), M_VIMAGE, M_NOWAIT);
+	vml = malloc(sizeof(struct vnet_modlink), M_VNET, M_NOWAIT);
 
 	/*
 	 * XXX we support only statically assigned module IDs at the time.
@@ -513,7 +260,7 @@ vnet_mod_deregister_multi(const struct vnet_modinfo *vmi, void *iarg,
 	}
 
 	TAILQ_REMOVE(&vnet_modlink_head, vml, vml_mod_le);
-	free(vml, M_VIMAGE);
+	free(vml, M_VNET);
 }
 
 static int
@@ -625,75 +372,6 @@ vnet_foreach(void (*vnet_foreach_fn)(struct vnet *, void *), void *arg)
 	VNET_LIST_RUNLOCK();
 }
 
-static struct vimage *
-vi_alloc(struct vimage *parent, char *name)
-{
-	struct vimage *vip;
-	struct vprocg *vprocg;
-
-	vip = malloc(sizeof(struct vimage), M_VIMAGE, M_NOWAIT | M_ZERO);
-	if (vip == NULL)
-		panic("vi_alloc: malloc failed for vimage \"%s\"\n", name);
-	vip->vi_id = last_vi_id++;
-	LIST_INIT(&vip->vi_child_head);
-	sprintf(vip->vi_name, "%s", name);
-	vip->vi_parent = parent;
-	/* XXX locking */
-	if (parent != NULL)
-		LIST_INSERT_HEAD(&parent->vi_child_head, vip, vi_sibling);
-	else if (!LIST_EMPTY(&vimage_head))
-		panic("there can be only one default vimage!");
-	LIST_INSERT_HEAD(&vimage_head, vip, vi_le);
-
-	vip->v_net = vnet_alloc();
-
-	vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT | M_ZERO);
-	if (vprocg == NULL)
-		panic("vi_alloc: malloc failed for vprocg \"%s\"\n", name);
-	vip->v_procg = vprocg;
-	vprocg->vprocg_id = last_vprocg_id++;
-
-	/* XXX locking */
-	LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le);
-
-	return (vip);
-}
-
-/*
- * Destroy a vnet - unlink all linked lists, hashtables etc., free all
- * the memory, stop all the timers...
- */
-static int
-vi_destroy(struct vimage *vip)
-{
-	struct vprocg *vprocg = vip->v_procg;
-
-	/* XXX Beware of races -> more locking to be done... */
-	if (!LIST_EMPTY(&vip->vi_child_head))
-		return (EBUSY);
-
-	if (vprocg->nprocs != 0)
-		return (EBUSY);
-
-#ifdef INVARIANTS
-	if (vip->vi_ucredrefc != 0)
-		printf("vi_destroy: %s ucredrefc %d\n",
-		    vip->vi_name, vip->vi_ucredrefc);
-#endif
-
-	/* Point with no return - cleanup MUST succeed! */
-	vnet_destroy(vip->v_net);
-
-	LIST_REMOVE(vip, vi_le);
-	LIST_REMOVE(vip, vi_sibling);
-	LIST_REMOVE(vprocg, vprocg_le);
-
-	free(vprocg, M_VPROCG);
-	free(vip, M_VIMAGE);
-
-	return (0);
-}
-
 static void
 vi_init(void *unused)
 {
@@ -701,22 +379,17 @@ vi_init(void *unused)
 	TAILQ_INIT(&vnet_modlink_head);
 	TAILQ_INIT(&vnet_modpending_head);
 
-	LIST_INIT(&vimage_head);
-	LIST_INIT(&vprocg_head);
 	LIST_INIT(&vnet_head);
 
 	mtx_init(&vnet_list_refc_mtx, "vnet_list_refc_mtx", NULL, MTX_DEF);
 	cv_init(&vnet_list_condvar, "vnet_list_condvar");
 
-	/* Default image has no parent and no name. */
-	vi_alloc(NULL, "");
-
 	/*
 	 * We MUST clear curvnet in vi_init_done() before going SMP,
 	 * otherwise CURVNET_SET() macros would scream about unnecessary
 	 * curvnet recursions.
 	 */
-	curvnet = prison0.pr_vnet = vnet0 = LIST_FIRST(&vnet_head);
+	curvnet = prison0.pr_vnet = vnet0 = vnet_alloc();
 }
 
 static void