selftests/size: rework to use main instead of _start

Message ID 20180307130725.8267-1-anders.roxell@linaro.org
State New
Headers show
Series
  • selftests/size: rework to use main instead of _start
Related show

Commit Message

Anders Roxell March 7, 2018, 1:07 p.m.
In a -ffreestanding environment without glibc, we shouldn't be able to
call either getenv or printf. It seems that printf() happens to work
fine, but it ends up using the glibc getenv(), which doesn't work unless
we call the glibc _start() function first.
Using _start() was originally meant as an optimization to reduce the
memory consumption of the test program itself, in order to get a more
accurate representation of the available RAM at system boot time.
However, it causes more problems than it helps, especially when run from
a shell script that also consumes some memory.

get_size[2838]: segfault at ffffffffffffffd0 ip 000000000040538b
   sp 00007ffc41980668 error 5 in get_size[400000+b0000]
audit: type=1701 audit(1521532923.838:4): auid=0 uid=0 gid=0 ses=2
   subj=kernel pid=2838 comm=\"get_size\"
   exe=\"/opt/kselftests/next/size/get_size\" sig=11 res=1
get_size[2840]: segfault at ffffffffffffffd0 ip 000000000040538b
   sp 00007ffdace9b378 error 5 in get_size[400000+b0000]
audit: type=1701 audit(1521532932.057:5): auid=0 uid=0 gid=0 ses=2
   subj=kernel pid=2840 comm=\"get_size\"
   exe=\"/opt/kselftests/next/size/get_size\" sig=11 res=1

Rework to get_size test to use main (and printf) instead of _start. All
other seftest tests uses main and not _start.

Fixes: 0081901af95f ("selftests: size call ksft_print_header() to print TAP header")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 tools/testing/selftests/size/Makefile   |  2 +-
 tools/testing/selftests/size/get_size.c | 47 ++++++++++-----------------------
 2 files changed, 15 insertions(+), 34 deletions(-)

-- 
2.11.0

Comments

Shuah Khan March 7, 2018, 3:11 p.m. | #1
On 03/07/2018 06:07 AM, Anders Roxell wrote:
> In a -ffreestanding environment without glibc, we shouldn't be able to

> call either getenv or printf. It seems that printf() happens to work

> fine, but it ends up using the glibc getenv(), which doesn't work unless

> we call the glibc _start() function first.

> Using _start() was originally meant as an optimization to reduce the

> memory consumption of the test program itself, in order to get a more

> accurate representation of the available RAM at system boot time.

> However, it causes more problems than it helps, especially when run from

> a shell script that also consumes some memory.

> 

> get_size[2838]: segfault at ffffffffffffffd0 ip 000000000040538b

>    sp 00007ffc41980668 error 5 in get_size[400000+b0000]

> audit: type=1701 audit(1521532923.838:4): auid=0 uid=0 gid=0 ses=2

>    subj=kernel pid=2838 comm=\"get_size\"

>    exe=\"/opt/kselftests/next/size/get_size\" sig=11 res=1

> get_size[2840]: segfault at ffffffffffffffd0 ip 000000000040538b

>    sp 00007ffdace9b378 error 5 in get_size[400000+b0000]

> audit: type=1701 audit(1521532932.057:5): auid=0 uid=0 gid=0 ses=2

>    subj=kernel pid=2840 comm=\"get_size\"

>    exe=\"/opt/kselftests/next/size/get_size\" sig=11 res=1

> 

> Rework to get_size test to use main (and printf) instead of _start. All

> other seftest tests uses main and not _start.

> 

> Fixes: 0081901af95f ("selftests: size call ksft_print_header() to print TAP header")

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>


Andres,

Thanks for finding and reporting the problem. This patch is in linux-kselftest next
for 4.17-rc1. I would rather revert the patch than fix it a this time.

I knew there was a reason why Tim didn't use printf() in the first, I couldn't
remember. I won't be sending

0081901af95f ("selftests: size call ksft_print_header() to print TAP header")

for inclusion into 4.17-rc1

thanks,
-- Shuah
Shuah Khan March 7, 2018, 3:38 p.m. | #2
On 03/07/2018 08:11 AM, Shuah Khan wrote:
> On 03/07/2018 06:07 AM, Anders Roxell wrote:

>> In a -ffreestanding environment without glibc, we shouldn't be able to

>> call either getenv or printf. It seems that printf() happens to work

>> fine, but it ends up using the glibc getenv(), which doesn't work unless

>> we call the glibc _start() function first.

>> Using _start() was originally meant as an optimization to reduce the

>> memory consumption of the test program itself, in order to get a more

>> accurate representation of the available RAM at system boot time.

>> However, it causes more problems than it helps, especially when run from

>> a shell script that also consumes some memory.

>>

>> get_size[2838]: segfault at ffffffffffffffd0 ip 000000000040538b

>>    sp 00007ffc41980668 error 5 in get_size[400000+b0000]

