numa_helper: add flag and min_nodes parameters to is_numa()
get_allowed_nodes() can fail if callers request more nodes than
are available. This patch changes is_numa() by adding a parameters
to it, which allows to easily check that system supports NUMA and
has at least certain number of nodes and it also updates tests
that used get_allowed_nodes() without checking node count first.
Signed-off-by: Jan Stancek <jstancek@redhat.com>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
diff --git a/testcases/kernel/mem/oom/oom02.c b/testcases/kernel/mem/oom/oom02.c
index 48bd0a3..8bbb18a 100644
--- a/testcases/kernel/mem/oom/oom02.c
+++ b/testcases/kernel/mem/oom/oom02.c
@@ -79,7 +79,7 @@
tst_sig(FORK, DEF_HANDLER, cleanup);
TEST_PAUSE;
- if (!is_numa(NULL))
+ if (!is_numa(NULL, NH_MEMS, 2))
tst_brkm(TCONF, NULL, "The case need a NUMA system.");
overcommit = get_sys_tune("overcommit_memory");
diff --git a/testcases/kernel/mem/oom/oom03.c b/testcases/kernel/mem/oom/oom03.c
index 3afc3de..879fdae 100644
--- a/testcases/kernel/mem/oom/oom03.c
+++ b/testcases/kernel/mem/oom/oom03.c
@@ -77,7 +77,7 @@
}
/* OOM for MEMCG with mempolicy */
- if (is_numa(cleanup)) {
+ if (is_numa(cleanup, NH_MEMS, 2)) {
tst_resm(TINFO, "OOM on MEMCG & mempolicy...");
testoom(MPOL_BIND, 0, ENOMEM, 1);
testoom(MPOL_INTERLEAVE, 0, ENOMEM, 1);
diff --git a/testcases/kernel/mem/oom/oom04.c b/testcases/kernel/mem/oom/oom04.c
index 0a315e1..4829d95 100644
--- a/testcases/kernel/mem/oom/oom04.c
+++ b/testcases/kernel/mem/oom/oom04.c
@@ -63,7 +63,7 @@
tst_resm(TINFO, "OOM on CPUSET...");
testoom(0, 0, ENOMEM, 1);
- if (is_numa(cleanup)) {
+ if (is_numa(cleanup, NH_MEMS, 2)) {
/*
* Under NUMA system, the migration of cpuset's memory
* is in charge of cpuset.memory_migrate, we can write
@@ -87,6 +87,9 @@
tst_sig(FORK, DEF_HANDLER, cleanup);
TEST_PAUSE;
+ if (!is_numa(NULL, NH_MEMS, 1))
+ tst_brkm(TCONF, NULL, "requires NUMA with at least 1 node");
+
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);
diff --git a/testcases/kernel/mem/oom/oom05.c b/testcases/kernel/mem/oom/oom05.c
index 44a243e..ccf456f 100644
--- a/testcases/kernel/mem/oom/oom05.c
+++ b/testcases/kernel/mem/oom/oom05.c
@@ -69,7 +69,7 @@
* is in charge of cpuset.memory_migrate, we can write
* 1 to cpuset.memory_migrate to enable the migration.
*/
- if (is_numa(cleanup)) {
+ if (is_numa(cleanup, NH_MEMS, 2)) {
write_cpuset_files(CPATH_NEW, "memory_migrate", "1");
tst_resm(TINFO, "OOM on CPUSET & MEMCG with "
"cpuset.memory_migrate=1");
@@ -110,6 +110,9 @@
tst_sig(FORK, DEF_HANDLER, cleanup);
TEST_PAUSE;
+ if (!is_numa(NULL, NH_MEMS, 1))
+ tst_brkm(TCONF, NULL, "requires NUMA with at least 1 node");
+
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);