Skip to contentSkip to conversation

API/cgroup: Add io controller

PATCH In review Richard Palethorpe via ltp 3 participants 8 messages Mar 29, 2022 – Apr 12, 2022 Library code

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 API/cgroup: Add io controller

---

V2:
* Fix doc format
* abstract reading io.stat
* abstract stating the underlying device

 lib/tst_cgroup.c | 9 +++++++++
 1 file changed, 9 insertions(+)
lib/tst_cgroup.c +9 -0
index 57940ba09..feb5b3d07 100644
@@ -83,6 +83,7 @@ enum cgroup_ctrl_indx {
 	CTRL_MEMORY = 1,
 	CTRL_CPU,
 	CTRL_CPUSET,
+	CTRL_IO,
 };
 #define CTRLS_MAX CTRL_CPUSET
 
@@ -191,6 +192,11 @@ static const struct cgroup_file cpuset_ctrl_files[] = {
 	{ }
 };
 
+static const struct cgroup_file io_ctrl_files[] = {
+	{ "io.stat", NULL, CTRL_IO },
+	{ }
+};
+
 /* Lookup tree for item names. */
 static struct cgroup_ctrl controllers[] = {
 	[0] = { "cgroup", cgroup_ctrl_files, 0, NULL, 0 },
@@ -203,6 +209,9 @@ static struct cgroup_ctrl controllers[] = {
 	[CTRL_CPUSET] = {
 		"cpuset", cpuset_ctrl_files, CTRL_CPUSET, NULL, 0
 	},
+	[CTRL_IO] = {
+		"io", io_ctrl_files, CTRL_IO, NULL, 0
+	},
 	{ }
 };
 
Signature · 5 lines
2.35.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

PATCH v2 2/3 API/device: Add func to stat the actual dev mounted to a path

BTRFS appears to create "anonymous" block devices for each sub partition. Stating an inode on this FS (and others) just returns the anon dev number. Instead we have to find the mounted device in /proc/self/mounts and stat its special file in /dev/.

---
 include/tst_device.h |  6 ++++++
 lib/tst_device.c     | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
include/tst_device.h +6 -0
index 95ccd453e..977427f1c 100644
@@ -8,6 +8,7 @@
 
 #include <unistd.h>
 #include <stdint.h>
+#include <sys/stat.h>
 
 struct tst_device {
 	const char *dev;
@@ -112,6 +113,11 @@ void tst_purge_dir(const char *path);
  */
 void tst_find_backing_dev(const char *path, char *dev);
 
+/*
+ * Stat the device mounted on a given path.
+ */
+void tst_stat_mount_dev(const char *const mnt_path, struct stat *const st);
+
 /*
  * Returns the size of a physical device block size for the specific path
  * @path   Path to find the block size
lib/tst_device.c +35 -0
index 1ef667fa0..d296f9118 100644
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
+#include <mntent.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -548,6 +549,40 @@ void tst_find_backing_dev(const char *path, char *dev)
 		tst_brkm(TCONF, NULL, "dev(%s) isn't a block dev", dev);
 }
 
+void tst_stat_mount_dev(const char *const mnt_path, struct stat *const st)
+{
+	struct mntent *mnt;
+	FILE *mntf = setmntent("/proc/self/mounts", "r");
+
+	if (!mntf) {
+		tst_brkm(TBROK | TERRNO, NULL, "Can't open /proc/self/mounts");
+		return;
+	}
+
+	mnt = getmntent(mntf);
+	if (!mnt) {
+		tst_brkm(TBROK | TERRNO, NULL, "Can't read mounts or no mounts?");
+		return;
+	}
+
+	do {
+		if (strcmp(mnt->mnt_dir, mnt_path)) {
+			mnt = getmntent(mntf);
+			continue;
+		}
+
+		if (stat(mnt->mnt_fsname, st)) {
+			tst_brkm(TBROK | TERRNO, NULL,
+				 "Can't stat '%s', mounted at '%s'",
+				 mnt->mnt_fsname, mnt_path);
+		}
+
+		return;
+	} while (mnt);
+
+	tst_brkm(TBROK, NULL, "Could not find mount device");
+}
+
 int tst_dev_block_size(const char *path)
 {
 	int fd;
Signature · 5 lines
2.35.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by on v2 2/3
#2 lore raw

Re: [LTP] [PATCH v2 2/3] API/device: Add func to stat the actual dev mounted to a path

Hi Richie,

Kind regards,
Petr

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

PATCH v2 3/3 cgroups: Add first IO controller test

In reply to Richard Palethorpe via ltp

In V1 there is the blkio controller. This was renamed to just io on V2. The interface and functionality is significantly different. Presently there do not appear to be any tests for the V2 controller.

Note that one can not simply stat a file on BTRFS to find the actual block device the filesystem is using. Nor can you read /proc/self/mountinfo. BTRFS seems to generate "anonymous" devices (e.g. 0:27) and this is what is reported by stat. These however are invisible to the IO controller.

So instead we have to look in /proc/mounts for the device path then stat the special (/dev/<device>) file to get the actual major and minor device number.

---
 runtest/controllers                           |   3 +
 testcases/kernel/controllers/io/.gitignore    |   1 +
 testcases/kernel/controllers/io/Makefile      |   6 +
 .../kernel/controllers/io/io_control01.c      | 155 ++++++++++++++++++
 4 files changed, 165 insertions(+)
 create mode 100644 testcases/kernel/controllers/io/.gitignore
 create mode 100644 testcases/kernel/controllers/io/Makefile
 create mode 100644 testcases/kernel/controllers/io/io_control01.c
runtest/controllers +3 -0
index 3108a2561..22d482050 100644
@@ -360,6 +360,9 @@ cpuset_regression_test cpuset_regression_test.sh
 
 cgroup_xattr	cgroup_xattr
 
+# V2 IO controller (was blkio)
+io_control01 io_control01
+
 pids_1_1 pids.sh 1 1 0
 pids_1_2 pids.sh 1 2 0
 pids_1_10 pids.sh 1 10 0
testcases/kernel/controllers/io/.gitignore new file +1 -0
new file mode 100644
index 000000000..d626fa80d
@@ -0,0 +1 @@
+io_control01
testcases/kernel/controllers/io/Makefile new file +6 -0
new file mode 100644
index 000000000..5ea7d67db
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/controllers/io/io_control01.c new file +155 -0

155 lines not on this page · raw message

Signature · 5 lines
2.35.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#4 lore raw

Re: [LTP] [PATCH v2 3/3] cgroups: Add first IO controller test

Hi Richie,

testcases/kernel/controllers/io/io_control01.c line 1

Quoted 3 lines

+++ b/testcases/kernel/controllers/io/io_control01.c

testcases/kernel/controllers/io/io_control01.c new file +1 -0
@@ -0,0 +1,155 @@
+// SPDX-License-Identifier: GPL-2.0

nit: not sure if it was deliberate not adding it, but you may want to add your/SUSE copyright.

Quoted 17 lines
testcases/kernel/controllers/io/io_control01.c new file +17 -0
+/*\
+ *
+ * [Description]
+ *
+ * Perform some I/O on a file and check if at least some of it is
+ * recorded by the I/O controller.
+ *
+ * The exact amount of I/O performed is dependent on the file system,
+ * page cache, scheduler and block driver. We call sync and drop the
+ * file's page cache to force reading and writing. We also write
+ * random data to try to prevent compression.
+ *
+ * The pagecache is a particular issue for reading. If the call to
+ * fadvise is ignored then the data may only be read from the
+ * cache. So that no I/O requests are made.
+ */
+

...

testcases/kernel/controllers/io/io_control01.c line 45

Quoted 8 lines
testcases/kernel/controllers/io/io_control01.c new file +8 -0
+static int read_io_stats(const char *const line, struct io_stats *const stat)
+{
+	return sscanf(line,
+		      "%u:%u rbytes=%lu wbytes=%lu rios=%lu wios=%lu dbytes=%lu dios=%lu",
+		      &stat->mjr, &stat->mnr,
+		      &stat->rbytes, &stat->wbytes, &stat->rios, &stat->wios,
+		      &stat->dbytes, &stat->dios);
+}

checkpatch.pl false positive:
io_control01.c:40: WARNING: unchecked sscanf return value Obviously perl parsing has some limitations as we check read_io_stats() return value.

...

Quoted 7 lines
testcases/kernel/controllers/io/io_control01.c new file +7 -0
+static void setup(void)
+{
+	char buf[PATH_MAX] = { 0 };
+	char *path = SAFE_GETCWD(buf, PATH_MAX - sizeof("mnt") - 1);
+	struct stat st;
+
+	strcpy(path + strlen(path), "/mnt");

testcases/kernel/controllers/io/io_control01.c line 148

Quoted 10 lines
testcases/kernel/controllers/io/io_control01.c new file +10 -0
+
+	tst_stat_mount_dev(path, &st);
+	dev_major = major(st.st_rdev);
+	dev_minor = minor(st.st_rdev);
+}
+
+static struct tst_test test = {
+	.test_all = run,
+	.setup = setup,
+	.needs_device = 1,

nit: testcases/kernel/controllers/io/io_control01.c: useless tag: needs_device

Kind regards,
Petr

Quoted 7 lines
testcases/kernel/controllers/io/io_control01.c new file +7 -0
+	.mntpoint = "mnt",
+	.mount_device = 1,
+	.all_filesystems = 1,
+	.skip_filesystems = (const char *const[]){ "ntfs", "tmpfs", NULL },
+	.needs_cgroup_ver = TST_CG_V2,
+	.needs_cgroup_ctrls = (const char *const[]){ "io", NULL },
+};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#5 lore raw

Re: [LTP] [PATCH v2 3/3] cgroups: Add first IO controller test

Hello Petr,

Quoted 26 lines · Petr Vorel

Hi Richie,

testcases/kernel/controllers/io/io_control01.c line 1

Quoted 3 lines

+++ b/testcases/kernel/controllers/io/io_control01.c

testcases/kernel/controllers/io/io_control01.c new file +1 -0
@@ -0,0 +1,155 @@
+// SPDX-License-Identifier: GPL-2.0

nit: not sure if it was deliberate not adding it, but you may want to add your/SUSE copyright.

Quoted 17 lines
testcases/kernel/controllers/io/io_control01.c new file +17 -0
+/*\
+ *
+ * [Description]
+ *
+ * Perform some I/O on a file and check if at least some of it is
+ * recorded by the I/O controller.
+ *
+ * The exact amount of I/O performed is dependent on the file system,
+ * page cache, scheduler and block driver. We call sync and drop the
+ * file's page cache to force reading and writing. We also write
+ * random data to try to prevent compression.
+ *
+ * The pagecache is a particular issue for reading. If the call to
+ * fadvise is ignored then the data may only be read from the
+ * cache. So that no I/O requests are made.
+ */
+

...

Quoted 12 lines

testcases/kernel/controllers/io/io_control01.c line 45

Quoted 8 lines
testcases/kernel/controllers/io/io_control01.c new file +8 -0
+static int read_io_stats(const char *const line, struct io_stats *const stat)
+{
+	return sscanf(line,
+		      "%u:%u rbytes=%lu wbytes=%lu rios=%lu wios=%lu dbytes=%lu dios=%lu",
+		      &stat->mjr, &stat->mnr,
+		      &stat->rbytes, &stat->wbytes, &stat->rios, &stat->wios,
+		      &stat->dbytes, &stat->dios);
+}

checkpatch.pl false positive:
io_control01.c:40: WARNING: unchecked sscanf return value Obviously perl parsing has some limitations as we check read_io_stats() return value.

I'm not sure what to do about this other than switch to a macro which is a bit silly.

IMO sscanf should have the warn_unused_result attribute and this should be inherited by read_io_stats. All of which is better handled by the compiler.

Quoted 12 lines

...

Quoted 10 lines
testcases/kernel/controllers/io/io_control01.c new file +10 -0
+static void setup(void)
+{
+	char buf[PATH_MAX] = { 0 };
+	char *path = SAFE_GETCWD(buf, PATH_MAX - sizeof("mnt") - 1);
+	struct stat st;
+
+	strcpy(path + strlen(path), "/mnt");
+
+	tst_stat_mount_dev(path, &st);
+	dev_major = major(st.st_rdev);
Quoted 8 lines

testcases/kernel/controllers/io/io_control01.c line 148

Quoted 7 lines
testcases/kernel/controllers/io/io_control01.c new file +7 -0
+	dev_minor = minor(st.st_rdev);
+}
+
+static struct tst_test test = {
+	.test_all = run,
+	.setup = setup,
+	.needs_device = 1,

nit: testcases/kernel/controllers/io/io_control01.c: useless tag: needs_device

Pushed with fixes (including needs_device).

Signature · 5 lines
Thank you,
Richard.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by on v2 3/3
#6 lore raw

Re: [LTP] [PATCH v2 3/3] cgroups: Add first IO controller test

In reply to Richard Palethorpe via ltp

Hi Richie,

LGTM, just please remove needs_device as not needed.

testcases/kernel/controllers/io/io_control01.c line 142

Quoted 11 lines
testcases/kernel/controllers/io/io_control01.c new file +11 -0
+static void setup(void)
+{
+	char buf[PATH_MAX] = { 0 };
+	char *path = SAFE_GETCWD(buf, PATH_MAX - sizeof("mnt") - 1);
+	struct stat st;
+
+	strcpy(path + strlen(path), "/mnt");
+
+	tst_stat_mount_dev(path, &st);
+	dev_major = major(st.st_rdev);
+	dev_minor = minor(st.st_rdev);

If we ever support test setup run inside do_setup() (i.e. setup function which would be run just once - before for_each_variant(), for_each_filesystem() and fork_testrun()), this test would have use case for it (I suppose more tests which use .all_filesystems). Because tst_stat_mount_dev() could be run just for first filesystem. But that's not related to the testcase.

Kind regards,
Petr

Quoted 13 lines
testcases/kernel/controllers/io/io_control01.c new file +13 -0
+}
+
+static struct tst_test test = {
+	.test_all = run,
+	.setup = setup,
+	.needs_device = 1,
+	.mntpoint = "mnt",
+	.mount_device = 1,
+	.all_filesystems = 1,
+	.skip_filesystems = (const char *const[]){ "ntfs", "tmpfs", NULL },
+	.needs_cgroup_ver = TST_CG_V2,
+	.needs_cgroup_ctrls = (const char *const[]){ "io", NULL },
+};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp