Commit 20e34aa7 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Andrew Morton
Browse files

proc: fix proc-empty-vm test with vsyscall 

* fix embarassing /proc/*/smaps test bug due to a typo in variable name
  it tested only the first line of the output if vsyscall is enabled:

  	ffffffffff600000-ffffffffff601000 r-xp ...

  so test passed but tested only VMA location and permissions.

* add "KSM" entry, unnoticed because (1)

* swap "r-xp" and "--xp" vsyscall test strings,
  also unnoticed because (1)

Link: https://lkml.kernel.org/r/76f42cce-b1ab-45ec-b6b2-4c64f0dccb90@p183


Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Tested-by: default avatarSwarup Laxman <Kotikalapudi&lt;swarupkotikalapudi@mail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 63993102

tools/testing/selftests/proc/proc-empty-vm.c

+6 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static const char proc_pid_maps_vsyscall_2[] = 
static const char proc_pid_smaps_vsyscall_0[] = "";



static const char proc_pid_smaps_vsyscall_1[] =

"ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0                  [vsyscall]\n"

"ffffffffff600000-ffffffffff601000 --xp 00000000 00:00 0                  [vsyscall]\n"

"Size:                  4 kB\n"

"KernelPageSize:        4 kB\n"

"MMUPageSize:           4 kB\n"
@@ -73,6 +73,7 @@ static const char proc_pid_smaps_vsyscall_1[] = 
"Private_Dirty:         0 kB\n"

"Referenced:            0 kB\n"

"Anonymous:             0 kB\n"

"KSM:                   0 kB\n"

"LazyFree:              0 kB\n"

"AnonHugePages:         0 kB\n"

"ShmemPmdMapped:        0 kB\n"
@@ -90,7 +91,7 @@ static const char proc_pid_smaps_vsyscall_1[] = 
;



static const char proc_pid_smaps_vsyscall_2[] =

"ffffffffff600000-ffffffffff601000 --xp 00000000 00:00 0                  [vsyscall]\n"

"ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0                  [vsyscall]\n"

"Size:                  4 kB\n"

"KernelPageSize:        4 kB\n"

"MMUPageSize:           4 kB\n"
@@ -103,6 +104,7 @@ static const char proc_pid_smaps_vsyscall_2[] = 
"Private_Dirty:         0 kB\n"

"Referenced:            0 kB\n"

"Anonymous:             0 kB\n"

"KSM:                   0 kB\n"

"LazyFree:              0 kB\n"

"AnonHugePages:         0 kB\n"

"ShmemPmdMapped:        0 kB\n"
@@ -244,10 +246,10 @@ static int test_proc_pid_smaps(pid_t pid) 
		if (g_vsyscall == 0) {

			assert(rv == 0);

		} else {

			size_t len = strlen(g_proc_pid_maps_vsyscall);

			size_t len = strlen(g_proc_pid_smaps_vsyscall);

			/* TODO "ProtectionKey:" */

			assert(rv > len);

			assert(memcmp(buf, g_proc_pid_maps_vsyscall, len) == 0);

			assert(memcmp(buf, g_proc_pid_smaps_vsyscall, len) == 0);

		}

		return EXIT_SUCCESS;

	}