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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3115FC433EF for ; Thu, 4 Nov 2021 12:52:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1979960F70 for ; Thu, 4 Nov 2021 12:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231408AbhKDMzW (ORCPT ); Thu, 4 Nov 2021 08:55:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24757 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbhKDMzV (ORCPT ); Thu, 4 Nov 2021 08:55:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636030363; 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=jYhhzQMxGRJA5ZHcomS+lM4F+CGYhtTQGQ3nY68oQaU=; b=g8mAYHNaP1Mj/RiNt0WQyuap8JAFa9pgZhqP7VxkSUjwh4x1ZsYHCt9krtLiVKnp+uImLW U2GHS2ZKSGgQ3C7ftwtSYXGPFk+PpTEWxmlyIW+GwZCCK3oWIBTrRmlfVUcYH4ju7CVFhM 7aOfWtTgfix/bYMwhAkMyXMvjm0V5LY= 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-198-T3evhSqaOTG1iO1drNu1SQ-1; Thu, 04 Nov 2021 08:52:42 -0400 X-MC-Unique: T3evhSqaOTG1iO1drNu1SQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 711D21926DA0 for ; Thu, 4 Nov 2021 12:52:41 +0000 (UTC) Received: from work (unknown [10.40.194.61]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0E6019C79; Thu, 4 Nov 2021 12:52:31 +0000 (UTC) Date: Thu, 4 Nov 2021 13:52:26 +0100 From: Lukas Czerner To: Carlos Maiolino Cc: fstests@vger.kernel.org Subject: Re: [PATCH 1/2] common/rc: Enable _format_swapfile to return the swap size Message-ID: <20211104125226.7kozp45e2ifvmiyw@work> References: <20211102152828.26895-1-cmaiolino@redhat.com> <20211102152828.26895-2-cmaiolino@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211102152828.26895-2-cmaiolino@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Tue, Nov 02, 2021 at 04:28:27PM +0100, Carlos Maiolino wrote: > Once the kernel is free to not map the full swap file during a swapon call, > it can be useful to know the exact size of the swap area created during > _format_swapfile(). > > To achieve this, it is required to change _require_scratch_swapfile(), to drop > the _format_swapfile() return value, otherwise, it will also have a return value > that will end up in tests outputs causing tests to fail. > > Tests using _format_swapfile() that do not require the swap file size do not > need to be modified, as the return value will be simply ignored. > > Signed-off-by: Carlos Maiolino > --- > common/rc | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/common/rc b/common/rc > index 7f693d39..fb1f32e0 100644 > --- a/common/rc > +++ b/common/rc > @@ -2587,6 +2587,7 @@ _require_odirect() > _format_swapfile() { > local fname="$1" > local sz="$2" > + local swap_log="" > > rm -f "$fname" > touch "$fname" > @@ -2595,8 +2596,11 @@ _format_swapfile() { > $CHATTR_PROG +C "$fname" > /dev/null 2>&1 > _pwrite_byte 0x61 0 "$sz" "$fname" >> $seqres.full > # Ignore permission complaints on filesystems that don't support perms > - $MKSWAP_PROG "$fname" 2>&1 >> $seqres.full | \ > - grep -v "insecure permission" > + swap_log=$($MKSWAP_PROG "$fname" 2>&1 | grep -v "insecure permission") > + echo $swap_log >> $seqres.full > + > + # return created swap size > + echo $swap_log | grep -oP '(?<=size = )\w+' I think you need take into account the fact that the units of the mkswap output will change depedning on the actual size. It might be better to grab the size in bytes which is in the output as well. -Lukas > } > > _swapon_file() { > @@ -2628,7 +2632,7 @@ _require_scratch_swapfile() > _scratch_mount > > # Minimum size for mkswap is 10 pages > - _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) > + _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) > /dev/null > > # ext* has supported all variants of swap files since their > # introduction, so swapon should not fail. > -- > 2.31.1 >