The xAPIC IPI test uses MPOL_F_MEMS_ALLOWED to get the memory nodes available to the current process. Move the query to numaif.h as get_numa_mem_nodes() so other KVM selftests can use it.
Call get_mempolicy() directly instead of using the assert-on-failure kvm_get_mempolicy() wrapper. The xAPIC test already asserts its two node requirement. Signed-off-by: Shivank Garg <[email protected]> --- tools/testing/selftests/kvm/include/numaif.h | 13 +++++++++++++ tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 6 ++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/include/numaif.h b/tools/testing/selftests/kvm/include/numaif.h index 29572a6d789c..98cf77cfc481 100644 --- a/tools/testing/selftests/kvm/include/numaif.h +++ b/tools/testing/selftests/kvm/include/numaif.h @@ -6,6 +6,7 @@ #include <dirent.h> +#include <linux/bits.h> #include <linux/mempolicy.h> #include "kvm_syscalls.h" @@ -75,6 +76,18 @@ static bool is_numa_available(void) (errno != ENOSYS && errno != EPERM); } +static inline unsigned long get_numa_mem_nodes(void) +{ + unsigned long nodemask = 0; + + /* Get set of first 64 numa nodes available */ + if (get_mempolicy(NULL, &nodemask, BITS_PER_TYPE(nodemask), NULL, + MPOL_F_MEMS_ALLOWED)) + return 0; + + return nodemask; +} + static inline bool is_multi_numa_node_system(void) { return is_numa_available() && get_max_numa_node() >= 1; diff --git a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c index e5706dd62d3b..b5f4ed671218 100644 --- a/tools/testing/selftests/kvm/x86/xapic_ipi_test.c +++ b/tools/testing/selftests/kvm/x86/xapic_ipi_test.c @@ -232,7 +232,7 @@ void do_migrations(struct test_data_page *data, int run_secs, int delay_usecs, u64 *pipis_rcvd) { long pages_not_moved; - unsigned long nodemask = 0; + unsigned long nodemask; unsigned long nodemasks[BITS_PER_TYPE(nodemask)]; int nodes = 0; time_t start_time, last_update, now; @@ -247,9 +247,7 @@ void do_migrations(struct test_data_page *data, int run_secs, int delay_usecs, fprintf(stderr, "Calling migrate_pages every %d microseconds\n", delay_usecs); - /* Get set of first 64 numa nodes available */ - kvm_get_mempolicy(NULL, &nodemask, BITS_PER_TYPE(nodemask), - 0, MPOL_F_MEMS_ALLOWED); + nodemask = get_numa_mem_nodes(); fprintf(stderr, "Numa nodes found amongst first %lu possible nodes " "(each 1-bit indicates node is present): %#lx\n", -- 2.43.0
