| Message ID | cover.1688134399.git.falcon@tinylab.org |
|---|---|
| Headers | show |
| Series | selftests/nolibc: allow run with minimal kernel config | expand |
_GNU_SOURCE Implies _LARGEFILE64_SOURCE in glibc, but in musl, the default configuration doesn't enable _LARGEFILE64_SOURCE.
On Fri, Jun 30, 2023, at 16:44, Zhangjin Wu wrote: > _GNU_SOURCE Implies _LARGEFILE64_SOURCE in glibc, but in musl, the > default configuration doesn't enable _LARGEFILE64_SOURCE. > > From include/dirent.h of musl, getdents64 is provided as getdents when > _LARGEFILE64_SOURCE is defined. > > #if defined(_LARGEFILE64_SOURCE) > ... > #define getdents64 getdents > #endif > > Let's define _LARGEFILE64_SOURCE to fix up this compile error: I think a better solution would be to use the normal getdents() instead of glibc getdents64(), but then define _FILE_OFFSET_BITS=64 to tell glibc to use the modern version of all filesystem syscalls. Arnd
On Fri, Jun 30, 2023, at 20:01, Zhangjin Wu wrote: > Hi, Arnd > >> On Fri, Jun 30, 2023, at 16:44, Zhangjin Wu wrote: >> > _GNU_SOURCE Implies _LARGEFILE64_SOURCE in glibc, but in musl, the >> > default configuration doesn't enable _LARGEFILE64_SOURCE. >> > >> > From include/dirent.h of musl, getdents64 is provided as getdents when >> > _LARGEFILE64_SOURCE is defined. >> > >> > #if defined(_LARGEFILE64_SOURCE) >> > ... >> > #define getdents64 getdents >> > #endif >> > >> > Let's define _LARGEFILE64_SOURCE to fix up this compile error: >> >> I think a better solution would be to use the normal getdents() instead >> of glibc getdents64(), but then define _FILE_OFFSET_BITS=64 to tell >> glibc to use the modern version of all filesystem syscalls. >> > > Just checked the getdents manpage[1] and the nolibc code, both of glibc and > nolibc don't provide the getdents() library routine but both of them provide > the getdents64(), only musl provide getdents() by default. > > And as the manpage shows, it is not easy to call getdents() with glibc, we > need manually call syscall() and define the 'dirent' struct ourselves: > > glibc does not provide a wrapper for getdents(); call getdents() > using syscall(2). In that case you will need to define the > linux_dirent or linux_dirent64 structure yourself. > > And for nolibc, a getdents64() with linux_dirent64 struct (with int64_t offset) > is provided, there is either no getdents() currently. > > This patch aims to let nolibc-test at least compile for musl and therefore we > can easily check the new tests for musl, glibc and nolibc together. Ok, I see. Your current approach should be fine then. > For the 64bit offset related stuff, we'd better delay it in another patchset > (part of full rv32 support), which will convert the off_t to 64bit by default. Right, makes sense. ARnd
Willy, Thomas This is v3 to allow run with minimal kernel config, see v2 [1]. Applied further 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_self [SKIPPED] 16 chown_self [SKIPPED] 40 link_cross [SKIPPED] 0 -fstackprotector not supported [SKIPPED] 139 test(s) passed, 4 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, 4 skipped, 0 failed. See all results in /labs/linux-lab/logging/nolibc/arm-vexpress-a9-nolibc-test.log Changes from v2 --> v3: * Added Reviewed-by from Thomas for the whole series, Many Thanks * 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: vfprintf: remove MEMFD_CREATE dependency No code changes except some commit message cleanups. * selftests/nolibc: prepare /tmp for tmpfs or ramfs As suggested by Thomas, simply calling mkdir() and mount() to prepare /tmp can save a stat() call. * selftests/nolibc: chroot_exe: remove procfs dependency As suggested by Thomas, remove the 'weird' get_tmpfile() and use the '/init' for !procfs as we did for stat_timestamps. For the worst-case scene, when '/init' is not there, add ENOENT to the error check list. Now, it is a oneline code change. * selftests/nolibc: add chmod_tmpdir test Without get_tmpfile(), let's direct mkdir() a temp directory for chmod_tmpdir test, it function as a substitute for the removed chmod_net. Now, it is a oneline code change. Best regards, Zhangjin --- [1]: https://lore.kernel.org/lkml/cover.1688078604.git.falcon@tinylab.org/ Zhangjin Wu (14): 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: chroot_exe: 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 chmod_tmpdir test selftests/nolibc: vfprintf: remove MEMFD_CREATE dependency tools/include/nolibc/sys.h | 22 ++++++ tools/testing/selftests/nolibc/nolibc-test.c | 83 +++++++++++++++----- 2 files changed, 87 insertions(+), 18 deletions(-)