Re: [LTP] [PATCH v10 2/2] tst_cgroup.c: Add a cgroup base controller

Petr Vorel
2023-04-28T07:59:33Z

Hi Wei,

> lib/tst_cgroup.c | 47 ++++++++++++++++++++++++++++++++---------------
...
> @@ -798,6 +804,10 @@ void tst_cg_require(const char *const ctrl_name,
> const char *const cgsc = "cgroup.subtree_control";
> struct cgroup_ctrl *const ctrl = cgroup_find_ctrl(ctrl_name);
> struct cgroup_root *root;
> + int base = !strcmp(ctrl->ctrl_name, "base");
> +
> + if (base && options->needs_ver != TST_CG_V2)
> + tst_brk(TCONF, "Base control only support needs_ver TST_CG_V2!");

> if (!ctrl) {
> tst_brk(TBROK, "'%s' controller is unknown to LTP", ctrl_name);
> @@ -827,6 +837,9 @@ void tst_cg_require(const char *const ctrl_name,
> if (options->needs_ver != TST_CG_V2)
> cgroup_mount_v1(ctrl);

> + if (base)
> + ctrl->ctrl_root = roots;
> +
> if (!ctrl->ctrl_root) {
> tst_brk(TCONF,
> "'%s' controller required, but not available",
> @@ -849,13 +862,13 @@ mkdirs:
> ctrl->ctrl_name);
> }

> - if (cgroup_ctrl_on_v2(ctrl)) {
> + if (cgroup_ctrl_on_v2(ctrl) && !base) {
> if (root->we_mounted_it) {
> SAFE_FILE_PRINTFAT(root->mnt_dir.dir_fd,
> - cgsc, "+%s", ctrl->ctrl_name);
> + cgsc, "+%s", ctrl->ctrl_name);
This is just unneeded whitespace change, it should be reverted.
I guess you changed it just by accident, right?
> } else {
> tst_file_printfat(root->mnt_dir.dir_fd,
> - cgsc, "+%s", ctrl->ctrl_name);
> + cgsc, "+%s", ctrl->ctrl_name);
Here as well.

Kind regards,
Petr
> }
> }
...