memblock test: fix implicit declaration of function 'memparse'

Commit 1e4c64b71c9b ("mm/memblock: Add "reserve_mem" to reserved named
memory at boot up") introduce the usage of memparse(), which is not
defined in memblock test.

Add the definition and link it to fix the build.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Link: https://lore.kernel.org/r/20240806010319.29194-3-richard.weiyang@gmail.com
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>

diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h
index db5c99318c7994245d641461f59024e412b6ceff..fb8eda3019b5fd5d03edc726a7f4e6535e5d2ae4 100644 (file)
--- a/tools/include/linux/string.h
+++ b/tools/include/linux/string.h
@@ -47,4 +47,5 @@ extern char * __must_check skip_spaces(const char *);
 extern char *strim(char *);
 
 extern void *memchr_inv(const void *start, int c, size_t bytes);
+extern unsigned long long memparse(const char *ptr, char **retptr);
 #endif /* _TOOLS_LINUX_STRING_H_ */

diff --git a/tools/lib/cmdline.c b/tools/lib/cmdline.c
new file mode 100644 (file)
index 0000000..c85f00f
--- /dev/null
+++ b/tools/lib/cmdline.c
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * From lib/cmdline.c
+ */
+#include <stdlib.h>
+
+#if __has_attribute(__fallthrough__)
+# define fallthrough                    __attribute__((__fallthrough__))
+#else
+# define fallthrough                    do {} while (0)  /* fallthrough */
+#endif
+
+unsigned long long memparse(const char *ptr, char **retptr)
+{
+       char *endptr;   /* local pointer to end of parsed string */
+
+       unsigned long long ret = strtoll(ptr, &endptr, 0);
+
+       switch (*endptr) {
+       case 'E':
+       case 'e':
+               ret <<= 10;
+               fallthrough;
+       case 'P':
+       case 'p':
+               ret <<= 10;
+               fallthrough;
+       case 'T':
+       case 't':
+               ret <<= 10;
+               fallthrough;
+       case 'G':
+       case 'g':
+               ret <<= 10;
+               fallthrough;
+       case 'M':
+       case 'm':
+               ret <<= 10;
+               fallthrough;
+       case 'K':
+       case 'k':
+               ret <<= 10;
+               endptr++;
+               fallthrough;
+       default:
+               break;
+       }
+
+       if (retptr)
+               *retptr = endptr;
+
+       return ret;
+}

diff --git a/tools/testing/memblock/Makefile b/tools/testing/memblock/Makefile
index 7a1ca694a9825c4ea8fc19e85945b3627bb2d75f..d80982ccdc2099aed8a9f055b31f99aca8991dd1 100644 (file)
--- a/tools/testing/memblock/Makefile
+++ b/tools/testing/memblock/Makefile
@@ -8,7 +8,7 @@ LDFLAGS += -fsanitize=address -fsanitize=undefined
 TARGETS = main
 TEST_OFILES = tests/alloc_nid_api.o tests/alloc_helpers_api.o tests/alloc_api.o \
                  tests/basic_api.o tests/common.o tests/alloc_exact_nid_api.o
-DEP_OFILES = memblock.o lib/slab.o mmzone.o slab.o
+DEP_OFILES = memblock.o lib/slab.o mmzone.o slab.o cmdline.o
 OFILES = main.o $(DEP_OFILES) $(TEST_OFILES)
 EXTR_SRC = ../../../mm/memblock.c
 

diff --git a/tools/testing/memblock/linux/kernel.h b/tools/testing/memblock/linux/kernel.h
index d2f148bd89022be8ea0966a1451ebc3ba01785d8..c16d9cd2d1aee0b65bbb7cab87b2130f3dd2c545 100644 (file)
--- a/tools/testing/memblock/linux/kernel.h
+++ b/tools/testing/memblock/linux/kernel.h
@@ -8,5 +8,6 @@
 #include <linux/printk.h>
 #include <linux/linkage.h>
 #include <linux/kconfig.h>
+#include <linux/string.h>
 
 #endif