Skip to contentSkip to conversation

Add mbind and set_mempolicy tests

PATCH New Cyril Hrubis 3 participants 8 messages Feb 28, 2019 – Jun 3, 2019 Library code

lore
Share & tools
lore
#0 lore raw

v4 cover Add mbind and set_mempolicy tests

Changes from v3 for the set_mempolicy patch follows comments from Jan, the allocation stays in the library but was made generic enough to support mbind tests.

The mbind tests are not 100% ready to be merged, but are included to show that the API is flexible enough now.

Cyril Hrubis (2):
syscalls: Add set_mempolicy numa tests.
syscalls/mbind0{2,3,4}: Add basic mbind tests

 include/tst_numa.h                            | 112 ++++++++++
 lib/tst_numa.c                                | 208 ++++++++++++++++++
 runtest/numa                                  |   5 +
 runtest/syscalls                              |   3 +
 testcases/kernel/syscalls/mbind/.gitignore    |   3 +
 testcases/kernel/syscalls/mbind/mbind.h       |  26 +++
 testcases/kernel/syscalls/mbind/mbind02.c     |  99 +++++++++
 testcases/kernel/syscalls/mbind/mbind03.c     | 123 +++++++++++
 testcases/kernel/syscalls/mbind/mbind04.c     | 127 +++++++++++
 .../kernel/syscalls/set_mempolicy/.gitignore  |   4 +
 .../kernel/syscalls/set_mempolicy/Makefile    |   7 +
 .../syscalls/set_mempolicy/set_mempolicy.h    |  21 ++
 .../syscalls/set_mempolicy/set_mempolicy01.c  | 120 ++++++++++
 .../syscalls/set_mempolicy/set_mempolicy02.c  | 117 ++++++++++
 .../syscalls/set_mempolicy/set_mempolicy03.c  | 113 ++++++++++
 .../syscalls/set_mempolicy/set_mempolicy04.c  | 142 ++++++++++++
 16 files changed, 1230 insertions(+)
 create mode 100644 include/tst_numa.h
 create mode 100644 lib/tst_numa.c
 create mode 100644 testcases/kernel/syscalls/mbind/mbind.h
 create mode 100644 testcases/kernel/syscalls/mbind/mbind02.c
 create mode 100644 testcases/kernel/syscalls/mbind/mbind03.c
 create mode 100644 testcases/kernel/syscalls/mbind/mbind04.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/.gitignore
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/Makefile
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy.h
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c
Signature · 1 line
2.19.2
#1 lore raw

PATCH v4 1/2 syscalls: Add set_mempolicy numa tests.

This is initial attempt to replace numa.sh tests that despite having been fixed several times have still many shortcommings that wouldn't easy to fix. It's not finished nor 100% replacement at this point but it should be pretty good start.

The main selling points of these testcases are:

The memory allocated for the testing is tracked exactly. We are using get_mempolicy() with MPOL_F_NODE | MPOL_F_ADDR that returns the node ID on which specified address is allocated on to count pages allocated per node after we set desired memory policy.

We also check for free memory on each numa memory mode and skip nodes that don't have sufficient amount of memory for a particular test. The tests checks usuall for twice as much memory per each node in order to allow for allocations to be "misplaced".

The tests for file based shared interleaved mappings are no longer mapping a single small file but rather than that we accumulate statistic for larger amount of files over longer period of time and we also allow for small offset (currently 10%). We should probably also increase the number of samples we take as currently it's about 5MB in total on x86 although I haven't managed to make this test fail so far. This also fixes the test on Btrfs where the synthetic test that expects the pages to be distributed exactly equally fails.

CC Michal Hocko <[email protected]>
CC Vlastimil Babka <[email protected]>
CC Jan Stancek <[email protected]>
---
 include/tst_numa.h                            | 112 ++++++++++
 lib/tst_numa.c                                | 208 ++++++++++++++++++
 runtest/numa                                  |   5 +
 .../kernel/syscalls/set_mempolicy/.gitignore  |   4 +
 .../kernel/syscalls/set_mempolicy/Makefile    |   7 +
 .../syscalls/set_mempolicy/set_mempolicy.h    |  21 ++
 .../syscalls/set_mempolicy/set_mempolicy01.c  | 120 ++++++++++
 .../syscalls/set_mempolicy/set_mempolicy02.c  | 117 ++++++++++
 .../syscalls/set_mempolicy/set_mempolicy03.c  | 113 ++++++++++
 .../syscalls/set_mempolicy/set_mempolicy04.c  | 142 ++++++++++++
 10 files changed, 849 insertions(+)
 create mode 100644 include/tst_numa.h
 create mode 100644 lib/tst_numa.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/.gitignore
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/Makefile
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy.h
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c
 create mode 100644 testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c
