memblock test: fix implicit declaration of function 'virt_to_phys'
PATCH v3 1/5 memblock test: fix implicit declaration of function 'virt_to_phys'
Commit 94ff46de4a73 ("memblock: Move late alloc warning down to phys alloc") introduce the usage of virt_to_phys(), which is not defined in memblock tests.
Define it in mm.h to fix the build error.
---
v3: use static inline as phys_to_virt
v2: move definition to mm.h
--- tools/include/linux/mm.h | 6 ++++++ 1 file changed, 6 insertions(+)
tools/include/linux/mm.h +6 -0
@@ -25,6 +25,12 @@ static inline void *phys_to_virt(unsigned long address)return __va (address); } +#define virt_to_phys virt_to_phys +static inline phys_addr_t virt_to_phys (volatile void *address) +{ +return (unsigned long )address; +} +void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid);static inline void totalram_pages_inc (void )
Signature · 1 line
2.34.1
PATCH v3 2/5 memblock test: add the definition of __setup()
Commit 1e4c64b71c9b ("mm/memblock: Add "reserve_mem" to reserved named memory at boot up") introduce usage of __setup(), which is not defined in memblock test.
Define it in init.h to fix the build error.
--- tools/testing/memblock/linux/init.h | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/memblock/linux/init.h +3 -0
@@ -28,6 +28,9 @@ struct obs_kernel_param {__aligned (__alignof__ (struct obs_kernel_param )) = \ { __setup_str_##unique_id, fn, early } +#define __setup (str, fn) \ + __setup_param(str, fn, fn, 0) +#define early_param (str, fn) \ __setup_param(str, fn, fn, 1)
Signature · 1 line
2.34.1
PATCH v3 3/5 memblock test: fix implicit declaration of function 'memparse'
In reply to Wei YangCommit 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.
--- tools/include/linux/string.h | 1 + tools/lib/cmdline.c | 53 +++++++++++++++++++++++++++ tools/testing/memblock/Makefile | 2 +- tools/testing/memblock/linux/kernel.h | 1 + 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 tools/lib/cmdline.c
tools/include/linux/string.h +1 -0
@@ -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_ */
tools/lib/cmdline.c new file +53 -0
53 lines not on this page · raw message
tools/testing/memblock/Makefile +1 -1
@@ -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
tools/testing/memblock/linux/kernel.h +1 -0
@@ -8,5 +8,6 @@#include <linux/printk.h> #include <linux/linkage.h> #include <linux/kconfig.h> +#include <linux/string.h> #endif
Signature · 1 line
2.34.1
PATCH v3 4/5 memblock test: fix implicit declaration of function 'isspace'
In reply to Wei YangCommit 1e4c64b71c9b ("mm/memblock: Add "reserve_mem" to reserved named memory at boot up") introduce usage of isspace().
Let's include <linux/ctype.h> in kernel.h to fix this.
---
v2: include ctype.h in kernel.h
--- tools/testing/memblock/linux/kernel.h | 1 + 1 file changed, 1 insertion(+)
tools/testing/memblock/linux/kernel.h +1 -0
@@ -9,5 +9,6 @@#include <linux/linkage.h> #include <linux/kconfig.h> #include <linux/string.h> +#include <linux/ctype.h> #endif
Signature · 1 line
2.34.1
PATCH v3 5/5 memblock test: fix implicit declaration of function 'strscpy'
In reply to Wei YangCommit 1e4c64b71c9b ("mm/memblock: Add "reserve_mem" to reserved named memory at boot up") introduce the usage of strscpy, which breaks the memblock test.
Let's define it as strcpy in userspace to fix it.
--- tools/include/linux/string.h | 2 ++ 1 file changed, 2 insertions(+)
tools/include/linux/string.h +2 -0
@@ -12,6 +12,8 @@ void argv_free(char **argv);int strtobool (const char *s,bool *res); +#define strscpy strcpy +/* * glibc based builds needs the extern while uClibc doesn't. * However uClibc headers also define __GLIBC__ hence the hack below
Signature · 1 line
2.34.1
Mike Rapoport
maintainerQuoted 20 lines · Wei Yang
Commit
94ff46de4a73("memblock: Move late alloc warning down to phys alloc") introduce the usage ofvirt_to_phys(), which is not defined in memblock tests.Define it in
mm.hto fix the build error.Signed-off-by Wei Yang <[email protected]>---
v3: use static inline asphys_to_virt
v2: move definition tomm.h--- tools/include/linux/mm.h | 6 ++++++ 1 file changed, 6 insertions(+)tools/include/linux/mm.h +0
-0
tools/include/linux/mm.h static inline void *phys_to_virt(unsigned long address) · line 29
Quoted 5 lines
tools/include/linux/mm.h +2
-0@@ -25,6 +25,12 @@ static inline void *phys_to_virt(unsigned long address)return __va (address); } +#define virt_to_phys virt_to_phys +static inline phys_addr_t virt_to_phys (volatile void *address)
Why volatilte?
tools/include/linux/mm.h static inline void *phys_to_virt(unsigned long address) · line 31
Quoted 2 lines
tools/include/linux/mm.h +2
-0+{ +return (unsigned long )address;
This should be phys_addr_t, look at its definition in tools/include/linux/types.h
Quoted 8 lines
tools/include/linux/mm.h +2
-0+} +void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid);static inline void totalram_pages_inc (void )Signature · 1 line
2.34.1
Signature · 2 lines
Sincerely yours, Mike.
Quoted 24 lines · Mike Rapoport
Quoted 23 lines · Wei Yang
Commit
94ff46de4a73("memblock: Move late alloc warning down to phys alloc") introduce the usage ofvirt_to_phys(), which is not defined in memblock tests.Define it in
mm.hto fix the build error.Signed-off-by Wei Yang <[email protected]>---
v3: use static inline asphys_to_virt
v2: move definition tomm.h--- tools/include/linux/mm.h | 6 ++++++ 1 file changed, 6 insertions(+)tools/include/linux/mm.h +0
-0@@ -25,6 +25,12 @@ static inline void *phys_to_virt(unsigned long address)return __va (address); }
Quoted 5 lines
tools/include/linux/mm.h static inline void *phys_to_virt(unsigned long address) · line 29
Quoted 2 lines
tools/include/linux/mm.h +2
-0+#define virt_to_phys virt_to_phys +static inline phys_addr_t virt_to_phys (volatile void *address)Why volatilte?
There are two definitions of virt_to_phys:
include/asm-generic/io.h
arch/x86/include/asm/io.h
both has volatile.
I just copy from it. But I don't 100% understand it.
Quoted 5 lines
tools/include/linux/mm.h static inline void *phys_to_virt(unsigned long address) · line 31
Quoted 2 lines
tools/include/linux/mm.h +2
-0+{ +return (unsigned long )address;This should be
phys_addr_t, look at its definition intools/include/linux/types.h
You are right. Will fix it.
Quoted 12 lines
Quoted 8 lines
tools/include/linux/mm.h +2
-0+} +void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid);static inline void totalram_pages_inc (void )Signature · 1 line
2.34.1Signature · 2 lines
Sincerely yours, Mike.
Signature · 2 lines
Wei Yang Help you, Help me
Mike Rapoport
maintainerQuoted 31 lines · Wei Yang
Quoted 24 lines · Mike Rapoport
Quoted 23 lines · Wei Yang
Commit
94ff46de4a73("memblock: Move late alloc warning down to phys alloc") introduce the usage ofvirt_to_phys(), which is not defined in memblock tests.Define it in
mm.hto fix the build error.Signed-off-by Wei Yang <[email protected]>---
v3: use static inline asphys_to_virt
v2: move definition tomm.h--- tools/include/linux/mm.h | 6 ++++++ 1 file changed, 6 insertions(+)tools/include/linux/mm.h +0
-0@@ -25,6 +25,12 @@ static inline void *phys_to_virt(unsigned long address)return __va (address); }Quoted 5 lines
tools/include/linux/mm.h static inline void *phys_to_virt(unsigned long address) · line 29
Quoted 2 lines
tools/include/linux/mm.h +2
-0+#define virt_to_phys virt_to_phys +static inline phys_addr_t virt_to_phys (volatile void *address)Why volatilte?
Quoted 8 lines
There are two definitions of
virt_to_phys:
include/asm-generic/io.h
arch/x86/include/asm/io.hboth has volatile.
I just copy from it. But I don't 100% understand it.
Let's keep it inline with the kernel definitions
Quoted 24 lines
Quoted 5 lines
tools/include/linux/mm.h static inline void *phys_to_virt(unsigned long address) · line 31
Quoted 2 lines
tools/include/linux/mm.h +2
-0+{ +return (unsigned long )address;This should be
phys_addr_t, look at its definition intools/include/linux/types.hYou are right. Will fix it.
Quoted 12 lines
Quoted 8 lines
tools/include/linux/mm.h +2
-0+} +void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid);static inline void totalram_pages_inc (void )Signature · 1 line
2.34.1Signature · 2 lines
Sincerely yours, Mike.Signature · 2 lines
Wei Yang Help you, Help me
Signature · 2 lines
Sincerely yours, Mike.