numa: Fix TCONF message when numa disabled with --without-numa
RFC PATCH 1/1 numa: Fix TCONF message when numa disabled with --without-numa
Default error message was misleading when using --without-numa configure option.
Fixes 39a85a1f1 ("configure: add knob to control numa support")
Signed-off-by Petr Vorel <[email protected]>
--- configure.ac | 11 ++++++++--- include/mk/config.mk.in | 1 + .../cpuset/cpuset_syscall_test/cpuset_syscall_test.c | 2 +- testcases/kernel/hotplug/memory_hotplug/memtoy.c | 2 +- testcases/kernel/mem/cpuset/cpuset01.c | 2 +- testcases/kernel/mem/ksm/ksm02.c | 2 +- testcases/kernel/mem/ksm/ksm04.c | 2 +- testcases/kernel/mem/ksm/ksm06.c | 2 +- testcases/kernel/mem/oom/oom02.c | 2 +- testcases/kernel/mem/oom/oom03.c | 2 +- testcases/kernel/mem/oom/oom04.c | 2 +- testcases/kernel/mem/oom/oom05.c | 2 +- testcases/kernel/mem/vma/vma02.c | 2 +- testcases/kernel/mem/vma/vma04.c | 2 +- testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c | 2 +- testcases/kernel/syscalls/mbind/mbind01.c | 2 +- testcases/kernel/syscalls/migrate_pages/migrate_pages01.c | 3 +-- testcases/kernel/syscalls/migrate_pages/migrate_pages02.c | 3 +-- .../kernel/syscalls/migrate_pages/migrate_pages_common.h | 2 ++ testcases/kernel/syscalls/move_pages/move_pages01.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages02.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages03.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages04.c | 3 +-- testcases/kernel/syscalls/move_pages/move_pages05.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages06.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages07.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages08.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages09.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages10.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages11.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages12.c | 2 +- testcases/kernel/syscalls/move_pages/move_pages_support.c | 2 +- 32 files changed, 40 insertions(+), 35 deletions(-)
configure.ac +8 -3
@@ -165,9 +165,6 @@ LTP_CHECK_SELINUX LTP_CHECK_SIGNAL LTP_CHECK_SYSCALL_EVENTFD LTP_CHECK_SYSCALL_MODIFY_LDT -if test "x$with_numa" = xyes; then -LTP_CHECK_SYSCALL_NUMA -fi LTP_CHECK_SYSCALL_QUOTACTL LTP_CHECK_SYSCALL_SIGNALFD LTP_CHECK_SYSCALL_UNSHARE
@@ -215,4 +212,12 @@ LTP_CHECK_ATOMIC_MEMORY_MODEL LTP_CHECK_TPACKET_V3 LTP_DETECT_HOST_CPU +if test "x$with_numa" = xyes; then + LTP_CHECK_SYSCALL_NUMA + numa_error_msg="test requires libnuma >= 2 and it's development packages" +else + numa_error_msg="NUMA support was disabled during build" +fi +AC_DEFINE_UNQUOTED(NUMA_ERROR_MSG, ["$numa_error_msg"], [Error message when no NUMA support]) + AC_OUTPUT
include/mk/config.mk.in +1 -0
@@ -82,6 +82,7 @@ LINUX_VERSION_PATCH := @LINUX_VERSION_PATCH@ WITH_MODULES := @WITH_MODULES@ HOST_CPU := @HOST_CPU@ +NUMA_ERROR_MSG := @NUMA_ERROR_MSG@ ifeq ($(strip $(prefix)),) $(error you are using $$(prefix) incorrectly -- set it to $(abs_top_srcdir) if you want to build in the source tree)
testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_test.c +1 -1
@@ -232,6 +232,6 @@ int main(int argc, char *argv[])#else int main (void ) { -tst_brkm (TCONF ,NULL ,"test requires libnuma >= 2 and it's development packages" ); +tst_brkm (TCONF ,NULL ,NUMA_ERROR_MSG ); }#endif
testcases/kernel/hotplug/memory_hotplug/memtoy.c +1 -1
@@ -497,7 +497,7 @@ int main(int argc, char *argv[])#else int main (void ) { -fprintf (stderr,"test requires libnuma >= 2 and it's development packages\n" ); +fprintf (stderr,NUMA_ERROR_MSG "\n" );return TCONF ; }#endif
testcases/kernel/mem/cpuset/cpuset01.c +1 -1
@@ -190,5 +190,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/ksm/ksm02.c +1 -1
@@ -119,5 +119,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/ksm/ksm04.c +1 -1
@@ -123,5 +123,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/ksm/ksm06.c +1 -1
@@ -103,5 +103,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/oom/oom02.c +1 -1
@@ -75,5 +75,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/oom/oom03.c +1 -1
@@ -89,5 +89,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/oom/oom04.c +1 -1
@@ -97,5 +97,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/oom/oom05.c +1 -1
@@ -123,5 +123,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/mem/vma/vma02.c +1 -1
@@ -166,6 +166,6 @@ void usage(void)#else int main (void ) { -tst_brkm (TCONF ,NULL ,"test requires libnuma >= 2 and it's development packages" ); +tst_brkm (TCONF ,NULL ,NUMA_ERROR_MSG ); }#endif
testcases/kernel/mem/vma/vma04.c +1 -1
@@ -327,6 +327,6 @@ static void usage(void)#else int main (void ) { -tst_brkm (TCONF ,NULL ,"test requires libnuma >= 2 and it's development packages" ); +tst_brkm (TCONF ,NULL ,NUMA_ERROR_MSG ); }#endif
testcases/kernel/syscalls/get_mempolicy/get_mempolicy01.c +1 -1
@@ -315,6 +315,6 @@ static void setup(void)#else int main (void ) { -tst_brkm (TCONF ,NULL ,"test requires libnuma >= 2 and it's development packages" ); +tst_brkm (TCONF ,NULL ,NUMA_ERROR_MSG ); }#endif
testcases/kernel/syscalls/mbind/mbind01.c +1 -1
@@ -237,5 +237,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/syscalls/migrate_pages/migrate_pages01.c +1 -2
@@ -253,7 +253,6 @@ static void cleanup(void)#else int main (void ) { -tst_brkm (TCONF ,NULL ,"System doesn't support __NR_migrate_pages or " -"libnuma or libnuma development packages are not available" ); +tst_brkm (TCONF ,NULL ,NUMA_MIGRATE_PAGES_ERROR_MSG ); }#endif
testcases/kernel/syscalls/migrate_pages/migrate_pages02.c +1 -2
@@ -402,7 +402,6 @@ static void cleanup(void)#else int main (void ) { -tst_brkm (TCONF ,NULL ,"System doesn't support __NR_migrate_pages or " -"libnuma or libnuma development packages are not available" ); +tst_brkm (TCONF ,NULL ,NUMA_MIGRATE_PAGES_ERROR_MSG ); }#endif
testcases/kernel/syscalls/migrate_pages/migrate_pages_common.h +2 -0
@@ -27,6 +27,8 @@#define bitsperlong (8 * sizeof(unsigned long)) +#define NUMA_MIGRATE_PAGES_ERROR_MSG NUMA_ERROR_MSG " or system doesn't support __NR_migrate_pages" +void set_bit (unsigned long *b,unsigned int n,unsigned int v);int check_ret (long expected_ret);int check_errno (long expected_errno);
testcases/kernel/syscalls/move_pages/move_pages01.c +1 -1
@@ -101,7 +101,7 @@ int main(int argc, char **argv) }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages02.c +1 -1
@@ -117,7 +117,7 @@ int main(int argc, char **argv) free_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages03.c +1 -1
@@ -183,7 +183,7 @@ err_free_pages: free_shared_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages04.c +1 -2
@@ -150,12 +150,11 @@ err_free_pages: free_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();tst_exit (); - }/*
testcases/kernel/syscalls/move_pages/move_pages05.c +1 -1
@@ -198,7 +198,7 @@ err_free_shared: free_shared_pages(pages + SHARED_PAGE, N_SHARED_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages06.c +1 -1
@@ -113,7 +113,7 @@ int main(int argc, char **argv) free_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages07.c +1 -1
@@ -115,7 +115,7 @@ int main(int argc, char **argv) free_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages08.c +1 -1
@@ -113,7 +113,7 @@ int main(int argc, char **argv) free_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages09.c +1 -1
@@ -125,7 +125,7 @@ int main(int argc, char **argv) free_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages10.c +1 -1
@@ -112,7 +112,7 @@ int main(int argc, char **argv) free_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages11.c +1 -1
@@ -186,7 +186,7 @@ err_free_pages: free_shared_pages(pages, TEST_PAGES); }#else -tst_resm (TCONF ,"test requires libnuma >= 2 and it's development packages" ); +tst_resm (TCONF ,NUMA_ERROR_MSG );#endif cleanup ();
testcases/kernel/syscalls/move_pages/move_pages12.c +1 -1
@@ -267,5 +267,5 @@ static struct tst_test test = { };#else -TST_TEST_TCONF ("test requires libnuma >= 2 and it's development packages" ); +TST_TEST_TCONF (NUMA_ERROR_MSG );#endif
testcases/kernel/syscalls/move_pages/move_pages_support.c +1 -1
@@ -409,6 +409,6 @@ void check_config(unsigned int min_nodes) tst_brkm(TCONF, NULL, "2.6.18 or greater kernel required"); }#else -tst_brkm (TCONF ,NULL ,"NUMA support not provided" ); +tst_brkm (TCONF ,NULL ,NUMA_ERROR_MSG );#endif }
Signature · 1 line
2.16.1
RFC PATCH 1/1 numa: Fix TCONF message when numa disabled with --without-numa
Hi!
include/mk/config.mk.in LINUX_VERSION_PATCH := @LINUX_VERSION_PATCH@ · line 85
Quoted 10 lines
AC_OUTPUTinclude/mk/config.mk.in +1
-0@@ -82,6 +82,7 @@ LINUX_VERSION_PATCH := @LINUX_VERSION_PATCH@ WITH_MODULES := @WITH_MODULES@ HOST_CPU := @HOST_CPU@ +NUMA_ERROR_MSG := @NUMA_ERROR_MSG@
Huh, why do we need this in config.mk ?
Otherwise it looks good.
Signature · 2 lines
Cyril Hrubis [email protected]
RFC PATCH 1/1 numa: Fix TCONF message when numa disabled with --without-numa
Hi Cyril,
Quoted 8 lines
Quoted 7 lines
AC_OUTPUTinclude/mk/config.mk.in +0
-0@@ -82,6 +82,7 @@ LINUX_VERSION_PATCH := @LINUX_VERSION_PATCH@ WITH_MODULES := @WITH_MODULES@
Quoted 6 lines
include/mk/config.mk.in LINUX_VERSION_PATCH := @LINUX_VERSION_PATCH@ · line 85
Quoted 2 lines
include/mk/config.mk.in +1
-0HOST_CPU := @HOST_CPU@ +NUMA_ERROR_MSG := @NUMA_ERROR_MSG@Huh, why do we need this in config.mk ?
Otherwise it looks good.
Thanks for review. Fixed, rebased with changes from Xiao Yang and merged.
Kind regards,
Petr