include/tst_numa.h new file +112 -0
new file mode 100644
index 000000000..a4cd1be37
@@ -0,0 +1,112 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright (c) 2018 Cyril Hrubis <[email protected]>
+ */
+
+#ifndef TST_NUMA_H__
+#define TST_NUMA_H__
+
+/**
+ * Numa nodemap.
+ */
+struct tst_nodemap {
+        /** Number of nodes in map */
+	unsigned int cnt;
+	/** Page allocation counters */
+	unsigned int *counters;
+	/** Array of numa ids */
+	unsigned int map[];
+};
+
+/**
+ * Clears numa counters. The counters are lazy-allocated on first call of this function.
+ *
+ * @nodes Numa nodemap.
+ */
+void tst_nodemap_reset_counters(struct tst_nodemap *nodes);
+
+/**
+ * Prints pages allocated per each node.
+ *
+ * @nodes Numa nodemap.
+ */
+void tst_nodemap_print_counters(struct tst_nodemap *nodes);
+
+/**
+ * Returns a name for a mempolicy/mbind mode.
+ *
+ * @mode Numa mempolicy mode.
+ */
+const char *tst_numa_mode_name(int mode);
+
+/**
+ * Maps pages into memory, if path is NULL the mapping is anonymous otherwise is backed by the file.
+ *
+ * @path Path to a file, if not NULL mapping is file based.
+ * @size Mapping size.
+ */
+void *tst_numa_map(const char *path, size_t size);
+
+/*
+ * Writes to memory in order to get the pages faulted.
+ *
+ * @ptr Start of the mapping.
+ * @size Size of the mapping.
+ */
+static inline void tst_numa_fault(void *ptr, size_t size)
+{
+	memset(ptr, 'a', size);
+}
+
+/*
+ * Frees the memory.
+ *
+ * @ptr Start of the mapping.
+ * @size Size of the mapping.
+ */
+static inline void tst_numa_unmap(void *ptr, size_t size)
+{
+	SAFE_MUNMAP(ptr, size);
+}
+
+/**
+ * Check on which numa node resides each page of the mapping starting at ptr
+ * and continuing pages long and increases nodemap counters accordingly.
+ *
+ * @nodes Nodemap with initialized counters.
+ * @ptr   Pointer to start of a mapping.
+ * @size  Size of the mapping.
+ */
+void tst_nodemap_count_pages(struct tst_nodemap *nodes, void *ptr, size_t size);
+
+/**
+ * Frees nodemap.
+ *
+ * @nodes Numa nodemap to be freed.
+ */
+void tst_nodemap_free(struct tst_nodemap *nodes);
+
+/**
+ * Bitflags for tst_get_nodemap() function.
+ */
+enum tst_numa_types {
+	TST_NUMA_ANY = 0x00,
+	TST_NUMA_MEM = 0x01,
+};
+
+/**
+ * Allocates and returns numa node map, which is an array of numa nodes which
+ * contain desired resources e.g. memory.
+ *
+ * @type       Bitflags of enum tst_numa_types specifying desired resources.
+ * @min_mem_kb Minimal free RAM on memory nodes, if given node has less than
+ *             requested amount of free+buffers memory it's not included in
+ *             the resulting list of nodes.
+ *
+ * @return On success returns allocated and initialized struct tst_nodemap which contains
+ *         array of numa node ids that contains desired resources.
+ */
+struct tst_nodemap *tst_get_nodemap(int type, size_t min_mem_kb);
+
+#endif /* TST_NUMA_H__ */
lib/tst_numa.c new file +208 -0

208 lines not on this page · raw message

runtest/numa +5 -0
index 12aedbb4b..7885be90c 100644
@@ -11,3 +11,8 @@ move_pages09 move_pages09
 move_pages10 move_pages10
 move_pages11 move_pages11
 move_pages12 move_pages12
