From patchwork Mon Apr 17 12:47:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 674473 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 0DBDAC77B76 for ; Mon, 17 Apr 2023 12:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231182AbjDQMsS (ORCPT ); Mon, 17 Apr 2023 08:48:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbjDQMsQ (ORCPT ); Mon, 17 Apr 2023 08:48:16 -0400 Received: from wnew3-smtp.messagingengine.com (wnew3-smtp.messagingengine.com [64.147.123.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A27D765B2; Mon, 17 Apr 2023 05:47:53 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id ED8442B0679B; Mon, 17 Apr 2023 08:47:52 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 17 Apr 2023 08:47:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1681735672; x= 1681736272; bh=OOw1AAJkLQjLU0GAGlJCBYEb4ecro8RwuRFm5lMByG8=; b=g TY7FMyipiJ6yPibgy86TIbkcp5p1cPtoymiYIXMptI1jVVGhIdiuL0fSu6Lgponl kpmdB8V6rMSxmo3BG3QLOST0PUWNO/GvwwM0R5OuZeK03NRVtVq0FGRePdhOjIOV mfJAgJ2/1oWgr+dovgmU7lJmVCi1c7VklWAeugmuNc0kcL5rA8AM7oq1X68/S2SK qasEXPxS2q+su6fUTYchpATk2VQh8yA3aFTjxX1ewZjTEcoAHYzueNVEqDcQzR+5 RxT68rZgb27Wit4kAmiBqUxaS6IbRsOlUplQp/I9nXEICCB9oOjZX8EzO/uSH20h 7W7WYl/QwfamuyfGSVNXQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=ie1e949a3.fm3; t= 1681735672; x=1681736272; bh=OOw1AAJkLQjLU0GAGlJCBYEb4ecro8RwuRF m5lMByG8=; b=HtWMwnCHWRwP3skZfJW9c1eUfKecH/8XF8MMPos+eL22b+CF/fM w2J8ABrX6z5fOXxGFlAeAgbmexk7PNKcnKOASZlY2WQN8wOkyg+bspeI+75DutDd S9YkQcoLKuYe1nPo6fHM7ft0COMvZdj/G7lmhwjLkl+kPskSNIYD4tkdrRfjCZ41 8hQZYyqQ/JRvuQxbTPl/9+rLmhDNPW6XvX/0Y/CSvrdMoexO+GldIqV50a04lVdz TWCRe03plfJuSN1Vy58BA3eGmqaudVtMfLkOPyYChN/+uDe2gBeeIVxSNcDaCBcC Q2jidOnju/ik6PY17wtxvZgGpahiipB/ofg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeliedgheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefuhhhinhdkihgthhhirhhoucfmrgifrghsrghkihcuoehs hhhinhhitghhihhrohesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpe fggfegffejgeefueetgeeukedvhfeludfhhefftdeitdfhteelieefiefhueekgeenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehshhhinhhitg hhihhrohesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: ie1e949a3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Apr 2023 08:47:50 -0400 (EDT) From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Shin'ichiro Kawasaki , Shin'ichiro Kawasaki Subject: [PATCH blktests 1/9] common/rc: skip module file check if modules path does not exist Date: Mon, 17 Apr 2023 21:47:20 +0900 Message-Id: <20230417124728.458630-2-shinichiro@fastmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417124728.458630-1-shinichiro@fastmail.com> References: <20230417124728.458630-1-shinichiro@fastmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Shin'ichiro Kawasaki When all of the kernel modules are built-in, /lib/modules/*/kernel path may not exist. In this case, check for the path results in failure. Skip the check when the path does not exist. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Chaitanya Kulkarni --- common/rc | 1 + 1 file changed, 1 insertion(+) diff --git a/common/rc b/common/rc index af4c0b1..f67b434 100644 --- a/common/rc +++ b/common/rc @@ -36,6 +36,7 @@ _module_file_exists() local -i count libpath="/lib/modules/$(uname -r)/kernel" + [[ ! -d $libpath ]] && return 1 count=$(find "$libpath" -name "$ko_underscore*" -o \ -name "$ko_hyphen*" | wc -l) ((count)) && return 0 From patchwork Mon Apr 17 12:47:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 674472 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 6DB8EC77B77 for ; Mon, 17 Apr 2023 12:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231235AbjDQMs1 (ORCPT ); Mon, 17 Apr 2023 08:48:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231238AbjDQMsX (ORCPT ); Mon, 17 Apr 2023 08:48:23 -0400 Received: from wnew3-smtp.messagingengine.com (wnew3-smtp.messagingengine.com [64.147.123.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3CEA7EEB; Mon, 17 Apr 2023 05:47:58 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.west.internal (Postfix) with ESMTP id 46E632B0679F; Mon, 17 Apr 2023 08:47:58 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 17 Apr 2023 08:47:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1681735677; x= 1681736277; bh=qytjDzneUj140M+Xh/g65kAwZaaW7nCzkWlPLlgiqs4=; b=Q bOT5Wlkk9m0LM95wQQgPxCHWr1izSMqm58lMx6yVV0+rBlXujs597Kjm2FD2n8hf w7hegWNmO+v02mqphYysL3R5azlk1QSd5fgpRsuEaEOM6bILSG1X307lVoF4IVzS LWV6TvzPfUh7lteBpgROMjs3G/VOKMCqLnCChBjH0v68skMFkfqrcPFbfQNVNBzt HXQ0XMVxTt1oGppFmo3K7IpScWsWZuKvvDuPUH8+kDqCGLQPhwU0RBXkxvf+z59S 24MfJD2cdjV+BmTManazSWBmhEMQbamhF+KIzeRrYgm/FmEzcCKKWdlhTNTeiBb+ wbksW1Z7mlxnbzEA0SnNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=ie1e949a3.fm3; t= 1681735677; x=1681736277; bh=qytjDzneUj140M+Xh/g65kAwZaaW7nCzkWl PLlgiqs4=; b=L/o+Oe38ZkARCCuuYMxIMITbHgA3TyYtBAZFvVZ/P+TgzH9MPX/ b6YFTrjemai6c0oevT5aP9aGQn13c7pKI8zTSWD/8iD3UJIZyU3Qoe3spSkSN0KR bqYLiT2OH3uP3iC6e3mQtnJGvFpju2nXPpuePIiGxL0Q+Cko2XCfBnL42dQb3Ujh CfnQjJmPTlKdouQOKn3ZqEqWiE7taUwgYUIfxBY/Ko2i3QkYTmYsP2cGt5E8d3s4 TAAOrlvZhWlc6tAnQ7G64zUV74Jodqenoodt1TGGMr27ccZ0eFwXX7AKJt5TJ5IQ toiVBb1ejgCldUuwnz/jLrD8fgESBKMiipA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeliedgheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefuhhhinhdkihgthhhirhhoucfmrgifrghsrghkihcuoehs hhhinhhitghhihhrohesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpe fggfegffejgeefueetgeeukedvhfeludfhhefftdeitdfhteelieefiefhueekgeenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehshhhinhhitg hhihhrohesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: ie1e949a3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Apr 2023 08:47:56 -0400 (EDT) From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Shin'ichiro Kawasaki , Shin'ichiro Kawasaki Subject: [PATCH blktests 3/9] common/scsi_debug: factor out _setup_scsi_debug_vars Date: Mon, 17 Apr 2023 21:47:22 +0900 Message-Id: <20230417124728.458630-4-shinichiro@fastmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417124728.458630-1-shinichiro@fastmail.com> References: <20230417124728.458630-1-shinichiro@fastmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Shin'ichiro Kawasaki As a preparation to introduce a new helper function to configure scsi_debug device with built-in scsi_debug module, factor out a part of _init_scsi_debug to a new function _setup_scsi_debug_vars. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Chaitanya Kulkarni --- common/scsi_debug | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/common/scsi_debug b/common/scsi_debug index 5f73354..0bf768a 100644 --- a/common/scsi_debug +++ b/common/scsi_debug @@ -8,22 +8,7 @@ _have_scsi_debug() { _have_driver scsi_debug } -_init_scsi_debug() { - local -a args=("$@") - - if (( RUN_FOR_ZONED )); then - if ! _have_module_param scsi_debug zbc; then - return - fi - args+=(zbc=host-managed zone_nr_conv=0) - fi - - if ! modprobe -r scsi_debug || ! modprobe scsi_debug "${args[@]}"; then - return 1 - fi - - udevadm settle - +_setup_scsi_debug_vars() { local host_sysfs host target_sysfs target SCSI_DEBUG_HOSTS=() SCSI_DEBUG_TARGETS=() @@ -55,6 +40,25 @@ _init_scsi_debug() { return 0 } +_init_scsi_debug() { + local -a args=("$@") + + if (( RUN_FOR_ZONED )); then + if ! _have_module_param scsi_debug zbc; then + return + fi + args+=(zbc=host-managed zone_nr_conv=0) + fi + + if ! modprobe -r scsi_debug || ! modprobe scsi_debug "${args[@]}"; then + return 1 + fi + + udevadm settle + + _setup_scsi_debug_vars +} + _exit_scsi_debug() { unset SCSI_DEBUG_HOSTS unset SCSI_DEBUG_TARGETS From patchwork Mon Apr 17 12:59:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 674470 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 B4B8BC77B76 for ; Mon, 17 Apr 2023 13:04:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231330AbjDQNE1 (ORCPT ); Mon, 17 Apr 2023 09:04:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230034AbjDQND7 (ORCPT ); Mon, 17 Apr 2023 09:03:59 -0400 Received: from wnew3-smtp.messagingengine.com (wnew3-smtp.messagingengine.com [64.147.123.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1B0012017; Mon, 17 Apr 2023 06:01:00 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 8EDE62B066B3; Mon, 17 Apr 2023 08:59:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 17 Apr 2023 08:59:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm3; t=1681736359; x=1681736959; bh=TBaT+4cr6v Wz/Vz1IbQN7kXEDEkzvZRMD990nt4ep2M=; b=NCp8K1lPQIB2ax2JeBaHR3G58J rxPI2+uyLoOFip4qX0Ah8MisLZG/uYNYYr4eVFJfYH/+0ZF1argZ5wGlLOWjM44h HO4jTtOvu9t5X+X315bOfWLNdYbA/1p/Ol0nD+nDFzQmmYY5RTLNS1Var/Kl3SEF XujD1CsTFztZY8d9C6LLTk7yxcqVMUrnNVnyDBolHrq9xLW3UMXumM6+mp5doAwL 4tC7PSWUnX8LMU2v78HXvLfpw6QQxLzhZijJRUZElkmE1Jbe21/XC+OTixLcHhXe w+pHTpqB3OwzLpBHzMxvPysVMzFCtmQ7pEVDuJ8AlZDO2FXlrSFxiWwA9vJg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=ie1e949a3.fm3; t=1681736359; x=1681736959; bh=TBa T+4cr6vWz/Vz1IbQN7kXEDEkzvZRMD990nt4ep2M=; b=HM61VvHZFpPY/Qev1Ar PCPVjc7Np+mFUM9OQ7HZspnvd1yXQFWyGZ9qIGU5e5KGBnmQ6ydGbc/7lVGNG70i wfdwilDBglYGgi85VV6/t/aV0yiuMMot+Z2DWSLSwkkfxgWhf0aaGMjLUqqZTlNP oHGPJzTQyv6DjjDjNrPYIZaoZyc8l0V9jg0i+CukuIXCdUvMxtonJcGsUCLIh88q El5NH5Qn5dHUauEZtKFWHLZpBFO3ESuN8Tmqkdggv9D6QiZE6gMvqak3Zfrm3apk gGtWeItCuOrBjNbtmyG2gfIQ3VtdzsWIRYpoZCBKr7qMRa9zva8kGfR1SZ2dA75i ZKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeliedgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefuhhhinhdkihgthhhirhhoucfmrgifrghsrghkihcuoehshhhi nhhitghhihhrohesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpefhke dtteeggeegleeltdfgffehleekhfduvdegveduffetudejveetieejiefghfenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehshhhinhhitghhih hrohesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: ie1e949a3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Apr 2023 08:59:17 -0400 (EDT) From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Shin'ichiro Kawasaki , Shin'ichiro Kawasaki Subject: [PATCH blktests 5/9] scsi/004: allow to run with built-in scsi_debug Date: Mon, 17 Apr 2023 21:59:09 +0900 Message-Id: <20230417125913.458726-1-shinichiro@fastmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Shin'ichiro Kawasaki To allow the test case run with build-in scsi_debug, replace '_have_module scsi_debug' with _have_scsi_debug, and replace _init_scsi_debug with _configure_scsi_debug. Also, save and restore the values of scsi_debug parameters 'opts' and 'ndelay'. The test case modifies the parameters and do not restore their original values. It is fine when scsi_debug is loadable since scsi_debug is unloaded after the test case run. However, when scsi_debug is built- in, the modified parameters may affect following test cases. To avoid potential impact on following test cases, save original values of the parameters and restore them at the end of the test case. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Chaitanya Kulkarni --- tests/scsi/004 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/scsi/004 b/tests/scsi/004 index f0845c1..110b5f4 100755 --- a/tests/scsi/004 +++ b/tests/scsi/004 @@ -18,15 +18,22 @@ DESCRIPTION="ensure repeated TASK SET FULL results in EIO on timing out command" CAN_BE_ZONED=1 requires() { - _have_module scsi_debug + _have_scsi_debug } test() { + local opts ndelay + echo "Running ${TEST_NAME}" - if ! _init_scsi_debug add_host=1 max_luns=1 statistics=1 every_nth=1; then + if ! _configure_scsi_debug max_luns=1 statistics=1 every_nth=1; then return 1 fi + + # save scsi_debug parameters + opts=$( "/sys/block/${SCSI_DEBUG_DEVICES[0]}/device/timeout" # every_nth RW with full queue gets SAM_STAT_TASK_SET_FULL echo 0x800 > /sys/bus/pseudo/drivers/scsi_debug/opts @@ -42,7 +49,11 @@ test() { while grep -q -F "in_use_bm BUSY:" "/proc/scsi/scsi_debug/${SCSI_DEBUG_HOSTS[0]}"; do sleep 1 done - echo 1 > /sys/bus/pseudo/drivers/scsi_debug/ndelay + + # restore scsi_debug parameters + echo "$opts" > /sys/bus/pseudo/drivers/scsi_debug/opts + echo "$ndelay" > /sys/bus/pseudo/drivers/scsi_debug/ndelay + _exit_scsi_debug echo "Test complete" From patchwork Mon Apr 17 12:59:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 674471 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 AC529C77B72 for ; Mon, 17 Apr 2023 13:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231388AbjDQNEB (ORCPT ); Mon, 17 Apr 2023 09:04:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231387AbjDQNDm (ORCPT ); Mon, 17 Apr 2023 09:03:42 -0400 Received: from wnew3-smtp.messagingengine.com (wnew3-smtp.messagingengine.com [64.147.123.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6939F11BA2; Mon, 17 Apr 2023 06:00:42 -0700 (PDT) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailnew.west.internal (Postfix) with ESMTP id 36E6F2B06733; Mon, 17 Apr 2023 08:59:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 17 Apr 2023 08:59:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1681736361; x= 1681736961; bh=2NZbhL7tjJaNUxYqL9byU5qKMZUlP07NY/no4LnIiOo=; b=m /zpokqEhLV4s0DCRdg23eNxo0EJjxziiwPXw/UzyZBQaF5QK9BZJ2n1ndDlxFUv6 7Zd6uWwU/7F/BP1PnshMFcrXZm4FSxkt2470l9pIO/cQeRe0ftrK84Pr6sDp9IAc 9hAObUnx9iGaxbRGqOySn4ITRMUtAit6VxswFdOC80ZPbFyfWVG5n/5mnJXQyEXG AoOiHRXaq+PjS0LYXosyu8EUme3/m7MGsy+xIebI5Rqp5mloDQz7mVvJQw1n3vh3 2WbJQTlh+6tsjUlmMLjzX5pMKn9jFTyU/VJzdezZnWkMJ2Sxf3c89NzFDjjy9hga YfN4XiEgKcL8tmbPahcGQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=ie1e949a3.fm3; t= 1681736361; x=1681736961; bh=2NZbhL7tjJaNUxYqL9byU5qKMZUlP07NY/n o4LnIiOo=; b=Vz84V/d4N3LeFd7pJhTBSr0n7laggwbDNEthKB2s3Mc86FwGqDK eX8sPzuuU4HfrT7TG8vIwClEzljXXNEMPA8hvIqdHhG6pw07CLuL8TspNX81r8+T YJjFXaUw+smWG5wrwDU9tOo7jG10/wiD9wrpTCItcW2LojIMvJIzHqMftXBmLNC6 s6/ZdJ3H6nU4Q2nrKAUhiPPNbQKMKhMOcuJgWU2D/R0hE3YwEHOi+JESnOfYiWKO jQcEJ8J1yGevRCP2GEAoOr0xQE5oscs3dhvkIClplt48zRfilcmJ0oQtVQA3nPBy YE3jZq9dAQxh8igRKMxAFhYBksR/IBG5EkQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeliedgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefuhhhinhdkihgthhhirhhoucfmrgifrghsrghkihcuoehs hhhinhhitghhihhrohesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrghtthgvrhhnpe fggfegffejgeefueetgeeukedvhfeludfhhefftdeitdfhteelieefiefhueekgeenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehshhhinhhitg hhihhrohesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: ie1e949a3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Apr 2023 08:59:20 -0400 (EDT) From: Shin'ichiro Kawasaki To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Shin'ichiro Kawasaki , Shin'ichiro Kawasaki Subject: [PATCH blktests 6/9] scsi/005: allow to run with built-in scsi_debug Date: Mon, 17 Apr 2023 21:59:10 +0900 Message-Id: <20230417125913.458726-2-shinichiro@fastmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417125913.458726-1-shinichiro@fastmail.com> References: <20230417125913.458726-1-shinichiro@fastmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Shin'ichiro Kawasaki To allow the test case run with build-in scsi_debug, replace '_have_module scsi_debug' with _have_scsi_debug, and replace _init_scsi_debug with _configure_scsi_debug. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Chaitanya Kulkarni --- tests/scsi/005 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scsi/005 b/tests/scsi/005 index efd3d82..bfa1014 100755 --- a/tests/scsi/005 +++ b/tests/scsi/005 @@ -11,7 +11,7 @@ DESCRIPTION="test SCSI device blacklisting" QUICK=1 requires() { - _have_module scsi_debug + _have_scsi_debug _have_module_param scsi_debug inq_vendor } @@ -33,7 +33,7 @@ test() { for inq in "${inqs[@]}"; do vendor="${inq:0:8}" model="${inq:8:16}" - if ! _init_scsi_debug inq_vendor="$vendor" inq_product="$model"; then + if ! _configure_scsi_debug inq_vendor="$vendor" inq_product="$model"; then continue fi vendor="$(cat "/sys/block/${SCSI_DEBUG_DEVICES[0]}/device/vendor")"