Commit 06c8580a authored by Rebecca Mckeever's avatar Rebecca Mckeever Committed by Mike Rapoport

memblock tests: change build options to run-time options

Change verbose and movable node build options to run-time options.

Movable node usage:
    $ ./main -m

    Or:
    $ ./main --movable-node

Verbose usage:
    $ ./main -v

    Or:
    $ ./main --verbose
Signed-off-by: default avatarRebecca Mckeever <remckee0@gmail.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Link: https://lore.kernel.org/r/20220714031717.12258-1-remckee0@gmail.com
parent fe833b4e
...@@ -45,13 +45,8 @@ help: ...@@ -45,13 +45,8 @@ help:
@echo ' clean - Remove generated files and symlinks in the directory' @echo ' clean - Remove generated files and symlinks in the directory'
@echo '' @echo ''
@echo 'Configuration:' @echo 'Configuration:'
@echo ' make VERBOSE=1 - enable verbose output, which includes the'
@echo ' names of functions being tested and the'
@echo ' number of test cases passing'
@echo ' make MEMBLOCK_DEBUG=1 - enable memblock_dbg() messages' @echo ' make MEMBLOCK_DEBUG=1 - enable memblock_dbg() messages'
@echo ' make NUMA=1 - simulate enabled NUMA' @echo ' make NUMA=1 - simulate enabled NUMA'
@echo ' make MOVABLE_NODE=1 - override `movable_node_is_enabled`'
@echo ' definition to simulate movable NUMA nodes'
@echo ' make 32BIT_PHYS_ADDR_T=1 - Use 32 bit physical addresses' @echo ' make 32BIT_PHYS_ADDR_T=1 - Use 32 bit physical addresses'
vpath %.c ../../lib vpath %.c ../../lib
......
...@@ -7,13 +7,11 @@ ...@@ -7,13 +7,11 @@
#include <linux/cache.h> #include <linux/cache.h>
#include <linux/types.h> #include <linux/types.h>
extern bool movable_node_enabled;
static inline bool movable_node_is_enabled(void) static inline bool movable_node_is_enabled(void)
{ {
#ifdef MOVABLE_NODE return movable_node_enabled;
return true;
#else
return false;
#endif
} }
#endif #endif
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
#include "tests/alloc_api.h" #include "tests/alloc_api.h"
#include "tests/alloc_helpers_api.h" #include "tests/alloc_helpers_api.h"
#include "tests/alloc_nid_api.h" #include "tests/alloc_nid_api.h"
#include "tests/common.h"
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
parse_args(argc, argv);
memblock_basic_checks(); memblock_basic_checks();
memblock_alloc_checks(); memblock_alloc_checks();
memblock_alloc_helpers_checks(); memblock_alloc_helpers_checks();
......
...@@ -6,11 +6,6 @@ ifeq ($(NUMA), 1) ...@@ -6,11 +6,6 @@ ifeq ($(NUMA), 1)
CFLAGS += -D CONFIG_NUMA CFLAGS += -D CONFIG_NUMA
endif endif
# Simulate movable NUMA memory regions
ifeq ($(MOVABLE_NODE), 1)
CFLAGS += -D MOVABLE_NODE
endif
# Use 32 bit physical addresses. # Use 32 bit physical addresses.
# Remember to install 32-bit version of dependencies. # Remember to install 32-bit version of dependencies.
ifeq ($(32BIT_PHYS_ADDR_T), 1) ifeq ($(32BIT_PHYS_ADDR_T), 1)
...@@ -18,11 +13,6 @@ ifeq ($(32BIT_PHYS_ADDR_T), 1) ...@@ -18,11 +13,6 @@ ifeq ($(32BIT_PHYS_ADDR_T), 1)
LDFLAGS += -m32 LDFLAGS += -m32
endif endif
# Enable verbose testing output
ifeq ($(VERBOSE), 1)
CFLAGS += -D VERBOSE
endif
# Enable memblock_dbg() messages # Enable memblock_dbg() messages
ifeq ($(MEMBLOCK_DEBUG), 1) ifeq ($(MEMBLOCK_DEBUG), 1)
CFLAGS += -D MEMBLOCK_DEBUG CFLAGS += -D MEMBLOCK_DEBUG
......
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "tests/common.h" #include "tests/common.h"
#include <string.h> #include <string.h>
#include <getopt.h>
#include <linux/memory_hotplug.h>
#include <linux/build_bug.h>
#define INIT_MEMBLOCK_REGIONS 128 #define INIT_MEMBLOCK_REGIONS 128
#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS #define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS
...@@ -11,6 +14,27 @@ static struct test_memory memory_block; ...@@ -11,6 +14,27 @@ static struct test_memory memory_block;
static const char __maybe_unused *prefixes[PREFIXES_MAX]; static const char __maybe_unused *prefixes[PREFIXES_MAX];
static int __maybe_unused nr_prefixes; static int __maybe_unused nr_prefixes;
static const char *short_opts = "mv";
static const struct option long_opts[] = {
{"movable-node", 0, NULL, 'm'},
{"verbose", 0, NULL, 'v'},
{NULL, 0, NULL, 0}
};
static const char * const help_opts[] = {
"disallow allocations from regions marked as hotplugged\n\t\t\t"
"by simulating enabling the \"movable_node\" kernel\n\t\t\t"
"parameter",
"enable verbose output, which includes the name of the\n\t\t\t"
"memblock function being tested, the name of the test,\n\t\t\t"
"and whether the test passed or failed."
};
static int verbose;
/* sets global variable returned by movable_node_is_enabled() stub */
bool movable_node_enabled;
void reset_memblock_regions(void) void reset_memblock_regions(void)
{ {
memset(memblock.memory.regions, 0, memset(memblock.memory.regions, 0,
...@@ -51,7 +75,39 @@ void dummy_physical_memory_cleanup(void) ...@@ -51,7 +75,39 @@ void dummy_physical_memory_cleanup(void)
free(memory_block.base); free(memory_block.base);
} }
#ifdef VERBOSE static void usage(const char *prog)
{
BUILD_BUG_ON(ARRAY_SIZE(help_opts) != ARRAY_SIZE(long_opts) - 1);
printf("Usage: %s [-%s]\n", prog, short_opts);
for (int i = 0; long_opts[i].name; i++) {
printf(" -%c, --%-12s\t%s\n", long_opts[i].val,
long_opts[i].name, help_opts[i]);
}
exit(1);
}
void parse_args(int argc, char **argv)
{
int c;
while ((c = getopt_long_only(argc, argv, short_opts, long_opts,
NULL)) != -1) {
switch (c) {
case 'm':
movable_node_enabled = true;
break;
case 'v':
verbose = 1;
break;
default:
usage(argv[0]);
}
}
}
void print_prefixes(const char *postfix) void print_prefixes(const char *postfix)
{ {
for (int i = 0; i < nr_prefixes; i++) for (int i = 0; i < nr_prefixes; i++)
...@@ -61,25 +117,31 @@ void print_prefixes(const char *postfix) ...@@ -61,25 +117,31 @@ void print_prefixes(const char *postfix)
void test_fail(void) void test_fail(void)
{ {
ksft_test_result_fail(": "); if (verbose) {
print_prefixes("failed\n"); ksft_test_result_fail(": ");
print_prefixes("failed\n");
}
} }
void test_pass(void) void test_pass(void)
{ {
ksft_test_result_pass(": "); if (verbose) {
print_prefixes("passed\n"); ksft_test_result_pass(": ");
print_prefixes("passed\n");
}
} }
void test_print(const char *fmt, ...) void test_print(const char *fmt, ...)
{ {
int saved_errno = errno; if (verbose) {
va_list args; int saved_errno = errno;
va_list args;
va_start(args, fmt);
errno = saved_errno; va_start(args, fmt);
vprintf(fmt, args); errno = saved_errno;
va_end(args); vprintf(fmt, args);
va_end(args);
}
} }
void prefix_reset(void) void prefix_reset(void)
...@@ -102,4 +164,3 @@ void prefix_pop(void) ...@@ -102,4 +164,3 @@ void prefix_pop(void)
nr_prefixes--; nr_prefixes--;
} }
} }
#endif /* VERBOSE */
...@@ -70,22 +70,14 @@ void reset_memblock_attributes(void); ...@@ -70,22 +70,14 @@ void reset_memblock_attributes(void);
void setup_memblock(void); void setup_memblock(void);
void dummy_physical_memory_init(void); void dummy_physical_memory_init(void);
void dummy_physical_memory_cleanup(void); void dummy_physical_memory_cleanup(void);
void parse_args(int argc, char **argv);
#ifdef VERBOSE
void test_fail(void); void test_fail(void);
void test_pass(void); void test_pass(void);
void test_print(const char *fmt, ...); void test_print(const char *fmt, ...);
void prefix_reset(void); void prefix_reset(void);
void prefix_push(const char *prefix); void prefix_push(const char *prefix);
void prefix_pop(void); void prefix_pop(void);
#else
static inline void test_fail(void) {}
static inline void test_pass(void) {}
static inline void test_print(const char *fmt, ...) {}
static inline void prefix_reset(void) {}
static inline void prefix_push(const char *prefix) {}
static inline void prefix_pop(void) {}
#endif /* VERBOSE */
static inline void test_pass_pop(void) static inline void test_pass_pop(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment