mirror of
https://github.com/torvalds/linux
synced 2024-10-15 15:59:15 +00:00
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: Alexey Dobriyan <adobriyan@gmail.com> Tested-by: Swarup Laxman Kotikalapudi<swarupkotikalapudi@mail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
639931020e
commit
20e34aa7e0
|
@ -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_0[] = "";
|
||||||
|
|
||||||
static const char proc_pid_smaps_vsyscall_1[] =
|
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"
|
"Size: 4 kB\n"
|
||||||
"KernelPageSize: 4 kB\n"
|
"KernelPageSize: 4 kB\n"
|
||||||
"MMUPageSize: 4 kB\n"
|
"MMUPageSize: 4 kB\n"
|
||||||
|
@ -73,6 +73,7 @@ static const char proc_pid_smaps_vsyscall_1[] =
|
||||||
"Private_Dirty: 0 kB\n"
|
"Private_Dirty: 0 kB\n"
|
||||||
"Referenced: 0 kB\n"
|
"Referenced: 0 kB\n"
|
||||||
"Anonymous: 0 kB\n"
|
"Anonymous: 0 kB\n"
|
||||||
|
"KSM: 0 kB\n"
|
||||||
"LazyFree: 0 kB\n"
|
"LazyFree: 0 kB\n"
|
||||||
"AnonHugePages: 0 kB\n"
|
"AnonHugePages: 0 kB\n"
|
||||||
"ShmemPmdMapped: 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[] =
|
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"
|
"Size: 4 kB\n"
|
||||||
"KernelPageSize: 4 kB\n"
|
"KernelPageSize: 4 kB\n"
|
||||||
"MMUPageSize: 4 kB\n"
|
"MMUPageSize: 4 kB\n"
|
||||||
|
@ -103,6 +104,7 @@ static const char proc_pid_smaps_vsyscall_2[] =
|
||||||
"Private_Dirty: 0 kB\n"
|
"Private_Dirty: 0 kB\n"
|
||||||
"Referenced: 0 kB\n"
|
"Referenced: 0 kB\n"
|
||||||
"Anonymous: 0 kB\n"
|
"Anonymous: 0 kB\n"
|
||||||
|
"KSM: 0 kB\n"
|
||||||
"LazyFree: 0 kB\n"
|
"LazyFree: 0 kB\n"
|
||||||
"AnonHugePages: 0 kB\n"
|
"AnonHugePages: 0 kB\n"
|
||||||
"ShmemPmdMapped: 0 kB\n"
|
"ShmemPmdMapped: 0 kB\n"
|
||||||
|
@ -244,10 +246,10 @@ static int test_proc_pid_smaps(pid_t pid)
|
||||||
if (g_vsyscall == 0) {
|
if (g_vsyscall == 0) {
|
||||||
assert(rv == 0);
|
assert(rv == 0);
|
||||||
} else {
|
} else {
|
||||||
size_t len = strlen(g_proc_pid_maps_vsyscall);
|
size_t len = strlen(g_proc_pid_smaps_vsyscall);
|
||||||
/* TODO "ProtectionKey:" */
|
/* TODO "ProtectionKey:" */
|
||||||
assert(rv > len);
|
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;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue