Hello.
On Mon, Jul 29, 2024 at 10:37:43AM GMT, David Finkel <davidf@xxxxxxxxx> wrote:
> Extend two existing tests to cover extracting memory usage through the
> newly mutable memory.peak and memory.swap.peak handlers.
BTW do the tests pass for you?
I gave it a try (v6.11-rc1+your patches)
$ grep "not ok 2" -B30 test.strace
...
315 15:19:13.990351 read(6, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096) = 4096
315 15:19:13.994457 read(6, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096) = 4096
315 15:19:13.998562 read(6, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096) = 4096
315 15:19:13.998652 read(6, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096) = 4096
315 15:19:14.002759 read(6, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 4096) = 4096
315 15:19:14.006864 openat(AT_FDCWD, "/sys/fs/cgroup/memcg_test/memory.current", O_RDONLY) = 7
315 15:19:14.006989 read(7, "270336\n", 127) = 7
315 15:19:14.011114 close(7) = 0
315 15:19:14.015262 close(6) = 0
315 15:19:14.015448 exit_group(-1) = ?
315 15:19:14.019753 +++ exited with 255 +++
313 15:19:14.019820 <... wait4 resumed>[{WIFEXITED(s) && WEXITSTATUS(s) == 255}], 0, NULL) = 315
313 15:19:14.019878 --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=315, si_uid=0, si_status=255, si_utime=1 /* 0.01 s */, -
313 15:19:14.019926 close(3) = 0
313 15:19:14.020001 close(5) = 0
313 15:19:14.020072 close(4) = 0
313 15:19:14.024173 rmdir("/sys/fs/cgroup/memcg_test") = 0
313 15:19:14.028517 write(1, "not ok 2 test_memcg_current_peak"..., 33) = 33
grep "^315 .*read.*4096" -c test.strace
12800
Hopefully, unrelated to your changes. I ran this within initrd (rapido
image) so it may be an issue how rootfs pagecache is undercharged (due
to sharing?), instead of 50M, there's only ~256k.
To verify, I also tried with memory.peak patch reverted, failing
differently:
...
238 15:30:29.034623 openat(AT_FDCWD, "/sys/fs/cgroup/memcg_test/memory.current", O_RDONLY) = 3
238 15:30:29.034766 read(3, "52801536\n", 127) = 9
238 15:30:29.038895 close(3) = 0
238 15:30:29.043048 openat(AT_FDCWD, "/sys/fs/cgroup/memcg_test/memory.stat", O_RDONLY) = 3
238 15:30:29.043230 read(3, "anon 52436992\nfile 0\nkernel 1105"..., 4095) = 870
238 15:30:29.047379 close(3) = 0
238 15:30:29.051491 munmap(0x7f2473600000, 52432896) = 0
238 15:30:29.058516 exit_group(0) = ?
238 15:30:29.062992 +++ exited with 0 +++
237 15:30:29.067054 <... wait4 resumed>[{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 238
237 15:30:29.067136 --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=238, si_uid=0, si_status=0, si_utime=1 /* 0.01 s */, si-
237 15:30:29.067210 openat(AT_FDCWD, "/sys/fs/cgroup/memcg_test/memory.peak", O_RDONLY) = 3
237 15:30:29.071349 read(3, "52805632\n", 127) = 9
237 15:30:29.075470 close(3) = 0
237 15:30:29.075562 openat(AT_FDCWD, "/sys/fs/cgroup/memcg_test/memory.peak", O_RDWR|O_APPEND|O_CLOEXEC) = 3
237 15:30:29.079712 openat(AT_FDCWD, "/sys/fs/cgroup/memcg_test/memory.peak", O_RDWR|O_APPEND|O_CLOEXEC) = 4
237 15:30:29.083848 openat(AT_FDCWD, "/sys/fs/cgroup/memcg_test/memory.peak", O_RDWR|O_APPEND|O_CLOEXEC) = 5
237 15:30:29.083970 write(3, "reset\n\0", 7) = -1 EINVAL (Invalid argument)
237 15:30:29.088095 close(3) = 0
237 15:30:29.092209 close(4) = 0
237 15:30:29.092295 close(5) = 0
237 15:30:29.096398 close(-1) = -1 EBADF (Bad file descriptor)
237 15:30:29.100497 rmdir("/sys/fs/cgroup/memcg_test") = 0
237 15:30:29.100760 write(1, "not ok 2 test_memcg_current_peak"..., 33) = 33
This failure makes sense but it reminded me --
could you please modify the test so that it checks write permission
of memory.peak and skips the reset testing on old(er) kernels? That'd be
in accordance with other cgroup selftest that maintain partial backwards
compatibility when possible.
Thanks,
Michal
Attachment:
signature.asc
Description: PGP signature
