* [PATCH xfstests 1/2] overlay: test relatime for directories
@ 2017-09-14 12:04 zhangyi (F)
2017-09-14 12:04 ` [PATCH xfstests 2/2] overlay: test chattr lower file in overlay zhangyi (F)
2017-09-14 13:07 ` [PATCH xfstests 1/2] overlay: test relatime for directories Amir Goldstein
0 siblings, 2 replies; 6+ messages in thread
From: zhangyi (F) @ 2017-09-14 12:04 UTC (permalink / raw)
To: fstests; +Cc: eguan, linux-unionfs, miklos, amir73il, yi.zhang, miaoxie
Add test access time update issue for directories in upper layer.
Upstream commit cd91304e7190 ("ovl: fix relatime for directories")
fixed this issue.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
tests/overlay/039 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++
tests/overlay/039.out | 2 ++
tests/overlay/group | 1 +
3 files changed, 92 insertions(+)
create mode 100755 tests/overlay/039
create mode 100644 tests/overlay/039.out
diff --git a/tests/overlay/039 b/tests/overlay/039
new file mode 100755
index 0000000..cd81ce5
--- /dev/null
+++ b/tests/overlay/039
@@ -0,0 +1,89 @@
+#! /bin/bash
+# FS QA Test 039
+#
+# Test access time update issue for directories in upper layer.
+#
+# Upstream Commit cd91304e7190 ("ovl: fix relatime for directories")
+# fixed this issue.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2017 Huawei. All Rights Reserved.
+# Author: zhangyi (F) <yi.zhang@huawei.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_relatime
+
+# remove all files from previous runs
+_scratch_mkfs
+
+lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
+upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
+mkdir -p $upperdir/test
+
+_scratch_mount "-o relatime"
+
+# access test dir, it's access time will be updated normally
+ls $SCRATCH_MNT/test
+
+pre_access_time=`stat -c "%X" $SCRATCH_MNT/test`
+
+# In relatime mode, access time is only updated if the previous
+# access time was earlier than the current modify or change time,
+# so trigger modify and change time update.
+touch $SCRATCH_MNT/test/foo
+sleep 1
+
+# access test dir again
+ls $SCRATCH_MNT/test > /dev/null 2>&1
+
+cur_access_time=`stat -c "%X" $SCRATCH_MNT/test`
+
+# compare the results, current access time should later than the previous one
+if [ $cur_access_time -le $pre_access_time ] ; then
+ echo "Access time is not updated correctly."
+fi
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/039.out b/tests/overlay/039.out
new file mode 100644
index 0000000..d4e7ef6
--- /dev/null
+++ b/tests/overlay/039.out
@@ -0,0 +1,2 @@
+QA output created by 039
+Silence is golden
diff --git a/tests/overlay/group b/tests/overlay/group
index ac66bc7..39177c4 100644
--- a/tests/overlay/group
+++ b/tests/overlay/group
@@ -41,3 +41,4 @@
036 auto quick mount
037 auto quick mount
038 auto quick copyup
+039 auto quick
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH xfstests 2/2] overlay: test chattr lower file in overlay
2017-09-14 12:04 [PATCH xfstests 1/2] overlay: test relatime for directories zhangyi (F)
@ 2017-09-14 12:04 ` zhangyi (F)
2017-09-14 13:07 ` Amir Goldstein
2017-09-14 13:31 ` Eryu Guan
2017-09-14 13:07 ` [PATCH xfstests 1/2] overlay: test relatime for directories Amir Goldstein
1 sibling, 2 replies; 6+ messages in thread
From: zhangyi (F) @ 2017-09-14 12:04 UTC (permalink / raw)
To: fstests; +Cc: eguan, linux-unionfs, miklos, amir73il, yi.zhang, miaoxie
chattr with [iap..] attributes open file for read-only and
invoke ioctl(). If we chattr a lower file in overlay, it
will get the lower file but not trigger copy-up, so ioctl()
lead to modification of that lower file incorrectly. Add this
test for this case.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
---
tests/overlay/040 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++
tests/overlay/040.out | 2 ++
tests/overlay/group | 1 +
3 files changed, 92 insertions(+)
create mode 100755 tests/overlay/040
create mode 100644 tests/overlay/040.out
diff --git a/tests/overlay/040 b/tests/overlay/040
new file mode 100755
index 0000000..4d0c7ef
--- /dev/null
+++ b/tests/overlay/040
@@ -0,0 +1,89 @@
+#! /bin/bash
+# FS QA Test 040
+#
+# chattr with [iap..] attributes open file for read-only and
+# invoke ioctl(). If we chattr a lower file in overlay, it
+# will get the lower file but not trigger copy-up, so ioctl()
+# lead to modification of that lower file.
+#
+# Upstream Commit 7c6893e3c9ab ("ovl: don't allow writing
+# ioctl on lower layer") return EPERM for this case to avoid
+# this issue.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2017 Huawei. All Rights Reserved.
+# Author: zhangyi (F) <yi.zhang@huawei.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ $CHATTR_PROG -i $lowerdir/foo
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_chattr i
+
+# remove all files from previous runs
+_scratch_mkfs
+
+# prepare lower test file
+lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
+mkdir -p $lowerdir
+touch $lowerdir/foo
+
+# mounting overlay
+_scratch_mount
+
+# Try to add immutable attributes in overlay, it will
+# open file for read-only and invoke ioctl(), it should not
+# modify lower origin file.
+$CHATTR_PROG +i $SCRATCH_MNT/foo > /dev/null 2>&1
+
+$UMOUNT_PROG $SCRATCH_MNT
+
+# touching origin file in lower, should succeed
+touch $lowerdir/foo > /dev/null 2>&1
+
+if [ $? -ne 0 ]; then
+ echo "Test Fail, immutable attributes is modified in lower."
+fi
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/040.out b/tests/overlay/040.out
new file mode 100644
index 0000000..9e3d4d9
--- /dev/null
+++ b/tests/overlay/040.out
@@ -0,0 +1,2 @@
+QA output created by 040
+Silence is golden
diff --git a/tests/overlay/group b/tests/overlay/group
index 39177c4..4cd4af1 100644
--- a/tests/overlay/group
+++ b/tests/overlay/group
@@ -42,3 +42,4 @@
037 auto quick mount
038 auto quick copyup
039 auto quick
+040 auto quick
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH xfstests 2/2] overlay: test chattr lower file in overlay
2017-09-14 12:04 ` [PATCH xfstests 2/2] overlay: test chattr lower file in overlay zhangyi (F)
@ 2017-09-14 13:07 ` Amir Goldstein
2017-09-14 13:31 ` Eryu Guan
1 sibling, 0 replies; 6+ messages in thread
From: Amir Goldstein @ 2017-09-14 13:07 UTC (permalink / raw)
To: zhangyi (F); +Cc: fstests, Eryu Guan, overlayfs, Miklos Szeredi, miaoxie
On Thu, Sep 14, 2017 at 3:04 PM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> chattr with [iap..] attributes open file for read-only and
> invoke ioctl(). If we chattr a lower file in overlay, it
> will get the lower file but not trigger copy-up, so ioctl()
> lead to modification of that lower file incorrectly. Add this
> test for this case.
>
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
> ---
Looks good.
Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH xfstests 1/2] overlay: test relatime for directories
2017-09-14 12:04 [PATCH xfstests 1/2] overlay: test relatime for directories zhangyi (F)
2017-09-14 12:04 ` [PATCH xfstests 2/2] overlay: test chattr lower file in overlay zhangyi (F)
@ 2017-09-14 13:07 ` Amir Goldstein
1 sibling, 0 replies; 6+ messages in thread
From: Amir Goldstein @ 2017-09-14 13:07 UTC (permalink / raw)
To: zhangyi (F); +Cc: fstests, Eryu Guan, overlayfs, Miklos Szeredi, miaoxie
On Thu, Sep 14, 2017 at 3:04 PM, zhangyi (F) <yi.zhang@huawei.com> wrote:
> Add test access time update issue for directories in upper layer.
>
> Upstream commit cd91304e7190 ("ovl: fix relatime for directories")
> fixed this issue.
>
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Looks good.
Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH xfstests 2/2] overlay: test chattr lower file in overlay
2017-09-14 12:04 ` [PATCH xfstests 2/2] overlay: test chattr lower file in overlay zhangyi (F)
2017-09-14 13:07 ` Amir Goldstein
@ 2017-09-14 13:31 ` Eryu Guan
2017-09-15 1:06 ` zhangyi (F)
1 sibling, 1 reply; 6+ messages in thread
From: Eryu Guan @ 2017-09-14 13:31 UTC (permalink / raw)
To: zhangyi (F); +Cc: fstests, linux-unionfs, miklos, amir73il, miaoxie
On Thu, Sep 14, 2017 at 08:04:03PM +0800, zhangyi (F) wrote:
> chattr with [iap..] attributes open file for read-only and
> invoke ioctl(). If we chattr a lower file in overlay, it
> will get the lower file but not trigger copy-up, so ioctl()
> lead to modification of that lower file incorrectly. Add this
> test for this case.
>
> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
> ---
> tests/overlay/040 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/overlay/040.out | 2 ++
> tests/overlay/group | 1 +
> 3 files changed, 92 insertions(+)
> create mode 100755 tests/overlay/040
> create mode 100644 tests/overlay/040.out
>
> diff --git a/tests/overlay/040 b/tests/overlay/040
> new file mode 100755
> index 0000000..4d0c7ef
> --- /dev/null
> +++ b/tests/overlay/040
> @@ -0,0 +1,89 @@
> +#! /bin/bash
> +# FS QA Test 040
> +#
> +# chattr with [iap..] attributes open file for read-only and
> +# invoke ioctl(). If we chattr a lower file in overlay, it
> +# will get the lower file but not trigger copy-up, so ioctl()
> +# lead to modification of that lower file.
> +#
> +# Upstream Commit 7c6893e3c9ab ("ovl: don't allow writing
> +# ioctl on lower layer") return EPERM for this case to avoid
> +# this issue.
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2017 Huawei. All Rights Reserved.
> +# Author: zhangyi (F) <yi.zhang@huawei.com>
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it would be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write the Free Software Foundation,
> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> +#-----------------------------------------------------------------------
> +#
> +
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> + cd /
> + $CHATTR_PROG -i $lowerdir/foo
> + rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +# remove previous $seqres.full before test
> +rm -f $seqres.full
> +
> +# real QA test starts here
> +_supported_fs overlay
> +_supported_os Linux
> +_require_scratch
> +_require_chattr i
> +
> +# remove all files from previous runs
> +_scratch_mkfs
> +
> +# prepare lower test file
> +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
> +mkdir -p $lowerdir
> +touch $lowerdir/foo
> +
> +# mounting overlay
> +_scratch_mount
> +
> +# Try to add immutable attributes in overlay, it will
> +# open file for read-only and invoke ioctl(), it should not
> +# modify lower origin file.
> +$CHATTR_PROG +i $SCRATCH_MNT/foo > /dev/null 2>&1
> +
> +$UMOUNT_PROG $SCRATCH_MNT
> +
> +# touching origin file in lower, should succeed
> +touch $lowerdir/foo > /dev/null 2>&1
> +
> +if [ $? -ne 0 ]; then
> + echo "Test Fail, immutable attributes is modified in lower."
> +fi
No need to check return value of 'touch', a bare 'touch $lowerdir/foo'
would work, if touch failed the error message would break the golden
image. I can fix it at commit time. Thanks for the tests!
Eryu
> +
> +# success, all done
> +echo "Silence is golden"
> +status=0
> +exit
> diff --git a/tests/overlay/040.out b/tests/overlay/040.out
> new file mode 100644
> index 0000000..9e3d4d9
> --- /dev/null
> +++ b/tests/overlay/040.out
> @@ -0,0 +1,2 @@
> +QA output created by 040
> +Silence is golden
> diff --git a/tests/overlay/group b/tests/overlay/group
> index 39177c4..4cd4af1 100644
> --- a/tests/overlay/group
> +++ b/tests/overlay/group
> @@ -42,3 +42,4 @@
> 037 auto quick mount
> 038 auto quick copyup
> 039 auto quick
> +040 auto quick
> --
> 2.5.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH xfstests 2/2] overlay: test chattr lower file in overlay
2017-09-14 13:31 ` Eryu Guan
@ 2017-09-15 1:06 ` zhangyi (F)
0 siblings, 0 replies; 6+ messages in thread
From: zhangyi (F) @ 2017-09-15 1:06 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-unionfs, miklos, amir73il, miaoxie
On 2017/9/14 21:31, Eryu Guan Wrote:
> On Thu, Sep 14, 2017 at 08:04:03PM +0800, zhangyi (F) wrote:
>> chattr with [iap..] attributes open file for read-only and
>> invoke ioctl(). If we chattr a lower file in overlay, it
>> will get the lower file but not trigger copy-up, so ioctl()
>> lead to modification of that lower file incorrectly. Add this
>> test for this case.
>>
>> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
>> ---
>> tests/overlay/040 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++
>> tests/overlay/040.out | 2 ++
>> tests/overlay/group | 1 +
>> 3 files changed, 92 insertions(+)
>> create mode 100755 tests/overlay/040
>> create mode 100644 tests/overlay/040.out
>>
>> diff --git a/tests/overlay/040 b/tests/overlay/040
>> new file mode 100755
>> index 0000000..4d0c7ef
>> --- /dev/null
>> +++ b/tests/overlay/040
>> @@ -0,0 +1,89 @@
>> +#! /bin/bash
>> +# FS QA Test 040
>> +#
>> +# chattr with [iap..] attributes open file for read-only and
>> +# invoke ioctl(). If we chattr a lower file in overlay, it
>> +# will get the lower file but not trigger copy-up, so ioctl()
>> +# lead to modification of that lower file.
>> +#
>> +# Upstream Commit 7c6893e3c9ab ("ovl: don't allow writing
>> +# ioctl on lower layer") return EPERM for this case to avoid
>> +# this issue.
>> +#
>> +#-----------------------------------------------------------------------
>> +# Copyright (c) 2017 Huawei. All Rights Reserved.
>> +# Author: zhangyi (F) <yi.zhang@huawei.com>
>> +#
>> +# This program is free software; you can redistribute it and/or
>> +# modify it under the terms of the GNU General Public License as
>> +# published by the Free Software Foundation.
>> +#
>> +# This program is distributed in the hope that it would be useful,
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> +# GNU General Public License for more details.
>> +#
>> +# You should have received a copy of the GNU General Public License
>> +# along with this program; if not, write the Free Software Foundation,
>> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
>> +#-----------------------------------------------------------------------
>> +#
>> +
>> +seq=`basename $0`
>> +seqres=$RESULT_DIR/$seq
>> +echo "QA output created by $seq"
>> +
>> +here=`pwd`
>> +tmp=/tmp/$$
>> +status=1 # failure is the default!
>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>> +
>> +_cleanup()
>> +{
>> + cd /
>> + $CHATTR_PROG -i $lowerdir/foo
>> + rm -f $tmp.*
>> +}
>> +
>> +# get standard environment, filters and checks
>> +. ./common/rc
>> +. ./common/filter
>> +
>> +# remove previous $seqres.full before test
>> +rm -f $seqres.full
>> +
>> +# real QA test starts here
>> +_supported_fs overlay
>> +_supported_os Linux
>> +_require_scratch
>> +_require_chattr i
>> +
>> +# remove all files from previous runs
>> +_scratch_mkfs
>> +
>> +# prepare lower test file
>> +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
>> +mkdir -p $lowerdir
>> +touch $lowerdir/foo
>> +
>> +# mounting overlay
>> +_scratch_mount
>> +
>> +# Try to add immutable attributes in overlay, it will
>> +# open file for read-only and invoke ioctl(), it should not
>> +# modify lower origin file.
>> +$CHATTR_PROG +i $SCRATCH_MNT/foo > /dev/null 2>&1
>> +
>> +$UMOUNT_PROG $SCRATCH_MNT
>> +
>> +# touching origin file in lower, should succeed
>> +touch $lowerdir/foo > /dev/null 2>&1
>> +
>> +if [ $? -ne 0 ]; then
>> + echo "Test Fail, immutable attributes is modified in lower."
>> +fi
>
> No need to check return value of 'touch', a bare 'touch $lowerdir/foo'
> would work, if touch failed the error message would break the golden
> image. I can fix it at commit time. Thanks for the tests!
Yes, you are right, it's more simple, thanks!
Thanks,
Yi.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-15 1:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-14 12:04 [PATCH xfstests 1/2] overlay: test relatime for directories zhangyi (F)
2017-09-14 12:04 ` [PATCH xfstests 2/2] overlay: test chattr lower file in overlay zhangyi (F)
2017-09-14 13:07 ` Amir Goldstein
2017-09-14 13:31 ` Eryu Guan
2017-09-15 1:06 ` zhangyi (F)
2017-09-14 13:07 ` [PATCH xfstests 1/2] overlay: test relatime for directories Amir Goldstein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).