From patchwork Tue Feb 4 21:26:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13959907 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CAA621A45B; Tue, 4 Feb 2025 21:26:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738704405; cv=none; b=JGBuW6+2wYIa6ecGXHjzeaCafmAuUdBDoo9YTtQldIajiVVNfti12pv0JvL+WHSpUOrqW4dH5oKk2ct++F1sugNkJULF8WAr86iZndMDOvzzYRK2R4/UpFc+tA08S/+iQIpFlincUYSaruifi7pnkA/7jddDw25eTBqlInynxKU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738704405; c=relaxed/simple; bh=MfjHKgkqp9l6R2gUwf2DTEEOf0Ohgf+D6MRFlVD6UPc=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=unkIQDnd45Pt0a2c/N3ooS+2IzGyfxCeaLEI7wL5feiqWON/B4lEhHUd+hbBxVRMA6R51lQicJepot1z6vNxec5QyHQjtFi5dsQhqrwUvV1ffQdnsM7Nwfc7r+J4VOdMwMTsuQQ4m9kd2PHWmfnBrbdTEx3lTwi6Mz9XM8v2/3E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ntgSSuUY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ntgSSuUY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 236A6C4CEDF; Tue, 4 Feb 2025 21:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738704405; bh=MfjHKgkqp9l6R2gUwf2DTEEOf0Ohgf+D6MRFlVD6UPc=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=ntgSSuUYub2bfXZ1NouhupIXRclcrYOD4ZqazawlYzLUs0VQAUlyQHS9kxpS+cPxG SMPw8dSSZ7k1D3RVvkQga3B3sbKU8KE94KFtAxu75LUNuFU9Y7zxwgWbzv96VC22NH hAuvUAXTaGmjDVhmA/jMTSwKw7ENRrFlfsjeGLvu9N1u9qEho+Wo4BQTmo0YAtn42x ohHp6I8vlFXUR5JLocGxff30fPS5D6advzYM7RV9gQy0Lspru4mBHqYdcLkH9Rioxz lNXkr6LAnycTUp97m3acL5YDwml0f+ynJ0F0nVvW3l9cjYMlEeKlOrWTEdOf88P7zE Iu6N9S9tWLHjw== Date: Tue, 04 Feb 2025 13:26:44 -0800 Subject: [PATCH 17/34] common/rc: don't copy fsstress to $TEST_DIR From: "Darrick J. Wong" To: zlang@redhat.com, djwong@kernel.org Cc: dchinner@redhat.com, fstests@vger.kernel.org, linux-xfs@vger.kernel.org Message-ID: <173870406366.546134.14549843790655673477.stgit@frogsfrogsfrogs> In-Reply-To: <173870406063.546134.14070590745847431026.stgit@frogsfrogsfrogs> References: <173870406063.546134.14070590745847431026.stgit@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Darrick J. Wong Now that we can pkill only processes that were started by this test, we don't need to copy the fsstress binary to $TEST_DIR to avoid killing the wrong program instances. This avoids a whole slew of ETXTBSY problems with scrub stress tests that run multiple copies of fsstress in the background. Revert most of the changes to generic/270, because it wants to do something fancy with the fsstress binary, so it needs to control the process directly. Signed-off-by: "Darrick J. Wong" Reviewed-by: Dave Chinner --- common/rc | 13 ++++--------- tests/generic/270 | 10 ++++++---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/common/rc b/common/rc index 25900533acb974..6a1d4fd712bb40 100644 --- a/common/rc +++ b/common/rc @@ -54,11 +54,9 @@ _pkill() # task name to kill. # # If tasks want to start fsstress themselves (e.g. under a different uid) then -# they can set up _FSSTRESS_BIN and record _FSSTRESS_PID themselves. Then if the -# test is killed then it will get cleaned up automatically. +# they can record _FSSTRESS_PID themselves. Then if the test is killed then it +# will get cleaned up automatically. -_FSSTRESS_BIN="$seq.fsstress" -_FSSTRESS_PROG="$TEST_DIR/$seq.fsstress" _FSSTRESS_PID="" _wait_for_fsstress() { @@ -69,7 +67,6 @@ _wait_for_fsstress() ret=$? unset _FSSTRESS_PID fi - rm -f $_FSSTRESS_PROG return $ret } @@ -78,8 +75,7 @@ _kill_fsstress() { if [ -n "$_FSSTRESS_PID" ]; then # use SIGPIPE to avoid "Killed" messages from bash - echo "killing $_FSSTRESS_BIN" >> $seqres.full - _pkill -PIPE $_FSSTRESS_BIN >> $seqres.full 2>&1 + _pkill --echo -PIPE fsstress >> $seqres.full 2>&1 _wait_for_fsstress return $? fi @@ -87,8 +83,7 @@ _kill_fsstress() _run_fsstress_bg() { - cp -f $FSSTRESS_PROG $_FSSTRESS_PROG - $_FSSTRESS_PROG $FSSTRESS_AVOID "$@" >> $seqres.full 2>&1 & + $FSSTRESS_PROG $FSSTRESS_AVOID "$@" >> $seqres.full 2>&1 & _FSSTRESS_PID=$! } diff --git a/tests/generic/270 b/tests/generic/270 index d74971bb535239..ce51592004fe77 100755 --- a/tests/generic/270 +++ b/tests/generic/270 @@ -28,8 +28,8 @@ _workout() args=`_scale_fsstress_args -p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out` echo "fsstress $args" >> $seqres.full # Grant chown capability - cp $FSSTRESS_PROG $_FSSTRESS_PROG - $SETCAP_PROG cap_chown=epi $_FSSTRESS_PROG + cp $FSSTRESS_PROG $tmp.fsstress.bin + $SETCAP_PROG cap_chown=epi $tmp.fsstress.bin # io_uring accounts memory it needs under the rlimit memlocked option, # which can be quite low on some setups (especially 64K pagesize). root @@ -37,7 +37,7 @@ _workout() # io_uring_queue_init fail on ENOMEM, set max locked memory to unlimited # temporarily. ulimit -l unlimited - _su $qa_user -c "$_FSSTRESS_PROG $args" > /dev/null 2>&1 & + _su $qa_user -c "$tmp.fsstress.bin $args" > /dev/null 2>&1 & _FSSTRESS_PID=$! echo "Run dd writers in parallel" @@ -50,7 +50,9 @@ _workout() sleep $enospc_time done - _kill_fsstress + _pkill -PIPE -f fsstress + pidwait $_FSSTRESS_PID + return 0 } _require_quota