From patchwork Thu May 14 01:53:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 6402441 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B9196BEEE5 for ; Thu, 14 May 2015 01:54:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEAA720382 for ; Thu, 14 May 2015 01:54:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAAEC20397 for ; Thu, 14 May 2015 01:54:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933439AbbENByB (ORCPT ); Wed, 13 May 2015 21:54:01 -0400 Received: from ipmail07.adl2.internode.on.net ([150.101.137.131]:59570 "EHLO ipmail07.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933462AbbENBx7 (ORCPT ); Wed, 13 May 2015 21:53:59 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ARDgAk/1NV//DOLHlcgw+BMrJfAQEBAQEBBpsVTQEBAQEBAYELQQWDWwEFVjMIGDE5AxsZiCvbFoYWikaEFwW0QiNhcoI2LDGCRgEBAQ Received: from ppp121-44-206-240.lns20.syd7.internode.on.net (HELO dastard) ([121.44.206.240]) by ipmail07.adl2.internode.on.net with ESMTP; 14 May 2015 11:23:52 +0930 Received: from disappointment.disaster.area ([192.168.1.110] helo=disappointment) by dastard with esmtp (Exim 4.80) (envelope-from ) id 1YsiLD-0004WU-Ev for fstests@vger.kernel.org; Thu, 14 May 2015 11:53:39 +1000 Received: from dave by disappointment with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1YsiLD-0001hA-Do for fstests@vger.kernel.org; Thu, 14 May 2015 11:53:39 +1000 From: Dave Chinner To: fstests@vger.kernel.org Subject: [PATCH 2/3] generic/223, xfs/203: IO is not well aligned Date: Thu, 14 May 2015 11:53:36 +1000 Message-Id: <1431568417-6462-3-git-send-email-david@fromorbit.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1431568417-6462-1-git-send-email-david@fromorbit.com> References: <1431568417-6462-1-git-send-email-david@fromorbit.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dave Chinner On certain configurations (e.g. MOUNT_OPTIONS="-o dax") we get different allocation patterns due to the writes being done in multiple pwrite() calls. e.g. the write is 8k, but the buffer size is 4k, and so the filesystem sees 4k writes. If the filesytem is not using delayed allocation, then the allocation context is a 4k write rather than an 8k write and so they don't get appropriately aligned. Fix this by making the write buffer the same size and the writes being done. Signed-off-by: Dave Chinner --- tests/generic/223 | 2 +- tests/xfs/203 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/generic/223 b/tests/generic/223 index a67b8d5..f150dc9 100755 --- a/tests/generic/223 +++ b/tests/generic/223 @@ -69,7 +69,7 @@ for SUNIT_K in 8 16 32 64 128; do $XFS_IO_PROG -f -c "falloc 0 $SIZE" \ $SCRATCH_MNT/file-$FILE-$SIZE-falloc \ >> $seqres.full 2>&1 - $XFS_IO_PROG -f -c "pwrite 0 $SIZE" \ + $XFS_IO_PROG -f -c "pwrite -b $SIZE 0 $SIZE" \ $SCRATCH_MNT/file-$FILE-$SIZE-write \ >> $seqres.full 2>&1 src/t_stripealign $SCRATCH_MNT/file-$FILE-$SIZE-falloc \ diff --git a/tests/xfs/203 b/tests/xfs/203 index 7e18ca3..2ac5290 100755 --- a/tests/xfs/203 +++ b/tests/xfs/203 @@ -38,11 +38,11 @@ _write_holes() let fsize=$(($writes * 0x100000)) # prevent EOF preallocation from affecting results - xfs_io -f $file -c "truncate $fsize" + $XFS_IO_PROG -f $file -c "truncate $fsize" offset=0 for i in `seq 0 $writes`; do - xfs_io -f $file -c "pwrite -q $offset 64k" + $XFS_IO_PROG -f $file -c "pwrite -b 64k -q $offset 64k" let offset=$offset+0x100000 done }