tst_device: refine tst_is_mounted()
PATCH 1/2 tst_device: refine tst_is_mounted()
Refactor tst_is_mounted() to reuse tst_mount_has_opt() instead of parsing /proc/mounts with strstr(). This makes the check more accurate and consistent with tst_is_mounted_ro()/rw().
Also moved tst_is_mounted_at_tmpdir() below for consistency.
--- lib/tst_device.c | 79 +++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 44 deletions(-)
lib/tst_device.c +35 -44
@@ -429,50 +429,6 @@ int tst_umount(const char *path)return -1 ; } -int tst_is_mounted (const char *path) -{ -char line[PATH_MAX ]; -FILE *file; -int ret =0 ; - - file =SAFE_FOPEN (NULL ,"/proc/mounts" ,"r" ); - -while (fgets (line,sizeof (line), file)) { -if (strstr (line, path) !=NULL ) { - ret =1 ; -break ; - } - } - -SAFE_FCLOSE (NULL , file); - -if (!ret) -tst_resm (TINFO ,"No device is mounted at %s" , path); - -return ret; -} - -int tst_is_mounted_at_tmpdir (const char *path) -{ -char cdir[PATH_MAX ], mpath[PATH_MAX ]; -int ret; - -if (!getcwd (cdir,PATH_MAX )) { -tst_resm (TWARN |TERRNO ,"Failed to find current directory" ); -return 0 ; - } - - ret =snprintf (mpath,PATH_MAX ,"%s/%s" , cdir, path); -if (ret <0 || ret >=PATH_MAX ) { -tst_resm (TWARN |TERRNO , -"snprintf() should have returned %d instead of %d" , -PATH_MAX , ret); -return 0 ; - } - -return tst_is_mounted (mpath); -} -static int tst_mount_has_opt (const char *path,const char *opt) {char line[PATH_MAX ];
@@ -496,6 +452,11 @@ static int tst_mount_has_opt(const char *path, const char *opt)if (strcmp (mount_point, abspath) !=0 )continue ; +if (!opt) { + ret =1 ; +break ; + } +char *tok =strtok (options,"," );while (tok) {if (strcmp (tok, opt) ==0 ) {
@@ -512,6 +473,15 @@ static int tst_mount_has_opt(const char *path, const char *opt)return ret; } +int tst_is_mounted (const char *path) +{ +int ret =tst_mount_has_opt (path,NULL ); +if (!ret) +tst_resm (TINFO ,"No device is mounted at %s" , path); + +return ret; +} +int tst_is_mounted_ro (const char *path) {return tst_mount_has_opt (path,"ro" );
@@ -522,6 +492,27 @@ int tst_is_mounted_rw(const char *path)return tst_mount_has_opt (path,"rw" ); } +int tst_is_mounted_at_tmpdir (const char *path) +{ +char cdir[PATH_MAX ], mpath[PATH_MAX ]; +int ret; + +if (!getcwd (cdir,PATH_MAX )) { +tst_resm (TWARN |TERRNO ,"Failed to find current directory" ); +return 0 ; + } + + ret =snprintf (mpath,PATH_MAX ,"%s/%s" , cdir, path); +if (ret <0 || ret >=PATH_MAX ) { +tst_resm (TWARN |TERRNO , +"snprintf() should have returned %d instead of %d" , +PATH_MAX , ret); +return 0 ; + } + +return tst_is_mounted (mpath); +} +static int find_stat_file (const char *dev,char *path,size_t path_len) {const char *devname =strrchr (dev,'/' ) +1 ;
Signature · 5 lines
2.49.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 2/2 mount05: check if mount path exist before tst_is_mounted
tst_is_mounted() now internally resolves the mount path via realpath(), which will fail if the path does not exist. In mount05, MNTPOINT2 may not always be created during the test flow, so calling tst_is_mounted() directly could produce misleading warnings or errors.
Add an explicit access(MNTPOINT2, F_OK) check before calling tst_is_mounted(), ensuring we only query mounts for existing paths.
--- testcases/kernel/syscalls/mount/mount05.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
testcases/kernel/syscalls/mount/mount05.c +1 -1
@@ -35,7 +35,7 @@ static void cleanup(void)if (tst_is_mounted (MNTPOINT1 ))SAFE_UMOUNT (MNTPOINT1 ); -if (tst_is_mounted (MNTPOINT2 )) +if (!access (MNTPOINT2 ,F_OK ) &&tst_is_mounted (MNTPOINT2 ))SAFE_UMOUNT (MNTPOINT2 ); }
Signature · 5 lines
2.49.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH 2/2] mount05: check if mount path exist before tst_is_mounted
Quoted 7 lines · Li Wang via ltp
tst_is_mounted()now internally resolves the mount path viarealpath(),which will fail if the path does not exist. In mount05, MNTPOINT2 may not always be created during the test flow, so calling
tst_is_mounted()
This line was forgotten to amend in my git log:
"In mount05, MNTPOINT2 may not exist yet during cleanup. "
directly could produce misleading warnings or errors.
Quoted 31 lines
Add an explicit
access(MNTPOINT2, F_OK)check before callingtst_is_mounted(), ensuring we only query mounts for existing paths.Signed-off-by Li Wang <[email protected]>--- testcases/kernel/syscalls/mount/mount05.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)testcases/kernel/syscalls/mount/mount05.c +1
-2@@ -35,7 +35,7 @@ static void cleanup(void)if (tst_is_mounted (MNTPOINT1 ))SAFE_UMOUNT (MNTPOINT1 ); -if (tst_is_mounted (MNTPOINT2 )) +if (!access (MNTPOINT2 ,F_OK ) &&tst_is_mounted (MNTPOINT2 ))SAFE_UMOUNT (MNTPOINT2 ); } --2.49.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 2/2 mount: check path exists before tst_is_mounted in cleanup
tst_is_mounted() now internally resolves the mount path via realpath(), which will fail if the path does not exist. In sometest (e.g. mount05), MNTPOINT2 may not exist yet during cleanup, calling tst_is_mounted() directly could produce misleading warnings or errors.
Add an explicit access(PATH, F_OK) check before calling tst_is_mounted() in the cleanup, ensuring we only query mounts for existing paths.
---
Notes:
v1 --> v2:
patch 1/2, keep no change, do not send v2. patch 2/2, adding two more files for path exist check
testcases/kernel/containers/mqns/mqns_03.c | 2 +- testcases/kernel/containers/mqns/mqns_04.c | 2 +- testcases/kernel/syscalls/mount/mount05.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/containers/mqns/mqns_03.c +1 -1
@@ -130,7 +130,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }
testcases/kernel/containers/mqns/mqns_04.c +1 -1
@@ -123,7 +123,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }
testcases/kernel/syscalls/mount/mount05.c +1 -1
@@ -35,7 +35,7 @@ static void cleanup(void)if (tst_is_mounted (MNTPOINT1 ))SAFE_UMOUNT (MNTPOINT1 ); -if (tst_is_mounted (MNTPOINT2 )) +if (!access (MNTPOINT2 ,F_OK ) &&tst_is_mounted (MNTPOINT2 ))SAFE_UMOUNT (MNTPOINT2 ); }
Signature · 5 lines
2.49.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/2] mount: check path exists before tst_is_mounted in cleanup
Quoted 16 lines · Li Wang via ltp
tst_is_mounted()now internally resolves the mount path viarealpath(), which will fail if the path does not exist. In sometest (e.g. mount05), MNTPOINT2 may not exist yet during cleanup, callingtst_is_mounted()directly could produce misleading warnings or errors.Add an explicit
access(PATH, F_OK)check before callingtst_is_mounted()in the cleanup, ensuring we only query mounts for existing paths.Signed-off-by Li Wang <[email protected]>---
Notes:
v1 --> v2:
patch 1/2, keep no change, do not send v2. patch 2/2, adding two more files for path exist check
Quoted 4 lines
testcases/kernel/containers/mqns/mqns_03.c | 2 +- testcases/kernel/containers/mqns/mqns_04.c | 2 +- testcases/kernel/syscalls/mount/mount05.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Still more test case need update such as following?
13 111 testcases/kernel/syscalls/mount/mount02.c <<cleanup>>
if (tst_is_mounted(MNTPOINT))
14 202 testcases/kernel/syscalls/mount/mount03.c <<cleanup>>
if (tst_is_mounted(MNTPOINT))
15 21 testcases/kernel/syscalls/mount/mount04.c <<cleanup>>
if (tst_is_mounted(MNTPOINT))
Maybe we can just report warning instead of error?
lib/tst_device.c +1 -1
@@ -481,7 +481,7 @@ static int tst_mount_has_opt(const char *path, const char *opt)char abspath[PATH_MAX ];if (!realpath (path, abspath)) { -tst_resm (TWARN |TERRNO ,"realpath(%s) failed" , path); +tst_resm (TWARN ,"realpath(%s) failed" , path);return 0 ; }
Quoted 46 lines
testcases/kernel/containers/mqns/mqns_03.c +1
-1@@ -130,7 +130,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }testcases/kernel/containers/mqns/mqns_04.c +1
-1@@ -123,7 +123,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }testcases/kernel/syscalls/mount/mount05.c +1
-1@@ -35,7 +35,7 @@ static void cleanup(void)if (tst_is_mounted (MNTPOINT1 ))SAFE_UMOUNT (MNTPOINT1 ); -if (tst_is_mounted (MNTPOINT2 )) +if (!access (MNTPOINT2 ,F_OK ) &&tst_is_mounted (MNTPOINT2 ))SAFE_UMOUNT (MNTPOINT2 ); }Signature · 5 lines
2.49.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/2] mount: check path exists before tst_is_mounted in cleanup
Quoted 21 lines · Wei Gao
Quoted 16 lines · Li Wang via ltp
tst_is_mounted()now internally resolves the mount path viarealpath(), which will fail if the path does not exist. In sometest (e.g. mount05), MNTPOINT2 may not exist yet during cleanup, callingtst_is_mounted()directly could produce misleading warnings or errors.Add an explicit
access(PATH, F_OK)check before callingtst_is_mounted()in the cleanup, ensuring we only query mounts for existing paths.Signed-off-by Li Wang <[email protected]>---
Notes:
v1 --> v2:
patch 1/2, keep no change, do not send v2. patch 2/2, adding two more files for path exist checkQuoted 4 lines
testcases/kernel/containers/mqns/mqns_03.c | 2 +- testcases/kernel/containers/mqns/mqns_04.c | 2 +- testcases/kernel/syscalls/mount/mount05.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Quoted 8 lines
Still more test case need update such as following?
13 111testcases/kernel/syscalls/mount/mount02.c<<cleanup>>
if (tst_is_mounted(MNTPOINT))
14 202testcases/kernel/syscalls/mount/mount03.c<<cleanup>>
if (tst_is_mounted(MNTPOINT))
15 21testcases/kernel/syscalls/mount/mount04.c<<cleanup>>
if (tst_is_mounted(MNTPOINT))
I wasn't encountering these test failures on that, the problem only appears when the mounted path is deleted by test.
Did you test and get anything abnormal on your side?
Quoted 3 lines
Maybe we can just report warning instead of error?
It is Warning but not an error, the 'TERRNO' is only use to show the errno for better debugging.
tst_device.c:440: TWARN: realpath(mntpoint2) failed: ENOENT (2)
Quoted 64 lines
lib/tst_device.c +1
-1@@ -481,7 +481,7 @@ static int tst_mount_has_opt(const char *path, const char *opt)char abspath[PATH_MAX ];if (!realpath (path, abspath)) { -tst_resm (TWARN |TERRNO ,"realpath(%s) failed" , path); +tst_resm (TWARN ,"realpath(%s) failed" , path);return 0 ; }Review
Quoted 3 lines
(quoted diff) +0
-0
b/testcases/kernel/containers/mqns/mqns_03.cReview
Quoted 13 lines
index
4d3bfc52f..ac8311559100644testcases/kernel/containers/mqns/mqns_03.c +1
-1@@ -130,7 +130,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }(quoted diff) +0
-0
b/testcases/kernel/containers/mqns/mqns_04.cReview
Quoted 13 lines
index
d28c330c4..790607ecd100644testcases/kernel/containers/mqns/mqns_04.c +1
-1@@ -123,7 +123,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }(quoted diff) +0
-0
b/testcases/kernel/syscalls/mount/mount05.cQuoted 18 lines
index
66e102a32..5585e230e100644testcases/kernel/syscalls/mount/mount05.c +1
-2@@ -35,7 +35,7 @@ static void cleanup(void)if (tst_is_mounted (MNTPOINT1 ))SAFE_UMOUNT (MNTPOINT1 ); -if (tst_is_mounted (MNTPOINT2 )) +if (!access (MNTPOINT2 ,F_OK ) &&tst_is_mounted (MNTPOINT2 ))SAFE_UMOUNT (MNTPOINT2 ); } --2.49.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/2] mount: check path exists before tst_is_mounted in cleanup
Quoted 32 lines · Li Wang
Quoted 21 lines · Wei Gao
Quoted 16 lines · Li Wang via ltp
tst_is_mounted()now internally resolves the mount path viarealpath(), which will fail if the path does not exist. In sometest (e.g. mount05), MNTPOINT2 may not exist yet during cleanup, callingtst_is_mounted()directly could produce misleading warnings or errors.Add an explicit
access(PATH, F_OK)check before callingtst_is_mounted()in the cleanup, ensuring we only query mounts for existing paths.Signed-off-by Li Wang <[email protected]>---
Notes:
v1 --> v2:
patch 1/2, keep no change, do not send v2. patch 2/2, adding two more files for path exist checkQuoted 4 lines
testcases/kernel/containers/mqns/mqns_03.c | 2 +- testcases/kernel/containers/mqns/mqns_04.c | 2 +- testcases/kernel/syscalls/mount/mount05.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)Quoted 8 lines
Still more test case need update such as following?
13 111testcases/kernel/syscalls/mount/mount02.c<<cleanup>>
if (tst_is_mounted(MNTPOINT))
14 202testcases/kernel/syscalls/mount/mount03.c<<cleanup>>
if (tst_is_mounted(MNTPOINT))
15 21testcases/kernel/syscalls/mount/mount04.c<<cleanup>>
if (tst_is_mounted(MNTPOINT))
Quoted 4 lines
I wasn't encountering these test failures on that, the problem only appears when the mounted path is deleted by test.
Did you test and get anything abnormal on your side?
Quick use your patch check mount02/3/4 no issue happen.
Quoted 10 lines
Quoted 5 lines
Maybe we can just report warning instead of error?
It is Warning but not an error, the 'TERRNO' is only use to show the errno for better debugging.
tst_device.c:440: TWARN: realpath(mntpoint2) failed: ENOENT (2)
Sorry i thought this will give an error :)
Quoted 71 lines
Quoted 67 lines
lib/tst_device.c +1
-1@@ -481,7 +481,7 @@ static int tst_mount_has_opt(const char *path, const char *opt)char abspath[PATH_MAX ];if (!realpath (path, abspath)) { -tst_resm (TWARN |TERRNO ,"realpath(%s) failed" , path); +tst_resm (TWARN ,"realpath(%s) failed" , path);return 0 ; }Review
Quoted 3 lines
(quoted diff) +0
-0
b/testcases/kernel/containers/mqns/mqns_03.cReview
Quoted 13 lines
index
4d3bfc52f..ac8311559100644testcases/kernel/containers/mqns/mqns_03.c +1
-1@@ -130,7 +130,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }(quoted diff) +0
-0
b/testcases/kernel/containers/mqns/mqns_04.cReview
Quoted 13 lines
index
d28c330c4..790607ecd100644testcases/kernel/containers/mqns/mqns_04.c +1
-1@@ -123,7 +123,7 @@ static void cleanup(void)if (!access (MQUEUE2 ,F_OK ))SAFE_MQ_UNLINK (MQNAME2 ); -if (tst_is_mounted (DEVDIR )) +if (!access (DEVDIR ,F_OK ) &&tst_is_mounted (DEVDIR ))SAFE_UMOUNT (DEVDIR ); }(quoted diff) +0
-0
b/testcases/kernel/syscalls/mount/mount05.cQuoted 18 lines
index
66e102a32..5585e230e100644testcases/kernel/syscalls/mount/mount05.c +1
-2@@ -35,7 +35,7 @@ static void cleanup(void)if (tst_is_mounted (MNTPOINT1 ))SAFE_UMOUNT (MNTPOINT1 ); -if (tst_is_mounted (MNTPOINT2 )) +if (!access (MNTPOINT2 ,F_OK ) &&tst_is_mounted (MNTPOINT2 ))SAFE_UMOUNT (MNTPOINT2 ); } --2.49.0
--
Mailing list info: https://lists.linux.it/listinfo/ltpSignature · 2 lines
Regards, Li Wang
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 126 lines · Li Wang
Refactor
tst_is_mounted()to reusetst_mount_has_opt()instead of parsing/proc/mountswithstrstr(). This makes the check more accurate and consistent with tst_is_mounted_ro()/rw().Also moved
tst_is_mounted_at_tmpdir()below for consistency.Signed-off-by Li Wang <[email protected]>Cc Wei Gao <[email protected]>--- lib/tst_device.c | 79 +++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 44 deletions(-)lib/tst_device.c +35
-44@@ -429,50 +429,6 @@ int tst_umount(const char *path)return -1 ; } -int tst_is_mounted (const char *path) -{ -char line[PATH_MAX ]; -FILE *file; -int ret =0 ; - - file =SAFE_FOPEN (NULL ,"/proc/mounts" ,"r" ); - -while (fgets (line,sizeof (line), file)) { -if (strstr (line, path) !=NULL ) { - ret =1 ; -break ; - } - } - -SAFE_FCLOSE (NULL , file); - -if (!ret) -tst_resm (TINFO ,"No device is mounted at %s" , path); - -return ret; -} - -int tst_is_mounted_at_tmpdir (const char *path) -{ -char cdir[PATH_MAX ], mpath[PATH_MAX ]; -int ret; - -if (!getcwd (cdir,PATH_MAX )) { -tst_resm (TWARN |TERRNO ,"Failed to find current directory" ); -return 0 ; - } - - ret =snprintf (mpath,PATH_MAX ,"%s/%s" , cdir, path); -if (ret <0 || ret >=PATH_MAX ) { -tst_resm (TWARN |TERRNO , -"snprintf() should have returned %d instead of %d" , -PATH_MAX , ret); -return 0 ; - } - -return tst_is_mounted (mpath); -} -static int tst_mount_has_opt (const char *path,const char *opt) {char line[PATH_MAX ];@@ -496,6 +452,11 @@ static int tst_mount_has_opt(const char *path, const char *opt)if (strcmp (mount_point, abspath) !=0 )continue ; +if (!opt) { + ret =1 ; +break ; + } +char *tok =strtok (options,"," );while (tok) {if (strcmp (tok, opt) ==0 ) {@@ -512,6 +473,15 @@ static int tst_mount_has_opt(const char *path, const char *opt)return ret; } +int tst_is_mounted (const char *path) +{ +int ret =tst_mount_has_opt (path,NULL ); +if (!ret) +tst_resm (TINFO ,"No device is mounted at %s" , path); + +return ret; +} +int tst_is_mounted_ro (const char *path) {return tst_mount_has_opt (path,"ro" );@@ -522,6 +492,27 @@ int tst_is_mounted_rw(const char *path)return tst_mount_has_opt (path,"rw" ); } +int tst_is_mounted_at_tmpdir (const char *path) +{ +char cdir[PATH_MAX ], mpath[PATH_MAX ]; +int ret; + +if (!getcwd (cdir,PATH_MAX )) { +tst_resm (TWARN |TERRNO ,"Failed to find current directory" ); +return 0 ; + } + + ret =snprintf (mpath,PATH_MAX ,"%s/%s" , cdir, path); +if (ret <0 || ret >=PATH_MAX ) { +tst_resm (TWARN |TERRNO , +"snprintf() should have returned %d instead of %d" , +PATH_MAX , ret); +return 0 ; + } + +return tst_is_mounted (mpath); +} +static int find_stat_file (const char *dev,char *path,size_t path_len) {const char *devname =strrchr (dev,'/' ) +1 ;Signature · 1 line
2.49.0
Thanks for your patch!
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 3 lines · Wei Gao
Thanks for your patch!
Reviewed-by Wei Gao <[email protected]>
Patchset merged, thanks for the review.
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp