#include <sys/mount.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/resource.h>
#include <fcntl.h>
#include <ctype.h>
#include <stdarg.h>
//--------------------------------------------------------------------
#include "vserver.h"
+#include "planetlab.h"
#undef CONFIG_VSERVER_LEGACY
struct resources {
char *name;
- int *limit;
+ unsigned long long *limit;
};
#define VSERVERCONF "/etc/vservers/"
-static void get_limits(char *context, int *cpu, int *mem, int *task) {
+static void get_limits(char *context, struct resources *list){
FILE *fb;
size_t len = strlen(VSERVERCONF) + strlen(context) + strlen(".conf") + NULLBYTE_SIZE;
char *conf = (char *)malloc(len);
- struct resources list[] =
- {{"MEMLIMIT", mem},
- {"CPULIMIT", cpu},
- {"TASKLIMIT", task},
- {0,0}};
struct resources *r;
sprintf(conf, "%s%s.conf", VSERVERCONF, context);
}
-static int sandbox_processes(xid_t xid, char *context)
+static int sandbox_processes(xid_t ctx, char *context)
{
#ifdef CONFIG_VSERVER_LEGACY
int flags;
flags |= 1; /* VX_INFO_LOCK -- cannot request a new vx_id */
/* flags |= 4; VX_INFO_NPROC -- limit number of procs in a context */
- (void) vc_new_s_context(xid, 0, flags);
+ (void) vc_new_s_context(ctx, 0, flags);
/* use legacy dirty hack for capremove */
if (vc_new_s_context(VC_SAMECTX, vc_get_insecurebcaps(), flags) == VC_NOCTX) {
exit(1);
}
#else
- struct vc_ctx_caps caps;
- struct vc_ctx_flags flags;
- int cpu = VC_LIM_KEEP;
- int mem = VC_LIM_KEEP;
- int task = VC_LIM_KEEP;
- get_limits(context,&cpu, &mem, &task);
- (void) (sandbox_chroot(xid));
-
- caps.ccaps = ~vc_get_insecureccaps();
- caps.cmask = ~0ull;
- caps.bcaps = ~vc_get_insecurebcaps();
- caps.bmask = ~0ull;
-
- flags.flagword = VC_VXF_INFO_LOCK;
- flags.mask = VC_VXF_STATE_SETUP | VC_VXF_INFO_LOCK;
+ int ctx_is_new;
+ unsigned long long cpu = VC_LIM_KEEP;
+ unsigned long long mem = VC_LIM_KEEP;
+ unsigned long long task = VC_LIM_KEEP;
+ unsigned long long cpuguaranteed = 0;
+ struct resources list[] =
+ {{"MEMLIMIT", &mem},
+ {"CPULIMIT", &cpu},
+ {"CPUGUARANTEED", &cpuguaranteed},
+ {"TASKLIMIT", &task},
+ {0,0}};
- errno = 0;
- if ((vc_ctx_create(xid) == VC_NOCTX) && (errno != EEXIST)) {
- PERROR("vc_ctx_create(%d)", xid);
+ get_limits(context,list);
+
+ /* check whether the slice has been disabled */
+ if (!cpu)
+ {
+ fprintf(stderr, "*** this slice has been suspended ***\n");
+ exit(0);
+ }
+
+ (void) (sandbox_chroot(ctx));
+
+ if ((ctx_is_new = pl_chcontext(ctx, 0, ~vc_get_insecurebcaps())) < 0)
+ {
+ PERROR("pl_chcontext(%u)", ctx);
+ exit(1);
+ }
+ if (ctx_is_new)
+ {
+ /* set resources */
+ struct vc_rlimit limits;
+
+ limits.min = VC_LIM_KEEP;
+ limits.soft = VC_LIM_KEEP;
+ limits.hard = mem;
+ if (vc_set_rlimit(ctx, RLIMIT_RSS, &limits))
+ {
+ PERROR("pl_setrlimit(%u, RLIMIT_RSS)", ctx);
exit(1);
- }
-
- if (errno != EEXIST) {
- struct vc_rlimit limits;
- /* The context did not exist before, which requires that we set the various limit */
-
- /* CPU */
- /* not yet */
-
- /* MEM */
- limits.min = VC_LIM_KEEP;
- limits.soft = VC_LIM_KEEP;
- limits.hard = mem;
- if (vc_set_rlimit(xid, 5, &limits)) {
- }
-
- /* TASK */
- limits.min = VC_LIM_KEEP;
- limits.soft = VC_LIM_KEEP;
- limits.hard = task;
- if (vc_set_rlimit(xid, 6, &limits)) {
- /* setting limit failed */
- }
- }
-
- if (vc_set_ccaps(xid, &caps) == -1) {
- PERROR("vc_set_ccaps(%d, 0x%16ullx/0x%16ullx, 0x%16ullx/0x%16ullx)\n",
- xid, caps.ccaps, caps.cmask, caps.bcaps, caps.bmask);
+ }
+ limits.hard = task;
+ if (vc_set_rlimit(ctx, RLIMIT_NPROC, &limits))
+ {
+ PERROR("pl_setrlimit(%u, RLIMIT_NPROC)", ctx);
exit(1);
- }
-
- if (vc_set_cflags(xid, &flags) == -1) {
- PERROR("vc_set_cflags(%d, 0x%16llx/0x%16llx)\n",
- xid, flags.flagword, flags.mask);
+ }
+ cpuguaranteed &= VS_SCHED_CPU_GUARANTEED;
+ if (pl_setsched(ctx, cpu, cpuguaranteed) < 0)
+ {
+ PERROR("pl_setsched(&u)", ctx);
exit(1);
- }
+ }
+ pl_setup_done(ctx);
+ }
#endif
return 0;
}