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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4070CEE7FF7 for ; Fri, 8 Sep 2023 13:43:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233679AbjIHNna (ORCPT ); Fri, 8 Sep 2023 09:43:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbjIHNn2 (ORCPT ); Fri, 8 Sep 2023 09:43:28 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B891F1BF1 for ; Fri, 8 Sep 2023 06:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694180555; 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=wylPZd/3B9gjx9Ofti3mnfkiNB8+dn8NzT1yLJRf33c=; b=bQZ2umQfHdP8CxIm/IChk5vWG+NSeghvWltomQs+jXwM7UxpwW/f71tDnMT/9t8EzjiJq5 ZfX1ym3otPWkglNAB3GlxGvILdkh0VafZGb52sN2aC3bjL9EWpJNRBXuUsh+FyDfE1SxbE DdTD5tOOHxELrWlGiCEbA48HEse/71I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-681-RnYFQ5-NOh-7rQxjpgYXbA-1; Fri, 08 Sep 2023 09:42:33 -0400 X-MC-Unique: RnYFQ5-NOh-7rQxjpgYXbA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F07D856DED; Fri, 8 Sep 2023 13:42:33 +0000 (UTC) Received: from redhat.com (unknown [10.22.35.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 29C1E2026D2B; Fri, 8 Sep 2023 13:42:33 +0000 (UTC) Date: Fri, 8 Sep 2023 08:42:31 -0500 From: Bill O'Donnell To: Bill O'Donnell Cc: fstests@vger.kernel.org, zlang@redhat.com, quwenruo.btrfs@gmx.com Subject: Re: [PATCH v2] fstests: generic/353 should accomodate other pwrite behaviors Message-ID: References: <20230901161816.148854-1-bodonnel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230901161816.148854-1-bodonnel@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org cc quwenruo.btrfs@gmx.com On Fri, Sep 01, 2023 at 11:18:16AM -0500, Bill O'Donnell wrote: > xfs_io pwrite issues a series of block size writes, but there is no > guarantee that the resulting extent(s) will be singular or contiguous. > This behavior is acceptable, but the test is flawed in that it expects > a single extent for a pwrite. > > Modify test to use actual blocksize for pwrite and reflink. Also > modify it to accommodate pwrite and reflink that produce different > mapping results. > > Signed-off-by: Bill O'Donnell > --- > tests/generic/353 | 29 ++++++++++++++++------------- > tests/generic/353.out | 15 +-------------- > 2 files changed, 17 insertions(+), 27 deletions(-) > > diff --git a/tests/generic/353 b/tests/generic/353 > index 9a1471bd..c5639725 100755 > --- a/tests/generic/353 > +++ b/tests/generic/353 > @@ -29,31 +29,34 @@ _require_xfs_io_command "fiemap" > _scratch_mkfs > /dev/null 2>&1 > _scratch_mount > > -blocksize=64k > +blocksize=$(_get_file_block_size $SCRATCH_MNT) > + > file1="$SCRATCH_MNT/file1" > file2="$SCRATCH_MNT/file2" > +extmap1="$SCRATCH_MNT/extmap1" > +extmap2="$SCRATCH_MNT/extmap2" > > # write the initial file > -_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 | _filter_xfs_io > +_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 > /dev/null > > # reflink initial file > -_reflink_range $file1 0 $file2 0 $blocksize | _filter_xfs_io > +_reflink_range $file1 0 $file2 0 $blocksize > /dev/null > > # check their fiemap to make sure it's correct > -echo "before sync:" > -echo "$file1" | _filter_scratch > -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > -echo "$file2" | _filter_scratch > -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 > +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 > + > +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps before sync" > > # sync and recheck, to make sure the fiemap doesn't change just > # due to sync > sync > -echo "after sync:" > -echo "$file1" | _filter_scratch > -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > -echo "$file2" | _filter_scratch > -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 > +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 > + > +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps after sync" > + > +echo "Silence is golden" > > # success, all done > status=0 > diff --git a/tests/generic/353.out b/tests/generic/353.out > index 4f6e0b92..16ba4f1f 100644 > --- a/tests/generic/353.out > +++ b/tests/generic/353.out > @@ -1,15 +1,2 @@ > QA output created by 353 > -wrote 65536/65536 bytes at offset 0 > -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > -linked 65536/65536 bytes at offset 0 > -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > -before sync: > -SCRATCH_MNT/file1 > -0: [0..127]: shared|last > -SCRATCH_MNT/file2 > -0: [0..127]: shared|last > -after sync: > -SCRATCH_MNT/file1 > -0: [0..127]: shared|last > -SCRATCH_MNT/file2 > -0: [0..127]: shared|last > +Silence is golden > -- > 2.41.0 >