X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fplanetlab.c;h=40ed5a7c25ffdc058518bc4330892a1ad495b206;hb=5594cc4c22c895396adc5c59d39b294f7b171de1;hp=69f1fb07ab2614f50dc7f2a34b55ad64f35df323;hpb=ec4370f7ebd7fb0ce7f002f5bf2c74f03acd3ec1;p=util-vserver.git

diff --git a/lib/planetlab.c b/lib/planetlab.c
index 69f1fb0..40ed5a7 100644
--- a/lib/planetlab.c
+++ b/lib/planetlab.c
@@ -49,29 +49,24 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "planetlab.h"
 
 static int
-create_context(xid_t ctx, uint64_t bcaps, struct sliver_resources *slr)
+create_context(xid_t ctx, uint64_t bcaps)
 {
   struct vc_ctx_caps  vc_caps;
-  struct vc_net_nx  vc_net;
   struct vc_net_flags  vc_nf;
 
   /* Create network context */
-  if (vc_net_create(ctx) == VC_NOCTX)
+  if (vc_net_create(ctx) == VC_NOCTX) {
+    if (errno == EEXIST)
+      goto process;
     return -1;
+  }
 
   /* Make the network context persistent */
   vc_nf.mask = vc_nf.flagword = VC_NXF_PERSISTENT;
   if (vc_set_nflags(ctx, &vc_nf))
     return -1;
 
-  /* XXX: Allow access to all IPv4 addresses (for now) */
-  vc_net.type = vcNET_IPV4;
-  vc_net.count = 1;
-  vc_net.ip[0] = 0;
-  vc_net.mask[0] = 0;
-  if (vc_net_add(ctx, &vc_net) == -1)
-    return -1;
-
+process:
   /*
    * Create context info - this sets the STATE_SETUP and STATE_INIT flags.
    */
@@ -86,7 +81,10 @@ create_context(xid_t ctx, uint64_t bcaps, struct sliver_resources *slr)
   if (vc_set_ccaps(ctx, &vc_caps))
     return -1;
 
-  pl_set_limits(ctx, slr);
+  if (pl_setsched(ctx, 1, 0) < 0) {
+    PERROR("pl_setsched(%u)", ctx);
+    exit(1);
+  }
 
   return 0;
 }
@@ -110,11 +108,13 @@ pl_setup_done(xid_t ctx)
 #define RETRY_LIMIT  10
 
 int
-pl_chcontext(xid_t ctx, uint64_t bcaps, struct sliver_resources *slr)
+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);
+
   for (;;)
     {
       struct vc_ctx_flags  vc_flags;
@@ -125,7 +125,7 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, struct sliver_resources *slr)
 	    return -1;
 
 	  /* context doesn't exist - create it */
-	  if (create_context(ctx, bcaps,slr))
+	  if (create_context(ctx, bcaps))
 	    {
 	      if (errno == EEXIST)
 		/* another process beat us in a race */
@@ -195,28 +195,22 @@ pl_setsched(xid_t ctx, uint32_t cpu_share, uint32_t cpu_sched_flags)
   vc_sched.tokens_min = 50;  /* need this many tokens to run */
   vc_sched.tokens_max = 100;  /* max accumulated number of tokens */
 
-  if (cpu_share == VC_LIM_KEEP)
+  if (cpu_share == (uint32_t)VC_LIM_KEEP)
     vc_sched.set_mask &= ~(VC_VXSM_FILL_RATE|VC_VXSM_FILL_RATE2);
 
-  VC_SYSCALL(vc_set_sched(ctx, &vc_sched));
-
-  /* get current flag values */
-  VC_SYSCALL(vc_get_cflags(ctx, &vc_flags));
-
   /* guaranteed CPU corresponds to SCHED_SHARE flag being cleared */
   if (cpu_sched_flags & VS_SCHED_CPU_GUARANTEED) {
-    new_flags = VC_VXF_SCHED_SHARE;
+    new_flags = 0;
     vc_sched.fill_rate = vc_sched.fill_rate2;
   }
   else
-    new_flags = 0;
+    new_flags = VC_VXF_SCHED_SHARE;
 
-  if ((vc_flags.flagword & VC_VXF_SCHED_SHARE) != new_flags)
-    {
-      vc_flags.mask = VC_VXF_SCHED_FLAGS;
-      vc_flags.flagword = new_flags | VC_VXF_SCHED_HARD;
-      VC_SYSCALL(vc_set_cflags(ctx, &vc_flags));
-    }
+  VC_SYSCALL(vc_set_sched(ctx, &vc_sched));
+
+  vc_flags.mask = VC_VXF_SCHED_FLAGS;
+  vc_flags.flagword = new_flags | VC_VXF_SCHED_HARD;
+  VC_SYSCALL(vc_set_cflags(ctx, &vc_flags));
 
   return 0;
 }
