From 7f27a290aca8e45ec1f39b631cb6acf923917ca4 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 19 Apr 2022 10:32:15 -0700 Subject: [PATCH] xfs: make sure syncfs(2) passes back super_operations.sync_fs errors This is a regression test to make sure that nonzero error returns from a filesystem's ->sync_fs implementation are actually passed back to userspace when the call stack involves syncfs(2). [zlang@ add '_supported_fs xfs' in case] Signed-off-by: Darrick J. Wong Reviewed-by: Zorro Lang Reviewed-by: Amir Goldstein Signed-off-by: Zorro Lang --- tests/xfs/546 | 43 +++++++++++++++++++++++++++++++++++++++++++ tests/xfs/546.out | 2 ++ 2 files changed, 45 insertions(+) create mode 100755 tests/xfs/546 create mode 100644 tests/xfs/546.out diff --git a/tests/xfs/546 b/tests/xfs/546 new file mode 100755 index 000000000..8c903a1b5 --- /dev/null +++ b/tests/xfs/546 @@ -0,0 +1,43 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Oracle. All Rights Reserved. +# +# FS QA Test No. 546 +# +# Regression test for kernel commits: +# +# 5679897eb104 ("vfs: make sync_filesystem return errors from ->sync_fs") +# 2d86293c7075 ("xfs: return errors in xfs_fs_sync_fs") +# +# During a code inspection, I noticed that sync_filesystem ignores the return +# value of the ->sync_fs calls that it makes. sync_filesystem, in turn is used +# by the syncfs(2) syscall to persist filesystem changes to disk. This means +# that syncfs(2) does not capture internal filesystem errors that are neither +# visible from the block device (e.g. media error) nor recorded in s_wb_err. +# XFS historically returned 0 from ->sync_fs even if there were log failures, +# so that had to be corrected as well. +# +# The kernel commits above fix this problem, so this test tries to trigger the +# bug by using the shutdown ioctl on a clean, freshly mounted filesystem in the +# hope that the EIO generated as a result of the filesystem being shut down is +# only visible via ->sync_fs. +# +. ./common/preamble +_begin_fstest auto quick shutdown + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_require_xfs_io_command syncfs +_require_scratch_nocheck +_require_scratch_shutdown + +# Reuse the fs formatted when we checked for the shutdown ioctl, and don't +# bother checking the filesystem afterwards since we never wrote anything. +_scratch_mount +$XFS_IO_PROG -x -c 'shutdown -f ' -c syncfs $SCRATCH_MNT + +# success, all done +status=0 +exit diff --git a/tests/xfs/546.out b/tests/xfs/546.out new file mode 100644 index 000000000..b6c38a672 --- /dev/null +++ b/tests/xfs/546.out @@ -0,0 +1,2 @@ +QA output created by 546 +syncfs: Input/output error -- 2.50.1