[LTP] [PATCH v2 1/2] lib: Add .ulimit

Wei Gao wegao@suse.com
Wed Oct 25 10:37:05 CEST 2023


Fixs: #530
Signed-off-by: Wei Gao <wegao@suse.com>
---
 include/tst_test.h | 14 ++++++++++++++
 lib/tst_test.c     | 28 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/include/tst_test.h b/include/tst_test.h
index 75c2109b9..dcdbc71d7 100644
--- a/include/tst_test.h
+++ b/include/tst_test.h
@@ -15,6 +15,7 @@
 #include <limits.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/resource.h>
 
 #include "tst_common.h"
 #include "tst_res_flags.h"
@@ -148,6 +149,11 @@ extern unsigned int tst_variant;
 
 #define TST_UNLIMITED_RUNTIME (-1)
 
+struct tst_ulimit_val {
+	int resource;
+	rlim_t rlim_cur;
+};
+
 struct tst_test {
 	/* number of tests available in test() function */
 	unsigned int tcnt;
@@ -306,6 +312,11 @@ struct tst_test {
 	 */
 	const struct tst_path_val *save_restore;
 
+	/*
+	 * {NULL, NULL} terminated array of (ulimit resource type and value)
+	 */
+	const struct tst_ulimit_val *ulimit;
+
 	/*
 	 * NULL terminated array of kernel config options required for the
 	 * test.
@@ -392,6 +403,9 @@ int tst_validate_children_(const char *file, const int lineno,
 #define tst_validate_children(child_count) \
 	tst_validate_children_(__FILE__, __LINE__, (child_count))
 
+#define tst_set_ulimit(conf) \
+	tst_set_ulimit_(__FILE__, __LINE__, (conf))
+
 #ifndef TST_NO_DEFAULT_MAIN
 
 static struct tst_test test;
diff --git a/lib/tst_test.c b/lib/tst_test.c
index 2e58cad33..59eeda7e7 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -1129,6 +1129,25 @@ static void do_cgroup_requires(void)
 	tst_cg_init();
 }
 
+void tst_set_ulimit_(const char *file, const int lineno, const struct tst_ulimit_val *conf)
+{
+	struct rlimit rlim;
+
+	SAFE_GETRLIMIT(conf->resource, &rlim);
+
+	if (conf->rlim_cur > rlim.rlim_max) {
+		rlim.rlim_max = conf->rlim_cur;
+		rlim.rlim_cur = conf->rlim_cur;
+	} else {
+		rlim.rlim_cur = conf->rlim_cur;
+	}
+
+	tst_res_(file, lineno, TINFO, "Set ulimit resource:%d rlim_cur:%lu rlim_max:%lu",
+		conf->resource, rlim.rlim_cur, rlim.rlim_max);
+
+	safe_setrlimit(file, lineno, conf->resource, &rlim);
+}
+
 static void do_setup(int argc, char *argv[])
 {
 	if (!tst_test)
@@ -1227,6 +1246,15 @@ static void do_setup(int argc, char *argv[])
 		}
 	}
 
+	if (tst_test->ulimit) {
+		const struct tst_ulimit_val *pvl = tst_test->ulimit;
+
+		while (pvl->resource) {
+			tst_set_ulimit(pvl);
+			pvl++;
+		}
+	}
+
 	if (tst_test->mntpoint)
 		SAFE_MKDIR(tst_test->mntpoint, 0777);
 
-- 
2.35.3



More information about the ltp mailing list