X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fplanetlab.c;h=824039b4ceb5755cda297cd2f48ed80c3a0a408e;hb=de7215310b459bac3471991612e1e9a0b0ae347c;hp=5211ba0b55be9897dac4b87c19bf30ef5fc88c34;hpb=ed6d8670b9379b91b00ffe3258c8529713f78ce0;p=util-vserver-pl.git

diff --git a/src/planetlab.c b/src/planetlab.c
index 5211ba0..824039b 100644
--- a/src/planetlab.c
+++ b/src/planetlab.c
@@ -64,6 +64,7 @@ create_context(xid_t ctx, uint64_t bcaps)
   struct vc_ctx_caps   vc_caps;
   struct vc_net_flags  vc_nf;
   struct vc_net_caps   vc_ncaps;
+  uint32_t unshare_mask;
 
   /* Create network context */
   if (vc_net_create(ctx) == VC_NOCTX) {
@@ -88,12 +89,19 @@ tag:
     return -1;
 
 process:
+
   /*
    * Create context info - this sets the STATE_SETUP and STATE_INIT flags.
    */
   if (vc_ctx_create(ctx, 0) == VC_NOCTX)
     return -1;
 
+  /* Unshare the NET namespace if the slice if requested in the local slice configuration */
+  unshare_mask = get_space_flag(ctx);
+  if (unshare_mask != 0) {
+      sys_unshare(unshare_mask);
+  }
+
   /* Set capabilities - these don't take effect until SETUP flag is unset */
   vc_caps.bcaps = bcaps;
   vc_caps.bmask = ~0ULL;  /* currently unused */
@@ -134,7 +142,8 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr)
   int  retry_count = 0;
   int  net_migrated = 0;
 
-  pl_set_ulimits(slr);
+  if (pl_set_ulimits(slr) != 0)
+    return -1;
 
   for (;;)
     {
@@ -231,9 +240,18 @@ pl_setsched(xid_t ctx, uint32_t cpu_min, uint32_t cpu_share)
   return 0;
 }
 
+enum {
+  TYPE_LONG = 1,
+  TYPE_PERS = 2,
+};
+
 struct pl_resources {
 	char *name;
-	unsigned long long *limit;
+        unsigned type;
+  union {
+    unsigned long long *limit;
+    unsigned long int *personality;
+  };
 };
 
 #define WHITESPACE(buffer,index,len)     \
@@ -241,6 +259,7 @@ struct pl_resources {
 	if (index < len) index++; else goto out;
 
 #define VSERVERCONF "/etc/vservers/"
+
 void
 pl_get_limits(const char *context, struct sliver_resources *slr)
 {
@@ -250,23 +269,25 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
   char *conf = (char *)malloc(len + strlen("rlimits/openfd.hard"));
   struct pl_resources *r;
   struct pl_resources sliver_list[] = {
-    {"sched/fill-rate2", &slr->vs_cpu},
+    {"sched/fill-rate2", TYPE_LONG, &slr->vs_cpu},
 
-    {"rlimits/nproc.hard", &slr->vs_nproc.hard},
-    {"rlimits/nproc.soft", &slr->vs_nproc.soft},
-    {"rlimits/nproc.min", &slr->vs_nproc.min},
+    {"rlimits/nproc.hard", TYPE_LONG, &slr->vs_nproc.hard},
+    {"rlimits/nproc.soft", TYPE_LONG, &slr->vs_nproc.soft},
+    {"rlimits/nproc.min", TYPE_LONG, &slr->vs_nproc.min},
   
-    {"rlimits/rss.hard", &slr->vs_rss.hard},
-    {"rlimits/rss.soft", &slr->vs_rss.soft},
-    {"rlimits/rss.min", &slr->vs_rss.min},
+    {"rlimits/rss.hard", TYPE_LONG, &slr->vs_rss.hard},
+    {"rlimits/rss.soft", TYPE_LONG, &slr->vs_rss.soft},
+    {"rlimits/rss.min", TYPE_LONG, &slr->vs_rss.min},
   
-    {"rlimits/as.hard", &slr->vs_as.hard},
-    {"rlimits/as.soft", &slr->vs_as.soft},
-    {"rlimits/as.min", &slr->vs_as.min},
+    {"rlimits/as.hard", TYPE_LONG, &slr->vs_as.hard},
+    {"rlimits/as.soft", TYPE_LONG, &slr->vs_as.soft},
+    {"rlimits/as.min", TYPE_LONG, &slr->vs_as.min},
   
-    {"rlimits/openfd.hard", &slr->vs_openfd.hard},
-    {"rlimits/openfd.soft", &slr->vs_openfd.soft},
-    {"rlimits/openfd.min", &slr->vs_openfd.min},
+    {"rlimits/openfd.hard", TYPE_LONG, &slr->vs_openfd.hard},
+    {"rlimits/openfd.soft", TYPE_LONG, &slr->vs_openfd.soft},
+    {"rlimits/openfd.min", TYPE_LONG, &slr->vs_openfd.min},
+
+    {"personality", TYPE_PERS, &slr->personality},
 
     {0,0}
   };
@@ -289,6 +310,8 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
   slr->vs_openfd.soft = VC_LIM_KEEP;
   slr->vs_openfd.min = VC_LIM_KEEP;
 
+  slr->personality = 0;
+
   cwd = open(".", O_RDONLY);
   if (cwd == -1) {
     perror("cannot get a handle on .");
@@ -305,8 +328,24 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
     fb = fopen(r->name, "r");
     if (fb == NULL)
       continue;
-    if (fgets(buf, sizeof(buf), fb) != NULL && isdigit(*buf))
-      *r->limit = atoi(buf);
+    if (fgets(buf, sizeof(buf), fb) != NULL) {
+      len=strlen(buf);
+      /* remove trailing newline */
+      if (buf[len-1] == '\n') {
+	buf[len-1]='\0';
+	len --;
+      }
+      if ( (r->type == TYPE_LONG) && isdigit(*buf)) {
+	*r->limit = atoi(buf);
+      } else if ( (r->type == TYPE_PERS) && isalpha(*buf)) {
+	unsigned long int res;
+	res = vc_str2personalitytype(buf,len);
+	if (res != VC_BAD_PERSONALITY) {
+	  *r->personality = res;
+	}
+      }
+    }
+    
     fclose(fb);
   }
 
@@ -365,14 +404,26 @@ set_one_ulimit(int resource, const struct vc_rlimit *limit)
   setrlimit(resource, &lim);
 }
 
-void
+static inline int 
+set_personality(unsigned long int personality_arg)
+{
+  if (personality_arg == 0) 
+    return 0;
+  if (personality(personality_arg) < 0) {
+    return -1;
+  }
+  return 0;
+}
+
+int
 pl_set_ulimits(const struct sliver_resources *slr)
 {
   if (!slr)
-    return;
+    return 0;
 
   set_one_ulimit(RLIMIT_RSS, &slr->vs_rss);
   set_one_ulimit(RLIMIT_AS, &slr->vs_as);
   set_one_ulimit(RLIMIT_NPROC, &slr->vs_nproc);
   set_one_ulimit(RLIMIT_NOFILE, &slr->vs_openfd);
+  return set_personality(slr->personality);
 }