projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sg: Avoid READ CAPACITY failures
[fio.git]
/
cgroup.c
diff --git
a/cgroup.c
b/cgroup.c
index 629047b495b33c145ca545ac4856efdecaf78df5..77e31a4d0e222fd4f03ccbccb92a48a7c1457d9a 100644
(file)
--- a/
cgroup.c
+++ b/
cgroup.c
@@
-18,12
+18,13
@@
struct cgroup_member {
unsigned int cgroup_nodelete;
};
unsigned int cgroup_nodelete;
};
-static
char
*find_cgroup_mnt(struct thread_data *td)
+static
struct cgroup_mnt
*find_cgroup_mnt(struct thread_data *td)
{
{
-
char *mntpoi
nt = NULL;
+
struct cgroup_mnt *cgroup_m
nt = NULL;
struct mntent *mnt, dummy;
char buf[256] = {0};
FILE *f;
struct mntent *mnt, dummy;
char buf[256] = {0};
FILE *f;
+ bool cgroup2 = false;
f = setmntent("/proc/mounts", "r");
if (!f) {
f = setmntent("/proc/mounts", "r");
if (!f) {
@@
-35,15
+36,29
@@
static char *find_cgroup_mnt(struct thread_data *td)
if (!strcmp(mnt->mnt_type, "cgroup") &&
strstr(mnt->mnt_opts, "blkio"))
break;
if (!strcmp(mnt->mnt_type, "cgroup") &&
strstr(mnt->mnt_opts, "blkio"))
break;
+ if (!strcmp(mnt->mnt_type, "cgroup2")) {
+ cgroup2 = true;
+ break;
+ }
}
}
- if (mnt)
- mntpoint = smalloc_strdup(mnt->mnt_dir);
- else
+ if (mnt) {
+ cgroup_mnt = smalloc(sizeof(*cgroup_mnt));
+ if (cgroup_mnt) {
+ cgroup_mnt->path = smalloc_strdup(mnt->mnt_dir);
+ if (!cgroup_mnt->path) {
+ sfree(cgroup_mnt);
+ log_err("fio: could not allocate memory\n");
+ } else {
+ cgroup_mnt->cgroup2 = cgroup2;
+ }
+ }
+ } else {
log_err("fio: cgroup blkio does not appear to be mounted\n");
log_err("fio: cgroup blkio does not appear to be mounted\n");
+ }
endmntent(f);
endmntent(f);
- return
mntpoi
nt;
+ return
cgroup_m
nt;
}
static void add_cgroup(struct thread_data *td, const char *name,
}
static void add_cgroup(struct thread_data *td, const char *name,
@@
-96,14
+111,14
@@
void cgroup_kill(struct flist_head *clist)
fio_sem_up(lock);
}
fio_sem_up(lock);
}
-static char *get_cgroup_root(struct thread_data *td,
char
*mnt)
+static char *get_cgroup_root(struct thread_data *td,
struct cgroup_mnt
*mnt)
{
char *str = malloc(64);
if (td->o.cgroup)
{
char *str = malloc(64);
if (td->o.cgroup)
- sprintf(str, "%s/%s", mnt, td->o.cgroup);
+ sprintf(str, "%s/%s", mnt
->path
, td->o.cgroup);
else
else
- sprintf(str, "%s/%s", mnt, td->o.name);
+ sprintf(str, "%s/%s", mnt
->path
, td->o.name);
return str;
}
return str;
}
@@
-128,22
+143,25
@@
static int write_int_to_file(struct thread_data *td, const char *path,
}
}
-static int cgroup_write_pid(struct thread_data *td, c
onst char *root
)
+static int cgroup_write_pid(struct thread_data *td, c
har *path, bool cgroup2
)
{
unsigned int val = td->pid;
{
unsigned int val = td->pid;
- return write_int_to_file(td, root, "tasks", val, "cgroup write pid");
+ if (cgroup2)
+ return write_int_to_file(td, path, "cgroup.procs",
+ val, "cgroup write pid");
+ return write_int_to_file(td, path, "tasks", val, "cgroup write pid");
}
/*
* Move pid to root class
*/
}
/*
* Move pid to root class
*/
-static int cgroup_del_pid(struct thread_data *td,
char
*mnt)
+static int cgroup_del_pid(struct thread_data *td,
struct cgroup_mnt
*mnt)
{
{
- return cgroup_write_pid(td, mnt);
+ return cgroup_write_pid(td, mnt
->path, mnt->cgroup2
);
}
}
-int cgroup_setup(struct thread_data *td, struct flist_head *clist,
char
**mnt)
+int cgroup_setup(struct thread_data *td, struct flist_head *clist,
struct cgroup_mnt
**mnt)
{
char *root;
{
char *root;
@@
-172,13
+190,17
@@
int cgroup_setup(struct thread_data *td, struct flist_head *clist, char **mnt)
add_cgroup(td, root, clist);
if (td->o.cgroup_weight) {
add_cgroup(td, root, clist);
if (td->o.cgroup_weight) {
+ if ((*mnt)->cgroup2) {
+ log_err("fio: cgroup weit doesn't work with cgroup2\n");
+ goto err;
+ }
if (write_int_to_file(td, root, "blkio.weight",
td->o.cgroup_weight,
"cgroup open weight"))
goto err;
}
if (write_int_to_file(td, root, "blkio.weight",
td->o.cgroup_weight,
"cgroup open weight"))
goto err;
}
- if (!cgroup_write_pid(td, root)) {
+ if (!cgroup_write_pid(td, root
, (*mnt)->cgroup2
)) {
free(root);
return 0;
}
free(root);
return 0;
}
@@
-188,14
+210,18
@@
err:
return 1;
}
return 1;
}
-void cgroup_shutdown(struct thread_data *td,
char *
*mnt)
+void cgroup_shutdown(struct thread_data *td,
struct cgroup_mnt
*mnt)
{
{
- if (
*
mnt == NULL)
+ if (mnt == NULL)
return;
if (!td->o.cgroup_weight && !td->o.cgroup)
return;
if (!td->o.cgroup_weight && !td->o.cgroup)
-
return
;
+
goto out
;
- cgroup_del_pid(td, *mnt);
+ cgroup_del_pid(td, mnt);
+out:
+ if (mnt->path)
+ sfree(mnt->path);
+ sfree(mnt);
}
static void fio_init cgroup_init(void)
}
static void fio_init cgroup_init(void)