From patchwork Mon Dec 12 23:08:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 13071515 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 11314C4332F for ; Mon, 12 Dec 2022 23:07:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233721AbiLLXHe (ORCPT ); Mon, 12 Dec 2022 18:07:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbiLLXHd (ORCPT ); Mon, 12 Dec 2022 18:07:33 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98E401B1FE for ; Mon, 12 Dec 2022 15:07:32 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1A83A337C0; Mon, 12 Dec 2022 23:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1670886451; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fekh+/50vUYKMk/CkqbEdqr4sBl6kbzxpdZqFkdOjHE=; b=RrtnmIsxaAI8jaoy3gXsX4wovxbp7MwHajS9MPmYzHuiN8iBGQ5RklUxe33lbb9THtbEfX +MvsZLYkvmb00AlALROdpYoeH9t4+jlWgTMofvy5jD/lLHL6FSHnrFZpk+ZHaHAroWhRyP XnGQAdg/OgwrsqynPx1UnMe4ehu6zOg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1670886451; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fekh+/50vUYKMk/CkqbEdqr4sBl6kbzxpdZqFkdOjHE=; b=O+zbvNNYnOhXdeRaqq+5sbmPaFLkjXBJQw5RytGzf6nT0JNoBFzkzjwF7KUVTxuCfs+IcL fASpD5GuRFmYdOCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F2E8613456; Mon, 12 Dec 2022 23:07:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CqraOTK0l2NtNQAAMHmgww (envelope-from ); Mon, 12 Dec 2022 23:07:30 +0000 From: David Disseldorp To: fstests@vger.kernel.org Cc: David Disseldorp Subject: [PATCH 1/3] common/attr: require xfs_spaceman for xfs acl_get_max Date: Tue, 13 Dec 2022 00:08:18 +0100 Message-Id: <20221212230820.3466-1-ddiss@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org For xfs, _acl_get_max() calls xfs_info which in turn calls "xfs_spaceman -c info ...". Without this change, xfs_spaceman absence results in: --- tests/generic/026.out +++ /home/david/xfstests/results//generic/026.out.bad @@ -1,9 +1,11 @@ QA output created by 026 +/usr/sbin/xfs_info: line 44: xfs_spaceman: command not found === Test out large ACLs === +/usr/sbin/xfs_info: line 44: xfs_spaceman: command not found 1 below acl max acl max ... Signed-off-by: David Disseldorp --- common/attr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/attr b/common/attr index cce4d1b2..a94c5e4b 100644 --- a/common/attr +++ b/common/attr @@ -57,6 +57,9 @@ _acl_get_max() _require_acl_get_max() { + # _acl_get_max -> xfs_info -> xfs_spaceman + [ "$FSTYP" == "xfs" ] && _require_xfs_spaceman_command "info" + if [ $(_acl_get_max) -eq 0 ]; then _notrun "$FSTYP does not define maximum ACL count" fi From patchwork Mon Dec 12 23:08:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 13071517 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 9D0DBC4167B for ; Mon, 12 Dec 2022 23:07:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229975AbiLLXHf (ORCPT ); Mon, 12 Dec 2022 18:07:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233450AbiLLXHe (ORCPT ); Mon, 12 Dec 2022 18:07:34 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98ED61B783 for ; Mon, 12 Dec 2022 15:07:32 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 46412337E6; Mon, 12 Dec 2022 23:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1670886451; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JmwC85hKQFhfaYeWk3vERnOwRrvk138oCJrVtmkMvgE=; b=wZVHsrvC6Ssq6By/fRcbRrfrZ86Yw1sTY69EsyZr3Io1Z868plnsmDf9+XUF4GoGI2gw9Z IwncsRvWZR5ZFpGJyJePxLtoXpaFer/fyRmio0DUXeSSFbRQRtVunMzrOlnxKZek34XmU3 39Iah3+DY1NdA9AOe5Jn5TBjCZct6gU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1670886451; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JmwC85hKQFhfaYeWk3vERnOwRrvk138oCJrVtmkMvgE=; b=yzylAkfzm583G7ukqoUsqbKmiXwNgdUrZ3OitKwCRihVbEUv50Ohbwt/kHwMflbRNTTFRI Vr0iHHIDNkPUZkAQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 2076313456; Mon, 12 Dec 2022 23:07:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kGesBjO0l2NtNQAAMHmgww (envelope-from ); Mon, 12 Dec 2022 23:07:31 +0000 From: David Disseldorp To: fstests@vger.kernel.org Cc: David Disseldorp Subject: [PATCH 2/3] tests/generic/027: use c-style for loops Date: Tue, 13 Dec 2022 00:08:19 +0100 Message-Id: <20221212230820.3466-2-ddiss@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221212230820.3466-1-ddiss@suse.de> References: <20221212230820.3466-1-ddiss@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Signed-off-by: David Disseldorp --- tests/generic/027 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/generic/027 b/tests/generic/027 index 47f1981d..002be120 100755 --- a/tests/generic/027 +++ b/tests/generic/027 @@ -53,22 +53,18 @@ fi dir=$SCRATCH_MNT/testdir echo -n "iteration" >>$seqres.full -i=1 -while [ $i -le $loop ]; do +for ((i = 1; i < loop; i++)); do echo -n " $i" >>$seqres.full - nr_worker=8 - while [ $nr_worker -gt 0 ]; do + for ((nr_worker = 8; nr_worker > 0; nr_worker--)); do # half buffered I/O half direct I/O if [ `expr $nr_worker % 2` -eq 0 ]; then create_file $dir/$nr_worker -d >>$seqres.full & else create_file $dir/$nr_worker >>$seqres.full & fi - let nr_worker=$nr_worker-1 done wait rm -rf $dir - let i=$i+1 done _scratch_unmount From patchwork Mon Dec 12 23:08:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 13071516 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 69585C00145 for ; Mon, 12 Dec 2022 23:07:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229944AbiLLXHe (ORCPT ); Mon, 12 Dec 2022 18:07:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229975AbiLLXHd (ORCPT ); Mon, 12 Dec 2022 18:07:33 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F0A21B786 for ; Mon, 12 Dec 2022 15:07:32 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5D6D0337EC; Mon, 12 Dec 2022 23:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1670886451; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U9t0bjFqLRCCXSO9jyTGI4Ew9eD3z6E7ZslH0ro/uwU=; b=wVhei5TGtZkEaShbfPpYwrqDt6/UXcMx9y4+w9V2U9Wbwg0fYhdfXalhLaXc+xzEAn2IrH YuSglML432L/Ce3sxezeqaQXPLLeTjL84iViuyOsxb/gRKI2bLWHPEsl34q30SgoLh4N3K OpM7jhcQaRFYmlxNTlZOubDaP1Im72s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1670886451; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U9t0bjFqLRCCXSO9jyTGI4Ew9eD3z6E7ZslH0ro/uwU=; b=MWU0QLrEynqV6xPGyRGJz8054NV4x6voH/X58PDWqB8YlFIjL0BPMKgO3+fS3kemEvn992 nzD++yrzkUxpWLDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 41EEA138F4; Mon, 12 Dec 2022 23:07:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UFe4DjO0l2NtNQAAMHmgww (envelope-from ); Mon, 12 Dec 2022 23:07:31 +0000 From: David Disseldorp To: fstests@vger.kernel.org Cc: David Disseldorp Subject: [PATCH 3/3] check: ensure sect_stop is initialized if interrupted Date: Tue, 13 Dec 2022 00:08:20 +0100 Message-Id: <20221212230820.3466-3-ddiss@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221212230820.3466-1-ddiss@suse.de> References: <20221212230820.3466-1-ddiss@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org sect_stop is normally set immediately prior to calling _wrapup() via run_section(). However, when called via a trap signal handler, sect_stop may be uninitialized, leading to a negative section time (sect_stop - sect_start) in the xunit report. E.g. Interrupted! Passed all 1 tests Xunit report: /home/david/xfstests/results//result.xml rapido1:/# head /home/david/xfstests/results//result.xml This commit uses the existing $interrupt flag to determine when sect_stop needs to be initialised. Signed-off-by: David Disseldorp Reviewed-by: Zorro Lang --- check | 1 + 1 file changed, 1 insertion(+) diff --git a/check b/check index d2e51296..cb3ea155 100755 --- a/check +++ b/check @@ -433,6 +433,7 @@ _wrapup() { seq="check" check="$RESULT_BASE/check" + $interrupt && sect_stop=`_wallclock` if $showme && $needwrap; then if $do_report; then