+
+set_mempolicy01 set_mempolicy01
+set_mempolicy02 set_mempolicy02
+set_mempolicy03 set_mempolicy03
+set_mempolicy04 set_mempolicy04
testcases/kernel/syscalls/set_mempolicy/.gitignore new file +4 -0
new file mode 100644
index 000000000..c5e35a405
@@ -0,0 +1,4 @@
+/set_mempolicy01
+/set_mempolicy02
+set_mempolicy03
+set_mempolicy04
testcases/kernel/syscalls/set_mempolicy/Makefile new file +7 -0
new file mode 100644
index 000000000..d273b432b
@@ -0,0 +1,7 @@
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+LDLIBS  += $(NUMA_LIBS)
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/set_mempolicy/set_mempolicy.h new file +21 -0
new file mode 100644
index 000000000..da6419e18
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright (c) 2018 Cyril Hrubis <[email protected]>
+ */
+
+#ifndef SET_MEMPOLICY_H__
+#define SET_MEMPOLICY_H__
+
+static inline void alloc_fault_count(struct tst_nodemap *nodes,
+                                     const char *file, size_t size)
+{
+	void *ptr;
+
+	ptr = tst_numa_map(file, size);
+	tst_numa_fault(ptr, size);
+	tst_nodemap_count_pages(nodes, ptr, size);
+	tst_numa_unmap(ptr, size);
+}
+
+#endif /* SET_MEMPOLICY_H__ */
testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c new file +120 -0

120 lines not on this page · raw message

testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c new file +117 -0

117 lines not on this page · raw message

testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c new file +113 -0

113 lines not on this page · raw message

testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c new file +142 -0

142 lines not on this page · raw message

Signature · 1 line
2.19.2
#2 lore raw

PATCH v4 1/2 syscalls: Add set_mempolicy numa tests.

----- Original Message -----

Quoted 5 lines

This is initial attempt to replace numa.sh tests that despite having been fixed several times have still many shortcommings that wouldn't easy to fix. It's not finished nor 100% replacement at this point but it should be pretty good start.

Quoted 7 lines

The main selling points of these testcases are:

The memory allocated for the testing is tracked exactly. We are using get_mempolicy() with MPOL_F_NODE | MPOL_F_ADDR that returns the node ID on which specified address is allocated on to count pages allocated per node after
we set desired memory policy.

Hi,

Quoted 5 lines

We also check for free memory on each numa memory mode and skip nodes that don't have sufficient amount of memory for a particular test. The tests checks usuall for twice as much memory per each node in order to allow for allocations to be "misplaced".

I wonder if we should add some constant to it. I have foggy idea, that kernel keeps some reserves.

Quoted 9 lines

The tests for file based shared interleaved mappings are no longer mapping a single small file but rather than that we accumulate statistic for larger amount of files over longer period of time and we also allow for small offset (currently 10%). We should probably also increase the number of samples we take as currently it's about 5MB in total on x86 although I haven't managed to make this test fail so far. This also fixes the test on Btrfs where the synthetic test that expects the pages to be distributed exactly equally fails.

API looks good to me, ACK. Maybe you could split it into 2 commits, one for new library API, and one for new tests.

Couple small comments below.

Quoted 11 lines
lib/tst_numa.c new file +11 -0
+
+void tst_nodemap_count_pages(struct tst_nodemap *nodes,
+                             void *ptr, size_t size)
+{
+	size_t page_size = getpagesize();
+	unsigned int i;
+	int node;
+	unsigned int pages = (size + page_size - 1)/page_size;
+
+	for (i = 0; i < pages; i++) {
+		get_mempolicy(&node, NULL, 0, ptr + i * page_size, MPOL_F_NODE |
Quoted 1 line

MPOL_F_ADDR);

We should check return value from get_mempolicy here.

Quoted 10 lines
lib/tst_numa.c new file +10 -0
+
+		if (node < 0 || (unsigned int)node >= nodes->cnt) {
+			tst_res(TWARN, "get_mempolicy(...) returned invalid node %i\n", node);
+			continue;
+		}
+
+		inc_counter(node, nodes);
+	}
+}
+

<snip>

testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c line 74

