new_gate/ms-runner
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add starter output handling, runner resource management

Browse source
This commit is contained in:
root 2024-06-22 20:59:29 +05:00
parent 505431fedc
commit 4e0711fe8c
4 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
starter/ns_exec.c
View file

@ -56,10 +56,13 @@ static int nsrun(void* arg) {
if (prctl(PR_SET_PDEATHSIG, SIGKILL)) die("cannot PR_SET_PDEATHSIG for child process: %m\n");
struct params *params = (struct params*) arg;
await_setup(params->fd[0]);
if(chdir("shared")) die("failed to chdir: %m");
int out_fd=open("out",O_WRONLY|O_CREAT);
if(out_fd==-1) die("unable to open out file:%m");
else dup2(out_fd,STDOUT_FILENO);
if(chdir("..")) die("failed to chdir: %m");
mnt_prepare("minrootfs",params->shared_folder);
//if(chdir("shared")) die("faled to chdir: %m");
sethostname(hostname,sizeof(hostname));
//if(chdir("..")) die("faled to chdir: %m");
ro_fs(params->shared_folder);
if(setgid(1000)) die("failed to setgid:%m");
if(setuid(1000)) die("failed to setuid:%m");

17
starter/starter.c
View file

@ -18,6 +18,7 @@
struct params {
char* shared_folder;
int fd[2];
int out_fd;
char **argv;
};
@ -32,6 +33,9 @@ struct killparams{
int pid;
};
#define READ_SIZE 100
char read_buf[READ_SIZE+1];
#include "ns_exec.c"
#include "cgroup_prepare.c"
@ -52,7 +56,7 @@ static char killstack[STACK_SIZE];
static void parse_args(int argc, char **argv, struct params *params,struct limits *limits){
if (argc < 6) {
printf("usage:\n starter <core_id> <memory_amount> <time limit in ms> <shared folder> <command, arg1,arg2,...>");
puts("usage:\n starter <core_id> <memory_amount> <time limit in ms> <shared folder> <command, arg1,arg2,...>");
exit(0);
}
argc--;argv++;
@ -91,11 +95,13 @@ static void prepare_userns(int pid) {
}
int main(int argc,char** argv) {
if(setuid(0)) die("need to be run as root");
if(setgid(0)) die("need to be run as root");
//getting binary folder
char bin_path[PATH_MAX];
if (realpath (argv[0], bin_path) == 0) die("unable to resolve real path: %m");
for(int i = strlen(bin_path);i>0 && bin_path[i]!='/';i--) bin_path[i]=0;
if(chdir(bin_path)) die("unable to chdir: %m");
if(chdir(bin_path)) die("unable to chdir to binary path: %m");
//setting random seed
srand(time(NULL));
struct params params;
@ -104,10 +110,7 @@ int main(int argc,char** argv) {
memset(&limits, 0, sizeof(struct limits));
parse_args(argc, argv, &params, &limits);
prepare_cgroup(&limits);
//exit(0);
if(setuid(0)) die("need to be run as root");
if(setgid(0)) die("need to be run as root");
if (pipe(params.fd) < 0) exit(0);
if (pipe(params.fd) < 0) die("can't open pipe: %m");
int clone_flags = SIGCHLD | CLONE_NEWUTS | CLONE_NEWUSER | CLONE_NEWNS | CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | CLONE_NEWCGROUP/* | CLONE_NEWTIME*/;
int nsrun_pid=clone(nsrun,nmstack+STACK_SIZE,clone_flags,&params);
int pipe=params.fd[1];
@ -115,13 +118,13 @@ int main(int argc,char** argv) {
prepare_userns(nsrun_pid);
if (nsrun_pid<0) {die("faled to clone");}
add_to_cgroup(nsrun_pid);
//dup2(STDOUT_FILENO,params.out[0]);
if (write(pipe, "OK", 2) != 2) die("Failed to write to pipe: %m");//report readiness
struct killparams killparams;
killparams.time=limits.time;
killparams.pid=nsrun_pid;
clone(killafter,killstack+STACK_SIZE,SIGCHLD,&killparams);
if (waitpid(nsrun_pid, NULL, 0) == -1) die("Failed to wait pid %d: %m\n", nsrun_pid);
//int pipe=params.fd[1];
remove_cgroup();
return 0;
}