[PATCH v3 1/5] memblock test: fix implicit declaration of function 'virt_to_phys'

[PATCH v3 1/5] memblock test: fix implicit declaration of function 'virt_to_phys'

[Wei Yang]

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.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>

---
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(+)

diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h
index cad4f2927983..c9e915914add 100644
--- a/tools/include/linux/mm.h
+++ b/tools/include/linux/mm.h
@@ -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)
-- 
2.34.1

[PATCH v3 2/5] memblock test: add the definition of __setup()

[Wei Yang]

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.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
---
 tools/testing/memblock/linux/init.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/testing/memblock/linux/init.h b/tools/testing/memblock/linux/init.h
index 828e0ee0bc6c..036616a25427 100644
--- a/tools/testing/memblock/linux/init.h
+++ b/tools/testing/memblock/linux/init.h
@@ -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)
 
-- 
2.34.1

[PATCH v3 3/5] memblock test: fix implicit declaration of function 'memparse'

[Wei Yang]

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>
---
 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

diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h
index db5c99318c79..fb8eda3019b5 100644
--- 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
index 000000000000..c85f00f43c5e
--- /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 7a1ca694a982..d80982ccdc20 100644
--- 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 d2f148bd8902..c16d9cd2d1ae 100644
--- 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
-- 
2.34.1

[PATCH v3 4/5] memblock test: fix implicit declaration of function 'isspace'

[Wei Yang]

Commit 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.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>

---
v2: include ctype.h in kernel.h
---
 tools/testing/memblock/linux/kernel.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/memblock/linux/kernel.h b/tools/testing/memblock/linux/kernel.h
index c16d9cd2d1ae..4d1012d5be6e 100644
--- a/tools/testing/memblock/linux/kernel.h
+++ b/tools/testing/memblock/linux/kernel.h
@@ -9,5 +9,6 @@
 #include <linux/linkage.h>
 #include <linux/kconfig.h>
 #include <linux/string.h>
+#include <linux/ctype.h>
 
 #endif
-- 
2.34.1

[PATCH v3 5/5] memblock test: fix implicit declaration of function 'strscpy'

[Wei Yang]

Commit 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.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
---
 tools/include/linux/string.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h
index fb8eda3019b5..41e7fa734922 100644
--- a/tools/include/linux/string.h
+++ b/tools/include/linux/string.h
@@ -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
-- 
2.34.1

Re: [PATCH v3 1/5] memblock test: fix implicit declaration of function 'virt_to_phys'

[Mike Rapoport]

On Fri, Aug 02, 2024 at 01:09:19AM +0000, Wei Yang wrote:
> 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.
> 
> Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
> 
> ---
> 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(+)
> 
> diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h
> index cad4f2927983..c9e915914add 100644
> --- a/tools/include/linux/mm.h
> +++ b/tools/include/linux/mm.h
> @@ -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?

> +{
> +	return (unsigned long)address;

This should be phys_addr_t, look at its definition in tools/include/linux/types.h

> +}
> +
>  void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid);
>  
>  static inline void totalram_pages_inc(void)
> -- 
> 2.34.1
> 

-- 
Sincerely yours,
Mike.

Re: [PATCH v3 1/5] memblock test: fix implicit declaration of function 'virt_to_phys'

[Wei Yang]

On Mon, Aug 05, 2024 at 01:03:14PM +0300, Mike Rapoport wrote:
>On Fri, Aug 02, 2024 at 01:09:19AM +0000, Wei Yang wrote:
>> 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.
>> 
>> Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
>> 
>> ---
>> 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(+)
>> 
>> diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h
>> index cad4f2927983..c9e915914add 100644
>> --- a/tools/include/linux/mm.h
>> +++ b/tools/include/linux/mm.h
>> @@ -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?
>

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.

>> +{
>> +	return (unsigned long)address;
>
>This should be phys_addr_t, look at its definition in tools/include/linux/types.h
>

You are right. Will fix it.

>> +}
>> +
>>  void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid);
>>  
>>  static inline void totalram_pages_inc(void)
>> -- 
>> 2.34.1
>> 
>
>-- 
>Sincerely yours,
>Mike.

-- 
Wei Yang
Help you, Help me

Re: [PATCH v3 1/5] memblock test: fix implicit declaration of function 'virt_to_phys'

[Mike Rapoport]

On Mon, Aug 05, 2024 at 03:37:20PM +0000, Wei Yang wrote:
> On Mon, Aug 05, 2024 at 01:03:14PM +0300, Mike Rapoport wrote:
> >On Fri, Aug 02, 2024 at 01:09:19AM +0000, Wei Yang wrote:
> >> 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.
> >> 
> >> Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
> >> 
> >> ---
> >> 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(+)
> >> 
> >> diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h
> >> index cad4f2927983..c9e915914add 100644
> >> --- a/tools/include/linux/mm.h
> >> +++ b/tools/include/linux/mm.h
> >> @@ -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?
> >
> 
> 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.

Let's keep it inline with the kernel definitions
 
> >> +{
> >> +	return (unsigned long)address;
> >
> >This should be phys_addr_t, look at its definition in tools/include/linux/types.h
> >
> 
> You are right. Will fix it.
> 
> >> +}
> >> +
> >>  void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid);
> >>  
> >>  static inline void totalram_pages_inc(void)
> >> -- 
> >> 2.34.1
> >> 
> >
> >-- 
> >Sincerely yours,
> >Mike.
> 
> -- 
> Wei Yang
> Help you, Help me

-- 
Sincerely yours,
Mike.