From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 722D7C433E3 for ; Thu, 23 Jul 2020 04:57:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4EEBD2068F for ; Thu, 23 Jul 2020 04:57:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Cmw8ygDY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725843AbgGWE5H (ORCPT ); Thu, 23 Jul 2020 00:57:07 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:20186 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725774AbgGWE5G (ORCPT ); Thu, 23 Jul 2020 00:57:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595480224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/4MD7qsWN1B0yrMgLKUYI1ow/qdtbtLAlSs3+Jsg6Ps=; b=Cmw8ygDYrygBGgfH9MSt4gqAwmL+lwspYT1N2TIilBcBy0p5dLm5KgRyO0k1DWM0XD3U/9 SojcTOexnKvwnD/0hcnkX/V4M5H9js2moH4tZx+T04nF/5Y1cjpHC+K637Q26skoB56y+g mLLP+K/DZH3S4CWSyAHhTDU2A+Jl+Go= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-0ayObmDiPvm1xWNhVZwY2w-1; Thu, 23 Jul 2020 00:57:02 -0400 X-MC-Unique: 0ayObmDiPvm1xWNhVZwY2w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBF0B800688; Thu, 23 Jul 2020 04:57:00 +0000 (UTC) Received: from localhost (dhcp-12-102.nay.redhat.com [10.66.12.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 471055D9D5; Thu, 23 Jul 2020 04:57:00 +0000 (UTC) Date: Thu, 23 Jul 2020 13:09:10 +0800 From: Zorro Lang To: fdmanana@kernel.org Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, Filipe Manana , Murphy Zhou Subject: Re: [PATCH] generic/501: make the test work on machines with a non 4K page size Message-ID: <20200723050909.GD2937@dhcp-12-102.nay.redhat.com> Mail-Followup-To: fdmanana@kernel.org, fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, Filipe Manana , Murphy Zhou References: <20200722141254.19511-1-fdmanana@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200722141254.19511-1-fdmanana@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Wed, Jul 22, 2020 at 03:12:54PM +0100, fdmanana@kernel.org wrote: > From: Filipe Manana > > Currently generic/501 fails on machines with a page size different from 4K > (like ppc64le), because the clone operation fails with -EINVAL due to the > fact we pass it an offset that is 4K aligned but not aligned to the page > size of the machine. > > The test doesn't actually need offsets and lengths to be 4K aligned, so > just update the test to use offsets and lenghts that work for page size. > Also add a comment mentioning that a file size of at least 16Mb was a > necessary condition to trigger the btrfs bug. > > The test is a regression test for a btrfs issue fixed by kernel commit > bd3599a0e142cd ("Btrfs: fix file data corruption after cloning a range > and fsync"), which landed in kernel 4.18. > > Since I couldn't compile a 4.17 kernel on debian testing, I tried this > with a 4.18 kernel with that commit reverted, and it fails as expected > on a x86_64 box: > > $ ./check generic/501 > FSTYP -- btrfs > PLATFORM -- Linux/x86_64 debian9 4.18.0-btrfs-next-64 #1 SMP (...) > MKFS_OPTIONS -- /dev/sdc > MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1 > > generic/501 1s ... - output mismatch (see .../xfstests/results//generic/501.out.bad) > --- tests/generic/501.out 2020-07-22 14:50:12.585674202 +0100 > +++ /home/fdmanana/git/hub/xfstests/results//generic/501.out.bad ... > @@ -2,4 +2,4 @@ > File bar digest before power failure: > 69319d0343ab8f5ea564167da445addc SCRATCH_MNT/bar > File bar digest after power failure: > -69319d0343ab8f5ea564167da445addc SCRATCH_MNT/bar > +21de7d7325fe4dae1f3311d5a76f819f SCRATCH_MNT/bar > ... > (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/generic/501.out ... > Ran: generic/501 > Failures: generic/501 > Failed 1 of 1 tests > > Without the commit reverted it passes as expected. > > Reported-by: Murphy Zhou > Signed-off-by: Filipe Manana > --- Looks good to me, although I think you don't need to list the whole test process in the commit log. Anyway, that's fine for me. Reviewed-by: Zorro Lang > tests/generic/501 | 14 ++++++++------ > tests/generic/501.out | 4 ++-- > 2 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/tests/generic/501 b/tests/generic/501 > index 0d1f6ffe..bf020095 100755 > --- a/tests/generic/501 > +++ b/tests/generic/501 > @@ -42,14 +42,16 @@ _require_metadata_journaling $SCRATCH_DEV > _init_flakey > _mount_flakey > > -$XFS_IO_PROG -f -c "pwrite -S 0x18 9000K 6908K" $SCRATCH_MNT/foo >>$seqres.full > -$XFS_IO_PROG -f -c "pwrite -S 0x20 2572K 156K" $SCRATCH_MNT/bar >>$seqres.full > +# Use file sizes and offsets/lengths for the clone operation that are multiples > +# of 64Kb, so that the test works on machine with any page size. > +$XFS_IO_PROG -f -s -c "pwrite -S 0x18 0 2M" $SCRATCH_MNT/foo >>$seqres.full > +$XFS_IO_PROG -f -s -c "pwrite -S 0x20 0 20M" $SCRATCH_MNT/bar >>$seqres.full > > # We clone from file foo into a range of file bar that overlaps the existing > -# extent at file bar. The destination offset of the reflink operation matches > -# the eof position of file bar minus 4Kb. > -$XFS_IO_PROG -c "fsync" \ > - -c "reflink ${SCRATCH_MNT}/foo 0 2724K 15908K" \ > +# extent at file bar. The clone operation must also extend the size of file bar. > +# Note: in order to trigger the original bug on btrfs, the destination file size > +# must be at least 16Mb and the destination file must have been fsynced before. > +$XFS_IO_PROG -c "reflink ${SCRATCH_MNT}/foo 0 19M 2M" \ > -c "fsync" \ > $SCRATCH_MNT/bar >>$seqres.full > > diff --git a/tests/generic/501.out b/tests/generic/501.out > index 5d7da017..778aba4b 100644 > --- a/tests/generic/501.out > +++ b/tests/generic/501.out > @@ -1,5 +1,5 @@ > QA output created by 501 > File bar digest before power failure: > -95a95813a8c2abc9aa75a6c2914a077e SCRATCH_MNT/bar > +69319d0343ab8f5ea564167da445addc SCRATCH_MNT/bar > File bar digest after power failure: > -95a95813a8c2abc9aa75a6c2914a077e SCRATCH_MNT/bar > +69319d0343ab8f5ea564167da445addc SCRATCH_MNT/bar > -- > 2.26.2 >