X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=cgroup.c;h=de00d986eb05246b25e853c3af524149f1b53e22;hp=417c50be1088cc77bf531febfb29bbe1eeb8ddb2;hb=599e72b74ed2c44fd846b95160c5037c16438994;hpb=3858bf9eb509136b800cda1a08247e9c0ff167b9 diff --git a/cgroup.c b/cgroup.c index 417c50be..de00d986 100644 --- a/cgroup.c +++ b/cgroup.c @@ -3,184 +3,183 @@ */ #include #include +#include +#include +#include #include "fio.h" #include "flist.h" #include "cgroup.h" #include "smalloc.h" -static struct flist_head *cgroup_list; static struct fio_mutex *lock; struct cgroup_member { struct flist_head list; char *root; + unsigned int cgroup_nodelete; }; -static void add_cgroup(const char *name) +static char *find_cgroup_mnt(struct thread_data *td) +{ + char *mntpoint = NULL; + struct mntent *mnt, dummy; + char buf[256] = {0}; + FILE *f; + + f = setmntent("/proc/mounts", "r"); + if (!f) { + td_verror(td, errno, "setmntent /proc/mounts"); + return NULL; + } + + while ((mnt = getmntent_r(f, &dummy, buf, sizeof(buf))) != NULL) { + if (!strcmp(mnt->mnt_type, "cgroup") && + strstr(mnt->mnt_opts, "blkio")) + break; + } + + if (mnt) + mntpoint = smalloc_strdup(mnt->mnt_dir); + else + log_err("fio: cgroup blkio does not appear to be mounted\n"); + + endmntent(f); + return mntpoint; +} + +static void add_cgroup(struct thread_data *td, const char *name, + struct flist_head *clist) { struct cgroup_member *cm; cm = smalloc(sizeof(*cm)); INIT_FLIST_HEAD(&cm->list); cm->root = smalloc_strdup(name); - + if (td->o.cgroup_nodelete) + cm->cgroup_nodelete = 1; fio_mutex_down(lock); - - if (!cgroup_list) { - cgroup_list = smalloc(sizeof(struct flist_head)); - INIT_FLIST_HEAD(cgroup_list); - } - - flist_add_tail(&cm->list, cgroup_list); + flist_add_tail(&cm->list, clist); fio_mutex_up(lock); } -void cgroup_kill(void) +void cgroup_kill(struct flist_head *clist) { struct flist_head *n, *tmp; struct cgroup_member *cm; fio_mutex_down(lock); - if (!cgroup_list) - goto out; - flist_for_each_safe(n, tmp, cgroup_list) { + flist_for_each_safe(n, tmp, clist) { cm = flist_entry(n, struct cgroup_member, list); - rmdir(cm->root); + if (!cm->cgroup_nodelete) + rmdir(cm->root); flist_del(&cm->list); sfree(cm->root); sfree(cm); } - sfree(cgroup_list); - cgroup_list = NULL; -out: fio_mutex_up(lock); } -/* - * Check if the given root appears valid - */ -static int cgroup_check_fs(struct thread_data *td) -{ - struct stat sb; - char tmp[256]; - - sprintf(tmp, "%s/tasks", td->o.cgroup_root); - return stat(tmp, &sb); -} - -static char *get_cgroup_root(struct thread_data *td) +static char *get_cgroup_root(struct thread_data *td, char *mnt) { char *str = malloc(64); if (td->o.cgroup) - sprintf(str, "%s/%s", td->o.cgroup_root, td->o.cgroup); + sprintf(str, "%s/%s", mnt, td->o.cgroup); else - sprintf(str, "%s/%s", td->o.cgroup_root, td->o.name); + sprintf(str, "%s/%s", mnt, td->o.name); return str; } -static int cgroup_write_pid(struct thread_data *td, const char *root) +static int write_int_to_file(struct thread_data *td, const char *path, + const char *filename, unsigned int val, + const char *onerr) { char tmp[256]; FILE *f; - sprintf(tmp, "%s/tasks", root); + sprintf(tmp, "%s/%s", path, filename); f = fopen(tmp, "w"); if (!f) { - td_verror(td, errno, "cgroup open tasks"); + td_verror(td, errno, onerr); return 1; } - fprintf(f, "%d", td->pid); + fprintf(f, "%u", val); fclose(f); return 0; } -/* - * Add pid to given class - */ -static int cgroup_add_pid(struct thread_data *td) +static int cgroup_write_pid(struct thread_data *td, const char *root) { - char *root; - int ret; + unsigned int val = td->pid; - root = get_cgroup_root(td); - ret = cgroup_write_pid(td, root); - free(root); - return ret; + return write_int_to_file(td, root, "tasks", val, "cgroup write pid"); } /* * Move pid to root class */ -static int cgroup_del_pid(struct thread_data *td) +static int cgroup_del_pid(struct thread_data *td, char *mnt) { - return cgroup_write_pid(td, td->o.cgroup_root); + return cgroup_write_pid(td, mnt); } -int cgroup_setup(struct thread_data *td) +int cgroup_setup(struct thread_data *td, struct flist_head *clist, char **mnt) { - char *root, tmp[256]; - FILE *f; + char *root; - if (cgroup_check_fs(td)) { - log_err("fio: blkio cgroup mount point %s not valid\n", - td->o.cgroup_root); - return 1; + if (!*mnt) { + *mnt = find_cgroup_mnt(td); + if (!*mnt) + return 1; } /* * Create container, if it doesn't exist */ - root = get_cgroup_root(td); + root = get_cgroup_root(td, *mnt); if (mkdir(root, 0755) < 0) { int __e = errno; if (__e != EEXIST) { td_verror(td, __e, "cgroup mkdir"); + log_err("fio: path %s\n", root); goto err; } } else - add_cgroup(root); + add_cgroup(td, root, clist); if (td->o.cgroup_weight) { - sprintf(tmp, "%s/blkio.weight", root); - f = fopen(tmp, "w"); - if (!f) { - td_verror(td, errno, "cgroup open weight"); + if (write_int_to_file(td, root, "blkio.weight", + td->o.cgroup_weight, + "cgroup open weight")) goto err; - } - - fprintf(f, "%d", td->o.cgroup_weight); - fclose(f); } - free(root); - - if (cgroup_add_pid(td)) - return 1; + if (!cgroup_write_pid(td, root)) { + free(root); + return 0; + } - return 0; err: free(root); return 1; } -void cgroup_shutdown(struct thread_data *td) +void cgroup_shutdown(struct thread_data *td, char **mnt) { - if (cgroup_check_fs(td)) + if (*mnt == NULL) return; - if (!td->o.cgroup_weight && td->o.cgroup) + if (!td->o.cgroup_weight && !td->o.cgroup) return; - cgroup_del_pid(td); + cgroup_del_pid(td, *mnt); } - static void fio_init cgroup_init(void) { lock = fio_mutex_init(1);