syscalls/ioctl_loop05.c: skip test on overlay filesystem
PATCH 1/1 syscalls/ioctl_loop05.c: skip test on overlay filesystem
The undelrying device can't be properly detected and causes failure when running in an overlay filesystem.
--- testcases/kernel/syscalls/ioctl/ioctl_loop05.c | 3 +++ 1 file changed, 3 insertions(+)
testcases/kernel/syscalls/ioctl/ioctl_loop05.c +3 -0
@@ -101,6 +101,9 @@ static void setup(void)if (tst_fs_type ("." ) ==TST_TMPFS_MAGIC )tst_brk (TCONF ,"tmpfd doesn't support O_DIRECT flag" ); +if (tst_fs_type ("." ) ==TST_OVERLAYFS_MAGIC ) +tst_brk (TCONF ,"device isn't properly detected in overlay fs" ); + dev_num =tst_find_free_loopdev (dev_path,sizeof (dev_path));if (dev_num <0 )tst_brk (TBROK ,"Failed to find free loop device" );
Signature · 1 line
2.26.2
PATCH 1/1 syscalls/ioctl_loop05.c: skip test on overlay filesystem
Hi Radoslav
Quoted 2 lines
The undelrying device can't be properly detected and causes failure when running in an overlay filesystem.
I guess the best way is to change tst_find_backing_dev api, so it can detect the correct underlying device.
Quoted 20 lines
Signed-off-by Radoslav Kolev<[email protected]>--- testcases/kernel/syscalls/ioctl/ioctl_loop05.c | 3 +++ 1 file changed, 3 insertions(+)testcases/kernel/syscalls/ioctl/ioctl_loop05.c +3
-0@@ -101,6 +101,9 @@ static void setup(void)if (tst_fs_type ("." ) ==TST_TMPFS_MAGIC )tst_brk (TCONF ,"tmpfd doesn't support O_DIRECT flag" ); +if (tst_fs_type ("." ) ==TST_OVERLAYFS_MAGIC ) +tst_brk (TCONF ,"device isn't properly detected in overlay fs" ); + dev_num =tst_find_free_loopdev (dev_path,sizeof (dev_path));if (dev_num<0 )tst_brk (TBROK ,"Failed to find free loop device" );
PATCH 1/1 syscalls/ioctl_loop05.c: skip test on overlay filesystem
Quoted 7 lines · Yang Xu
Hi Radoslav
Quoted 2 lines
The undelrying device can't be properly detected and causes failure when running in an overlay filesystem.
I guess the best way is to change
tst_find_backing_devapi, so it can
detect the correct underlying device.
Yes, that would be the best solution. If you have and idea of how to do it that's not too complicated please give me some pointers.
I looked into it briefly, but didn't see a straighforward way.
PATCH 1/1 syscalls/ioctl_loop05.c: skip test on overlay filesystem
Hi Radoslav
Quoted 5 lines · Yang Xu
Quoted 4 lines
Hi Radoslav
Quoted 2 lines
The undelrying device can't be properly detected and causes failure when running in an overlay filesystem.
Quoted 9 lines
Quoted 3 lines
I guess the best way is to change
tst_find_backing_devapi, so it can
detect the correct underlying device.Yes, that would be the best solution. If you have and idea of how to do it that's not too complicated please give me some pointers.
I looked into it briefly, but didn't see a straighforward way.
The code maybe below(just check whether the device is a mountpotint, if it is, call tst_find_backing_dev api again)
lib/tst_device.c +5 -2
@@ -534,6 +534,10 @@ void tst_find_backing_dev(const char *path, char *dev)if (stat (dev, &buf) <0 )tst_brkm (TWARN |TERRNO ,NULL ,"stat(%s) failed" , dev); -if (S_ISBLK (buf.st_mode) !=1 ) -tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev" , dev); +if (S_ISBLK (buf.st_mode) !=1 ) { +if (tst_is_mounted (dev)) +tst_find_backing_dev (dev, dev); +else + tst_brkm(TCONF, NULL, "dev(%s) isn't a block
dev", dev);
+ }
}
My test environment is that
/dev/sda10 20G 623M 18G 4% /mnt/xfstests/test /mnt/xfstests/test 20G 623M 18G 4% /mnt/xfstests/test/ovl-mnt /dev/sda11 20G 46M 19G 1% /mnt/xfstests/scratch /mnt/xfstests/scratch 20G 46M 19G 1% /mnt/xfstests/scratch/ovl-mnt
and my TMPDIR env is /mnt/xfstests/test/ovl-mnt.
Quoted 4 lines
.
PATCH 1/1 syscalls/ioctl_loop05.c: skip test on overlay filesystem
Hi!
Quoted 19 lines
lib/tst_device.c +6
-2@@ -534,6 +534,10 @@ void tst_find_backing_dev(const char *path, char *dev)if (stat (dev, &buf) <0 )tst_brkm (TWARN |TERRNO ,NULL ,"stat(%s) failed" , dev); -if (S_ISBLK (buf.st_mode) !=1 ) -tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev" , dev); +if (S_ISBLK (buf.st_mode) !=1 ) { +if (tst_is_mounted (dev)) +tst_find_backing_dev (dev, dev); +else +tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev", dev); + }}
Quoted 7 lines
My test environment is that
/dev/sda10 20G 623M 18G 4% /mnt/xfstests/test /mnt/xfstests/test 20G 623M 18G 4% /mnt/xfstests/test/ovl-mnt /dev/sda11 20G 46M 19G 1% /mnt/xfstests/scratch /mnt/xfstests/scratch 20G 46M 19G 1% /mnt/xfstests/scratch/ovl-mntand my TMPDIR env is
/mnt/xfstests/test/ovl-mnt.
Does this code works for everyone or should we apply patch that disables the test on overlay so that it's fixed for next release?
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 syscalls/ioctl_loop05.c: skip test on overlay filesystem
Hi Cyril
Quoted 26 lines
Hi!
Quoted 25 lines
lib/tst_device.c +6
-2@@ -534,6 +534,10 @@ void tst_find_backing_dev(const char *path, char *dev)if (stat (dev,&buf)<0 )tst_brkm (TWARN |TERRNO ,NULL ,"stat(%s) failed" , dev); -if (S_ISBLK (buf.st_mode) !=1 ) -tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev" , dev); +if (S_ISBLK (buf.st_mode) !=1 ) { +if (tst_is_mounted (dev)) +tst_find_backing_dev (dev, dev); +else +tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev", dev); + }}My test environment is that
/dev/sda10 20G 623M 18G 4% /mnt/xfstests/test /mnt/xfstests/test 20G 623M 18G 4% /mnt/xfstests/test/ovl-mnt /dev/sda11 20G 46M 19G 1% /mnt/xfstests/scratch /mnt/xfstests/scratch 20G 46M 19G 1% /mnt/xfstests/scratch/ovl-mnt
Quoted 4 lines
Quoted 1 line
and my TMPDIR env is
/mnt/xfstests/test/ovl-mnt.Does this code works for everyone or should we apply patch that disables the test on overlay so that it's fixed for next release?
I guess it is ok for everyone, but I want to listen some advise from Amir since he is an expert about overlay filesystem.
Hi Amir
Currently, Radoslav reported ltp tst_find_backing_dev api (we prase/proc/self/mountinfo and use " - " to delim string and get the bdev value after two fileds.) can not find really block dev when using overlay filesystem. It fails because this api doesn't consider user layer filesystem(like overlay). I think we should call tst_find_backing_dev_api again if this dev variable is not block dev and it is a mountpoint. I use the above environment and it is ok. Wha do you think about it?
Best Regards
Yang Xu
Quoted 1 line
PATCH 1/1 syscalls/ioctl_loop05.c: skip test on overlay filesystem
In reply to Cyril HrubisHi Radoslav
Quoted 26 lines
Hi!
Quoted 25 lines
lib/tst_device.c +6
-2@@ -534,6 +534,10 @@ void tst_find_backing_dev(const char *path, char *dev)if (stat (dev,&buf)<0 )tst_brkm (TWARN |TERRNO ,NULL ,"stat(%s) failed" , dev); -if (S_ISBLK (buf.st_mode) !=1 ) -tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev" , dev); +if (S_ISBLK (buf.st_mode) !=1 ) { +if (tst_is_mounted (dev)) +tst_find_backing_dev (dev, dev); +else +tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev", dev); + }}My test environment is that
/dev/sda10 20G 623M 18G 4% /mnt/xfstests/test /mnt/xfstests/test 20G 623M 18G 4% /mnt/xfstests/test/ovl-mnt /dev/sda11 20G 46M 19G 1% /mnt/xfstests/scratch /mnt/xfstests/scratch 20G 46M 19G 1% /mnt/xfstests/scratch/ovl-mnt
Quoted 4 lines
Quoted 1 line
and my TMPDIR env is
/mnt/xfstests/test/ovl-mnt.Does this code works for everyone or should we apply patch that disables the test on overlay so that it's fixed for next release?
Thanks for this patch, merged.
Best Regards
Yang Xu