Skip to contentSkip to conversation

generic/252: fix aiocp buffer alignment

PATCH In review Zorro Lang 2 participants 3 messages Nov 9, 2017 – Nov 10, 2017

lore
Share & tools
lore

Zorro Lang

author
#0 lore raw

PATCH 1/1 generic/252: fix aiocp buffer alignment

g/252 fails on 4k hard sector size disk, due to aiocp.c use 512 bytes alignment by default. So use the '-a' option of aiocp, to specify a proper alignment size.

---

Test this patch with below sector size:

TEST_DEV       SCRATCH_DEV
4k             4k
4k             512
512            4k
512            512

All passed.

Thanks,
Zorro

 tests/generic/252 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tests/generic/252 +2 -1
index ffedd569..418465b0 100755
@@ -69,6 +69,7 @@ nr=640
 bufnr=128
 filesize=$((blksz * nr))
 bufsize=$((blksz * bufnr))
+alignment=`_min_dio_alignment $TEST_DEV`
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 5 / 4))
 
@@ -85,7 +86,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x63 $bufsize 1" $testdir/file2 >> $seqres.full
 $XFS_IO_PROG -f -c "pwrite -S 0x63 -b $bufsize 0 $filesize" $TEST_DIR/moo >> $seqres.full
 sync
 _dmerror_load_error_table
-$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
+$AIO_TEST -a $alignment -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
 _dmerror_load_working_table
 _dmerror_unmount
 _dmerror_mount
Signature · 1 line
2.13.6
#1 lore raw
Quoted 5 lines · Zorro Lang

g/252 fails on 4k hard sector size disk, due to aiocp.c use 512 bytes alignment by default. So use the '-a' option of aiocp, to specify a proper alignment size.

There're other tests that calls aiocp with direct I/O, I think they can be fixed too in one patch.

$ grep -H DIRECT `grep aiocp tests/* -rI | cut -d: -f1 | sort | uniq`
tests/generic/252:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/generic/329:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/generic/330:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/xfs/237:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/xfs/239:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full

Thanks,
Eryu

author
#2 lore raw
Quoted 10 lines · Eryu Guan
Quoted 5 lines · Zorro Lang

g/252 fails on 4k hard sector size disk, due to aiocp.c use 512 bytes alignment by default. So use the '-a' option of aiocp, to specify a proper alignment size.

There're other tests that calls aiocp with direct I/O, I think they can be fixed too in one patch.

Quoted 6 lines
$ grep -H DIRECT `grep aiocp tests/* -rI | cut -d: -f1 | sort | uniq`
tests/generic/252:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/generic/329:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/generic/330:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/xfs/237:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full
tests/xfs/239:$AIO_TEST -f DIRECT -b $bufsize $TEST_DIR/moo $testdir/file2 >> $seqres.full

OK, I'm going to look into them, to see if there's a better way to fix them all.

Quoted 7 lines

Thanks,
Eryu
--
To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html