Page MenuHomeFreeBSD
Files F177131582

D29008.1793855313.diff
No OneTemporary
Actions

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D29008.1793855313.diff
View Options

Index: usr.sbin/jail/command.c
===================================================================
--- usr.sbin/jail/command.c
+++ usr.sbin/jail/command.c
@@ -30,6 +30,7 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
+#include <sys/cpuset.h>
#include <sys/event.h>
#include <sys/mount.h>
#include <sys/stat.h>
@@ -84,6 +85,20 @@
static struct phhead phash[PHASH_SIZE];
static int kq;
+static cpusetid_t
+root_cpuset_id(void)
+{
+ static cpusetid_t setid = CPUSET_INVALID;
+ static int error;
+
+ /* Only try to get the cpuset once. */
+ if (error == 0 && setid == CPUSET_INVALID)
+ error = cpuset_getid(CPU_LEVEL_ROOT, CPU_WHICH_PID, -1, &setid);
+ if (error != 0)
+ return (CPUSET_INVALID);
+ return (setid);
+}
+
/*
* Run the next command associated with a jail.
*/
@@ -283,6 +298,7 @@
enum intparam comparam;
size_t comlen;
pid_t pid;
+ cpusetid_t setid;
int argc, bg, clean, consfd, down, fib, i, injail, sjuser, timeout;
#if defined(INET) || defined(INET6)
char *addr, *extrap, *p, *val;
@@ -632,6 +648,10 @@
injail = comparam == IP_EXEC_START || comparam == IP_COMMAND ||
comparam == IP_EXEC_STOP;
+ if (injail)
+ setid = root_cpuset_id();
+ else
+ setid = CPUSET_INVALID;
clean = bool_param(j->intparams[IP_EXEC_CLEAN]);
username = string_param(j->intparams[injail
? IP_EXEC_JAIL_USER : IP_EXEC_SYSTEM_USER]);
@@ -700,6 +720,19 @@
jail_warnx(j, "setfib: %s", strerror(errno));
exit(1);
}
+
+ /*
+ * We wouldn't have specialized our affinity, so just setid to
+ * root. We do this prior to attaching to avoid the kernel
+ * having to create a transient cpuset that we'll promptly
+ * free up with a reset to the jail's cpuset.
+ *
+ * This is just a best-effort to use as wide of mask as
+ * possible.
+ */
+ if (setid != CPUSET_INVALID)
+ (void)cpuset_setid(CPU_WHICH_PID, -1, setid);
+
if (jail_attach(j->jid) < 0) {
jail_warnx(j, "jail_attach: %s", strerror(errno));
exit(1);

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 5, 5:08 AM (1 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41457979
Default Alt Text
D29008.1793855313.diff (1 KB)

Event Timeline