Re: [PATCH 2/2] common/rc: handle xfs_io copy_range when copy_file_range syscall isn't available

Luis Henriques
2017-06-27T08:50:17Z

On Tue, Jun 27, 2017 at 01:25:29PM +0800, Eryu Guan wrote:
> On Mon, Jun 26, 2017 at 05:40:53PM +0100, Luis Henriques wrote:
> > _require_xfs_io_command() isn't handling the case where the copy_file_range
> > syscall isn't available. Unfortunately, old versions of xfs_io don't
> > handle it correctly either and the test will succeed with an empty file.
>
> If copy_file_range syscall isn't available on the system, xfs_io should
> have no "copy_range" built either, or if you're using a pre-built xfs_io
> binary shipped by a distro, it should have no copy_range either to match
> the kernel space. Anyway, I don't think it would cause any problem if
> there's no copy_file_range syscall support. I'm curious what's your
> environment setup.

I am building an initramfs that contains the testing tools from a recent
distro, and running the tests against an old kernel (which does not
include this syscall). I'm not sure how usual this sort of setup is.

Would you rather have the test ignoring these sort of setups, and just
include the 2nd check (i.e., always assume the tools (xfs_io) are in sync
with the kernel)?

> >
> > To fix this function, we need to add two checks:
> >
> > 1) for old xfs_io versions, fail if the test seems to succeed (no output)
> > but the file created is empty,
> > 2) for newer versions, use the error returned.
> >
> > Signed-off-by: Luis Henriques <lhenriques@suse.com>
> > ---
> > common/rc | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/common/rc b/common/rc
> > index 2972f89e9527..aad065cb2ade 100644
> > --- a/common/rc
> > +++ b/common/rc
> > @@ -2146,6 +2146,10 @@ _require_xfs_io_command()
> > $XFS_IO_PROG -F -f -c "pwrite 0 4k" $testfile > /dev/null 2>&1
> > testio=`$XFS_IO_PROG -F -f -c "copy_range $testfile" $testcopy 2>&1`
> > rm -f $testcopy > /dev/null 2>&1
>
> $testcopy is removed here...
>
> > + [ -z "$testio" -a ! -s "$testcopy" ] && \
>
> then on hosts with copy_file_range support, this check always returns
> true, and test _notrun when it should run.

/me blushes and hides

I'll send v2 once you let me know if you want me to keep these 2 checks.

Cheers,
--
Luís

>
> Thanks,
> Eryu
>
> > + _notrun "xfs_io $command support is missing"
> > + echo $testio | egrep -q "Function not implemented" && \
> > + _notrun "xfs_io $command support is missing"
> > ;;
> > "falloc" )
> > testio=`$XFS_IO_PROG -F -f -c "falloc $param 0 1m" $testfile 2>&1`
> > --
> > 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
>