[LTP] [PATCH] mbind01, get_mempolicy01: dont use hardcoded node 0

[Jan Stancek <jstancek@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]


These tests are failing on following setup:
  # numactl -H
  available: 2 nodes (0-1)
  node 0 cpus: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
  23 24 25 26 27 28 29 30 31
  node 0 size: 0 MB
  node 0 free: 0 MB
  node 1 cpus:
  node 1 size: 12288 MB
  node 1 free: 9998 MB
  node distances:
  node   0   1
    0:  10  40
    1:  40  10

Avoid hardcoded node 0 by using numa_get_mems_allowed().

Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
 .../syscalls/get_mempolicy/get_mempolicy01.c       |    7 ++++---
 testcases/kernel/syscalls/mbind/mbind01.c          |    7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)



[-- Attachment #2: 0001-mbind01-get_mempolicy01-dont-use-hardcoded-node-0.patch --]
[-- Type: text/x-patch, Size: 2309 bytes --]

diff --git a/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c b/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
index 0565d6f..12dc8d3 100644
--- a/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
+++ b/testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c
@@ -226,20 +226,21 @@ static int do_test(struct test_case *tc)
 	nodemask_t *nodemask, *getnodemask;
 	unsigned long maxnode = NUMA_NUM_NODES;
 #else
-	struct bitmask *nodemask = numa_allocate_nodemask();
+	struct bitmask *nodemask = NULL;
 	struct bitmask *getnodemask = numa_allocate_nodemask();
 #endif
 	char *p = NULL;
 	unsigned long len = MEM_LENGTH;
 
 #if !defined(LIBNUMA_API_VERSION) || LIBNUMA_API_VERSION < 2
+	struct bitmask *allowed = numa_get_mems_allowed();
 	nodemask = malloc(sizeof(nodemask_t));
 	nodemask_zero(nodemask);
-	nodemask_set(nodemask, 0);
+	copy_bitmask_to_nodemask(allowed, nodemask);
 	getnodemask = malloc(sizeof(nodemask_t));
 	nodemask_zero(getnodemask);
 #else
-	numa_bitmask_setbit(nodemask, 0);
+	nodemask = numa_get_mems_allowed();
 #endif
 	switch (tc->ttype) {
 	case DEFAULT:
diff --git a/testcases/kernel/syscalls/mbind/mbind01.c b/testcases/kernel/syscalls/mbind/mbind01.c
index 4b25db0..48066db 100644
--- a/testcases/kernel/syscalls/mbind/mbind01.c
+++ b/testcases/kernel/syscalls/mbind/mbind01.c
@@ -211,7 +211,7 @@ static int do_test(struct test_case *tc)
 #if !defined(LIBNUMA_API_VERSION) || LIBNUMA_API_VERSION < 2
 	nodemask_t *nodemask, *getnodemask;
 #else
-	struct bitmask *nodemask = numa_allocate_nodemask();
+	struct bitmask *nodemask = NULL;
 	struct bitmask *getnodemask = numa_allocate_nodemask();
 #endif
 	unsigned long maxnode = NUMA_NUM_NODES;
@@ -219,13 +219,14 @@ static int do_test(struct test_case *tc)
 	unsigned long *invalid_nodemask;
 
 #if !defined(LIBNUMA_API_VERSION) || LIBNUMA_API_VERSION < 2
+	struct bitmask *allowed = numa_get_mems_allowed();
 	nodemask = malloc(sizeof(nodemask_t));
 	nodemask_zero(nodemask);
-	nodemask_set(nodemask, 0);
+	copy_bitmask_to_nodemask(allowed, nodemask);
 	getnodemask = malloc(sizeof(nodemask_t));
 	nodemask_zero(getnodemask);
 #else
-	numa_bitmask_setbit(nodemask, 0);
+	nodemask = numa_get_mems_allowed();
 #endif
 	p = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS,
 		    0, 0);


[-- Attachment #3: Type: text/plain, Size: 395 bytes --]

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

[-- Attachment #4: Type: text/plain, Size: 155 bytes --]

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list