Quoted 6 lines
testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c new file +6 -0
+
+static void verify_set_mempolicy(unsigned int n)
+{
+	struct bitmask *bm = numa_allocate_nodemask();
+	unsigned int exp_alloc[nodes->cnt];
+	unsigned int alloc_per_node = n ? 8 : 2;

Can you make this "8" a define, so that "16" above can be derived from it?

Quoted 58 lines
testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c new file +43 -0
+	unsigned int alloc_on_nodes = n ? 2 : nodes->cnt;
+	unsigned int alloc_total = alloc_per_node * alloc_on_nodes;
+	unsigned int i;
+
+	memset(exp_alloc, 0, sizeof(exp_alloc));
+
+	for (i = 0; i < alloc_on_nodes; i++) {
+		exp_alloc[i] = alloc_per_node;
+		numa_bitmask_setbit(bm, nodes->map[i]);
+	}
+
+	TEST(set_mempolicy(MPOL_INTERLEAVE, bm->maskp, bm->size+1));
+
+	tst_res(TINFO, "Allocating on nodes 1-%u - %u pages",
+	        alloc_on_nodes, alloc_total);
+
+	if (TST_RET) {
+		tst_res(TFAIL | TTERRNO,
+		        "set_mempolicy(MPOL_INTERLEAVE)");
+		return;
+	}
+
+	tst_res(TPASS, "set_mempolicy(MPOL_INTERLEAVE)");
+
+	numa_free_nodemask(bm);
+
+	alloc_and_check(alloc_total, exp_alloc);
+}
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test = verify_set_mempolicy,
+	.tcnt = 2,
+	.forks_child = 1,
+	.needs_checkpoints = 1,
+};
+
+#else
+
+TST_TEST_TCONF(NUMA_ERROR_MSG);
+
+#endif /* HAVE_NUMA_H */
testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c new file +8 -0
new file mode 100644
index 000000000..a1e7f1eb5
@@ -0,0 +1,113 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright (c) 2018 Cyril Hrubis <[email protected]>
+ */
+
+/*
+ * We are testing set_mempolicy() with MPOL_BIND and MPOL_PREFERRED backed
Quoted 2 lines

by a
+ * file.

Maybe extend this comment to say it's across all filesystems.

Regards,
Jan

#3 lore raw

PATCH v4 1/2 syscalls: Add set_mempolicy numa tests.

Hi!

Quoted 7 lines
Quoted 4 lines

We also check for free memory on each numa memory mode and skip nodes that don't have sufficient amount of memory for a particular test. The tests checks usuall for twice as much memory per each node in order to allow for allocations to be "misplaced".

I wonder if we should add some constant to it. I have foggy idea, that kernel keeps some reserves.

Hmm, no idea about this, I guess that adding a few megabytes for a good luck in the library wouldn't do any harm.

Quoted 11 lines
Quoted 8 lines

The tests for file based shared interleaved mappings are no longer mapping a single small file but rather than that we accumulate statistic for larger amount of files over longer period of time and we also allow for small offset (currently 10%). We should probably also increase the number of samples we take as currently it's about 5MB in total on x86 although I haven't managed to make this test fail so far. This also fixes the test on Btrfs where the synthetic test that expects the pages to be distributed exactly equally fails.

API looks good to me, ACK. Maybe you could split it into 2 commits, one for new library API, and one for new tests.

Sure, will do.

Ok to commit the library and set_mempolicy() tests with fixed nits you pointed out below or should I spin v5?

Signature · 2 lines
Cyril Hrubis
[email protected]
#4 lore raw

PATCH v4 1/2 syscalls: Add set_mempolicy numa tests.

----- Original Message -----

Quoted 21 lines

Hi!

Quoted 7 lines
Quoted 4 lines

We also check for free memory on each numa memory mode and skip nodes that don't have sufficient amount of memory for a particular test. The tests checks usuall for twice as much memory per each node in order to allow for allocations to be "misplaced".

I wonder if we should add some constant to it. I have foggy idea, that kernel keeps some reserves.

Hmm, no idea about this, I guess that adding a few megabytes for a good luck in the library wouldn't do any harm.

Quoted 9 lines
Quoted 8 lines

The tests for file based shared interleaved mappings are no longer mapping a single small file but rather than that we accumulate statistic for larger amount of files over longer period of time and we also allow for small offset (currently 10%). We should probably also increase the number of samples we take as currently it's about 5MB in total on x86 although I haven't managed to make this test fail so far. This also fixes the test on Btrfs where the synthetic test that expects the pages to be distributed exactly equally fails.

Quoted 7 lines
Quoted 2 lines

API looks good to me, ACK. Maybe you could split it into 2 commits, one for new library API, and one for new tests.

Sure, will do.

Ok to commit the library and set_mempolicy() tests with fixed nits you pointed out below or should I spin v5?

For me, OK to commit, this set has been on mailing list for couple months.

Quoted 5 lines

--
Cyril Hrubis
[email protected]

#5 lore raw

PATCH v4 2/2 syscalls/mbind0{2,3,4}: Add basic mbind tests

In reply to Cyril Hrubis

This test is similar to the set_mempolicy() tests, but with mbind we are actually binding memory to nodes after it was mapped.

mbind02: We are trying to get EIO with MPOL_MF_STRICT and page that was already
faulted on wrong node.

mbind03: We are moving pages with MPOL_MF_MOVE and MPOL_MF_MOVE_ALL and
checking the result.

mbind04: We are applying memory policy before we fault the pages and check
that the pages were faulted accordingly.

CC Michal Hocko <[email protected]>
CC Vlastimil Babka <[email protected]>
CC Jan Stancek <[email protected]>
---
 runtest/syscalls                           |   3 +
 testcases/kernel/syscalls/mbind/.gitignore |   3 +
 testcases/kernel/syscalls/mbind/mbind.h    |  26 +++++
 testcases/kernel/syscalls/mbind/mbind02.c  |  99 ++++++++++++++++
 testcases/kernel/syscalls/mbind/mbind03.c  | 123 ++++++++++++++++++++
 testcases/kernel/syscalls/mbind/mbind04.c  | 127 +++++++++++++++++++++
 6 files changed, 381 insertions(+)
 create mode 100644 testcases/kernel/syscalls/mbind/mbind.h
 create mode 100644 testcases/kernel/syscalls/mbind/mbind02.c
 create mode 100644 testcases/kernel/syscalls/mbind/mbind03.c
 create mode 100644 testcases/kernel/syscalls/mbind/mbind04.c
runtest/syscalls +3 -0
index 0af0f4475..b4e9d053c 100644
@@ -619,6 +619,9 @@ lstat03_64 lstat03_64
 mallopt01 mallopt01
 
 mbind01 mbind01
+mbind02 mbind02
+mbind03 mbind03
+mbind04 mbind04
 
 memset01 memset01
 memcmp01 memcmp01
testcases/kernel/syscalls/mbind/.gitignore +3 -0
index 64139f75c..b78d20264 100644
@@ -1 +1,4 @@
 /mbind01
+/mbind02
+/mbind03
+/mbind04
testcases/kernel/syscalls/mbind/mbind.h new file +26 -0
new file mode 100644
index 000000000..62e749bca
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright (c) 2019 Cyril Hrubis <[email protected]>
+ */
+
+#ifndef MBIND_H__
+#define MBIND_H__
+
+static inline const char *mbind_flag_name(unsigned flag)
+{
+	switch (flag) {
+	case 0:
+		return "0";
+	case MPOL_MF_STRICT:
+		return "MPOL_MF_STRICT";
+	case MPOL_MF_MOVE:
+		return "MPOL_MF_MOVE";
+	case MPOL_MF_MOVE_ALL:
+		return "MPOL_MF_MOVE_ALL";
+	default:
+		return "???";
+	}
+}
+
+#endif /* MBIND_H__ */
testcases/kernel/syscalls/mbind/mbind02.c new file +99 -0

