lib: Fix fs support detection for non-root
PATCH 1/1 lib: Fix fs support detection for non-root
grep /proc/filesystems to find kernel support.
But consider only 0 (filesystem found) or 1 (not found), ignore other results (e.g. 2: /proc/filesystems not available or no permissions) and fallback to old solution (calling mount()).
Warn when mount() fails due no permission (EPERM).
--- lib/tst_supported_fs_types.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
lib/tst_supported_fs_types.c +19 -0
@@ -52,10 +52,29 @@ static int has_kernel_support(const char *fs_type, int flags)char buf[128 ];int ret; +const char *const argv[] = {"grep" ,"-q" ,"-F" ,"-w" , fs_type,"/proc/filesystems" ,NULL }; + ret =tst_cmd_ (NULL , argv,"/dev/null" ,"/dev/null" ,TST_CMD_PASS_RETVAL ); + +if (ret ==0 ) { +tst_res (TINFO ,"Kernel supports %s" , fs_type); +return 1 ; + } + +if (ret ==1 ) { +tst_res (TINFO ,"Filesystem %s is not supported" , fs_type); +return 0 ; + } +if (!tmpdir) tmpdir ="/tmp" ;mount ("/dev/zero" , tmpdir, fs_type,0 ,NULL ); + +if (errno ==EPERM ) { +tst_res (TWARN ,"No permission to detect support for %s" , fs_type); +return 1 ; + } +if (errno !=ENODEV ) {tst_res (TINFO ,"Kernel supports %s" , fs_type);return 1 ;
Signature · 1 line
2.30.0
PATCH 1/1 lib: Fix fs support detection for non-root
Hi,
...
lib/tst_supported_fs_types.c static int has_kernel_support(const char *fs_type, int flags) · line 55
Quoted 6 lines
+++
b/lib/tst_supported_fs_types.clib/tst_supported_fs_types.c +1
-0@@ -52,10 +52,29 @@ static int has_kernel_support(const char *fs_type, int flags)char buf[128 ];int ret; +const char *const argv[] = {"grep" ,"-q" ,"-F" ,"-w" , fs_type,"/proc/filesystems" ,NULL };
"-F" is probably useless.
Kind regards,
Petr
PATCH 1/1 lib: Fix fs support detection for non-root
In reply to Petr VorelHi!
Quoted 4 lines
grep
/proc/filesystemsto find kernel support.
But consider only 0 (filesystem found) or 1 (not found), ignore other results (e.g. 2:/proc/filesystemsnot available or no permissions) and fallback to old solution (callingmount()).
Why is this needed?
Also this breaks FUSE detection.
Quoted 10 lines
Signed-off-by Petr Vorel <[email protected]>--- lib/tst_supported_fs_types.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)lib/tst_supported_fs_types.c +0
-0
lib/tst_supported_fs_types.c static int has_kernel_support(const char *fs_type, int flags) · line 56
Quoted 5 lines
lib/tst_supported_fs_types.c +2
-0@@ -52,10 +52,29 @@ static int has_kernel_support(const char *fs_type, int flags)char buf[128 ];int ret; +const char *const argv[] = {"grep" ,"-q" ,"-F" ,"-w" , fs_type,"/proc/filesystems" ,NULL }; + ret =tst_cmd_ (NULL , argv,"/dev/null" ,"/dev/null" ,TST_CMD_PASS_RETVAL );
Can't we just open the file and use fgets() in a loop?
Why do we have to execute a grep binary for something like this?
Quoted 8 lines
lib/tst_supported_fs_types.c +8
-0+if (ret ==0 ) { +tst_res (TINFO ,"Kernel supports %s" , fs_type); +return 1 ; + } + +if (ret ==1 ) { +tst_res (TINFO ,"Filesystem %s is not supported" , fs_type); +return 0 ;
lib/tst_supported_fs_types.c static int has_kernel_support(const char *fs_type, int flags) · line 75
Quoted 10 lines
lib/tst_supported_fs_types.c +6
-0+ } +if (!tmpdir) tmpdir ="/tmp" ;mount ("/dev/zero" , tmpdir, fs_type,0 ,NULL ); + +if (errno ==EPERM ) { +tst_res (TWARN ,"No permission to detect support for %s" , fs_type); +return 1 ;
Maybe we can try to read /proc/filesystems here as a fallback?
Again why do we need this at all?
Quoted 11 lines
lib/tst_supported_fs_types.c +2
-0+ } +if (errno !=ENODEV ) {tst_res (TINFO ,"Kernel supports %s" , fs_type);return 1 ;Signature · 5 lines
2.30.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 lib: Fix fs support detection for non-root
Hi Cyril,
Quoted 7 lines
Hi!
Quoted 4 lines
grep
/proc/filesystemsto find kernel support.
But consider only 0 (filesystem found) or 1 (not found), ignore other results (e.g. 2:/proc/filesystemsnot available or no permissions) and fallback to old solution (callingmount()).Why is this needed?
generate_lvm_runfile.sh correctly requires TST_NEEDS_ROOT=1, only for this. zram0{12}.sh (or maybe better zram_lib.sh, which they use) incorrectly don't require root, they need it for calling modprobe zram and generally for zram use, but also for this. I'll fix this in my patchset fixing zram and we can ignore generate_lvm_runfile.sh.
=> It might not be needed. But generally some test in the future (C or shell) may want to know filesystem support for other reason which does not require root. Thus we can drop /proc/filesystems, but at least warning would be nice to have (although that implementation only prints warning and returns 0, thus warning will be lost for shell).
Also .all_filesystems in C API have .needs_root = 1. Currently copy_file_range01, preadv03, pwritev03.
They get obvious hint from tst_acquire_loop_device():
tst_device.c:100: TINFO: Not allowed to open /dev/loop-control. Are you root?: EACCES (13) => they need to have .needs_root = 1.
And I wonder if we should have check expecting .needs_root for certain flags (.all_filesystems, .needs_device, .mntpoint at least).
Quoted 1 line
Also this breaks FUSE detection.
Sorry for this. Agree with all your suggestions and can send v2 if we don't decide wontfix.
Kind regards,
Petr