| Message ID | cover.1688078604.git.falcon@tinylab.org |
|---|---|
| Headers | show |
| Series | allow run with minimal kernel config | expand |
On 2023-06-30 08:00:28+0800, Zhangjin Wu wrote: > For CONFIG_PROC_FS=n, let's use tmpfs and create a tmp file for > chroot_exe test. > > Since chroot_exe is mainly testing the not directory case (ENOTDIR), so, > rename it to chroot_tmpfile may be better. > > Signed-off-by: Zhangjin Wu <falcon@tinylab.org> > --- > tools/testing/selftests/nolibc/nolibc-test.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c > index 1002e0267515..2e9eaa7efa6e 100644 > --- a/tools/testing/selftests/nolibc/nolibc-test.c > +++ b/tools/testing/selftests/nolibc/nolibc-test.c > @@ -682,6 +682,8 @@ int run_syscall(int min, int max) > int ret = 0; > void *p1, *p2; > int has_gettid = 1; > + const char *tmpfile = get_tmpfile("/tmp/dummy"); > + int has_tmpfile = tmpfile != NULL; > > /* <proc> indicates whether or not /proc is mounted */ > proc = stat("/proc", &stat_buf) == 0; > @@ -720,7 +722,7 @@ int run_syscall(int min, int max) > CASE_TEST(chown_self); EXPECT_SYSER(proc, chown("/proc/self", 0, 0), -1, EPERM); break; > CASE_TEST(chroot_root); EXPECT_SYSZR(euid0, chroot("/")); break; > CASE_TEST(chroot_blah); EXPECT_SYSER(1, chroot("/proc/self/blah"), -1, ENOENT); break; > - CASE_TEST(chroot_exe); EXPECT_SYSER(proc, chroot("/proc/self/exe"), -1, ENOTDIR); break; > + CASE_TEST(chroot_tmpfile); EXPECT_SYSER(has_tmpfile, chroot(tmpfile), -1, ENOTDIR); break; get_tempfile() looks really weird. Given that the nolibc implementation of chroot() is the most trivial imaginable in my opinion we can keep the current "chroot_exe" that is using procfs. > CASE_TEST(close_m1); EXPECT_SYSER(1, close(-1), -1, EBADF); break; > CASE_TEST(close_dup); EXPECT_SYSZR(1, close(dup(0))); break; > CASE_TEST(dup_0); tmp = dup(0); EXPECT_SYSNE(1, tmp, -1); close(tmp); break; > -- > 2.25.1 >
On 2023-06-30 07:22:39+0800, Zhangjin Wu wrote: > Willy, Thomas > > This is v2 to allow run with minimal kernel config, see v1 [1]. > > It mainly applied the suggestions from Thomas. It is based on our > previous v5 sysret helper series [2] and Thomas' chmod_net removal > patchset [3]. > > Now, a test report on arm/vexpress-a9 without procfs, shmem, tmpfs, net > and memfd_create looks like: > > LOG: testing report for arm/vexpress-a9: > > 14 chmod_net [SKIPPED] Shouldn't this be gone? > 15 chmod_self [SKIPPED] > 17 chown_self [SKIPPED] > 41 link_cross [SKIPPED] > 0 -fstackprotector not supported [SKIPPED] > > 139 test(s) passed, 5 skipped, 0 failed. > See all results in /labs/linux-lab/logging/nolibc/arm-vexpress-a9-nolibc-test.log > > LOG: testing summary: > > arch/board | result > ------------|------------ > arm/vexpress-a9 | 139 test(s) passed, 5 skipped, 0 failed. See all results in /labs/linux-lab/logging/nolibc/arm-vexpress-a9-nolibc-test.log > [..] > tools/include/nolibc/sys.h | 22 ++++ > tools/testing/selftests/nolibc/nolibc-test.c | 102 +++++++++++++++---- > 2 files changed, 106 insertions(+), 18 deletions(-) A few nitpicks left, mentioned on the patches themselves. In general: for the full series. Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Hi, Thomas > On 2023-06-30 08:00:28+0800, Zhangjin Wu wrote: > > For CONFIG_PROC_FS=n, let's use tmpfs and create a tmp file for > > chroot_exe test. > > > > Since chroot_exe is mainly testing the not directory case (ENOTDIR), so, > > rename it to chroot_tmpfile may be better. > > > > Signed-off-by: Zhangjin Wu <falcon@tinylab.org> > > --- > > tools/testing/selftests/nolibc/nolibc-test.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c > > index 1002e0267515..2e9eaa7efa6e 100644 > > --- a/tools/testing/selftests/nolibc/nolibc-test.c > > +++ b/tools/testing/selftests/nolibc/nolibc-test.c > > @@ -682,6 +682,8 @@ int run_syscall(int min, int max) > > int ret = 0; > > void *p1, *p2; > > int has_gettid = 1; > > + const char *tmpfile = get_tmpfile("/tmp/dummy"); > > + int has_tmpfile = tmpfile != NULL; > > > > /* <proc> indicates whether or not /proc is mounted */ > > proc = stat("/proc", &stat_buf) == 0; > > @@ -720,7 +722,7 @@ int run_syscall(int min, int max) > > CASE_TEST(chown_self); EXPECT_SYSER(proc, chown("/proc/self", 0, 0), -1, EPERM); break; > > CASE_TEST(chroot_root); EXPECT_SYSZR(euid0, chroot("/")); break; > > CASE_TEST(chroot_blah); EXPECT_SYSER(1, chroot("/proc/self/blah"), -1, ENOENT); break; > > - CASE_TEST(chroot_exe); EXPECT_SYSER(proc, chroot("/proc/self/exe"), -1, ENOTDIR); break; > > + CASE_TEST(chroot_tmpfile); EXPECT_SYSER(has_tmpfile, chroot(tmpfile), -1, ENOTDIR); break; > > get_tempfile() looks really weird. Yes, it is, it has been used in another patch, but now, only has one user, let's remove it. > Given that the nolibc implementation of chroot() is the most trivial > imaginable in my opinion we can keep the current "chroot_exe" that is > using procfs. > Just did some new tests, what about this one? - CASE_TEST(chroot_exe); EXPECT_SYSER(proc, chroot("/proc/self/exe"), -1, ENOTDIR); break; + CASE_TEST(chroot_exe); EXPECT_SYSER2(1, chroot(proc ? "/proc/self/exe" : "/init"), -1, ENOENT, ENOTDIR); break; "/init" added for !procfs, and ENOENT added for !/init ;-) And for the chmod_tmpfile, it is changed to chmod_tmpdir like this: CASE_TEST(chmod_tmpdir); mkdir("/tmp/blah", 0755); EXPECT_SYSZR(1, chmod("/tmp/blah", 0555)); rmdir("/tmp/blah"); break; Not sure if it is possible to use a syscall to return the file path from the fd without /proc/self/fd/<N>, if so, we could use the open(, O_TMPFILE...) method to get a random tmpfile, just like the mktemp command does, will run strace on it ;-) Thanks, Zhangjin > > CASE_TEST(close_m1); EXPECT_SYSER(1, close(-1), -1, EBADF); break; > > CASE_TEST(close_dup); EXPECT_SYSZR(1, close(dup(0))); break; > > CASE_TEST(dup_0); tmp = dup(0); EXPECT_SYSNE(1, tmp, -1); close(tmp); break; > > -- > > 2.25.1 > >
Willy, Thomas This is v2 to allow run with minimal kernel config, see v1 [1]. It mainly applied the suggestions from Thomas. It is based on our previous v5 sysret helper series [2] and Thomas' chmod_net removal patchset [3]. Now, a test report on arm/vexpress-a9 without procfs, shmem, tmpfs, net and memfd_create looks like: LOG: testing report for arm/vexpress-a9: 14 chmod_net [SKIPPED] 15 chmod_self [SKIPPED] 17 chown_self [SKIPPED] 41 link_cross [SKIPPED] 0 -fstackprotector not supported [SKIPPED] 139 test(s) passed, 5 skipped, 0 failed. See all results in /labs/linux-lab/logging/nolibc/arm-vexpress-a9-nolibc-test.log LOG: testing summary: arch/board | result ------------|------------ arm/vexpress-a9 | 139 test(s) passed, 5 skipped, 0 failed. See all results in /labs/linux-lab/logging/nolibc/arm-vexpress-a9-nolibc-test.log Changes from v1 --> v2: * selftests/nolibc: stat_fault: silence NULL argument warning with glibc selftests/nolibc: gettid: restore for glibc and musl selftests/nolibc: add _LARGEFILE64_SOURCE for musl selftests/nolibc: add a new rmdir() test case selftests/nolibc: fix up failures when CONFIG_PROC_FS=n The same as v1, only a few of commit message changes. * selftests/nolibc: fix up int_fast16/32_t test cases for musl Applied the method suggested by Thomas, two new macros are added to get SINT_MAX_OF_TYPE(type) and SINT_MIN_OF_TYPE(type). * selftests/nolibc: fix up kernel parameters support After discuss with Thomas and with more tests, both of argv[1] and NOLIBC_TEST environment variable should be verified to support such kernel parameters: NOLIBC_TEST=syscall noapic NOLIBC_TEST=syscall noapic * selftests/nolibc: stat_timestamps: remove procfs dependency Add '/init' and '/' for !procfs, don't skip it. * selftests/nolibc: link_cross: use /proc/self/cmdline Use /proc/self/cmdline instead of /proc/self/net, the ramfs based /tmp/file doesn't work as expected (not really crossdev). * tools/nolibc: add rmdir() support Now, rebased on __sysret() from sysret helper patchset [2]. * selftests/nolibc: prepare /tmp for tmpfs or ramfs Removed the hugetlbfs prepare part, not really required. Don't remove /tmp and reserve it to use ramfs as tmpfs. * selftests/nolibc: add common get_tmpfile() selftests/nolibc: rename chroot_exe to chroot_tmpfile Some cleanups. * selftests/nolibc: add chmod_tmpfile test To avoid conflict with Thomas' chmod_net removal patch [3], a new chmod_tmpfile is added (in v1, there is a rename patch from chmod_net to chmod_good) Still to avoid conflict, these two are removed in this series: - selftests/nolibc: rename proc variable to has_proc - selftests/nolibc: rename euid0 variable to is_root * selftests/nolibc: vfprintf: remove MEMFD_CREATE dependency Many checks are removed, only reserve the direct tmpfs access version. Best regards, Zhangjin --- [1]: https://lore.kernel.org/lkml/cover.1687344643.git.falcon@tinylab.org/ [2]: https://lore.kernel.org/lkml/cover.1687976753.git.falcon@tinylab.org/ [3]: https://lore.kernel.org/lkml/20230624-proc-net-setattr-v1-0-73176812adee@weissschuh.net/ Zhangjin Wu (15): selftests/nolibc: stat_fault: silence NULL argument warning with glibc selftests/nolibc: gettid: restore for glibc and musl selftests/nolibc: add _LARGEFILE64_SOURCE for musl selftests/nolibc: fix up int_fast16/32_t test cases for musl selftests/nolibc: fix up kernel parameters support selftests/nolibc: stat_timestamps: remove procfs dependency selftests/nolibc: link_cross: use /proc/self/cmdline tools/nolibc: add rmdir() support selftests/nolibc: add a new rmdir() test case selftests/nolibc: fix up failures when CONFIG_PROC_FS=n selftests/nolibc: prepare /tmp for tmpfs or ramfs selftests/nolibc: add common get_tmpfile() selftests/nolibc: rename chroot_exe to chroot_tmpfile selftests/nolibc: add chmod_tmpfile test selftests/nolibc: vfprintf: remove MEMFD_CREATE dependency tools/include/nolibc/sys.h | 22 ++++ tools/testing/selftests/nolibc/nolibc-test.c | 102 +++++++++++++++---- 2 files changed, 106 insertions(+), 18 deletions(-)