99 lines not on this page · raw message

testcases/kernel/syscalls/mbind/mbind03.c new file +123 -0

123 lines not on this page · raw message

testcases/kernel/syscalls/mbind/mbind04.c new file +127 -0

127 lines not on this page · raw message

Signature · 1 line
2.19.2
#6 lore raw

PATCH 2/2 syscalls/mbind0{2, 3, 4}: Add basic mbind tests

Hi Cyril,

Quoted 11 lines

This test is similar to the set_mempolicy() tests, but with mbind we are actually binding memory to nodes after it was mapped.

mbind02: We are trying to get EIO with MPOL_MF_STRICT and page that was already
faulted on wrong node.

mbind03: We are moving pages with MPOL_MF_MOVE and MPOL_MF_MOVE_ALL and
checking the result.

mbind04: We are applying memory policy before we fault the pages and check
that the pages were faulted accordingly.

Generally LGTM, just Makefile needs updating after adding libltpnuma:
LDFLAGS += -L$(top_builddir)/libs/libltpnuma
LDLIBS += $(NUMA_LIBS) -lltpnuma
(mbind01 does not need that, I'd ignore that).

...

Quoted 1 line

+++ b/testcases/kernel/syscalls/mbind/mbind.h

...

testcases/kernel/syscalls/mbind/mbind.h line 22

Quoted 13 lines
testcases/kernel/syscalls/mbind/mbind.h new file +13 -0
+static inline const char *mbind_flag_name(unsigned flag)
+{
+	switch (flag) {
+	case 0:
+		return "0";
+	case MPOL_MF_STRICT:
+		return "MPOL_MF_STRICT";
+	case MPOL_MF_MOVE:
+		return "MPOL_MF_MOVE";
+	case MPOL_MF_MOVE_ALL:
+		return "MPOL_MF_MOVE_ALL";
+	default:
+		return "???";

I guess "???" is important for us. Otherwise I'd use macro:
#define MBIND_FLAG_NAME(x) #x

..

Quoted 1 line

+++ b/testcases/kernel/syscalls/mbind/mbind02.c

...

testcases/kernel/syscalls/mbind/mbind02.c line 39

Quoted 13 lines
testcases/kernel/syscalls/mbind/mbind02.c new file +13 -0
+static void setup(void)
+{
+	page_size = getpagesize();
+
+	nodes = tst_get_nodemap(TST_NUMA_MEM, 2 * page_size / 1024);
+	if (nodes->cnt <= 1)
+		tst_brk(TCONF, "Test requires at least two NUMA memory nodes");
+}
+
+static void cleanup(void)
+{
+	tst_nodemap_free(nodes);
+}

Maybe setup and cleanup can be put as static inline into mbind.h? As it's repeated. PAGES_ALLOCATED would have to be defined for all.

...

testcases/kernel/syscalls/mbind/mbind02.c line 10

Quoted 12 lines

+++ b/testcases/kernel/syscalls/mbind/mbind03.c

testcases/kernel/syscalls/mbind/mbind02.c new file +10 -0
@@ -0,0 +1,123 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright (c) 2019 Cyril Hrubis <[email protected]>
+ */
+
+/*
+ * We are testing mbind() EIO error.
+ *
+ * We first fault a allocated page, then attempt to mbind it to a different node.

Here is a copy paste error. But commit message is correct:
mbind03: We are moving pages with MPOL_MF_MOVE and MPOL_MF_MOVE_ALL and
checking the result.

Kind regards,
Petr

#7 lore raw

PATCH 2/2 syscalls/mbind0{2, 3, 4}: Add basic mbind tests

In reply to Cyril Hrubis

HI Cyril,

testcases/kernel/syscalls/mbind/mbind02.c line 22

Quoted 10 lines
testcases/kernel/syscalls/mbind/mbind02.c new file +10 -0
+#include <errno.h>
+#include "config.h"
+#ifdef HAVE_NUMA_H
+# include <numa.h>
+# include <numaif.h>
+#endif
+#include "tst_test.h"
+#include "tst_numa.h"
+
+#ifdef HAVE_NUMA_H

This needs to be tested against HAVE_NUMA_V2 to get proper libnuma detection in cross-compilation [1] [2]:

/tmp/cclVNEz5.o: In function `verify_policy':
/usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:46: undefined reference to numa_allocate_nodemask' /usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:51: undefined reference to numa_bitmask_setbit' /usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:53: undefined reference to tst_numa_map' /usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:55: undefined reference to mbind' /usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:58: undefined reference to tst_numa_mode_name' /usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:64: undefined reference to tst_numa_mode_name' /tmp/cclVNEz5.o: In function `numa_free_nodemask':
/usr/include/numa.h:183: undefined reference to `numa_bitmask_free'
/tmp/cclVNEz5.o: In function `verify_policy':
/usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:78: undefined reference to tst_nodemap_count_pages' /tmp/cclVNEz5.o: In function setup':
/usr/src/ltp/testcases/kernel/syscalls/mbind/mbind04.c:34: undefined reference to `tst_get_nodemap'
collect2: error: ld returned 1 exit status

Id' personally move numa includes after it.

Kind regards,
Petr

[1] https://api.travis-ci.org/v3/job/540754157/log.txt
[2] https://travis-ci.org/pevik/ltp/builds/540754154