@@ -232,7 +226,7 @@ struct pl_resources {
 
 #define VSERVERCONF "/etc/vservers/"
 void
-pl_get_limits(char *context, struct sliver_resources *slr)
+pl_get_limits(const char *context, struct sliver_resources *slr)
 {
   FILE *fb;
   int cwd;
@@ -241,8 +235,7 @@ pl_get_limits(char *context, struct sliver_resources *slr)
   struct pl_resources *r;
   struct pl_resources sliver_list[] = {
     {"sched/fill-rate2", &slr->vs_cpu},
-    {"sched/fill-rate", &slr->vs_cpuguaranteed},
-  
+
     {"rlimits/nproc.hard", &slr->vs_nproc.hard},
     {"rlimits/nproc.soft", &slr->vs_nproc.soft},
     {"rlimits/nproc.min", &slr->vs_nproc.min},
@@ -259,15 +252,11 @@ pl_get_limits(char *context, struct sliver_resources *slr)
     {"rlimits/openfd.soft", &slr->vs_openfd.soft},
     {"rlimits/openfd.min", &slr->vs_openfd.min},
 
-    {"whitelisted", &slr->vs_whitelisted},
     {0,0}
   };
 
   sprintf(conf, "%s%s", VSERVERCONF, context);
 
-  slr->vs_cpu = VC_LIM_KEEP;
-  slr->vs_cpuguaranteed = 0;
-
   slr->vs_rss.hard = VC_LIM_KEEP;
   slr->vs_rss.soft = VC_LIM_KEEP;
   slr->vs_rss.min = VC_LIM_KEEP;
@@ -276,7 +265,6 @@ pl_get_limits(char *context, struct sliver_resources *slr)
   slr->vs_as.soft = VC_LIM_KEEP;
   slr->vs_as.min = VC_LIM_KEEP;
 
-
   slr->vs_nproc.hard = VC_LIM_KEEP;
   slr->vs_nproc.soft = VC_LIM_KEEP;
   slr->vs_nproc.min = VC_LIM_KEEP;
@@ -285,8 +273,6 @@ pl_get_limits(char *context, struct sliver_resources *slr)
   slr->vs_openfd.soft = VC_LIM_KEEP;
   slr->vs_openfd.min = VC_LIM_KEEP;
 
-  slr->vs_whitelisted = 1;
-
   cwd = open(".", O_RDONLY);
   if (cwd == -1) {
     perror("cannot get a handle on .");
@@ -303,9 +289,8 @@ pl_get_limits(char *context, struct sliver_resources *slr)
     fb = fopen(r->name, "r");
     if (fb == NULL)
       continue;
-    if (fgets(buf, sizeof(buf), fb) != NULL && isdigit(*buf)) {
+    if (fgets(buf, sizeof(buf), fb) != NULL && isdigit(*buf))
       *r->limit = atoi(buf);
-    }
     fclose(fb);
   }
 
@@ -313,58 +298,11 @@ pl_get_limits(char *context, struct sliver_resources *slr)
 out_fd:
   close(cwd);
 out:
-#if 0
-  /* open the conf file for reading */
-  fb = fopen(conf,"r");
-  if (fb != NULL) {
-    size_t index;
-    char *buffer = malloc(1000);
-    char *p;
-    
-    /* the conf file exist */ 
-    while((p=fgets(buffer,1000-1,fb))!=NULL) {
-      index = 0;
-      len = strnlen(buffer,1000);
-      WHITESPACE(buffer,index,len);
-      if (buffer[index] == '#') 
-	continue;
-      
-      for (r=&sliver_list[0]; r->name; r++)
-	if ((p=strstr(&buffer[index],r->name))!=NULL) {
-	  /* adjust index into buffer */
-	  index+= (p-&buffer[index])+strlen(r->name);
-	  
-	  /* skip over whitespace */
-	  WHITESPACE(buffer,index,len);
-	  
-	  /* expecting to see = sign */
-	  if (buffer[index++]!='=') goto out;
-	  
-	  /* skip over whitespace */
-	  WHITESPACE(buffer,index,len);
-	  
-	  /* expecting to see a digit for number */
-	  if (!isdigit((int)buffer[index])) goto out;
-	  
-	  *r->limit = atoi(&buffer[index]);
-	  if (0) /* for debugging only */
-	    fprintf(stderr,"pl_get_limits found %s=%lld\n",
-		    r->name,*r->limit);
-	  break;
-	}
-    }
-  out:
-    fclose(fb);
-    free(buffer);
-  } else {
-    fprintf(stderr,"cannot open %s\n",conf);
-  }
-#endif
   free(conf);
 }
 
 int
-adjust_lim(struct vc_rlimit *vcr, struct rlimit *lim)
+adjust_lim(const struct vc_rlimit *vcr, struct rlimit *lim)
 {
   int adjusted = 0;
   if (vcr->min != VC_LIM_KEEP) {
@@ -402,71 +340,23 @@ adjust_lim(struct vc_rlimit *vcr, struct rlimit *lim)
   return adjusted;
 }
 
+static inline void
+set_one_ulimit(int resource, const struct vc_rlimit *limit)
+{
+  struct rlimit lim;
+  getrlimit(resource, &lim);
+  adjust_lim(limit, &lim);
+  setrlimit(resource, &lim);
+}
 
 void
-pl_set_limits(xid_t ctx, struct sliver_resources *slr)
+pl_set_ulimits(const struct sliver_resources *slr)
 {
-  struct rlimit lim; /* getrlimit values */
-  unsigned long long vs_cpu;
-  uint32_t cpu_sched_flags;
-
-  if (slr != 0) {
-    /* set memory limits */
-    getrlimit(RLIMIT_RSS,&lim);
-    if (adjust_lim(&slr->vs_rss, &lim)) {
-      setrlimit(RLIMIT_RSS, &lim);
-      if (vc_set_rlimit(ctx, RLIMIT_RSS, &slr->vs_rss))
-	{
-	  PERROR("pl_setrlimit(%u, RLIMIT_RSS)", ctx);
-	  exit(1);
-	}
-    }
+  if (!slr)
+    return;
 
-    /* set address space limits */
-    getrlimit(RLIMIT_AS,&lim);
-    if (adjust_lim(&slr->vs_as, &lim)) {
-      setrlimit(RLIMIT_AS, &lim);
-      if (vc_set_rlimit(ctx, RLIMIT_AS, &slr->vs_as))
-	{
-	  PERROR("pl_setrlimit(%u, RLIMIT_AS)", ctx);
-	  exit(1);
-	}
-    }
-    /* set nrpoc limit */
-    getrlimit(RLIMIT_NPROC,&lim);
-    if (adjust_lim(&slr->vs_nproc, &lim)) {
-      setrlimit(RLIMIT_NPROC, &lim);
-      if (vc_set_rlimit(ctx, RLIMIT_NPROC, &slr->vs_nproc))
-	{
-	  PERROR("pl_setrlimit(%u, RLIMIT_NPROC)", ctx);
-	  exit(1);
-	}
-    }
-
-    /* set openfd limit */
-    getrlimit(RLIMIT_NOFILE,&lim);
-    if (adjust_lim(&slr->vs_openfd, &lim)) {
-      setrlimit(RLIMIT_NOFILE, &lim);
-      if (vc_set_rlimit(ctx, RLIMIT_NOFILE, &slr->vs_openfd))
-	{
-	  PERROR("pl_setrlimit(%u, RLIMIT_NOFILE)", ctx);
-	  exit(1);
-	}
-      if (vc_set_rlimit(ctx, VC_VLIMIT_OPENFD, &slr->vs_openfd))
-	{
-	  PERROR("pl_setrlimit(%u, VLIMIT_OPENFD)", ctx);
-	  exit(1);
-	}
-    }
-    vs_cpu = slr->vs_cpu;    
-    cpu_sched_flags = slr->vs_cpuguaranteed & VS_SCHED_CPU_GUARANTEED;
-  } else {
-    vs_cpu = 1;
-    cpu_sched_flags = 0;
-  }
-  
-  if (pl_setsched(ctx, vs_cpu, cpu_sched_flags) < 0) {
-    PERROR("pl_setsched(&u)", ctx);
-    exit(1);
-  }
+  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);
 }