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=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 CC279C49EA7 for ; Thu, 17 Jun 2021 05:18:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B1934613CB for ; Thu, 17 Jun 2021 05:18:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbhFQFUL (ORCPT ); Thu, 17 Jun 2021 01:20:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:37992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230205AbhFQFUH (ORCPT ); Thu, 17 Jun 2021 01:20:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8018A613CE; Thu, 17 Jun 2021 05:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623907080; bh=jbVoM+6enKBwz3wwxm89mZjH/Emg2yIVeAYlxU/Pw14=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=YKQEniTVxB4rt7616BaotV6rcjQphZ6zDZeAmSvacVg80c5HAJgFmGEJXoMhrczKA M4cHu+UeAKrOMYQK4eMM0kglNx+sO54mj0lggnfhEtfF0oawH2s/Zy+ppD/pqfccTg 3EW/7bihurvd8atCWlzhOtz2FliL2NZPJNtiMmwSgSnYhreygkJsmohYBP3jlRjMxP sA1qCPj57Hirjq0EUt5mAt/SZ9hSBcPrIHGMR6fzj2zex3z+UkOeG2Grj7svjzBZR9 SMWs8QYhMdW6tejtl5oVb6Gofb38Mn/PnOt0rb3ziEPL+ctunxvb2IhmjvaYw+jMDD 2Oaf8BYpt0HtA== Date: Wed, 16 Jun 2021 22:18:00 -0700 From: "Darrick J. Wong" To: Zorro Lang Cc: fstests@vger.kernel.org Subject: Re: [PATCH v3] generic: test small swapfile without page-aligned contiguous blocks Message-ID: <20210617051800.GB158186@locust> References: <20210617050525.902967-1-zlang@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210617050525.902967-1-zlang@redhat.com> Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Thu, Jun 17, 2021 at 01:05:25PM +0800, Zorro Lang wrote: > If a swapfile doesn't contain even a single page-aligned contiguous > range of blocks, it's an invalid swapfile, and might cause kernel > issue. This case covered commit 5808fecc5723 ("iomap: Fix negative > assignment to unsigned sis->pages in iomap_swapfile_activate"). > > Signed-off-by: Zorro Lang Looks good! Reviewed-by: Darrick J. Wong --D > --- > > Thanks the review from Darrick, V3 did below changes: > 1) Add _require_xfs_io_command fcollapse > 2) Change the notrun output if block size isn't 1024. > > Thanks, > Zorro > > tests/generic/639 | 83 +++++++++++++++++++++++++++++++++++++++++++ > tests/generic/639.out | 2 ++ > tests/generic/group | 1 + > 3 files changed, 86 insertions(+) > create mode 100755 tests/generic/639 > create mode 100644 tests/generic/639.out > > diff --git a/tests/generic/639 b/tests/generic/639 > new file mode 100755 > index 00000000..c8d0c6c5 > --- /dev/null > +++ b/tests/generic/639 > @@ -0,0 +1,83 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2021 Red Hat Inc. All Rights Reserved. > +# > +# FS QA Test No. 639 > +# > +# Test small swapfile which doesn't contain even a single page-aligned contiguous > +# range of blocks. This case covered commit 5808fecc5723 ("iomap: Fix negative > +# assignment to unsigned sis->pages in iomap_swapfile_activate"). > +# > +seq=`basename $0` > +seqres=$RESULT_DIR/$seq > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +status=1 # failure is the default! > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +_cleanup() > +{ > + cd / > + rm -f $tmp.* > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > + > +# remove previous $seqres.full before test > +rm -f $seqres.full > + > +# real QA test starts here > +_supported_fs generic > +_require_scratch > +_require_scratch_swapfile > +_require_test_program mkswap > +_require_test_program swapon > +_require_xfs_io_command fcollapse > + > +make_unaligned_swapfile() > +{ > + local fname=$1 > + local n=$((psize / bsize - 1)) > + > + # Make sure the swapfile doesn't contain even a single page-aligned > + # contiguous range of blocks. This's necessary to cover the bug > + $XFS_IO_PROG -f -t -c "pwrite 0 $(((psize + bsize) * n))" $fname >> $seqres.full 2>&1 > + for((i=1; i<=n; i++));do > + $XFS_IO_PROG -c "fcollapse $(((psize - bsize) * i)) $bsize" $fname > + done > + chmod 0600 $fname > + $CHATTR_PROG +C $fname > /dev/null 2>&1 > + $here/src/mkswap $fname > +} > + > +_scratch_mkfs >> $seqres.full 2>&1 > +_scratch_mount > +psize=`get_page_size` > +bsize=`_get_file_block_size $SCRATCH_MNT` > +# Due to we need page-unaligned blocks, so blocksize < pagesize is necessary. > +# If not, try to make a smaller enough block size > +if [ $bsize -ge $psize ];then > + _scratch_unmount > + _scratch_mkfs_blocksized 1024 >> $seqres.full 2>&1 > + if [ $? -ne 0 ];then > + _notrun "Can't make filesystem block size < page size." > + fi > + _scratch_mount > + bsize=`_get_file_block_size $SCRATCH_MNT` > + if [ $bsize -ne 1024 ];then > + _notrun "Can't force 1024-byte file block size." > + fi > +fi > +swapfile=$SCRATCH_MNT/$seq.swapfile > +make_unaligned_swapfile $swapfile > +$here/src/swapon $swapfile > +swapoff $swapfile > + > +echo "Silence is golden" > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/639.out b/tests/generic/639.out > new file mode 100644 > index 00000000..62c66537 > --- /dev/null > +++ b/tests/generic/639.out > @@ -0,0 +1,2 @@ > +QA output created by 639 > +Silence is golden > diff --git a/tests/generic/group b/tests/generic/group > index 9a636b23..48ffa3c7 100644 > --- a/tests/generic/group > +++ b/tests/generic/group > @@ -641,3 +641,4 @@ > 636 auto quick swap > 637 auto quick dir > 638 auto quick rw > +639 auto quick swap > -- > 2.31.1 >