>> audit: type=1701 audit(1521532923.838:4): auid=0 uid=0 gid=0 ses=2

>>    subj=kernel pid=2838 comm=\"get_size\"

>>    exe=\"/opt/kselftests/next/size/get_size\" sig=11 res=1

>> get_size[2840]: segfault at ffffffffffffffd0 ip 000000000040538b

>>    sp 00007ffdace9b378 error 5 in get_size[400000+b0000]

>> audit: type=1701 audit(1521532932.057:5): auid=0 uid=0 gid=0 ses=2

>>    subj=kernel pid=2840 comm=\"get_size\"

>>    exe=\"/opt/kselftests/next/size/get_size\" sig=11 res=1

>>

>> Rework to get_size test to use main (and printf) instead of _start. All

>> other seftest tests uses main and not _start.

>>

>> Fixes: 0081901af95f ("selftests: size call ksft_print_header() to print TAP header")

>> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> 

> Andres,

> 

> Thanks for finding and reporting the problem. This patch is in linux-kselftest next

> for 4.17-rc1. I would rather revert the patch than fix it a this time.

> 

> I knew there was a reason why Tim didn't use printf() in the first, I couldn't

> remember. I won't be sending

> 

> 0081901af95f ("selftests: size call ksft_print_header() to print TAP header")

> 

> for inclusion into 4.17-rc1

> 


Okay. Dropped the problem patch
0081901af95f ("selftests: size call ksft_print_header() to print TAP header")

from linux-kselftest next.

thanks again for finding the problem so quickly.
-- Shuah

Patch

diff --git a/tools/testing/selftests/size/Makefile b/tools/testing/selftests/size/Makefile
index 4685b3e421fc..73932e0e7cd0 100644
--- a/tools/testing/selftests/size/Makefile
+++ b/tools/testing/selftests/size/Makefile
@@ -1,4 +1,4 @@ 
-CFLAGS := -static -ffreestanding -nostartfiles -s
+CFLAGS := -static -ffreestanding -s
 
 TEST_GEN_PROGS := get_size
 
diff --git a/tools/testing/selftests/size/get_size.c b/tools/testing/selftests/size/get_size.c
index 1280b09266f0..490cf4e26eaf 100644
--- a/tools/testing/selftests/size/get_size.c
+++ b/tools/testing/selftests/size/get_size.c
@@ -26,13 +26,6 @@ 
 #include <stdio.h>
 #include "../kselftest.h"
 
-#define STDOUT_FILENO 1
-
-static int print(const char *s)
-{
-	return write(STDOUT_FILENO, s, __builtin_strlen(s));
-}
-
 static inline char *num_to_str(unsigned long num, char *buf, int len)
 {
 	unsigned int digit;
@@ -49,30 +42,18 @@  static inline char *num_to_str(unsigned long num, char *buf, int len)
 	return buf;
 }
 
-static int print_num(unsigned long num)
-{
-	char num_buf[30];
-
-	return print(num_to_str(num, num_buf, sizeof(num_buf)));
-}
-
 static int print_k_value(const char *s, unsigned long num, unsigned long units)
 {
 	unsigned long long temp;
-	int ccode;
-
-	print(s);
 
 	temp = num;
 	temp = (temp * units)/1024;
 	num = temp;
-	ccode = print_num(num);
-	print("\n");
-	return ccode;
+	return printf("%s%d\n", s, num);
 }
 
 /* this program has no main(), as startup libraries are not used */
-void _start(void)
+int main(void)
 {
 	int ccode;
 	struct sysinfo info;
@@ -80,28 +61,28 @@  void _start(void)
 	static const char *test_name = " get runtime memory use\n";
 
 	ksft_print_header();
-	print("# Testing system size.\n");
+	printf("# Testing system size.\n");
 
 	ccode = sysinfo(&info);
 	if (ccode < 0) {
-		print("not ok 1");
-		print(test_name);
-		print(" ---\n reason: \"could not get sysinfo\"\n ...\n");
-		_exit(ccode);
+		printf("not ok 1");
+		printf(test_name);
+		printf(" ---\n reason: \"could not get sysinfo\"\n ...\n");
+		return 1;
 	}
-	print("ok 1");
-	print(test_name);
+	printf("ok 1");
+	printf(test_name);
 
 	/* ignore cache complexities for now */
 	used = info.totalram - info.freeram - info.bufferram;
-	print("# System runtime memory report (units in Kilobytes):\n");
-	print(" ---\n");
+	printf("# System runtime memory report (units in Kilobytes):\n");
+	printf(" ---\n");
 	print_k_value(" Total:  ", info.totalram, info.mem_unit);
 	print_k_value(" Free:   ", info.freeram, info.mem_unit);
 	print_k_value(" Buffer: ", info.bufferram, info.mem_unit);
 	print_k_value(" In use: ", used, info.mem_unit);
-	print(" ...\n");
-	print("1..1\n");
+	printf(" ...\n");
+	printf("1..1\n");
 
-	_exit(0);
+	return 0;
 }