From patchwork Fri Aug 11 09:36:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134403 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp995914vqi; Fri, 11 Aug 2023 03:49:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIZBOVV3SaXbnwhj4W7vdWNWfq3T9sw54921RtupfngiShOIX9WCudch5MhDoAitg9n9bN X-Received: by 2002:a17:906:2191:b0:999:37ff:be94 with SMTP id 17-20020a170906219100b0099937ffbe94mr1477195eju.71.1691750995492; Fri, 11 Aug 2023 03:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691750995; cv=none; d=google.com; s=arc-20160816; b=cZENf+0iOaBr4N0PKBrzxs/wXKHhNlpte1cjwk7ACS15Gx6RCBEugNo0xfXAJcRxPb xEC58oig3kAxX7XgD2jKrF7lg+K2vLHLZ1jRKCvM9Q6IwHd3amIfEmRNVf6PTU4Ph5mK BUKWqvJYlJ1BDXqvoMjHyUdjf5/Ge2pjdE5NPf8NNXFCSoK95iq6s+W2GWceOg5aJ3Dg aj1DzqoBFV8jsKSv30wFXOgZAi7MeqvG4fox6RIuh3xFtfKNfI9EHUR87gc/la6eL9Xw LH6dN1VzMxknyrm38d4FumjSO61cTjNkHfkQQZ4PaKrzZ5dbpIJiOEbNKje8jdBqGlxj a9+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=9RZ2Yzq36jl6W2j4gefEmERvFCX8trh+F8G0TYairgM=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=GPSRngIbmOLaWXDzrSwyO0bbD1Uin87QAn+vgD2tbMc/TXtObYji5nLHsONTPyHf13 5u4qt2oBimfm8ltExch+/NeYVrYksU+vGXBhA/iQz18tyG3atHMxQhVcxxjYZ8XXFa2w xmpny9JI9wkEAORZr9/JwNfZhP1bT4QdoQi47JrlF+ei8gV8uk/RGQj11D+bhm4TTpv4 Av78NuH9i5mCoHhnENOrvU6hB1KkN/JgA6r53A9HmO/v5tedcT7acIAjskW9xa+n2THo abFtV2Q+vmtvJJY/bIlRV0DwGkYVbjrzXcgvUEtqnX1wAeTaZiV5IXI8j7+VUAa/Oh3v f7VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LNefJHLT; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jj4-20020a170907984400b00992f45c9342si2923903ejc.1020.2023.08.11.03.49.30; Fri, 11 Aug 2023 03:49:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LNefJHLT; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235094AbjHKJg0 (ORCPT + 99 others); Fri, 11 Aug 2023 05:36:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235024AbjHKJgY (ORCPT ); Fri, 11 Aug 2023 05:36:24 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BD5B2709; Fri, 11 Aug 2023 02:36:22 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id 014891F88C; Fri, 11 Aug 2023 09:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746581; 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=9RZ2Yzq36jl6W2j4gefEmERvFCX8trh+F8G0TYairgM=; b=LNefJHLTw6qvD0/sVgJrnnhuY5PLgra9PQgYn2GWkc83OBfRU8v468a0mmMTLK1yktmlWy bB5s303ZAIoYJPpR8Ools4jyte7fvhrHMxIBzvwQGXLbDyeoQS6aDSZXUVrF8xEHRG1gP3 YwBeEC4NlBGijjHIj/coNT16FmO82MU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746581; 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=9RZ2Yzq36jl6W2j4gefEmERvFCX8trh+F8G0TYairgM=; b=YHw2WhnxHLDJZXMyAgPMW87o6lkmNo+HXSH3yzdzlg7VhVyIdgDCf3SaeBzGqoOMVWxbJj VtJ8w7t8IOLRV1DA== 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 C9DDB138E2; Fri, 11 Aug 2023 09:36:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id VzuMIhQB1mSaHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:20 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 01/13] nvme/{003,004,005,013,046,049}: Group all variables declarations Date: Fri, 11 Aug 2023 11:36:02 +0200 Message-ID: <20230811093614.28005-2-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773929492095945618 X-GMAIL-MSGID: 1773929492095945618 Group all variable declarations together at the beginning of the function. Many of the nvme tests do this but not all. Thus make these tests use the same style. This allows to spot the odd balls in the refactoring of the tests. Signed-off-by: Daniel Wagner --- tests/nvme/003 | 3 ++- tests/nvme/004 | 3 ++- tests/nvme/005 | 5 +++-- tests/nvme/013 | 1 - tests/nvme/046 | 1 + tests/nvme/049 | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/nvme/003 b/tests/nvme/003 index 6604012d2068..aa26abf8d8b3 100755 --- a/tests/nvme/003 +++ b/tests/nvme/003 @@ -22,10 +22,11 @@ test() { _setup_nvmet + local loop_dev local port + port="$(_create_nvmet_port "${nvme_trtype}")" - local loop_dev loop_dev="$(losetup -f)" _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" diff --git a/tests/nvme/004 b/tests/nvme/004 index cab98ff44326..1e5c2b8b3e87 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -23,11 +23,12 @@ test() { _setup_nvmet local port + local loop_dev + port="$(_create_nvmet_port "${nvme_trtype}")" truncate -s "${nvme_img_size}" "$TMPDIR/img" - local loop_dev loop_dev="$(losetup -f --show "$TMPDIR/img")" _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \ diff --git a/tests/nvme/005 b/tests/nvme/005 index 8e15a13f3794..836854086822 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -22,11 +22,13 @@ test() { _setup_nvmet local port + local loop_dev + local nvmedev + port="$(_create_nvmet_port "${nvme_trtype}")" truncate -s "${nvme_img_size}" "$TMPDIR/img" - local loop_dev loop_dev="$(losetup -f --show "$TMPDIR/img")" _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \ @@ -35,7 +37,6 @@ test() { _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1 - local nvmedev nvmedev=$(_find_nvme_dev "blktests-subsystem-1") udevadm settle diff --git a/tests/nvme/013 b/tests/nvme/013 index 14e646a19c47..2be8681616d1 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -26,7 +26,6 @@ test() { local port local nvmedev local file_path="${TMPDIR}/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" diff --git a/tests/nvme/046 b/tests/nvme/046 index b37b9e98a559..942f25206c17 100755 --- a/tests/nvme/046 +++ b/tests/nvme/046 @@ -16,6 +16,7 @@ requires() { test_device() { echo "Running ${TEST_NAME}" + local ngdev=${TEST_DEV/nvme/ng} local perm nsid diff --git a/tests/nvme/049 b/tests/nvme/049 index f72862c6426d..599ab58d7a29 100755 --- a/tests/nvme/049 +++ b/tests/nvme/049 @@ -17,6 +17,7 @@ requires() { test_device() { echo "Running ${TEST_NAME}" + local ngdev=${TEST_DEV/nvme/ng} local common_args=( --size=1M From patchwork Fri Aug 11 09:36:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1001833vqi; Fri, 11 Aug 2023 04:02:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzO07If0PcsQvLj9SK+/7rffqbdlPwydFdm5AWVC9wZJNvW3fkb+i1k/m0En8+8HSZAM3e X-Received: by 2002:a54:4797:0:b0:3a1:e85f:33ee with SMTP id o23-20020a544797000000b003a1e85f33eemr1598579oic.56.1691751740703; Fri, 11 Aug 2023 04:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691751740; cv=none; d=google.com; s=arc-20160816; b=DhovtWX4Ycom9NzNOcEBLFruW/nPJhZiuO1mOOvNBSg+WeYdpiBTZ+LIbPM2IOZab+ uPInAZJ86i17Ho6QJaZIcXhTcDNdAvFJniiMGeMK3/nvYzCOoKPWja6dYyH4/Aeq8UAK NedoML/SxEz6mcjzcOaPsd+6cRUOhE6tvgx6YkhQh3Y0H28pDQD9MB//QiFTg1CWoBnc JbKG3pbT06SWIroKLxTrRD9VH/e3S00FumBFFLoySeM3gk13TLbJeKGh26c5I4SHtvWJ IckQNAvttNGTbe4MxRhj6JHcRTtebw8PYniDA/KWexwZy6pbXqc0Qo7snIfF7GcvwzDl oSxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ySX0bPj+OlMTvPO100mpK3C4LxGQ/kzWWhKoP04YVHk=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=U0jCFdIOzkyYApnHh4EzwPHEIxuW2r45eXDlNtGdD6zLfVA3Fe2vHKZ5Zpij9PgAge RQQIIH37ndSIqWesFeMNObqLR+o2/rcxik+vJB/HKLgtlsWhBqApRxzJSwVpnSnO6Jbf 6Byf2HQQ+WF5jN2Y9ZV/JI5SbB9zUNYqJaV05gRmlrDuePeEXH3RmNU0UofxrZD+JeYc Q2KOvYSCw47WcOHXqTGWUPUFINSlSOo0J+CFkThCPzMZ3ld7FeDO06A14Khx+xj1qSG0 93abi6Kn8Ypze5L+UCLNBwYcYVRsCbQbBbDhJuHzU3PKPBpWaIRoTieDbFpF4PC3MC6O FMLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=VbMpFrod; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c66-20020a633545000000b00563d9ff5154si3213865pga.823.2023.08.11.04.01.32; Fri, 11 Aug 2023 04:02:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=VbMpFrod; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235092AbjHKJgf (ORCPT + 99 others); Fri, 11 Aug 2023 05:36:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235121AbjHKJgb (ORCPT ); Fri, 11 Aug 2023 05:36:31 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D06F30D6; Fri, 11 Aug 2023 02:36:28 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id C40CF1F74A; Fri, 11 Aug 2023 09:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746586; 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=ySX0bPj+OlMTvPO100mpK3C4LxGQ/kzWWhKoP04YVHk=; b=VbMpFrod3ldH1MS01GB0y8S5/KfzgGqw0knj4Yf0a7mNb9GuUcGmJ0i2f6j4u+kRXlzqyx B08yvUOmf4paw4zh6VSGibx7xAbgkrggtmE6TK/1ziwyINk82gQKLffRHQbm9cV3FF27Zs BCAhl5ihDAljWjB4dlb8gre/Cni25NA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746586; 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=ySX0bPj+OlMTvPO100mpK3C4LxGQ/kzWWhKoP04YVHk=; b=fQWp79yuL39li4hY47smhIhNxqZK1RadgJCWBiMnPmdwqBmoBZem9PtSWlEuZYohlPl8u7 Lh+JLkyPUQ1r5HAg== 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 A805F138E2; Fri, 11 Aug 2023 09:36:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id hxgGKBoB1mSlHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:26 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 02/13] nvme: Reorganize test preamble code section Date: Fri, 11 Aug 2023 11:36:03 +0200 Message-ID: <20230811093614.28005-3-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773930273044636069 X-GMAIL-MSGID: 1773930273044636069 This unifies all the tests preamble code section. Reorganize all tests to start with printing the test name, then the setting nvmet and finally followed by the variable declarations. Signed-off-by: Daniel Wagner --- tests/nvme/006 | 4 ++-- tests/nvme/007 | 4 ++-- tests/nvme/016 | 4 ++-- tests/nvme/017 | 4 ++-- tests/nvme/030 | 8 ++++---- tests/nvme/031 | 8 ++++---- tests/nvme/033 | 7 ++++--- tests/nvme/034 | 7 ++++--- tests/nvme/035 | 7 ++++--- tests/nvme/036 | 7 ++++--- tests/nvme/037 | 8 ++++---- tests/nvme/038 | 6 +++--- tests/nvme/039 | 4 ++-- tests/nvme/040 | 7 ++++--- tests/nvme/041 | 8 ++++---- tests/nvme/042 | 8 ++++---- tests/nvme/043 | 8 ++++---- tests/nvme/044 | 8 ++++---- tests/nvme/045 | 8 ++++---- tests/nvme/048 | 8 ++++---- 20 files changed, 69 insertions(+), 64 deletions(-) diff --git a/tests/nvme/006 b/tests/nvme/006 index ea0db93791a7..b44c56b6a25d 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -18,12 +18,12 @@ requires() { test() { echo "Running ${TEST_NAME}" + _setup_nvmet + local port local loop_dev local subsys_name="blktests-subsystem-1" - _setup_nvmet - truncate -s "${nvme_img_size}" "$TMPDIR/img" loop_dev="$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/007 b/tests/nvme/007 index 243a79f5a254..112432df7a9d 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -17,12 +17,12 @@ requires() { test() { echo "Running ${TEST_NAME}" + _setup_nvmet + local port local file_path local subsys_name="blktests-subsystem-1" - _setup_nvmet - file_path="${TMPDIR}/img" truncate -s "${nvme_img_size}" "${file_path}" diff --git a/tests/nvme/016 b/tests/nvme/016 index f617cf103900..cac0c0509aca 100755 --- a/tests/nvme/016 +++ b/tests/nvme/016 @@ -16,13 +16,13 @@ requires() { test() { echo "Running ${TEST_NAME}" + _setup_nvmet + local port local iterations="${nvme_num_iter}" local loop_dev local subsys_nqn="blktests-subsystem-1" - _setup_nvmet - loop_dev="$(losetup -f)" local genctr=1 diff --git a/tests/nvme/017 b/tests/nvme/017 index 3dbb7c174b56..429a25e8e011 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -16,13 +16,13 @@ requires() { test() { echo "Running ${TEST_NAME}" + _setup_nvmet + local port local file_path local iterations="${nvme_num_iter}" local subsys_name="blktests-subsystem-1" - _setup_nvmet - file_path="${TMPDIR}/img" truncate -s "${nvme_img_size}" "${file_path}" diff --git a/tests/nvme/030 b/tests/nvme/030 index cfcdcbe6be23..a0b999cace94 100755 --- a/tests/nvme/030 +++ b/tests/nvme/030 @@ -16,14 +16,14 @@ requires() { } test() { - local port - local genctr - local subsys="blktests-subsystem-" - echo "Running ${TEST_NAME}" _setup_nvmet + local port + local genctr + local subsys="blktests-subsystem-" + port="$(_create_nvmet_port "${nvme_trtype}")" _create_nvmet_subsystem "${subsys}1" "$(losetup -f)" diff --git a/tests/nvme/031 b/tests/nvme/031 index e70898819a86..27b08e96dd0b 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -24,15 +24,15 @@ requires() { } test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys="blktests-subsystem-" local iterations=10 local loop_dev local port - echo "Running ${TEST_NAME}" - - _setup_nvmet - truncate -s "${nvme_img_size}" "$TMPDIR/img" loop_dev="$(losetup -f --show "$TMPDIR/img")" diff --git a/tests/nvme/033 b/tests/nvme/033 index 90aee817de5d..5a4fac03bea0 100755 --- a/tests/nvme/033 +++ b/tests/nvme/033 @@ -45,13 +45,14 @@ compare_dev_info() { } test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys="blktests-subsystem-1" local nsdev local port - echo "Running ${TEST_NAME}" - - _setup_nvmet port=$(_nvmet_passthru_target_setup "${subsys}") nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") diff --git a/tests/nvme/034 b/tests/nvme/034 index e0ede717c373..334b2525d1b6 100755 --- a/tests/nvme/034 +++ b/tests/nvme/034 @@ -15,14 +15,15 @@ requires() { } test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys="blktests-subsystem-1" local ctrldev local nsdev local port - echo "Running ${TEST_NAME}" - - _setup_nvmet port=$(_nvmet_passthru_target_setup "${subsys}") nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") diff --git a/tests/nvme/035 b/tests/nvme/035 index 0896f7bb578d..68a9b608920e 100755 --- a/tests/nvme/035 +++ b/tests/nvme/035 @@ -21,14 +21,15 @@ device_requires() { } test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys="blktests-subsystem-1" local ctrldev local nsdev local port - echo "Running ${TEST_NAME}" - - _setup_nvmet port=$(_nvmet_passthru_target_setup "${subsys}") nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") diff --git a/tests/nvme/036 b/tests/nvme/036 index 8218c6538dfd..c3fc5d4a948d 100755 --- a/tests/nvme/036 +++ b/tests/nvme/036 @@ -14,13 +14,14 @@ requires() { } test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys="blktests-subsystem-1" local ctrldev local port - echo "Running ${TEST_NAME}" - - _setup_nvmet port=$(_nvmet_passthru_target_setup "${subsys}") nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}") diff --git a/tests/nvme/037 b/tests/nvme/037 index fc6c21343652..5a78444b7e78 100755 --- a/tests/nvme/037 +++ b/tests/nvme/037 @@ -13,15 +13,15 @@ requires() { } test_device() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys="blktests-subsystem-" local iterations=10 local ctrldev local port - echo "Running ${TEST_NAME}" - - _setup_nvmet - for ((i = 0; i < iterations; i++)); do port=$(_nvmet_passthru_target_setup "${subsys}${i}") nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" \ diff --git a/tests/nvme/038 b/tests/nvme/038 index 24f02d4ad4d1..5af28da03c36 100755 --- a/tests/nvme/038 +++ b/tests/nvme/038 @@ -19,13 +19,13 @@ requires() { } test() { - local subsys_path="${NVMET_CFS}/subsystems/blktests-subsystem-1" - local port - echo "Running ${TEST_NAME}" _setup_nvmet + local subsys_path="${NVMET_CFS}/subsystems/blktests-subsystem-1" + local port + mkdir -p "${subsys_path}" rmdir "${subsys_path}" diff --git a/tests/nvme/039 b/tests/nvme/039 index f327b54a8d00..73b53d0b949c 100755 --- a/tests/nvme/039 +++ b/tests/nvme/039 @@ -131,12 +131,12 @@ inject_invalid_admin_cmd() } test_device() { + echo "Running ${TEST_NAME}" + local nvme_verbose_errors local ns_dev local ctrl_dev - echo "Running ${TEST_NAME}" - if _check_kernel_option NVME_VERBOSE_ERRORS; then nvme_verbose_errors=true else diff --git a/tests/nvme/040 b/tests/nvme/040 index 688a0939a376..3b76753132f3 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -17,6 +17,10 @@ requires() { } test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys="blktests-subsystem-1" local file_path="${TMPDIR}/img" local port @@ -24,9 +28,6 @@ test() { local nvmedev local fio_pid - echo "Running ${TEST_NAME}" - - _setup_nvmet truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" diff --git a/tests/nvme/041 b/tests/nvme/041 index 5b04b99b128e..d8937915d622 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -20,6 +20,10 @@ requires() { test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name="blktests-subsystem-1" local hostid @@ -28,8 +32,6 @@ test() { local hostkey local ctrldev - echo "Running ${TEST_NAME}" - hostid="${def_hostid}" hostnqn="${def_hostnqn}" hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" @@ -38,8 +40,6 @@ test() { return 1 fi - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ diff --git a/tests/nvme/042 b/tests/nvme/042 index 8df5ed37aacc..af291cb33a04 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -20,6 +20,10 @@ requires() { test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name="blktests-subsystem-1" local hostid @@ -30,13 +34,9 @@ test() { local hostkey local ctrldev - echo "Running ${TEST_NAME}" - hostid="${def_hostid}" hostnqn="${def_hostnqn}" - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/043 b/tests/nvme/043 index 8f4b783a02ff..4a37f91e50c3 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -21,6 +21,10 @@ requires() { test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name="blktests-subsystem-1" local hostid @@ -31,8 +35,6 @@ test() { local hostkey local ctrldev - echo "Running ${TEST_NAME}" - hostid="${def_hostid}" hostnqn="${def_hostnqn}" hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" @@ -41,8 +43,6 @@ test() { return 1 fi - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/044 b/tests/nvme/044 index fca0897af27b..27cb343f5ea7 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -21,6 +21,10 @@ requires() { test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name="blktests-subsystem-1" local hostid @@ -30,8 +34,6 @@ test() { local ctrlkey local ctrldev - echo "Running ${TEST_NAME}" - hostid="${def_hostid}" hostnqn="${def_hostnqn}" @@ -47,8 +49,6 @@ test() { return 1 fi - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/045 b/tests/nvme/045 index eca629a18691..005d62d4f886 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -22,6 +22,10 @@ requires() { test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local port local subsys_name="blktests-subsystem-1" local hostid @@ -34,8 +38,6 @@ test() { local ctrldev local rand_io_size - echo "Running ${TEST_NAME}" - hostid="${def_hostid}" hostnqn="${def_hostnqn}" @@ -51,8 +53,6 @@ test() { return 1 fi - _setup_nvmet - truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${subsys_name}" "${file_path}" diff --git a/tests/nvme/048 b/tests/nvme/048 index a6ebb8927865..6efcd7d6ab03 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -81,6 +81,10 @@ set_qid_max() { } test() { + echo "Running ${TEST_NAME}" + + _setup_nvmet + local subsys_name="blktests-subsystem-1" local cfs_path="${NVMET_CFS}/subsystems/${subsys_name}" local file_path="${TMPDIR}/img" @@ -89,10 +93,6 @@ test() { local hostid local port - echo "Running ${TEST_NAME}" - - _setup_nvmet - hostid="${def_hostid}" hostnqn="${def_hostnqn}" From patchwork Fri Aug 11 09:36:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134461 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1059965vqi; Fri, 11 Aug 2023 05:38:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHiybtJYg+OPZXKUIChguQrtMVubg5OlNxkf4rjn0uzP+HsexV6Zwz1h2DTih6zursu4op6 X-Received: by 2002:a05:6a20:3943:b0:12f:382d:2a37 with SMTP id r3-20020a056a20394300b0012f382d2a37mr2558978pzg.15.1691757499521; Fri, 11 Aug 2023 05:38:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691757499; cv=none; d=google.com; s=arc-20160816; b=xGbc876f51pQy3WAr6746JsX/Zi3JVKe6GHU3Ae5BK2JifTAgkce5Dsp53fRVaGUmP hNFQyb03qx61Acl8nj1PQnJ8yoCJgDc5JePQzgdk8z1+7u36SJ42ZOR4tBZ727oOggkD l6K4IEOOqm+ck6NsWASIAuzTRvcOz6kKRwq4npUIf3ZFYK6ZIqHxTas8SQ0yR3nKhJ0Z cxoefMCfcFuGuqmjMAfZOA9HOl5xZO5H9VPPjVDfaGA3k207ofYy/pjb7FU3szPQl2GW YCieS02q8mMJ950X4WpgtBo5Q1n4qwkkcXEjxsGC2xCZbkoVxaejLLJPc9m0aEYEBGiU RLtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=RiLrAjI/PW50HvWlrm+PJmGFw1sGaHe93CcjuVC440I=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=ARmWBBs961Kd7oNeRLzQ7IQxJ5Oi9R28+1laXC/70CoQh2csFKiM2Px3xYWMBe8KOz YIyqhjg/zeJ9eJwFa9+EajY4aebgT1YsygPyYEDjqHW1wnbZqGIMMBswCtI7cTws/fbx ksz2l6/YHb3DUNlAP3DgDmbYoTkPD1/mCn2OkTZ4Yh4wgUTcSxWogXnGGrvRLUNDmvGh 6PB/J8NawQ9OM45JGmKJyvXw8WPUVDwZB3APy26DD6YpRcXFq9Z1/YfWUeaewHAf8sX+ pB9mJ6zDHHKRDoeR8rOIfmKNSc4xhIiua4PJ4e1zdHPj5Ag+C2RJdwoT0A9u1rPZUbgz ifZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="oNqi5h5/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f10-20020a63de0a000000b0055ffed90cc9si861519pgg.609.2023.08.11.05.38.06; Fri, 11 Aug 2023 05:38:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="oNqi5h5/"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235235AbjHKJgm (ORCPT + 99 others); Fri, 11 Aug 2023 05:36:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235103AbjHKJgd (ORCPT ); Fri, 11 Aug 2023 05:36:33 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D017130E3; Fri, 11 Aug 2023 02:36:28 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id 87CED1F889; Fri, 11 Aug 2023 09:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746587; 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=RiLrAjI/PW50HvWlrm+PJmGFw1sGaHe93CcjuVC440I=; b=oNqi5h5/zwJ1tvBsN0wv/SlP/ckB3ZsZQeRvjdmqQmV1LuGJy5Vt10BQT8dVNhusqUYI2K ZrhGewvKeqltHEfEBZarAhXgpYLCELx/YYHM3BzeDZaGFCIBY1K2fFLC7SHosNc7B4GQ7Q L+6JHtwq9/MUE6cw56JQM0C+0+nD2zU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746587; 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=RiLrAjI/PW50HvWlrm+PJmGFw1sGaHe93CcjuVC440I=; b=To25ejZnOeNxcNud8cyUIGi/7vGMfwzsD6lcY5HU33O0SqROpVN7qUjg9uqOcGY4OAmleD v5KXjZEQqhODwNDQ== 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 76265138E2; Fri, 11 Aug 2023 09:36:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 91rlGxsB1mSrHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:27 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 03/13] nvme/043: Use hostnqn to generate DHCAP key Date: Fri, 11 Aug 2023 11:36:04 +0200 Message-ID: <20230811093614.28005-4-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773936311684240616 X-GMAIL-MSGID: 1773936311684240616 The key is supposed to be derived from the hostnqn not fom the subsys name. Signed-off-by: Daniel Wagner --- tests/nvme/043 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nvme/043 b/tests/nvme/043 index 4a37f91e50c3..b5cb8378681e 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -37,7 +37,7 @@ test() { hostid="${def_hostid}" hostnqn="${def_hostnqn}" - hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + hostkey="$(nvme gen-dhchap-key -n ${hostnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "nvme gen-dhchap-key failed" return 1 From patchwork Fri Aug 11 09:36:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134402 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp995602vqi; Fri, 11 Aug 2023 03:49:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExJUiViGMyhNwTNUygG+rZeGB6KVv+CsN6I/GOHj4qQ2uNfuAaJEvWfXB2ScwNjt0hmhRl X-Received: by 2002:a17:906:3083:b0:99c:f6f4:6306 with SMTP id 3-20020a170906308300b0099cf6f46306mr1364155ejv.46.1691750948513; Fri, 11 Aug 2023 03:49:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691750948; cv=none; d=google.com; s=arc-20160816; b=nCHYkN+m9oud3eruionsT2+v0PageE/oviwSyIgNm5EAzdpwE49/GYVVwgVOXRb5MZ dOTZseqsAGyhcYKSpMsue+Fy3AAheEEeLcJ1eLh+8560wbhtAdPyKYOOIq2vSyvXSX9M Z8PR2c3yypAja7fzzv3ri1zRfBbOsFc34B5f1q5qA2fxomU5uDYIeLaxdLXvbkjoqXak IHwjL11nRq3CJCykKop1TjSzvmSLlxjZN6vd843RaBYk8H9gLo5pTN/NvNmqKWt1qJai 5VIQWE7/E95n5mozT4TZFR5SQiyfYUza6yePtnVwZLPfNh9Q+zkDgEMCuHLRR1xkkGIS bPxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=GDAhw9eRdNKsV1ijHWKTKzdqUh/Rv/zY5LtVB/qhHdc=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=geVSq5ahQdarEDYOHU+Xxpv9phWSdhGEADrZGVZsGecbEKTaOh6+C2qcnMLbNwvyjZ T1R8p1KcWx2BSmfNdBsvLqBDU0EVf25cnAyWfFIUe0oeIv2lTMYhSvwc0hsupj/4Sx/L XdkEnC6Mw+PYICMDBYX9odlUFKYOAlCSuGRicXLwb7auRjG+9OCfAVCYhhMJqOC2FWtq Xi0glRbA1uBfbdAGbzQ0vY8C9NLIbHM3YNZ+4tWOcI6T93AT5nllM3oYhl7qCcO3yVpf LAEOb1Z5oGxlppPI68eVUcIHPjlheR0vG+yRnQlRVVXFxyquF4EW+Kc7jEcTVerxaDww uyug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=aWuuUbfX; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=JXoeHmfr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u19-20020a170906c41300b0099d6d4c11d4si2443991ejz.782.2023.08.11.03.48.43; Fri, 11 Aug 2023 03:49:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=aWuuUbfX; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=JXoeHmfr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235269AbjHKJgp (ORCPT + 99 others); Fri, 11 Aug 2023 05:36:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235148AbjHKJge (ORCPT ); Fri, 11 Aug 2023 05:36:34 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37AF230F3; Fri, 11 Aug 2023 02:36:30 -0700 (PDT) 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 A9D1421881; Fri, 11 Aug 2023 09:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746589; 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=GDAhw9eRdNKsV1ijHWKTKzdqUh/Rv/zY5LtVB/qhHdc=; b=aWuuUbfXfvLgBZA3cxl3poFpSrqqxBeY0y9TGuZlztqf7dZewgIHLP9MnspoioPBUsTLMp 5kAUpCEvNnby5InGgR/QsPVH9q2JDYXFProAqosf3trO4TQ/nGS8yFg/JUsoku3yE7ZsRA 9ig9BwIFNtbonyBCkiJ+v7hgPWTEvX8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746589; 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=GDAhw9eRdNKsV1ijHWKTKzdqUh/Rv/zY5LtVB/qhHdc=; b=JXoeHmfrlRB7IcxO20oSfWN1M4WCD/5SghZv4vA2sS9PjnRDxbB6WSjuH7jbFo/x2mDXDW m24W1jcIb3NLc/DQ== 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 99197138E2; Fri, 11 Aug 2023 09:36:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eCJ5JB0B1mSvHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:29 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 04/13] nvme/rc: Add common subsystem nqn define Date: Fri, 11 Aug 2023 11:36:05 +0200 Message-ID: <20230811093614.28005-5-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773929442776870665 X-GMAIL-MSGID: 1773929442776870665 Add common subsystem nqn as global definition so that we can reuse it. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/nvme/rc b/tests/nvme/rc index 4f3a994d75ce..c11848b59c49 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -16,6 +16,7 @@ def_local_wwnn="0x10001100aa000002" def_local_wwpn="0x20001100aa000002" def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349" def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}" +def_subsysnqn="blktests-subsystem-1" nvme_trtype=${nvme_trtype:-"loop"} nvme_img_size=${nvme_img_size:-"1G"} nvme_num_iter=${nvme_num_iter:-"1000"} From patchwork Fri Aug 11 09:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp973226vqi; Fri, 11 Aug 2023 02:59:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFn+g0eF3y/KCpRLHcznn+ZGhLd6olyp1umF16u1hWPjdcgSeTzKcQ1eWEx7GA+m4u1NmLI X-Received: by 2002:a17:906:2921:b0:99c:75f7:19c1 with SMTP id v1-20020a170906292100b0099c75f719c1mr1225296ejd.39.1691747947079; Fri, 11 Aug 2023 02:59:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691747947; cv=none; d=google.com; s=arc-20160816; b=J08GlF1wps2scxbQ5eloirgw/vLkmLtZZPYfa9KX6UkJ+bJjk256yaPjlStU4ohU4T mJJlHDqkHlXWzMRzuuU1UjjDlizbYr5iyIbjiuxIcx5el5pxL7gMpDpV7+vJozJTai0T /bSOnNXTHhado5Cz3bkvyMx+s2pZMeC+NylNn+TwWGcBITT+ULB6yjEKYb2lT1kIvt3J MkP1z67916jKgj2nRRzdyL43WSmNs1PIGmtXoxsqcYyyLOTABV7FPk4BWOnrZeYV3wGv tA9KDKZ6lqbwSp/IxgX9iwoErhyO3vFHvuW4gz8Nk65aL16S2rPVrgVTW2q1AVaTDn+N kxVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=+m0JXEcbUIJ4UstFeWQyh7RyMudlXdO0pOJ80U7IjD0=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=jojvbyob4L75C0zI3ik6rR4MgTeHQwBjqkSRtueuZsmoWA8SHIA89oDRKl+zwTpkaV Rl79VOIqabzSfiVYEtP1LEBA6n3wGBlJfvPCYydwtT6tAyuGnKExHUOYTB+dVtwIAkLA rIbVBT4Y9ZZ5+A1wRc4eYsPssEabBxzUGLfYK2JX5lBrll5msNwyPnJYKMyZ/FAVMbHc qE9MAKaSWPp597LV3w0MhmcOJODP8m2gGD82ZP727xjFSfiPJL6ttpGHdQxnOx1CXEOB f+0ZJHxDKIJ6sFfnb5D+Bb7cUo5tiuQDpFXlpMFmw4orjt2YK4kjA9mhb9QGjVyFCG5H nnuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ghb/Ceko"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=lR7aIv8o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rn5-20020a170906d92500b009924806ccffsi3231282ejb.488.2023.08.11.02.58.42; Fri, 11 Aug 2023 02:59:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ghb/Ceko"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=lR7aIv8o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235198AbjHKJhT (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235221AbjHKJgl (ORCPT ); Fri, 11 Aug 2023 05:36:41 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D7B93585; Fri, 11 Aug 2023 02:36:32 -0700 (PDT) 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 3AAFE2186E; Fri, 11 Aug 2023 09:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746591; 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=+m0JXEcbUIJ4UstFeWQyh7RyMudlXdO0pOJ80U7IjD0=; b=ghb/CekoM3M5jP7nYF5U1NN0tBQcIXghiKxpEu/tA7DsBXQUB7bQmQCsrRGYnm0eVq15R4 EKb4UftxpQWLjhezP9HyThlYDMjRuqdiLePZUv1hYUEA29Qz/D0IGviChKGF9krw6JC7j0 rvSWHKwDxFiCgD8CphfuAcSR3X2e33M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746591; 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=+m0JXEcbUIJ4UstFeWQyh7RyMudlXdO0pOJ80U7IjD0=; b=lR7aIv8oW1TigVjDPQrFKXI1LnrTlx2gwGNCKMSxbUWb5fBpFAPKogPEOg+ZnQl1DTkAMM PjYbdB27yMw3PqDg== 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 E345D138E2; Fri, 11 Aug 2023 09:36:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yMBiNx4B1mS1HwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:30 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 05/13] nvme: Use def_subsysnqn variable instead local variable Date: Fri, 11 Aug 2023 11:36:06 +0200 Message-ID: <20230811093614.28005-6-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773926295442771041 X-GMAIL-MSGID: 1773926295442771041 As all tests are using the same subsystem nqn anyway, use the def_subsysnqn variable and drop the local subsys_name variable. Signed-off-by: Daniel Wagner --- tests/nvme/003 | 8 ++++---- tests/nvme/004 | 14 +++++++------- tests/nvme/005 | 12 ++++++------ tests/nvme/006 | 9 ++++----- tests/nvme/007 | 9 ++++----- tests/nvme/008 | 15 +++++++-------- tests/nvme/009 | 15 +++++++-------- tests/nvme/010 | 15 +++++++-------- tests/nvme/011 | 15 +++++++-------- tests/nvme/012 | 15 +++++++-------- tests/nvme/013 | 15 +++++++-------- tests/nvme/014 | 15 +++++++-------- tests/nvme/015 | 15 +++++++-------- tests/nvme/016 | 13 ++++++------- tests/nvme/017 | 13 ++++++------- tests/nvme/018 | 15 +++++++-------- tests/nvme/019 | 15 +++++++-------- tests/nvme/020 | 15 +++++++-------- tests/nvme/021 | 15 +++++++-------- tests/nvme/022 | 15 +++++++-------- tests/nvme/023 | 15 +++++++-------- tests/nvme/024 | 15 +++++++-------- tests/nvme/025 | 15 +++++++-------- tests/nvme/026 | 15 +++++++-------- tests/nvme/027 | 15 +++++++-------- tests/nvme/028 | 15 +++++++-------- tests/nvme/029 | 15 +++++++-------- tests/nvme/033 | 2 +- tests/nvme/034 | 2 +- tests/nvme/035 | 2 +- tests/nvme/036 | 2 +- tests/nvme/038 | 2 +- tests/nvme/040 | 13 ++++++------- tests/nvme/041 | 21 ++++++++++----------- tests/nvme/042 | 23 +++++++++++------------ tests/nvme/043 | 18 +++++++++--------- tests/nvme/044 | 31 +++++++++++++++---------------- tests/nvme/045 | 27 +++++++++++++-------------- tests/nvme/047 | 19 +++++++++---------- tests/nvme/048 | 23 +++++++++++------------ 40 files changed, 266 insertions(+), 297 deletions(-) diff --git a/tests/nvme/003 b/tests/nvme/003 index aa26abf8d8b3..71b82ce758a3 100755 --- a/tests/nvme/003 +++ b/tests/nvme/003 @@ -29,8 +29,8 @@ test() { loop_dev="$(losetup -f)" - _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" - _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1" + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _nvme_connect_subsys "${nvme_trtype}" nqn.2014-08.org.nvmexpress.discovery @@ -46,8 +46,8 @@ test() { fi _nvme_disconnect_subsys nqn.2014-08.org.nvmexpress.discovery - _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1" - _remove_nvmet_subsystem "blktests-subsystem-1" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" echo "Test complete" diff --git a/tests/nvme/004 b/tests/nvme/004 index 1e5c2b8b3e87..0314ed3c949e 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -31,20 +31,20 @@ test() { loop_dev="$(losetup -f --show "$TMPDIR/img")" - _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" - _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1 + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" local nvmedev - nvmedev=$(_find_nvme_dev "blktests-subsystem-1") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - _nvme_disconnect_subsys blktests-subsystem-1 - _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1" - _remove_nvmet_subsystem "blktests-subsystem-1" + _nvme_disconnect_subsys ${def_subsysnqn} + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "$loop_dev" rm "$TMPDIR/img" diff --git a/tests/nvme/005 b/tests/nvme/005 index 836854086822..935b8634cb96 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -31,23 +31,23 @@ test() { loop_dev="$(losetup -f --show "$TMPDIR/img")" - _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" - _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1 + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "blktests-subsystem-1") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") udevadm settle echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller" _nvme_disconnect_ctrl "${nvmedev}" - _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_port "${port}" - _remove_nvmet_subsystem "blktests-subsystem-1" + _remove_nvmet_subsystem "${def_subsysnqn}" losetup -d "$loop_dev" rm "$TMPDIR/img" diff --git a/tests/nvme/006 b/tests/nvme/006 index b44c56b6a25d..066acabb1175 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -22,19 +22,18 @@ test() { local port local loop_dev - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "$TMPDIR/img" loop_dev="$(losetup -f --show "$TMPDIR/img")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "$loop_dev" diff --git a/tests/nvme/007 b/tests/nvme/007 index 112432df7a9d..c6ba36cc4b4f 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -21,19 +21,18 @@ test() { local port local file_path - local subsys_name="blktests-subsystem-1" file_path="${TMPDIR}/img" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm "${file_path}" diff --git a/tests/nvme/008 b/tests/nvme/008 index 5abc4240ca46..c3fbcbc59686 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -24,29 +24,28 @@ test() { local nvmedev local loop_dev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/009 b/tests/nvme/009 index 491d3c809ab0..88c27889fbe1 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -22,27 +22,26 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm "${file_path}" diff --git a/tests/nvme/010 b/tests/nvme/010 index d2eb95311510..38c062ec73f4 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -24,30 +24,29 @@ test() { local nvmedev local loop_dev local file_path="${TMPDIR}/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" _run_fio_verify_io --size="${nvme_img_size}" \ --filename="/dev/${nvmedev}n1" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/011 b/tests/nvme/011 index da8cbac11124..0dab74e7e5b5 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -24,28 +24,27 @@ test() { local nvmedev local file_path local file_path="${TMPDIR}/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" _run_fio_verify_io --size="${nvme_img_size}" \ --filename="/dev/${nvmedev}n1" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm "${file_path}" diff --git a/tests/nvme/012 b/tests/nvme/012 index efe227538c57..8ed57d3a5ab0 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -28,29 +28,28 @@ test() { local nvmedev local loop_dev local file_path="${TMPDIR}/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" _xfs_run_fio_verify_io "/dev/${nvmedev}n1" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/013 b/tests/nvme/013 index 2be8681616d1..e3eb4e914750 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -26,27 +26,26 @@ test() { local port local nvmedev local file_path="${TMPDIR}/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" _xfs_run_fio_verify_io "/dev/${nvmedev}n1" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm "${file_path}" diff --git a/tests/nvme/014 b/tests/nvme/014 index 55d920f2660b..cbafd802af16 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -27,20 +27,19 @@ test() { local bs local count local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -53,10 +52,10 @@ test() { nvme flush "/dev/${nvmedev}" -n 1 - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/015 b/tests/nvme/015 index 071141380e43..b32d16a91de8 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -26,18 +26,17 @@ test() { local bs local count local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -50,10 +49,10 @@ test() { nvme flush "/dev/${nvmedev}n1" -n 1 - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm "${file_path}" diff --git a/tests/nvme/016 b/tests/nvme/016 index cac0c0509aca..908abbdaaa75 100755 --- a/tests/nvme/016 +++ b/tests/nvme/016 @@ -21,30 +21,29 @@ test() { local port local iterations="${nvme_num_iter}" local loop_dev - local subsys_nqn="blktests-subsystem-1" loop_dev="$(losetup -f)" local genctr=1 - _create_nvmet_subsystem "${subsys_nqn}" "${loop_dev}" + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" for ((i = 2; i <= iterations; i++)); do - _create_nvmet_ns "${subsys_nqn}" "${i}" "${loop_dev}" + _create_nvmet_ns "${def_subsysnqn}" "${i}" "${loop_dev}" done port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "$port" "${subsys_nqn}" + _add_nvmet_subsys_to_port "$port" "${def_subsysnqn}" genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port") - _remove_nvmet_subsystem_from_port "${port}" "${subsys_nqn}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_port "${port}" for ((i = iterations; i > 1; i--)); do - _remove_nvmet_ns "${subsys_nqn}" "$i" + _remove_nvmet_ns "${def_subsysnqn}" "$i" done - _remove_nvmet_subsystem "${subsys_nqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" echo "Test complete" } diff --git a/tests/nvme/017 b/tests/nvme/017 index 429a25e8e011..6f7ef5882d3e 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -21,7 +21,6 @@ test() { local port local file_path local iterations="${nvme_num_iter}" - local subsys_name="blktests-subsystem-1" file_path="${TMPDIR}/img" @@ -29,26 +28,26 @@ test() { local genctr=1 - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" for ((i = 2; i <= iterations; i++)); do - _create_nvmet_ns "${subsys_name}" "${i}" "${file_path}" + _create_nvmet_ns "${def_subsysnqn}" "${i}" "${file_path}" done port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port") - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_port "${port}" for ((i = iterations; i > 1; i--)); do - _remove_nvmet_ns "${subsys_name}" "$i" + _remove_nvmet_ns "${def_subsysnqn}" "$i" done - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem "${def_subsysnqn}" rm "${file_path}" diff --git a/tests/nvme/018 b/tests/nvme/018 index 78e9b2bb94d8..155f094ea6b3 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -24,18 +24,17 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -47,10 +46,10 @@ test() { nvme read "/dev/${nvmedev}n1" -s "$sectors" -c 0 -z "$bs" &>"$FULL" \ && echo "ERROR: nvme read for out of range LBA was not rejected" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm "${file_path}" diff --git a/tests/nvme/019 b/tests/nvme/019 index 9fff8ccaac9c..4ac351cbb782 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -24,7 +24,6 @@ test() { local nvmedev local loop_dev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" @@ -32,23 +31,23 @@ test() { loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/020 b/tests/nvme/020 index 1966d5925213..744d4b7d6805 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -22,29 +22,28 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/021 b/tests/nvme/021 index 1fefc0fbca00..1fd9bcbb3d23 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -23,18 +23,17 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -42,10 +41,10 @@ test() { echo "ERROR: device not listed" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/022 b/tests/nvme/022 index 1ff915786f86..053991625250 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -23,18 +23,17 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -42,10 +41,10 @@ test() { echo "ERROR: reset failed" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/023 b/tests/nvme/023 index 90316230a3d7..c10e5a0138a8 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -24,20 +24,19 @@ test() { local nvmedev local loop_dev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -45,10 +44,10 @@ test() { echo "ERROR: smart-log bdev-ns failed" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/024 b/tests/nvme/024 index 384a8266e741..d1d7f0bfb994 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -23,28 +23,27 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then echo "ERROR: smart-log file-ns failed" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/025 b/tests/nvme/025 index 815223d1c28d..ea944830612b 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -23,18 +23,17 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -42,10 +41,10 @@ test() { echo "ERROR: effects-log failed" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/026 b/tests/nvme/026 index d2203f19f026..f1193c20477c 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -23,18 +23,17 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -42,10 +41,10 @@ test() { echo "ERROR: ns-desc failed" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/027 b/tests/nvme/027 index 97fe70e78344..c097c51ea4f3 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -23,28 +23,27 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" if ! nvme ns-rescan "/dev/${nvmedev}" >> "$FULL" 2>&1; then echo "ERROR: ns-rescan failed" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/028 b/tests/nvme/028 index c539620bee28..6e37be4893b1 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -23,28 +23,27 @@ test() { local port local nvmedev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" if ! nvme list-subsys 2>> "$FULL" | grep -q "${nvme_trtype}"; then echo "ERROR: list-subsys" fi - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" rm -f "${file_path}" diff --git a/tests/nvme/029 b/tests/nvme/029 index c6d38b42af70..4d0ca997404b 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -57,20 +57,19 @@ test() { local nvmedev local loop_dev local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" @@ -82,10 +81,10 @@ test() { test_user_io "$dev" 511 1023 > "$FULL" 2>&1 || echo FAIL test_user_io "$dev" 511 1025 > "$FULL" 2>&1 || echo FAIL - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/033 b/tests/nvme/033 index 5a4fac03bea0..46a520ae01fa 100755 --- a/tests/nvme/033 +++ b/tests/nvme/033 @@ -49,7 +49,7 @@ test_device() { _setup_nvmet - local subsys="blktests-subsystem-1" + local subsys="${def_subsysnqn}" local nsdev local port diff --git a/tests/nvme/034 b/tests/nvme/034 index 334b2525d1b6..3c65d92cbaea 100755 --- a/tests/nvme/034 +++ b/tests/nvme/034 @@ -19,7 +19,7 @@ test_device() { _setup_nvmet - local subsys="blktests-subsystem-1" + local subsys="${def_subsysnqn}" local ctrldev local nsdev local port diff --git a/tests/nvme/035 b/tests/nvme/035 index 68a9b608920e..c705d9cf25a4 100755 --- a/tests/nvme/035 +++ b/tests/nvme/035 @@ -25,7 +25,7 @@ test_device() { _setup_nvmet - local subsys="blktests-subsystem-1" + local subsys="${def_subsysnqn}" local ctrldev local nsdev local port diff --git a/tests/nvme/036 b/tests/nvme/036 index c3fc5d4a948d..2e933cc41928 100755 --- a/tests/nvme/036 +++ b/tests/nvme/036 @@ -18,7 +18,7 @@ test_device() { _setup_nvmet - local subsys="blktests-subsystem-1" + local subsys="${def_subsysnqn}" local ctrldev local port diff --git a/tests/nvme/038 b/tests/nvme/038 index 5af28da03c36..007b5f425312 100755 --- a/tests/nvme/038 +++ b/tests/nvme/038 @@ -23,7 +23,7 @@ test() { _setup_nvmet - local subsys_path="${NVMET_CFS}/subsystems/blktests-subsystem-1" + local subsys_path="${NVMET_CFS}/subsystems/${def_subsysnqn}" local port mkdir -p "${subsys_path}" diff --git a/tests/nvme/040 b/tests/nvme/040 index 3b76753132f3..8d7f68f9a2d7 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -21,7 +21,6 @@ test() { _setup_nvmet - local subsys="blktests-subsystem-1" local file_path="${TMPDIR}/img" local port local loop_dev @@ -32,11 +31,11 @@ test() { loop_dev="$(losetup -f --show "${file_path}")" port="$(_create_nvmet_port "${nvme_trtype}")" - _create_nvmet_subsystem "${subsys}" "${loop_dev}" - _add_nvmet_subsys_to_port "${port}" "${subsys}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys}" + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" udevadm settle - nvmedev=$(_find_nvme_dev "${subsys}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") # start fio job echo "starting background fio" @@ -55,8 +54,8 @@ test() { { kill "${fio_pid}"; wait; } &> /dev/null - _remove_nvmet_subsystem_from_port "${port}" "${subsys}" - _remove_nvmet_subsystem "${subsys}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/041 b/tests/nvme/041 index d8937915d622..fbceaa1cb2d5 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -25,7 +25,6 @@ test() { _setup_nvmet local port - local subsys_name="blktests-subsystem-1" local hostid local hostnqn local file_path="${TMPDIR}/img" @@ -34,7 +33,7 @@ test() { hostid="${def_hostid}" hostnqn="${def_hostnqn}" - hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "nvme gen-dhchap-key failed" return 1 @@ -42,33 +41,33 @@ test() { truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "b92842df-a394-44b1-84a4-92ae7d112861" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" - _create_nvmet_host "${subsys_name}" "${hostnqn}" "${hostkey}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" # Test unauthenticated connection (should fail) echo "Test unauthenticated connection (should fail)" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" # Test authenticated connection echo "Test authenticated connection" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" diff --git a/tests/nvme/042 b/tests/nvme/042 index af291cb33a04..28d712e835df 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -25,7 +25,6 @@ test() { _setup_nvmet local port - local subsys_name="blktests-subsystem-1" local hostid local hostnqn local file_path="${TMPDIR}/img" @@ -39,50 +38,50 @@ test() { truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" - _create_nvmet_host "${subsys_name}" "${hostnqn}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" for hmac in 0 1 2 3; do echo "Testing hmac ${hmac}" - hostkey="$(nvme gen-dhchap-key --hmac=${hmac} -n ${subsys_name} 2> /dev/null)" + hostkey="$(nvme gen-dhchap-key --hmac=${hmac} -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "couldn't generate host key for hmac ${hmac}" return 1 fi _set_nvmet_hostkey "${hostnqn}" "${hostkey}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" done for key_len in 32 48 64; do echo "Testing key length ${key_len}" - hostkey="$(nvme gen-dhchap-key --key-length=${key_len} -n ${subsys_name} 2> /dev/null)" + hostkey="$(nvme gen-dhchap-key --key-length=${key_len} -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "couldn't generate host key for length ${key_len}" return 1 fi _set_nvmet_hostkey "${hostnqn}" "${hostkey}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" done - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" diff --git a/tests/nvme/043 b/tests/nvme/043 index b5cb8378681e..184b1254a383 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -45,10 +45,10 @@ test() { truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" - _create_nvmet_host "${subsys_name}" "${hostnqn}" "${hostkey}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" for hash in "hmac(sha256)" "hmac(sha384)" "hmac(sha512)" ; do @@ -56,14 +56,14 @@ test() { _set_nvmet_hash "${hostnqn}" "${hash}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" done for dhgroup in "ffdhe2048" "ffdhe3072" "ffdhe4096" "ffdhe6144" "ffdhe8192" ; do @@ -72,18 +72,18 @@ test() { _set_nvmet_dhgroup "${hostnqn}" "${dhgroup}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" done - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" diff --git a/tests/nvme/044 b/tests/nvme/044 index 27cb343f5ea7..608a086a0864 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -26,7 +26,6 @@ test() { _setup_nvmet local port - local subsys_name="blktests-subsystem-1" local hostid local hostnqn local file_path="${TMPDIR}/img" @@ -37,13 +36,13 @@ test() { hostid="${def_hostid}" hostnqn="${def_hostnqn}" - hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "failed to generate host key" return 1 fi - ctrlkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$ctrlkey" ] ; then echo "failed to generate ctrl key" return 1 @@ -51,29 +50,29 @@ test() { truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" - _create_nvmet_host "${subsys_name}" "${hostnqn}" \ + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" \ "${hostkey}" "${ctrlkey}" _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048" # Step 1: Connect with host authentication only echo "Test host authentication" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" # Step 2: Connect with host authentication # and invalid ctrl authentication echo "Test invalid ctrl authentication (should fail)" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" \ @@ -81,12 +80,12 @@ test() { udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" # Step 3: Connect with host authentication # and valid ctrl authentication echo "Test valid ctrl authentication" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" \ @@ -94,13 +93,13 @@ test() { udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" # Step 4: Connect with host authentication # and invalid ctrl key echo "Test invalid ctrl key (should fail)" invkey="DHHC-1:00:Jc/My1o0qtLCWRp+sHhAVafdfaS7YQOMYhk9zSmlatobqB8C:" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" \ @@ -108,10 +107,10 @@ test() { udevadm settle - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" diff --git a/tests/nvme/045 b/tests/nvme/045 index 005d62d4f886..b8d886aaf9e8 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -27,7 +27,6 @@ test() { _setup_nvmet local port - local subsys_name="blktests-subsystem-1" local hostid local hostnqn local file_path="${TMPDIR}/img" @@ -41,13 +40,13 @@ test() { hostid="${def_hostid}" hostnqn="${def_hostnqn}" - hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "failed to generate host key" return 1 fi - ctrlkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$ctrlkey" ] ; then echo "failed to generate ctrl key" return 1 @@ -55,14 +54,14 @@ test() { truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" - _create_nvmet_host "${subsys_name}" "${hostnqn}" "${hostkey}" "${ctrlkey}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" "${ctrlkey}" _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --dhchap-secret "${hostkey}" \ @@ -72,7 +71,7 @@ test() { echo "Re-authenticate with original host key" - ctrldev=$(_find_nvme_dev "${subsys_name}") + ctrldev=$(_find_nvme_dev "${def_subsysnqn}") if [ -z "$ctrldev" ] ; then echo "nvme controller not found" fi @@ -81,7 +80,7 @@ test() { echo "Renew host key on the controller" - new_hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + new_hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" _set_nvmet_hostkey "${hostnqn}" "${new_hostkey}" @@ -91,7 +90,7 @@ test() { echo "Renew ctrl key on the controller" - new_ctrlkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)" + new_ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" _set_nvmet_ctrlkey "${hostnqn}" "${new_ctrlkey}" @@ -116,15 +115,15 @@ test() { echo "${new_hostkey}" > "${hostkey_file}" - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") rand_io_size="$(_nvme_calc_rand_io_size 4m)" _run_fio_rand_io --size="${rand_io_size}" --filename="/dev/${nvmedev}n1" - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" diff --git a/tests/nvme/047 b/tests/nvme/047 index 6a7599bc2e91..b435dd3cecba 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -27,37 +27,36 @@ test() { local loop_dev local rand_io_size local file_path="$TMPDIR/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" loop_dev="$(losetup -f --show "${file_path}")" - _create_nvmet_subsystem "${subsys_name}" "${loop_dev}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --nr-write-queues 1 || echo FAIL - nvmedev=$(_find_nvme_dev "${subsys_name}") + nvmedev=$(_find_nvme_dev "${def_subsysnqn}") rand_io_size="$(_nvme_calc_rand_io_size 4M)" _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${rand_io_size}" - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --nr-write-queues 1 \ --nr-poll-queues 1 || echo FAIL _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${rand_io_size}" - _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1 + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "${loop_dev}" diff --git a/tests/nvme/048 b/tests/nvme/048 index 6efcd7d6ab03..20d234e72621 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -85,8 +85,7 @@ test() { _setup_nvmet - local subsys_name="blktests-subsystem-1" - local cfs_path="${NVMET_CFS}/subsystems/${subsys_name}" + local cfs_path="${NVMET_CFS}/subsystems/${def_subsysnqn}" local file_path="${TMPDIR}/img" local skipped=false local hostnqn @@ -98,34 +97,34 @@ test() { truncate -s "${nvme_img_size}" "${file_path}" - _create_nvmet_subsystem "${subsys_name}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "b92842df-a394-44b1-84a4-92ae7d112861" port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${subsys_name}" - _create_nvmet_host "${subsys_name}" "${hostnqn}" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" if [[ -f "${cfs_path}/attr_qid_max" ]] ; then - _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}" \ + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --hostnqn "${hostnqn}" \ --hostid "${hostid}" \ --keep-alive-tmo 1 \ --reconnect-delay 2 - if ! nvmf_wait_for_state "${subsys_name}" "live" ; then + if ! nvmf_wait_for_state "${def_subsysnqn}" "live" ; then echo FAIL else - set_qid_max "${port}" "${subsys_name}" 1 || echo FAIL - set_qid_max "${port}" "${subsys_name}" 2 || echo FAIL + set_qid_max "${port}" "${def_subsysnqn}" 1 || echo FAIL + set_qid_max "${port}" "${def_subsysnqn}" 2 || echo FAIL fi - _nvme_disconnect_subsys "${subsys_name}" + _nvme_disconnect_subsys "${def_subsysnqn}" else SKIP_REASONS+=("missing attr_qid_max feature") skipped=true fi - _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" - _remove_nvmet_subsystem "${subsys_name}" + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" _remove_nvmet_host "${hostnqn}" From patchwork Fri Aug 11 09:36:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1028416vqi; Fri, 11 Aug 2023 04:50:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgDKKh6AMu0Fp4bvYkYqO+3UP8VSeM+GkEeUPd1ky9ZogEYLtM4GDR6QTP62n0dc0HycYl X-Received: by 2002:a17:902:b591:b0:1b9:ea60:cd82 with SMTP id a17-20020a170902b59100b001b9ea60cd82mr1555539pls.5.1691754627638; Fri, 11 Aug 2023 04:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691754627; cv=none; d=google.com; s=arc-20160816; b=qzt3+kKqqKSq2QIBw5dyEKcMIQMXm7vTDJt5KBFyN2jCB+DKMzwNo9xsAlSqo+ymZA iwTe4tMngy0KvnJ1i08vRC4He2lNzu1frkODJ6DDZkGmhLe+oQDWvz4FUZvFUrW4+ej3 lgDcXHdrDq8b/WmMBpW8wNi3w8KEAdewReyv/3mt4eVbbpfDwJDhlKUAVhiLv+I5buQS /sjc0lT+4jqXH4Y9v34OpQWowlJ0hx98iY5xNRw8EyBomC8T+mz+PkA4Ua85ZYmwP44G RPlZtQQT7+wmFW7xmExtCR1zlU3bz+rC933Ny989Ib2ZKgMPqN6rMcxPD+fZedw7Bxod grGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=wbSYEnKkGXGqX18jnJi5i9S+f6p5r42QmN0Vp86bh/4=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=YrkLH5x8lmDfpFjYdo1A4yeVAO5M9dkQTN0R6j0v8yX9tjcFDQ7AizwYGOMC/SL2Ss hqY0gO2Qmnt8RB962KZkXCWx55bBXLaLPlYfUXeVWbvKmhwZVGizdOG7Cobvbj4w6LMl Xe+ALK7F2EBLaethuguLLmLVopL/D0BNKsfYCutRqhq6XPKCRWSbpRXtikQj2B5Ge0CA LzYGB11iHpdjaSJAEiIx9cCdjbbXLbQ7fb8EsxiL28oulgKjk1Z9kwIkEau+loNKLJEd U5fFfkdvdEaCWPMdoyp5n8K4ZW2UvOjvbYcjvus0263vety/1E02mKkKTKaI1Aht5QPg H8Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=RYBQEyNg; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=AY+JD2RT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r20-20020a170903411400b001bc996e40cdsi3209269pld.511.2023.08.11.04.50.14; Fri, 11 Aug 2023 04:50:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=RYBQEyNg; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=AY+JD2RT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235142AbjHKJgz (ORCPT + 99 others); Fri, 11 Aug 2023 05:36:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235224AbjHKJgl (ORCPT ); Fri, 11 Aug 2023 05:36:41 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 935E02709; Fri, 11 Aug 2023 02:36:33 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id 05B7D1F88C; Fri, 11 Aug 2023 09:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746592; 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=wbSYEnKkGXGqX18jnJi5i9S+f6p5r42QmN0Vp86bh/4=; b=RYBQEyNgCrhzij6lDPRssP1C6WIAgjSE6bmHtclOkprByr+9vEk6c8FN0EoiQGRUTASScw dcit+8cOD2vwMV/LiGqUiinohtNTe8NXc1V/x+WxuPwv09bd7hoKipL757oeLdJYXXZMWK tr36vaAeHnQHhO0aOzpVGV7oBxT8u84= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746592; 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=wbSYEnKkGXGqX18jnJi5i9S+f6p5r42QmN0Vp86bh/4=; b=AY+JD2RTmI1tK6HOI6gJ2AcnPXMjJRWZR71pUaKZgCpFYfH4hobCpNVsgAYy49tRCOPQQW Ax32e1nQBWLL2EBQ== 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 DDEAA138E2; Fri, 11 Aug 2023 09:36:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id e/YtNR8B1mS+HwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:31 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 06/13] nvme/{041,042,043,044,045,048}: Remove local variable hostnqn and hostid Date: Fri, 11 Aug 2023 11:36:07 +0200 Message-ID: <20230811093614.28005-7-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773933300434294272 X-GMAIL-MSGID: 1773933300434294272 Commit acc408477e85 ("nvme/{041,042,043,044,045,048}: Use default hostnqn and hostid") switched the test over to use the default hostnqn. It missed the change to remove the local variable and use the def_hostnqn/def_hostid directly. Signed-off-by: Daniel Wagner --- tests/nvme/041 | 16 ++++++---------- tests/nvme/042 | 21 ++++++++------------- tests/nvme/043 | 23 +++++++++-------------- tests/nvme/044 | 27 +++++++++++---------------- tests/nvme/045 | 23 +++++++++-------------- tests/nvme/048 | 12 ++++-------- 6 files changed, 47 insertions(+), 75 deletions(-) diff --git a/tests/nvme/041 b/tests/nvme/041 index fbceaa1cb2d5..4c553251f379 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -25,14 +25,10 @@ test() { _setup_nvmet local port - local hostid - local hostnqn local file_path="${TMPDIR}/img" local hostkey local ctrldev - hostid="${def_hostid}" - hostnqn="${def_hostnqn}" hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "nvme gen-dhchap-key failed" @@ -45,21 +41,21 @@ test() { "b92842df-a394-44b1-84a4-92ae7d112861" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" # Test unauthenticated connection (should fail) echo "Test unauthenticated connection (should fail)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" _nvme_disconnect_subsys "${def_subsysnqn}" # Test authenticated connection echo "Test authenticated connection" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" udevadm settle @@ -71,7 +67,7 @@ test() { _remove_nvmet_port "${port}" - _remove_nvmet_host "${hostnqn}" + _remove_nvmet_host "${def_hostnqn}" rm "${file_path}" diff --git a/tests/nvme/042 b/tests/nvme/042 index 28d712e835df..866249ed598c 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -25,23 +25,18 @@ test() { _setup_nvmet local port - local hostid - local hostnqn local file_path="${TMPDIR}/img" local hmac local key_len local hostkey local ctrldev - hostid="${def_hostid}" - hostnqn="${def_hostnqn}" - truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" for hmac in 0 1 2 3; do echo "Testing hmac ${hmac}" @@ -50,11 +45,11 @@ test() { echo "couldn't generate host key for hmac ${hmac}" return 1 fi - _set_nvmet_hostkey "${hostnqn}" "${hostkey}" + _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" udevadm settle @@ -68,11 +63,11 @@ test() { echo "couldn't generate host key for length ${key_len}" return 1 fi - _set_nvmet_hostkey "${hostnqn}" "${hostkey}" + _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" udevadm settle @@ -85,7 +80,7 @@ test() { _remove_nvmet_port "${port}" - _remove_nvmet_host "${hostnqn}" + _remove_nvmet_host "${def_hostnqn}" rm "${file_path}" diff --git a/tests/nvme/043 b/tests/nvme/043 index 184b1254a383..5569a7a58ad5 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -26,18 +26,13 @@ test() { _setup_nvmet local port - local subsys_name="blktests-subsystem-1" - local hostid - local hostnqn local file_path="${TMPDIR}/img" local hash local dhgroup local hostkey local ctrldev - hostid="${def_hostid}" - hostnqn="${def_hostnqn}" - hostkey="$(nvme gen-dhchap-key -n ${hostnqn} 2> /dev/null)" + hostkey="$(nvme gen-dhchap-key -n ${def_hostnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "nvme gen-dhchap-key failed" return 1 @@ -48,17 +43,17 @@ test() { _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" for hash in "hmac(sha256)" "hmac(sha384)" "hmac(sha512)" ; do echo "Testing hash ${hash}" - _set_nvmet_hash "${hostnqn}" "${hash}" + _set_nvmet_hash "${def_hostnqn}" "${hash}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" udevadm settle @@ -70,11 +65,11 @@ test() { echo "Testing DH group ${dhgroup}" - _set_nvmet_dhgroup "${hostnqn}" "${dhgroup}" + _set_nvmet_dhgroup "${def_hostnqn}" "${dhgroup}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" udevadm settle @@ -87,7 +82,7 @@ test() { _remove_nvmet_port "${port}" - _remove_nvmet_host "${hostnqn}" + _remove_nvmet_host "${def_hostnqn}" rm "${file_path}" diff --git a/tests/nvme/044 b/tests/nvme/044 index 608a086a0864..6c2cb602313c 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -26,16 +26,11 @@ test() { _setup_nvmet local port - local hostid - local hostnqn local file_path="${TMPDIR}/img" local hostkey local ctrlkey local ctrldev - hostid="${def_hostid}" - hostnqn="${def_hostnqn}" - hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "failed to generate host key" @@ -53,16 +48,16 @@ test() { _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" \ + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" \ "${hostkey}" "${ctrlkey}" - _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048" + _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048" # Step 1: Connect with host authentication only echo "Test host authentication" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" udevadm settle @@ -73,8 +68,8 @@ test() { # and invalid ctrl authentication echo "Test invalid ctrl authentication (should fail)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ --dhchap-ctrl-secret "${hostkey}" @@ -86,8 +81,8 @@ test() { # and valid ctrl authentication echo "Test valid ctrl authentication" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ --dhchap-ctrl-secret "${ctrlkey}" @@ -100,8 +95,8 @@ test() { echo "Test invalid ctrl key (should fail)" invkey="DHHC-1:00:Jc/My1o0qtLCWRp+sHhAVafdfaS7YQOMYhk9zSmlatobqB8C:" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ --dhchap-ctrl-secret "${invkey}" @@ -114,7 +109,7 @@ test() { _remove_nvmet_port "${port}" - _remove_nvmet_host "${hostnqn}" + _remove_nvmet_host "${def_hostnqn}" rm "${file_path}" diff --git a/tests/nvme/045 b/tests/nvme/045 index b8d886aaf9e8..a936e7fb661f 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -27,8 +27,6 @@ test() { _setup_nvmet local port - local hostid - local hostnqn local file_path="${TMPDIR}/img" local hostkey local new_hostkey @@ -37,9 +35,6 @@ test() { local ctrldev local rand_io_size - hostid="${def_hostid}" - hostnqn="${def_hostnqn}" - hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" if [ -z "$hostkey" ] ; then echo "failed to generate host key" @@ -57,13 +52,13 @@ test() { _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${hostnqn}" "${hostkey}" "${ctrlkey}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" "${ctrlkey}" - _set_nvmet_dhgroup "${hostnqn}" "ffdhe2048" + _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ --dhchap-ctrl-secret "${ctrlkey}" @@ -82,7 +77,7 @@ test() { new_hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" - _set_nvmet_hostkey "${hostnqn}" "${new_hostkey}" + _set_nvmet_hostkey "${def_hostnqn}" "${new_hostkey}" echo "Re-authenticate with new host key" @@ -92,7 +87,7 @@ test() { new_ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)" - _set_nvmet_ctrlkey "${hostnqn}" "${new_ctrlkey}" + _set_nvmet_ctrlkey "${def_hostnqn}" "${new_ctrlkey}" echo "Re-authenticate with new ctrl key" @@ -101,7 +96,7 @@ test() { echo "Change DH group to ffdhe8192" - _set_nvmet_dhgroup "${hostnqn}" "ffdhe8192" + _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe8192" echo "Re-authenticate with changed DH group" @@ -109,7 +104,7 @@ test() { echo "Change hash to hmac(sha512)" - _set_nvmet_hash "${hostnqn}" "hmac(sha512)" + _set_nvmet_hash "${def_hostnqn}" "hmac(sha512)" echo "Re-authenticate with changed hash" @@ -127,7 +122,7 @@ test() { _remove_nvmet_port "${port}" - _remove_nvmet_host "${hostnqn}" + _remove_nvmet_host "${def_hostnqn}" rm "${file_path}" diff --git a/tests/nvme/048 b/tests/nvme/048 index 20d234e72621..f9a19b1e655e 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -88,25 +88,21 @@ test() { local cfs_path="${NVMET_CFS}/subsystems/${def_subsysnqn}" local file_path="${TMPDIR}/img" local skipped=false - local hostnqn - local hostid local port - hostid="${def_hostid}" - hostnqn="${def_hostnqn}" - truncate -s "${nvme_img_size}" "${file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ "b92842df-a394-44b1-84a4-92ae7d112861" port="$(_create_nvmet_port "${nvme_trtype}")" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" if [[ -f "${cfs_path}/attr_qid_max" ]] ; then _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ - --hostnqn "${hostnqn}" \ - --hostid "${hostid}" \ + --hostnqn "${def_hostnqn}" \ + --hostid "${def_hostid}" \ --keep-alive-tmo 1 \ --reconnect-delay 2 @@ -126,7 +122,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - _remove_nvmet_host "${hostnqn}" + _remove_nvmet_host "${def_hostnqn}" rm "${file_path}" From patchwork Fri Aug 11 09:36:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134390 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp978945vqi; Fri, 11 Aug 2023 03:10:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPCh6C8z1HOwl13LTp+PiIiFjs3Dn9afY/70C0QK7Fu7AW/y/XSnjn31r5uO+ZvaPMlJXH X-Received: by 2002:a05:6402:4cc:b0:51e:1643:5ad0 with SMTP id n12-20020a05640204cc00b0051e16435ad0mr1362310edw.8.1691748601040; Fri, 11 Aug 2023 03:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691748601; cv=none; d=google.com; s=arc-20160816; b=QJhhsPC8PX0hp1UsX5wshUEr50U2r2+6APsI12EWFwOh0ACjomYjDEuq+6Yep+xGJD gsG/GKxV2eGDhPnXXYexWNLxVilBxH58pwxdNtuZGvCYFQOzJyZpTpRviVkrM1CebJoH //xv3krzwbxZPKzyUEYpJith7J5Sf/26fd8B+LmS+oanCl4+BshVN/RHBqe6sa3uJeOW cu06TQyAKF0m6SF+Mur16KUDr+1zWmF1O+yiBcNOnmma8IurwtgDhtY4Kq1cvwAjEbjL 8c9z4VAXgcFVBJgfrfbHpdb7usKMmr17RJSRzWhyJFAjmgKFp1jsuIY99Gvspb5uZ9Yp /cqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=mG6IRZ9q40lCvRAwlcOpEAtXBD4DfqCDrz6tzkiMxmU=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=QGKuQ9UNZWLouYr4wrMVBklxIJlXGiUbYe3H/XTZ6eL2kaevGMoKD0TJg5ZvuvfXbn YGUf9rvbCRyAlGkY1epE4IN0Fdt8OWTiRL0Huoh89jJeABfT2LTqIOU7WztqQ523gUeq RgB8CUJWwsBUPweoJhNO/qc+GfZxlKN6FA8Ts8731h3Xty6eJqWGmSWGd6HTJ51WBiRo ttLJV/QRbsmad1PjeyFEkF7U0gAbaoB6hA0R3D9zKltPuIyQDqhtPmHean2fFYxfychh Bxo2qP8vOXN2oUp7IzUfVGq1GFQ8oqegAbwVD6hwDnOo4PMPqYk5phaMxqNNIr/sxQiO 8YLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=CGhHuE4Y; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=7KCrtASS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v13-20020a056402184d00b00523384d70eesi3179006edy.416.2023.08.11.03.09.37; Fri, 11 Aug 2023 03:10:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=CGhHuE4Y; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=7KCrtASS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235122AbjHKJhQ (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235226AbjHKJgl (ORCPT ); Fri, 11 Aug 2023 05:36:41 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33E8B30D6; Fri, 11 Aug 2023 02:36:34 -0700 (PDT) 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 DE09421870; Fri, 11 Aug 2023 09:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746592; 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=mG6IRZ9q40lCvRAwlcOpEAtXBD4DfqCDrz6tzkiMxmU=; b=CGhHuE4YaF4bmtRkYoBrXX+70/+I6zm0J7t1YOLsDqFbvJRQwXNsn+fq3ELwDix1xNHgLU B2WJMOwVD5h10TpDipyHXSPXYpsK+jS8YWhVxLd7Ht5YhUvIWZxwfTXTDvhHxmFn4Z1gxd uM8s/lMTAT+alv/fi8Em/q+kveRN4dM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746592; 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=mG6IRZ9q40lCvRAwlcOpEAtXBD4DfqCDrz6tzkiMxmU=; b=7KCrtASSd2Js+drBRfgJqsl79hLSuiRGBZQ+PdSSsgu9plM2GX/Sy3JobLZUcMLlNM/u9e UXgUvXp0AXLqQVCQ== 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 CB759138E2; Fri, 11 Aug 2023 09:36:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XWSYMCAB1mTEHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:32 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 07/13] nvme/rc: Add common file_path name define Date: Fri, 11 Aug 2023 11:36:08 +0200 Message-ID: <20230811093614.28005-8-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773926981225369008 X-GMAIL-MSGID: 1773926981225369008 Add common file_path name as global definition so that we can reuse it. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/nvme/rc b/tests/nvme/rc index c11848b59c49..9c802ddc872d 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -17,6 +17,7 @@ def_local_wwpn="0x20001100aa000002" def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349" def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}" def_subsysnqn="blktests-subsystem-1" +def_file_path="${TMPDIR}/img" nvme_trtype=${nvme_trtype:-"loop"} nvme_img_size=${nvme_img_size:-"1G"} nvme_num_iter=${nvme_num_iter:-"1000"} From patchwork Fri Aug 11 09:36:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1071177vqi; Fri, 11 Aug 2023 05:58:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcjvcf/YeYPzWIVolH4Sy+2tPf6ig+wxFY0mXS/fUQj9FhErPRj6gea3/QEorftBI5zu7w X-Received: by 2002:a17:906:18:b0:99b:48b9:8e45 with SMTP id 24-20020a170906001800b0099b48b98e45mr1812548eja.76.1691758721166; Fri, 11 Aug 2023 05:58:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691758721; cv=none; d=google.com; s=arc-20160816; b=ztbXdMgEqyZKBCWowLopnMGmr6bZZfRZ5XTPzbe7+D+6IXd+dYflRcLasPHdQP7zGx KsKKueYH0jy6C0hh0Q6L8YRSo9svsI++K6BVMWHF3hNowYlCO7Q3P6BY+LqDvggdB1ez XL5DY5nIz7DfoA6t0oQ+2JfLePH5t8plixpTlLf9dlMQ9h3I2csgFoadGVSlYB/uN3Q1 w2Zz+S78nAfzGjJ7lX0DMBpph5zLgfxmJdgwe5a1rnG15wJ6actaDpx3uRdcvTJJLyRF 4pCrhAUR3cG2W/jAY+q/q8GwwJB5ozPH2ihkt9BUEwVYSyIs4Z5shKktfM4JWc25rJGG ttAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=KKE2B+AUQdCdxtybXQXEsZ0s9QJcXsW1/BXKK44OcjU=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=Ttobybx0SdxE0qXYDNfz1F+FECcibA+lUpVuP9V4TXc1GRapwjB5acQQ+xoGR43iKs cCt2bb9f9CUycEpGlbYTFyt7jONbPFm/O3H8fJxZCfx2/AYYM2tyNbM3Bmyf8Hm5pDNf ywI8LIJWT8FxNbdWSvFr8pqJ3CoxclxaC3Skvim3swCTFteuc/jU6EW/u/6hNg+KQ27e xhE5q17jziejDXqiPRH7IDOVTrxR1kDyT/7fawSeXwAuTvS3AQNGY4NORpV1joQBVM1Z Ll0ctF67n7oBtnK6NyaW7lUqv1laBMZ3A291ewanHHhIEEAtuNtk5y0Y3rT60Mv/ifV4 KKAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qSNGNq77; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q23-20020a170906941700b0098f99532db4si2992562ejx.664.2023.08.11.05.58.17; Fri, 11 Aug 2023 05:58:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=qSNGNq77; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235297AbjHKJhW (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235244AbjHKJgn (ORCPT ); Fri, 11 Aug 2023 05:36:43 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A74430DB; Fri, 11 Aug 2023 02:36:35 -0700 (PDT) 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 47E8C21873; Fri, 11 Aug 2023 09:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746594; 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=KKE2B+AUQdCdxtybXQXEsZ0s9QJcXsW1/BXKK44OcjU=; b=qSNGNq77DKM7JWtq3rfmyqvV/C0IP/agjhEbkZ+o9nTbF5NKRFrXqwbVQAcY01/vymDxKX TymlnC9YUDBFYZ6VW/LPw1/zvzPFKCPYmCMHkYPN76JbIuHIP9Ql3qdm68xYBZF8LRyXiY +rIW1zXyFht32b+Hm3Mio2HfIdSj5eI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746594; 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=KKE2B+AUQdCdxtybXQXEsZ0s9QJcXsW1/BXKK44OcjU=; b=53K+i6LQq5hUzqdEVPz5eoPgZ301Luz3gOcLNW8oI2ccmWVc7MTHGoLf2OpqpWVU17I0DX XhUnBdABvCLLQgBw== 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 174AF138E2; Fri, 11 Aug 2023 09:36:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wojTAiIB1mTIHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:34 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 08/13] nvme: Use def_file_path variable instead local variable Date: Fri, 11 Aug 2023 11:36:09 +0200 Message-ID: <20230811093614.28005-9-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773937592889279883 X-GMAIL-MSGID: 1773937592889279883 As all tests are using the same file path name anyway, use the def_file_path variable. Signed-off-by: Daniel Wagner --- tests/nvme/004 | 6 +++--- tests/nvme/005 | 6 +++--- tests/nvme/006 | 6 +++--- tests/nvme/007 | 9 +++------ tests/nvme/008 | 7 +++---- tests/nvme/009 | 7 +++---- tests/nvme/010 | 7 +++---- tests/nvme/011 | 8 +++----- tests/nvme/012 | 7 +++---- tests/nvme/013 | 7 +++---- tests/nvme/014 | 7 +++---- tests/nvme/015 | 7 +++---- tests/nvme/017 | 11 ++++------- tests/nvme/018 | 7 +++---- tests/nvme/019 | 7 +++---- tests/nvme/020 | 7 +++---- tests/nvme/021 | 7 +++---- tests/nvme/022 | 7 +++---- tests/nvme/023 | 7 +++---- tests/nvme/024 | 7 +++---- tests/nvme/025 | 7 +++---- tests/nvme/026 | 7 +++---- tests/nvme/027 | 7 +++---- tests/nvme/028 | 7 +++---- tests/nvme/029 | 7 +++---- tests/nvme/031 | 6 +++--- tests/nvme/040 | 7 +++---- tests/nvme/041 | 7 +++---- tests/nvme/042 | 7 +++---- tests/nvme/043 | 7 +++---- tests/nvme/044 | 7 +++---- tests/nvme/045 | 7 +++---- tests/nvme/047 | 7 +++---- tests/nvme/048 | 7 +++---- 34 files changed, 103 insertions(+), 138 deletions(-) diff --git a/tests/nvme/004 b/tests/nvme/004 index 0314ed3c949e..78b11c7b84c5 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -27,9 +27,9 @@ test() { port="$(_create_nvmet_port "${nvme_trtype}")" - truncate -s "${nvme_img_size}" "$TMPDIR/img" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "$TMPDIR/img")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -47,7 +47,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" losetup -d "$loop_dev" - rm "$TMPDIR/img" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/005 b/tests/nvme/005 index 935b8634cb96..211b8affc32a 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -27,9 +27,9 @@ test() { port="$(_create_nvmet_port "${nvme_trtype}")" - truncate -s "${nvme_img_size}" "$TMPDIR/img" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "$TMPDIR/img")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -49,7 +49,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" losetup -d "$loop_dev" - rm "$TMPDIR/img" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/006 b/tests/nvme/006 index 066acabb1175..f31633825a70 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -23,9 +23,9 @@ test() { local port local loop_dev - truncate -s "${nvme_img_size}" "$TMPDIR/img" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "$TMPDIR/img")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -38,7 +38,7 @@ test() { losetup -d "$loop_dev" - rm "$TMPDIR/img" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/007 b/tests/nvme/007 index c6ba36cc4b4f..b6a4bc437103 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -20,13 +20,10 @@ test() { _setup_nvmet local port - local file_path - file_path="${TMPDIR}/img" + truncate -s "${nvme_img_size}" "${def_file_path}" - truncate -s "${nvme_img_size}" "${file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -35,7 +32,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/008 b/tests/nvme/008 index c3fbcbc59686..a38926ef0051 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -23,11 +23,10 @@ test() { local port local nvmedev local loop_dev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -50,7 +49,7 @@ test() { losetup -d "${loop_dev}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/009 b/tests/nvme/009 index 88c27889fbe1..2c8ea7ead9b8 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -21,11 +21,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -44,7 +43,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/010 b/tests/nvme/010 index 38c062ec73f4..81f7d2024ee6 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -23,11 +23,10 @@ test() { local port local nvmedev local loop_dev - local file_path="${TMPDIR}/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -51,7 +50,7 @@ test() { losetup -d "${loop_dev}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/011 b/tests/nvme/011 index 0dab74e7e5b5..e6f78867e283 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -22,12 +22,10 @@ test() { local port local nvmedev - local file_path - local file_path="${TMPDIR}/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -47,7 +45,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/012 b/tests/nvme/012 index 8ed57d3a5ab0..85549c25a1c6 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -27,11 +27,10 @@ test() { local port local nvmedev local loop_dev - local file_path="${TMPDIR}/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -54,7 +53,7 @@ test() { losetup -d "${loop_dev}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/013 b/tests/nvme/013 index e3eb4e914750..355bc2e03557 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -25,11 +25,10 @@ test() { local port local nvmedev - local file_path="${TMPDIR}/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -48,7 +47,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/014 b/tests/nvme/014 index cbafd802af16..44ae91e2210f 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -26,11 +26,10 @@ test() { local size local bs local count - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -60,7 +59,7 @@ test() { losetup -d "${loop_dev}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/015 b/tests/nvme/015 index b32d16a91de8..16e41ee65d42 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -25,11 +25,10 @@ test() { local size local bs local count - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -55,7 +54,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/017 b/tests/nvme/017 index 6f7ef5882d3e..7cbf274c13b0 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -19,20 +19,17 @@ test() { _setup_nvmet local port - local file_path local iterations="${nvme_num_iter}" - file_path="${TMPDIR}/img" - - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" local genctr=1 - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" for ((i = 2; i <= iterations; i++)); do - _create_nvmet_ns "${def_subsysnqn}" "${i}" "${file_path}" + _create_nvmet_ns "${def_subsysnqn}" "${i}" "${def_file_path}" done port="$(_create_nvmet_port "${nvme_trtype}")" @@ -49,7 +46,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/018 b/tests/nvme/018 index 155f094ea6b3..d1d2082e62ac 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -23,11 +23,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -52,7 +51,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/019 b/tests/nvme/019 index 4ac351cbb782..2628dea55ac8 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -23,13 +23,12 @@ test() { local port local nvmedev local loop_dev - local file_path="$TMPDIR/img" local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -52,7 +51,7 @@ test() { losetup -d "${loop_dev}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/020 b/tests/nvme/020 index 744d4b7d6805..4a4f3c12da30 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -21,13 +21,12 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -46,7 +45,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/021 b/tests/nvme/021 index 1fd9bcbb3d23..11f82d64f378 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -22,11 +22,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -47,7 +46,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/022 b/tests/nvme/022 index 053991625250..586f6cdd3448 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -22,11 +22,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -47,7 +46,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/023 b/tests/nvme/023 index c10e5a0138a8..b13426cf5615 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -23,11 +23,10 @@ test() { local port local nvmedev local loop_dev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -52,7 +51,7 @@ test() { losetup -d "${loop_dev}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/024 b/tests/nvme/024 index d1d7f0bfb994..b7c7b3f64321 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -22,11 +22,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -46,7 +45,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/025 b/tests/nvme/025 index ea944830612b..04ceace5840b 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -22,11 +22,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -47,7 +46,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/026 b/tests/nvme/026 index f1193c20477c..a9dc7bc15db5 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -22,11 +22,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -47,7 +46,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/027 b/tests/nvme/027 index c097c51ea4f3..fda8c61405a5 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -22,11 +22,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -46,7 +45,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/028 b/tests/nvme/028 index 6e37be4893b1..8e42ea37a634 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -22,11 +22,10 @@ test() { local port local nvmedev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -46,7 +45,7 @@ test() { _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/029 b/tests/nvme/029 index 4d0ca997404b..7988faf5dd03 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -56,11 +56,10 @@ test() { local port local nvmedev local loop_dev - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -89,7 +88,7 @@ test() { losetup -d "${loop_dev}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/031 b/tests/nvme/031 index 27b08e96dd0b..d5c2561b941b 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -33,9 +33,9 @@ test() { local loop_dev local port - truncate -s "${nvme_img_size}" "$TMPDIR/img" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "$TMPDIR/img")" + loop_dev="$(losetup -f --show "${def_file_path}")" port="$(_create_nvmet_port "${nvme_trtype}")" @@ -50,7 +50,7 @@ test() { _remove_nvmet_port "${port}" losetup -d "$loop_dev" - rm "$TMPDIR/img" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/040 b/tests/nvme/040 index 8d7f68f9a2d7..452ecd690edf 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -21,14 +21,13 @@ test() { _setup_nvmet - local file_path="${TMPDIR}/img" local port local loop_dev local nvmedev local fio_pid - truncate -s "${nvme_img_size}" "${file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + truncate -s "${nvme_img_size}" "${def_file_path}" + loop_dev="$(losetup -f --show "${def_file_path}")" port="$(_create_nvmet_port "${nvme_trtype}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" @@ -60,7 +59,7 @@ test() { losetup -d "${loop_dev}" - rm -f "${file_path}" + rm -f "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/041 b/tests/nvme/041 index 4c553251f379..0a0700533b7b 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -25,7 +25,6 @@ test() { _setup_nvmet local port - local file_path="${TMPDIR}/img" local hostkey local ctrldev @@ -35,9 +34,9 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "b92842df-a394-44b1-84a4-92ae7d112861" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" @@ -69,7 +68,7 @@ test() { _remove_nvmet_host "${def_hostnqn}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/042 b/tests/nvme/042 index 866249ed598c..9180fce17b4e 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -25,15 +25,14 @@ test() { _setup_nvmet local port - local file_path="${TMPDIR}/img" local hmac local key_len local hostkey local ctrldev - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" @@ -82,7 +81,7 @@ test() { _remove_nvmet_host "${def_hostnqn}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/043 b/tests/nvme/043 index 5569a7a58ad5..f08422949efb 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -26,7 +26,6 @@ test() { _setup_nvmet local port - local file_path="${TMPDIR}/img" local hash local dhgroup local hostkey @@ -38,9 +37,9 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" @@ -84,7 +83,7 @@ test() { _remove_nvmet_host "${def_hostnqn}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/044 b/tests/nvme/044 index 6c2cb602313c..5eb163db2c99 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -26,7 +26,6 @@ test() { _setup_nvmet local port - local file_path="${TMPDIR}/img" local hostkey local ctrlkey local ctrldev @@ -43,9 +42,9 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" \ @@ -111,7 +110,7 @@ test() { _remove_nvmet_host "${def_hostnqn}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/045 b/tests/nvme/045 index a936e7fb661f..8364d5ec3a2b 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -27,7 +27,6 @@ test() { _setup_nvmet local port - local file_path="${TMPDIR}/img" local hostkey local new_hostkey local ctrlkey @@ -47,9 +46,9 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" "${ctrlkey}" @@ -124,7 +123,7 @@ test() { _remove_nvmet_host "${def_hostnqn}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/047 b/tests/nvme/047 index b435dd3cecba..66032f679ae2 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -26,11 +26,10 @@ test() { local nvmedev local loop_dev local rand_io_size - local file_path="$TMPDIR/img" - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${file_path}")" + loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" @@ -61,7 +60,7 @@ test() { losetup -d "${loop_dev}" - rm "${file_path}" + rm "${def_file_path}" echo "Test complete" } diff --git a/tests/nvme/048 b/tests/nvme/048 index f9a19b1e655e..6a05feae9b82 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -86,13 +86,12 @@ test() { _setup_nvmet local cfs_path="${NVMET_CFS}/subsystems/${def_subsysnqn}" - local file_path="${TMPDIR}/img" local skipped=false local port - truncate -s "${nvme_img_size}" "${file_path}" + truncate -s "${nvme_img_size}" "${def_file_path}" - _create_nvmet_subsystem "${def_subsysnqn}" "${file_path}" \ + _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ "b92842df-a394-44b1-84a4-92ae7d112861" port="$(_create_nvmet_port "${nvme_trtype}")" @@ -124,7 +123,7 @@ test() { _remove_nvmet_port "${port}" _remove_nvmet_host "${def_hostnqn}" - rm "${file_path}" + rm "${def_file_path}" if [[ "${skipped}" = true ]] ; then return 1 From patchwork Fri Aug 11 09:36:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134387 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp973200vqi; Fri, 11 Aug 2023 02:59:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsgeEpNeYCNIAUCwJxrlXvtZuuKs04QbaTuXkK0BAEXC1G1eUwjwUAVhNq95N/bi0rXpUC X-Received: by 2002:a05:6512:2811:b0:4f8:5d0f:c779 with SMTP id cf17-20020a056512281100b004f85d0fc779mr1235877lfb.40.1691747941847; Fri, 11 Aug 2023 02:59:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691747941; cv=none; d=google.com; s=arc-20160816; b=Ccf/BfShINW1EAk6S8rs+pZuvydI0MRacxBHmFqRBaCqzHH3M7Hv47WLqTjkDXJFsx M4YYkRPW/SnyRfeSpzD6MJ7srQpTnKrP/lPzIzs/HEQv8DyCwRRpo7K0ou/f9NQZnLDQ Xln6RZAOoYKRY/AXNBwCHtPE4hUsLDqc3rLa44k+mzAUCst+ij7WHryfNO0bFaKj727a AFPOhFf8WCUKgZXJyy8IFNO8eUxXKj/5ubzIHqXeCk7BGyhTy1IeJccZJdI5z5MbTyHw MGQf7Rvzvd1pCXvvqjGmtrUQd5rwHNTMdNXTAv9+3ilg2LXAxyfR3PBUApUKJbj8bR9r 3EpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=f+dGeQazKVtEZfgImF+w31ZCjMos3YCov32HlfqtR9k=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=AzFYr+WFQchbg04mgWbnK3vrA3PEtK/iF6E1WXL7arVAeXVKhcDk17b5EB+47QjlGW bbILlZ/oBkoyRTfETw7SDXIyC8eivaE7hqI7oLUhTzVTtqELXD0GV5+tdKLbhv0O/46e /Q13y8iKuEQS8ipCevUk96+YVcbxkjIWU0CSd5thRSVdMC283kLgEcMl1kV5gQ9ItIFj k1XIUQAyCPU649MjAUMqUpkGZIkVfeymmx5iiL8qMmryQcW8eA4HeyNmMUDxQ2JHXhSb ILtLMbfZUcgtXSSbOr0U7Sw/5RvNb48vaD2t2OY/hDLLrGyusDzmi1N8M8CXWMSi7yzN UmLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pLSZmI+6; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q22-20020aa7da96000000b0052322c44db3si3396754eds.678.2023.08.11.02.58.38; Fri, 11 Aug 2023 02:59:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pLSZmI+6; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235330AbjHKJh3 (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235256AbjHKJgp (ORCPT ); Fri, 11 Aug 2023 05:36:45 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5510B30E5; Fri, 11 Aug 2023 02:36:36 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id 0D2BE1F889; Fri, 11 Aug 2023 09:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746595; 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=f+dGeQazKVtEZfgImF+w31ZCjMos3YCov32HlfqtR9k=; b=pLSZmI+6Q5VYmgAM+m4trz5YU9sEurvjg7UlgiPQKy/inpGt/7RJgzyjtIaKCU8LgyzvPc hcxs5fYiXkzASKQVmRKINWr9GWcMKw3Xok+pWIliFDRzvRBp8JDenLvAlL4wOqr+EaePo8 7wVZa8P2L4HyNqIsaGcXbQ1eqQJuLk8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746595; 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=f+dGeQazKVtEZfgImF+w31ZCjMos3YCov32HlfqtR9k=; b=dMXf7C4jslXeDmEJoCX6B8dhTetoKGVmJ9V1oGHcEYBNWWahTeaEMwljBALE1v89qfOfm2 V0dNGueDIy25sxDQ== 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 EF6C4138E2; Fri, 11 Aug 2023 09:36:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id PEl0OSIB1mTLHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:34 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 09/13] nvme/rc: Add common def_subsys_uuid define Date: Fri, 11 Aug 2023 11:36:10 +0200 Message-ID: <20230811093614.28005-10-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773926289698535298 X-GMAIL-MSGID: 1773926289698535298 Add common subsys uuid as global definition so that we can reuse it. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/nvme/rc b/tests/nvme/rc index 9c802ddc872d..7f5829a2e58d 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -17,6 +17,7 @@ def_local_wwpn="0x20001100aa000002" def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349" def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}" def_subsysnqn="blktests-subsystem-1" +def_subsys_uuid="91fdba0d-f87b-4c25-b80f-db7be1418b9e" def_file_path="${TMPDIR}/img" nvme_trtype=${nvme_trtype:-"loop"} nvme_img_size=${nvme_img_size:-"1G"} From patchwork Fri Aug 11 09:36:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134413 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1002692vqi; Fri, 11 Aug 2023 04:03:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGhaaOwRrbPkN5O2Xuk0sBxmlmzVq7oFCkY6yia6/yOqVKAXLpKaxFH8Q+Qlbp4t5DN4VH X-Received: by 2002:a17:903:41c8:b0:1b7:e86f:7631 with SMTP id u8-20020a17090341c800b001b7e86f7631mr1432528ple.19.1691751814153; Fri, 11 Aug 2023 04:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691751814; cv=none; d=google.com; s=arc-20160816; b=nj9CvJCnU/yR+lyQo2v9/dR40Q76CY3peWvS1ki1rlXSK7fkZtBoEelcNb8j5RZIBx 30yGID+UvIDr0oeyn+zXQvzCE8w9NMlOrSLVfg+O/mWh+w5TdLSKr++dD+PhzD4mdEGJ qy73keSGOsSrBXdAgfdl5N3h28x6u/1XgvMjHhn729dq3dTM0VXduqkGhNa3igZITXOr isVSeLEjaJSb74AjVvNBDlIZQ5wjrXW5lACQrSHQWreA8r+or2zSs7aD5aG25VV6M++P tvOpDIpi3hmhApEobmx19tvHk5hn8azRQmaA253s2doWXCU0ua6YeBqLBYr+KSdM9188 6pUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=/qhpDrnyJ7ZYfbrDMR7+SmW/nd2jhoSM4735T51Dzt4=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=zQsY8Pn+mvRDgcvwc3sWnlmGCe3ljg62p+nBrq6hy9Q7ZvdlJiOeySDVDP1M3DaCXQ kPK+4xwc16ZEbQHD97utFpgRmMS8L1vs5LEXWwPFoCmgINUrrXxz03A3nej8Z7qb5kHL GUrVNNHidU+H1ZQYk3VE2WRZBzl8KDv2hiN8i6DGXinExXUtLM0x9GL9ON4KH6P2E4GI hmvpy9dYImI9UpF19isWWRhjlQL05z5buVBPBgW/wO9sX7kz9CognyIDM4RyO95zwM+P MmxLR+wX6HnoWD6QMzEk+sHhSfZXbLrU3oFg2hQ3VKEKBC4jqxmuFTb/Uag1VPd7CzCa fifQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pcB43r5Z; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h17-20020a170902f7d100b001b8b4330585si3145334plw.510.2023.08.11.04.03.03; Fri, 11 Aug 2023 04:03:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pcB43r5Z; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235412AbjHKJhc (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235280AbjHKJgp (ORCPT ); Fri, 11 Aug 2023 05:36:45 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC7633599; Fri, 11 Aug 2023 02:36:37 -0700 (PDT) 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 C2B5E21886; Fri, 11 Aug 2023 09:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746595; 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=/qhpDrnyJ7ZYfbrDMR7+SmW/nd2jhoSM4735T51Dzt4=; b=pcB43r5Z/CBlWZVJ0T9kGSF0OnAGzh6SntRQxREobsma6jNwsF+jGmAWsHey9n2IsMGww8 7Wh0oxlHeHDSFZdmO9orM9k59U+UASus/sorN8v+/+NSPdRv6vEZn4g4wH5LeN36G0+sVQ ypPEAEZ/oMDY8oHzHmFhCTbyMp8Vfo4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746595; 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=/qhpDrnyJ7ZYfbrDMR7+SmW/nd2jhoSM4735T51Dzt4=; b=uLoPn+bTdPeHemz7XtZ9ewKQmr5Fk2fp2xEBIYFXh9cMmO191ZkR21ZI3yXWiLeAEk+/jo o1HR08ciq3ABnnAg== 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 A53C1138E2; Fri, 11 Aug 2023 09:36:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id tOd3JyMB1mTNHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:35 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 10/13] nvme: Use def_subsys_uuid variable Date: Fri, 11 Aug 2023 11:36:11 +0200 Message-ID: <20230811093614.28005-11-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773930349897852730 X-GMAIL-MSGID: 1773930349897852730 As all tests are using the same subsys uuid name anyway, use the def_subsys_uuid variable. Signed-off-by: Daniel Wagner --- tests/nvme/004 | 2 +- tests/nvme/005 | 2 +- tests/nvme/006 | 2 +- tests/nvme/007 | 2 +- tests/nvme/008 | 2 +- tests/nvme/009 | 2 +- tests/nvme/010 | 2 +- tests/nvme/011 | 2 +- tests/nvme/012 | 2 +- tests/nvme/013 | 2 +- tests/nvme/014 | 2 +- tests/nvme/015 | 2 +- tests/nvme/017 | 2 +- tests/nvme/018 | 2 +- tests/nvme/019 | 2 +- tests/nvme/020 | 2 +- tests/nvme/021 | 2 +- tests/nvme/022 | 2 +- tests/nvme/023 | 2 +- tests/nvme/024 | 2 +- tests/nvme/025 | 2 +- tests/nvme/026 | 2 +- tests/nvme/027 | 2 +- tests/nvme/028 | 2 +- tests/nvme/029 | 2 +- tests/nvme/041 | 2 +- tests/nvme/047 | 2 +- tests/nvme/048 | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/nvme/004 b/tests/nvme/004 index 78b11c7b84c5..54d74b61f689 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -32,7 +32,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" diff --git a/tests/nvme/005 b/tests/nvme/005 index 211b8affc32a..8e3ddfe75e2f 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -32,7 +32,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" diff --git a/tests/nvme/006 b/tests/nvme/006 index f31633825a70..910204aaeb90 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -28,7 +28,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/007 b/tests/nvme/007 index b6a4bc437103..db00bdcc2d08 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -24,7 +24,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/008 b/tests/nvme/008 index a38926ef0051..752ab30a756b 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -29,7 +29,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/009 b/tests/nvme/009 index 2c8ea7ead9b8..7debd837cc76 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -25,7 +25,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/010 b/tests/nvme/010 index 81f7d2024ee6..cba711b29af8 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -29,7 +29,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/011 b/tests/nvme/011 index e6f78867e283..ba2718d81bd9 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/012 b/tests/nvme/012 index 85549c25a1c6..629b5194435e 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -33,7 +33,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/013 b/tests/nvme/013 index 355bc2e03557..ca51544b82d1 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -29,7 +29,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/014 b/tests/nvme/014 index 44ae91e2210f..6d27300cfb30 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -32,7 +32,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/015 b/tests/nvme/015 index 16e41ee65d42..1b3aa4aa36c2 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -29,7 +29,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/017 b/tests/nvme/017 index 7cbf274c13b0..aa0a3fefae90 100755 --- a/tests/nvme/017 +++ b/tests/nvme/017 @@ -26,7 +26,7 @@ test() { local genctr=1 _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" for ((i = 2; i <= iterations; i++)); do _create_nvmet_ns "${def_subsysnqn}" "${i}" "${def_file_path}" diff --git a/tests/nvme/018 b/tests/nvme/018 index d1d2082e62ac..b66056d43041 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -27,7 +27,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/019 b/tests/nvme/019 index 2628dea55ac8..b456b38d038e 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -31,7 +31,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/020 b/tests/nvme/020 index 4a4f3c12da30..ba88921d75af 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -27,7 +27,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/021 b/tests/nvme/021 index 11f82d64f378..02ef9727ee59 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/022 b/tests/nvme/022 index 586f6cdd3448..74c12c3e0ba9 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/023 b/tests/nvme/023 index b13426cf5615..413b6afa6d14 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -29,7 +29,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/024 b/tests/nvme/024 index b7c7b3f64321..1baf5487ae64 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/025 b/tests/nvme/025 index 04ceace5840b..9eecd4d4a604 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/026 b/tests/nvme/026 index a9dc7bc15db5..8a8bc58170e2 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/027 b/tests/nvme/027 index fda8c61405a5..723e721202be 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/028 b/tests/nvme/028 index 8e42ea37a634..d4e62e8cae1c 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -26,7 +26,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/029 b/tests/nvme/029 index 7988faf5dd03..b113e387f1fa 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -62,7 +62,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/041 b/tests/nvme/041 index 0a0700533b7b..cb2766619b0e 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -37,7 +37,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "b92842df-a394-44b1-84a4-92ae7d112861" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" diff --git a/tests/nvme/047 b/tests/nvme/047 index 66032f679ae2..2b81f7ea9ffd 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -32,7 +32,7 @@ test() { loop_dev="$(losetup -f --show "${def_file_path}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "91fdba0d-f87b-4c25-b80f-db7be1418b9e" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" diff --git a/tests/nvme/048 b/tests/nvme/048 index 6a05feae9b82..19234a5b3791 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -92,7 +92,7 @@ test() { truncate -s "${nvme_img_size}" "${def_file_path}" _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "b92842df-a394-44b1-84a4-92ae7d112861" + "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" From patchwork Fri Aug 11 09:36:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134408 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp999853vqi; Fri, 11 Aug 2023 03:59:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQSno4NsykxxZopS4Yb03jV2eZ29vHwVMoIaixfrjwTBdS3uJ0Z1c1BjzMrNl9vFyNO/m3 X-Received: by 2002:a05:6402:88e:b0:523:102f:3ce1 with SMTP id e14-20020a056402088e00b00523102f3ce1mr1341442edy.10.1691751545582; Fri, 11 Aug 2023 03:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691751545; cv=none; d=google.com; s=arc-20160816; b=CgypqRILIs+YbVcUXg2xq68gIbZYDwloQXyQuE5iRHHmkwUtviplkPSBo9DIjoQT1E PzkIUC64qqOFlXe9ChkqR3Hcb04AUjqpEhd+ypHLBfbTq4gGNeZBJqwF3AgQfmlAUuuH bkECybRvgtutY21H87VB5247ELrLyg8LPC+oSXQvsMCo2SIKogqvYLb838SmuV2cp+US YABywTWSviUbGZm5V6OXmpNbYQ9qjIwTmH3QF66aFRfG7iMbm87v/a715VNOnYBiAt99 PEspHarLCOkgSlM27DqYg9RCUAkjxkjtUkhF5IzQBMdnqazlmiZWfFhOtmWpIupT7Vo2 lqag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ONB0rT+VRdNbFZzplDFSYd3J2+VwEauFZ4m3EdIIa7w=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=DWyoto59yZQmdoXzOMybRlA793vyW7DxJMokRxs9ZpRC9QdZeWrNyhKTyN1Ry5J5JH jMUEWUx+No1cExykms3Z/vJaQbDWKvOZ1hxY5eLKYBC8uDWIMBiFXTJylVQ6v2WYISWt D5L0gywDycHQpKfXrfiY/ht5E/VPkfZEnWavoS2PSSsDgmU+mG/kz2F7WfbSF1++wYGE 3YBE3NovlqyduT7nDLBkAqr0MDU5GYVa7G/Yt76y00fsnxcWv+q14MTAIHAYVYu51M5G PvAvvZOL9D9YvoeVnHfms6n/MrCQmPBY3i6XOxYkuclxIJ5ukcq4HeWrTtOLY+8Mqfen 2ibQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=vXPAhoae; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=FX7SI2W9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d8-20020a056402078800b005234d2cd73dsi3226386edy.149.2023.08.11.03.58.41; Fri, 11 Aug 2023 03:59:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=vXPAhoae; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=FX7SI2W9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235371AbjHKJh0 (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235163AbjHKJgp (ORCPT ); Fri, 11 Aug 2023 05:36:45 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC968359D; Fri, 11 Aug 2023 02:36:37 -0700 (PDT) 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 90DE121881; Fri, 11 Aug 2023 09:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746596; 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=ONB0rT+VRdNbFZzplDFSYd3J2+VwEauFZ4m3EdIIa7w=; b=vXPAhoaecUfc3nRG2DWFLi6cthWO/0rZvkaAWjUqkyhtY6vhKDxO5hpoh0JGHkzkBA/Vdu rBoQmwc8waBX440zY76tVffz29ARY+U9+IrSM+AMI5kJ1zf26t70NWrwDcXeIklh8KX9UA +It47EeQrmAIwD+oswf8Y+wwCQ0pnI0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746596; 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=ONB0rT+VRdNbFZzplDFSYd3J2+VwEauFZ4m3EdIIa7w=; b=FX7SI2W90x7QzkTw3STpDrjYVPdrJpArtwtc/Jb7dQ8DqvvxRIchakm1+ZU00Tj6P0Dsxn +rUkEpfu/WYRFKBg== 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 7DE83138E2; Fri, 11 Aug 2023 09:36:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8ErKHSQB1mTPHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:36 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 11/13] nvme/rc: Add helper for adding/removing to allow list Date: Fri, 11 Aug 2023 11:36:12 +0200 Message-ID: <20230811093614.28005-12-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773930068814109503 X-GMAIL-MSGID: 1773930068814109503 Add two helpers to add or remove the host from the allow list of the subsystem. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/nvme/rc b/tests/nvme/rc index 7f5829a2e58d..61cc2e6d2c2c 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -612,17 +612,32 @@ _create_nvmet_subsystem() { _create_nvmet_ns "${nvmet_subsystem}" "1" "${blkdev}" "${uuid}" } +_add_nvmet_allow_hosts() { + local nvmet_subsystem="$1" + local nvmet_hostnqn="$2" + local cfs_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" + local host_path="${NVMET_CFS}/hosts/${nvmet_hostnqn}" + + ln -s "${host_path}" "${cfs_path}/allowed_hosts/${nvmet_hostnqn}" +} + +_remove_nvmet_allow_hosts() { + local nvmet_subsystem="$1" + local nvmet_hostnqn="$2" + local cfs_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" + + rm "${cfs_path}/allowed_hosts/${nvmet_hostnqn}" +} + _create_nvmet_host() { local nvmet_subsystem="$1" local nvmet_hostnqn="$2" local nvmet_hostkey="$3" local nvmet_ctrlkey="$4" - local cfs_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" local host_path="${NVMET_CFS}/hosts/${nvmet_hostnqn}" mkdir "${host_path}" - echo 0 > "${cfs_path}/attr_allow_any_host" - ln -s "${host_path}" "${cfs_path}/allowed_hosts/${nvmet_hostnqn}" + _add_nvmet_allow_hosts "${nvmet_subsystem}" "${nvmet_hostnqn}" if [[ "${nvmet_hostkey}" ]] ; then echo "${nvmet_hostkey}" > "${host_path}/dhchap_key" fi From patchwork Fri Aug 11 09:36:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134411 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1002035vqi; Fri, 11 Aug 2023 04:02:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IES9mcF4xk4rNm7rNBJngLPLXhpQPGKMJ9669dtGftoHZtTBHrSHJJhvKdPSv0+DJ4yTxrl X-Received: by 2002:a17:902:c211:b0:1bc:7c8b:5f0d with SMTP id 17-20020a170902c21100b001bc7c8b5f0dmr1127990pll.3.1691751758514; Fri, 11 Aug 2023 04:02:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691751758; cv=none; d=google.com; s=arc-20160816; b=fjnJzw0iASi+y5+a27EcK4/wx6pfWVD25lzPiAzryDPGNYVM6NnbrFMZfQQJfR/+ZF wqWG1db8PJW3BfUKZm1pP7jSQ5qkN9mUIgVA5Wj5skhlyo/af559Bz2ReLMM8x6BXXGv xBtz1fMgBiJ+pg2btEI11ZgU41VFDMOJ20JgDbnkRX4RvLnCBIRTP/pz3vuS0RN81kDi Eoeje3FBhzjqpDCIji6AYRcJ5YQ+lsUnJLER8bkF7y+sV4SwLVT28hoSZI1+bK0MGMl6 X/KWSf3WBn65tyBWCrJEP8RuOlYA/Nn0E4TZ3+I1PyxLNZHkN34DYp64gvQArrBv5Qy2 9GWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=F/3g66sTTwH7DSyrxQhTnav2sVGdYCVdhQzPdl0m5hk=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=eJlKOtSYOaUnz9YeaYeZrTt3CL6C/zcV6CjqJqJf9YiS4+tDmtTzq0uvUytoxZt9q4 Qabt1yjBwLmZW9KzoPq5CNejRPSN5hfV6dp8OeOzLTqcem2WreTDhEziKDtohg2VQw6y FRloRy1yvUoUsQzkIRDUL9ZZzin+0r8/5yFD9wDxZsT/C5wsh0vwnXtb6w0DAe3yiCEr FiDCOaXwuewYZGh7nna2ng0T3r+K9ktp7UHTzcO057QyBlFBkNOZM9x/Mu9/5NniuF2y 1WDybf9oLu+VCJHFdDUIWFGoHNHXaVbZ+4zqrd/szPyclRQDMrxf75McOxcCtQbGw3cx z8PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=HVi4O4z6; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s4-20020a170902ea0400b001bb02e4b739si3261839plg.475.2023.08.11.04.01.55; Fri, 11 Aug 2023 04:02:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=HVi4O4z6; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235338AbjHKJhi (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235291AbjHKJgq (ORCPT ); Fri, 11 Aug 2023 05:36:46 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D701035A1; Fri, 11 Aug 2023 02:36:38 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id 98D891F74A; Fri, 11 Aug 2023 09:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746597; 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=F/3g66sTTwH7DSyrxQhTnav2sVGdYCVdhQzPdl0m5hk=; b=HVi4O4z60oftk9DuBhet3VHfpCSs/54H6wyO7L8j/hsIYEoGYqG7Po35O1dCWiYsgEsZ5e Eprypy+VaHlXqj0uTPpy6WNLc/s7Df2evO+m3E4g2rBv8susGJIH+J+X4vwklRmtmAJbTZ LTKxgwzq6gOevvv19MA/cXrljHLfLaI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746597; 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=F/3g66sTTwH7DSyrxQhTnav2sVGdYCVdhQzPdl0m5hk=; b=isAlobYTg9X2szHgc/Kil0p/21FI7CREz8KIbEnzTEDlovxzVWfgWOHtgC7JWactVB8poh 09CJB1PQt3wIA4Cw== 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 6BA23138E2; Fri, 11 Aug 2023 09:36:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id a7omGSUB1mTVHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:37 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 12/13] nvme: Add explicitly host to allow_host list Date: Fri, 11 Aug 2023 11:36:13 +0200 Message-ID: <20230811093614.28005-13-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773930292277845419 X-GMAIL-MSGID: 1773930292277845419 Only allow to connect to our setup target with the correct hostnqn. Thus we have to explicitly add the test hostnqn to the test subsysnqn allow_host list. In nvme/030 the genctr is updated as side effect by writing the attr_allow_any_host variable. Though writting to attr_allow_any_host is not allowed after switching to the allow_host list. We can achieve the same effect by adding and removing the host to the allow_host list. Signed-off-by: Daniel Wagner --- tests/nvme/004 | 2 ++ tests/nvme/005 | 4 +++- tests/nvme/008 | 2 ++ tests/nvme/009 | 2 ++ tests/nvme/010 | 2 ++ tests/nvme/011 | 2 ++ tests/nvme/012 | 2 ++ tests/nvme/013 | 2 ++ tests/nvme/014 | 2 ++ tests/nvme/015 | 2 ++ tests/nvme/018 | 2 ++ tests/nvme/019 | 2 ++ tests/nvme/020 | 2 ++ tests/nvme/021 | 2 ++ tests/nvme/022 | 2 ++ tests/nvme/023 | 2 ++ tests/nvme/024 | 2 ++ tests/nvme/025 | 2 ++ tests/nvme/026 | 2 ++ tests/nvme/027 | 2 ++ tests/nvme/028 | 2 ++ tests/nvme/029 | 2 ++ tests/nvme/030 | 11 ++++++----- tests/nvme/040 | 3 +++ tests/nvme/047 | 2 ++ tests/nvme/rc | 7 +++++-- 26 files changed, 61 insertions(+), 8 deletions(-) diff --git a/tests/nvme/004 b/tests/nvme/004 index 54d74b61f689..697c758d3059 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -34,6 +34,7 @@ test() { _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "${def_subsys_uuid}" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -46,6 +47,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "$loop_dev" rm "${def_file_path}" diff --git a/tests/nvme/005 b/tests/nvme/005 index 8e3ddfe75e2f..6646b826ecfa 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -34,6 +34,7 @@ test() { _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ "${def_subsys_uuid}" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -46,8 +47,9 @@ test() { _nvme_disconnect_ctrl "${nvmedev}" _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_port "${port}" - _remove_nvmet_subsystem "${def_subsysnqn}" + _remove_nvmet_host "${def_hostnqn}" + losetup -d "$loop_dev" rm "${def_file_path}" diff --git a/tests/nvme/008 b/tests/nvme/008 index 752ab30a756b..3921fc6992b2 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -32,6 +32,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -46,6 +47,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/009 b/tests/nvme/009 index 7debd837cc76..aac3c1e0f642 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -28,6 +28,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -42,6 +43,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm "${def_file_path}" diff --git a/tests/nvme/010 b/tests/nvme/010 index cba711b29af8..19bb7f3fc7a7 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -32,6 +32,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -47,6 +48,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/011 b/tests/nvme/011 index ba2718d81bd9..0e54c2588bc8 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,6 +45,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm "${def_file_path}" diff --git a/tests/nvme/012 b/tests/nvme/012 index 629b5194435e..c6b82c821bf2 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -36,6 +36,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -50,6 +51,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/013 b/tests/nvme/013 index ca51544b82d1..441db7477d75 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -32,6 +32,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -46,6 +47,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm "${def_file_path}" diff --git a/tests/nvme/014 b/tests/nvme/014 index 6d27300cfb30..3656f9399687 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -35,6 +35,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -56,6 +57,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/015 b/tests/nvme/015 index 1b3aa4aa36c2..bc04e39c628c 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -32,6 +32,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -53,6 +54,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm "${def_file_path}" diff --git a/tests/nvme/018 b/tests/nvme/018 index b66056d43041..68729c3cb070 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -30,6 +30,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -50,6 +51,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm "${def_file_path}" diff --git a/tests/nvme/019 b/tests/nvme/019 index b456b38d038e..33a25d52e9fd 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -34,6 +34,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -48,6 +49,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/020 b/tests/nvme/020 index ba88921d75af..f436cdc8b262 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -30,6 +30,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,6 +45,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/021 b/tests/nvme/021 index 02ef9727ee59..5043fe4916be 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -45,6 +46,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/022 b/tests/nvme/022 index 74c12c3e0ba9..8b6f610c4894 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -45,6 +46,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/023 b/tests/nvme/023 index 413b6afa6d14..90af0338e81f 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -32,6 +32,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -48,6 +49,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/024 b/tests/nvme/024 index 1baf5487ae64..7a89ddd79fd9 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,6 +45,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/025 b/tests/nvme/025 index 9eecd4d4a604..90f214eff6c8 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -45,6 +46,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/026 b/tests/nvme/026 index 8a8bc58170e2..ec352acaa489 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -45,6 +46,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/027 b/tests/nvme/027 index 723e721202be..339f7605a9f5 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,6 +45,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/028 b/tests/nvme/028 index d4e62e8cae1c..7f387eb337f6 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -29,6 +29,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,6 +45,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" rm -f "${def_file_path}" diff --git a/tests/nvme/029 b/tests/nvme/029 index b113e387f1fa..461e6c6c4454 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -65,6 +65,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -85,6 +86,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/030 b/tests/nvme/030 index a0b999cace94..9251e1744f61 100755 --- a/tests/nvme/030 +++ b/tests/nvme/030 @@ -28,6 +28,7 @@ test() { _create_nvmet_subsystem "${subsys}1" "$(losetup -f)" _add_nvmet_subsys_to_port "${port}" "${subsys}1" + _create_nvmet_host "${subsys}1" "${def_hostnqn}" genctr=$(_discovery_genctr) @@ -36,13 +37,13 @@ test() { genctr=$(_check_genctr "${genctr}" "adding a subsystem to a port") - echo 0 > "${NVMET_CFS}/subsystems/${subsys}2/attr_allow_any_host" + _add_nvmet_allow_hosts "${subsys}2" "${def_hostnqn}" - genctr=$(_check_genctr "${genctr}" "clearing attr_allow_any_host") + genctr=$(_check_genctr "${genctr}" "adding host to allow_hosts") - echo 1 > "${NVMET_CFS}/subsystems/${subsys}2/attr_allow_any_host" + _remove_nvmet_allow_hosts "${subsys}2" "${def_hostnqn}" - genctr=$(_check_genctr "${genctr}" "setting attr_allow_any_host") + genctr=$(_check_genctr "${genctr}" "removing host from allow_hosts") _remove_nvmet_subsystem_from_port "${port}" "${subsys}2" _remove_nvmet_subsystem "${subsys}2" @@ -51,8 +52,8 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${subsys}1" _remove_nvmet_subsystem "${subsys}1" - _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" echo "Test complete" } diff --git a/tests/nvme/040 b/tests/nvme/040 index 452ecd690edf..1a9be5c9342c 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -32,6 +32,8 @@ test() { port="$(_create_nvmet_port "${nvme_trtype}")" _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" udevadm settle nvmedev=$(_find_nvme_dev "${def_subsysnqn}") @@ -56,6 +58,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/047 b/tests/nvme/047 index 2b81f7ea9ffd..1da24b5638a6 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -35,6 +35,7 @@ test() { "${def_subsys_uuid}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --nr-write-queues 1 || echo FAIL @@ -57,6 +58,7 @@ test() { _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" _remove_nvmet_subsystem "${def_subsysnqn}" _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" losetup -d "${loop_dev}" diff --git a/tests/nvme/rc b/tests/nvme/rc index 61cc2e6d2c2c..e6ec32285f7a 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -608,7 +608,7 @@ _create_nvmet_subsystem() { local cfs_path="${NVMET_CFS}/subsystems/${nvmet_subsystem}" mkdir -p "${cfs_path}" - echo 1 > "${cfs_path}/attr_allow_any_host" + echo 0 > "${cfs_path}/attr_allow_any_host" _create_nvmet_ns "${nvmet_subsystem}" "1" "${blkdev}" "${uuid}" } @@ -678,7 +678,7 @@ _create_nvmet_passthru() { local passthru_path="${subsys_path}/passthru" mkdir -p "${subsys_path}" - echo 1 > "${subsys_path}/attr_allow_any_host" + echo 0 > "${subsys_path}/attr_allow_any_host" _test_dev_nvme_ctrl > "${passthru_path}/device_path" echo 1 > "${passthru_path}/enable" @@ -693,6 +693,7 @@ _remove_nvmet_passhtru() { local passthru_path="${subsys_path}/passthru" echo 0 > "${passthru_path}/enable" + rm -f "${subsys_path}"/allowed_hosts/* rmdir "${subsys_path}" } @@ -784,6 +785,7 @@ _nvmet_passthru_target_setup() { _create_nvmet_passthru "${subsys_name}" port="$(_create_nvmet_port "${nvme_trtype}")" _add_nvmet_subsys_to_port "${port}" "${subsys_name}" + _create_nvmet_host "${subsys_name}" "${def_hostnqn}" echo "$port" } @@ -810,6 +812,7 @@ _nvmet_passthru_target_cleanup() { _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" _remove_nvmet_port "${port}" _remove_nvmet_passhtru "${subsys_name}" + _remove_nvmet_host "${def_hostnqn}" } _discovery_genctr() { From patchwork Fri Aug 11 09:36:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1032060vqi; Fri, 11 Aug 2023 04:57:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPKKNuQ+lUqTImKjTa7uf6hZxxtyP4HuY9jM+FbW8ir58fp5OTouE/NkWwayfeVSFXOpmm X-Received: by 2002:a05:6a20:3943:b0:12f:382d:2a37 with SMTP id r3-20020a056a20394300b0012f382d2a37mr2410313pzg.15.1691755050639; Fri, 11 Aug 2023 04:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691755050; cv=none; d=google.com; s=arc-20160816; b=sX7cf1JGCc6cCAV3ZeC1dYaN9Tsk/sKCrarTW5VFgaDP6yWhMeIQs78ST77JK2yX6Y NV+Olpbg/CSuQ5QMcBbTEIzAEUg/7ZQdLuqdWNsvboXinVb9VO+AMzAL/LQUDdVnm6HI VJvq3zZMV/Ie+FLHtonpSbWDAVYVZVUxs5AsGamQkxc+/6avNAv2XAAJlkHzJqKmA53R KNPlqOHtL9mMyWpkhDfd7wEmJTUlpTpXCo9mDhM+f9RLRhabI+p3CQxop6lMRW8lHcJM mREcVWxC/xKf//VYphDRHAEf2Vr/Chi3rTkPCOzH2CTsBm2hC+bQqlawcYGNHV7cKdCM SxBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=97qJ2t1dei5AsFqKxY4znnkZhfKaShP0eW+TbvQA8F8=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=UNL1Q94g9D7Y1CQox1aS2vrh+Y6+JdYb0hPosi4W3iWV7PMZMb5MSwl31QkuUaRJY7 69uZSsNn/u32doOYm/4XBl420NSHbCeL0STQ7MSkonkAlmUJsPORzwRlmwol7vedY4IO O4fxl0YrY01YjqZNNnKUI9mBqOEMPLca0YG0wjJ1bqRc+sE9JrF6pL9g5AdroructXx2 IHQlo7AG9GL93/4clRdvc1qnLRl6ipnq2qOdK/EpRIFlZH3J52E2CE/4xOW/+Rdc4bR9 JGDak9pGyrRz+5R+ISNGcauVcKZGkLwzCGjs93to+4Gux6vQKzgIsvgCdvVSsBGzIHw7 YSoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=fqaLR6jY; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=VpeIW0FK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b14-20020a056a000a8e00b0066733d71d01si2732930pfl.317.2023.08.11.04.57.17; Fri, 11 Aug 2023 04:57:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=fqaLR6jY; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=VpeIW0FK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233482AbjHKJhm (ORCPT + 99 others); Fri, 11 Aug 2023 05:37:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235184AbjHKJgw (ORCPT ); Fri, 11 Aug 2023 05:36:52 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2E7E35AB; Fri, 11 Aug 2023 02:36:39 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id A89A71F88C; Fri, 11 Aug 2023 09:36:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746598; 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=97qJ2t1dei5AsFqKxY4znnkZhfKaShP0eW+TbvQA8F8=; b=fqaLR6jYgKIFedJtDywbZ6IxzRAotFurtmTkzZfVnX+8EpeOEa0OcLQUPMp5a2qzddgABv OvOR3Ct53eOSoRpaifvAdXz0aiOmgoPE9htfmDfobJSbM+hGDRYFIBTWFm+1+61uFur/NE Xhyou/jRqp2zJDne/lIuXJrv8ssEQ94= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746598; 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=97qJ2t1dei5AsFqKxY4znnkZhfKaShP0eW+TbvQA8F8=; b=VpeIW0FKyz4XimfctIlj1zBgoNxiMtcTI9kAvdKOOwLi+FmzaVSs5n+2MS4bGEy/wx4tSV JZ3mTQv6ZQ/9+SDg== 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 57DCA138E2; Fri, 11 Aug 2023 09:36:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 5nt/FCYB1mTXHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:38 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 13/13] nvme: Introduce nvmet_target_{setup/cleanup} common code Date: Fri, 11 Aug 2023 11:36:14 +0200 Message-ID: <20230811093614.28005-14-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773933744083328375 X-GMAIL-MSGID: 1773933744083328375 Almost all fabric tests have the identically code for setting up and cleaning up the target side. Introduce two new helpers. Signed-off-by: Daniel Wagner --- tests/nvme/003 | 13 +++------- tests/nvme/004 | 20 +++------------ tests/nvme/005 | 19 ++------------- tests/nvme/006 | 18 ++------------ tests/nvme/007 | 13 ++-------- tests/nvme/008 | 20 ++------------- tests/nvme/009 | 15 ++---------- tests/nvme/010 | 20 ++------------- tests/nvme/011 | 15 ++---------- tests/nvme/012 | 20 ++------------- tests/nvme/013 | 15 ++---------- tests/nvme/014 | 20 ++------------- tests/nvme/015 | 15 ++---------- tests/nvme/018 | 15 ++---------- tests/nvme/019 | 20 ++------------- tests/nvme/020 | 15 ++---------- tests/nvme/021 | 15 ++---------- tests/nvme/022 | 15 ++---------- tests/nvme/023 | 20 ++------------- tests/nvme/024 | 15 ++---------- tests/nvme/025 | 15 ++---------- tests/nvme/026 | 15 ++---------- tests/nvme/027 | 16 +++--------- tests/nvme/028 | 16 +++--------- tests/nvme/029 | 20 ++------------- tests/nvme/040 | 18 ++------------ tests/nvme/041 | 17 ++----------- tests/nvme/042 | 16 ++---------- tests/nvme/043 | 16 ++---------- tests/nvme/044 | 18 +++----------- tests/nvme/045 | 17 +++---------- tests/nvme/047 | 20 ++------------- tests/nvme/048 | 16 ++---------- tests/nvme/rc | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 34 files changed, 138 insertions(+), 486 deletions(-) diff --git a/tests/nvme/003 b/tests/nvme/003 index 71b82ce758a3..54e5fe651c9a 100755 --- a/tests/nvme/003 +++ b/tests/nvme/003 @@ -22,15 +22,9 @@ test() { _setup_nvmet - local loop_dev local port - port="$(_create_nvmet_port "${nvme_trtype}")" - - loop_dev="$(losetup -f)" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" nqn.2014-08.org.nvmexpress.discovery @@ -46,9 +40,8 @@ test() { fi _nvme_disconnect_subsys nqn.2014-08.org.nvmexpress.discovery - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" + + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/004 b/tests/nvme/004 index 697c758d3059..68c7619c7fb5 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -23,18 +23,8 @@ test() { _setup_nvmet local port - local loop_dev - port="$(_create_nvmet_port "${nvme_trtype}")" - - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,12 +34,8 @@ test() { cat "/sys/block/${nvmedev}n1/wwid" _nvme_disconnect_subsys ${def_subsysnqn} - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - losetup -d "$loop_dev" - rm "${def_file_path}" + + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/005 b/tests/nvme/005 index 6646b826ecfa..7dadd8b58dee 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -22,19 +22,9 @@ test() { _setup_nvmet local port - local loop_dev local nvmedev - port="$(_create_nvmet_port "${nvme_trtype}")" - - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -45,13 +35,8 @@ test() { echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller" _nvme_disconnect_ctrl "${nvmedev}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_host "${def_hostnqn}" - losetup -d "$loop_dev" - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/006 b/tests/nvme/006 index 910204aaeb90..8507e24b5ec5 100755 --- a/tests/nvme/006 +++ b/tests/nvme/006 @@ -21,24 +21,10 @@ test() { _setup_nvmet local port - local loop_dev - truncate -s "${nvme_img_size}" "${def_file_path}" + port="$(_nvmet_target_setup --blkdev=device)" - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - - losetup -d "$loop_dev" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/007 b/tests/nvme/007 index db00bdcc2d08..255f31e82bc4 100755 --- a/tests/nvme/007 +++ b/tests/nvme/007 @@ -21,18 +21,9 @@ test() { local port - truncate -s "${nvme_img_size}" "${def_file_path}" + port="$(_nvmet_target_setup --blkdev=file)" - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/008 b/tests/nvme/008 index 3921fc6992b2..48c51c9fb288 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -22,17 +22,8 @@ test() { local port local nvmedev - local loop_dev - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,14 +35,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/009 b/tests/nvme/009 index aac3c1e0f642..5b41c81ee876 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -22,13 +22,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -40,12 +34,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/010 b/tests/nvme/010 index 19bb7f3fc7a7..02bf94eb332f 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -22,17 +22,8 @@ test() { local port local nvmedev - local loop_dev - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -45,14 +36,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/011 b/tests/nvme/011 index 0e54c2588bc8..93748c406e83 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -42,12 +36,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/012 b/tests/nvme/012 index c6b82c821bf2..0d39596608b5 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -26,17 +26,8 @@ test() { local port local nvmedev - local loop_dev - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -48,14 +39,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/013 b/tests/nvme/013 index 441db7477d75..b0480e32fbbf 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -26,13 +26,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -44,12 +38,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/014 b/tests/nvme/014 index 3656f9399687..77fe64aa39e6 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -22,20 +22,11 @@ test() { local port local nvmedev - local loop_dev local size local bs local count - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -54,14 +45,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/015 b/tests/nvme/015 index bc04e39c628c..df36d32e4891 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -26,13 +26,7 @@ test() { local bs local count - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -51,12 +45,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/018 b/tests/nvme/018 index 68729c3cb070..9ea9ebc8648a 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -24,13 +24,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -48,12 +42,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/019 b/tests/nvme/019 index 33a25d52e9fd..4cb248f66bc3 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -22,19 +22,10 @@ test() { local port local nvmedev - local loop_dev local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -46,14 +37,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/020 b/tests/nvme/020 index f436cdc8b262..304a2c3ffc50 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -24,13 +24,7 @@ test() { local nblk_range="10,10,10,10,10,10,10,10,10,10" local sblk_range="100,200,300,400,500,600,700,800,900,1000" - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -42,12 +36,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/021 b/tests/nvme/021 index 5043fe4916be..c5c578d0a73b 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -43,12 +37,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/022 b/tests/nvme/022 index 8b6f610c4894..2b270042ab43 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -43,12 +37,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/023 b/tests/nvme/023 index 90af0338e81f..d527b7fff7da 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -22,17 +22,8 @@ test() { local port local nvmedev - local loop_dev - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -46,14 +37,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/024 b/tests/nvme/024 index 7a89ddd79fd9..7ba8406dba57 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -42,12 +36,7 @@ test() { fi _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/025 b/tests/nvme/025 index 90f214eff6c8..7f9df92fe301 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -43,12 +37,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/026 b/tests/nvme/026 index ec352acaa489..9ed929d89708 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -43,12 +37,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/027 b/tests/nvme/027 index 339f7605a9f5..bf1a55ca982b 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -40,14 +34,10 @@ test() { if ! nvme ns-rescan "/dev/${nvmedev}" >> "$FULL" 2>&1; then echo "ERROR: ns-rescan failed" fi - _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/028 b/tests/nvme/028 index 7f387eb337f6..783433c1ece3 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -23,13 +23,7 @@ test() { local port local nvmedev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -40,14 +34,10 @@ test() { if ! nvme list-subsys 2>> "$FULL" | grep -q "${nvme_trtype}"; then echo "ERROR: list-subsys" fi - _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" + _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/029 b/tests/nvme/029 index 461e6c6c4454..7dda6ddd96df 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -55,17 +55,8 @@ test() { local port local nvmedev - local loop_dev - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" @@ -83,14 +74,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/040 b/tests/nvme/040 index 1a9be5c9342c..09f9bddf92c0 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -22,17 +22,10 @@ test() { _setup_nvmet local port - local loop_dev local nvmedev local fio_pid - truncate -s "${nvme_img_size}" "${def_file_path}" - loop_dev="$(losetup -f --show "${def_file_path}")" - - port="$(_create_nvmet_port "${nvme_trtype}")" - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" udevadm settle @@ -55,14 +48,7 @@ test() { { kill "${fio_pid}"; wait; } &> /dev/null - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm -f "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/041 b/tests/nvme/041 index cb2766619b0e..e690c680c971 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -34,13 +34,7 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" + port="$(_nvmet_target_setup --blkdev=file --hostkey "${hostkey}")" # Test unauthenticated connection (should fail) echo "Test unauthenticated connection (should fail)" @@ -61,14 +55,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - - _remove_nvmet_port "${port}" - - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/042 b/tests/nvme/042 index 9180fce17b4e..961d362c9b86 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -30,12 +30,7 @@ test() { local hostkey local ctrldev - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" for hmac in 0 1 2 3; do echo "Testing hmac ${hmac}" @@ -74,14 +69,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" done - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - - _remove_nvmet_port "${port}" - - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/043 b/tests/nvme/043 index f08422949efb..47d07e3fa0c5 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -37,12 +37,7 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" + port="$(_nvmet_target_setup --blkdev=file --hostkey "${hostkey}")" for hash in "hmac(sha256)" "hmac(sha384)" "hmac(sha512)" ; do @@ -76,14 +71,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" done - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - - _remove_nvmet_port "${port}" - - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/044 b/tests/nvme/044 index 5eb163db2c99..0d2fc1dd83c5 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -42,13 +42,8 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" \ - "${hostkey}" "${ctrlkey}" + port="$(_nvmet_target_setup --blkdev=file --ctrlkey "${ctrlkey}" \ + --hostkey "${hostkey}")" _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048" @@ -103,14 +98,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - - _remove_nvmet_port "${port}" - - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/045 b/tests/nvme/045 index 8364d5ec3a2b..d17b4c54c6c3 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -46,12 +46,8 @@ test() { return 1 fi - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" "${hostkey}" "${ctrlkey}" + port="$(_nvmet_target_setup --blkdev=file --ctrlkey "${ctrlkey}" \ + --hostkey "${hostkey}")" _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048" @@ -116,14 +112,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - - _remove_nvmet_port "${port}" - - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/047 b/tests/nvme/047 index 1da24b5638a6..c0b64bd90eb6 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -24,18 +24,9 @@ test() { local port local nvmedev - local loop_dev local rand_io_size - truncate -s "${nvme_img_size}" "${def_file_path}" - - loop_dev="$(losetup -f --show "${def_file_path}")" - - _create_nvmet_subsystem "${def_subsysnqn}" "${loop_dev}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=device)" _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ --nr-write-queues 1 || echo FAIL @@ -55,14 +46,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - losetup -d "${loop_dev}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" echo "Test complete" } diff --git a/tests/nvme/048 b/tests/nvme/048 index 19234a5b3791..428add165dce 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -89,14 +89,7 @@ test() { local skipped=false local port - truncate -s "${nvme_img_size}" "${def_file_path}" - - _create_nvmet_subsystem "${def_subsysnqn}" "${def_file_path}" \ - "${def_subsys_uuid}" - port="$(_create_nvmet_port "${nvme_trtype}")" - - _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" - _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" + port="$(_nvmet_target_setup --blkdev=file)" if [[ -f "${cfs_path}/attr_qid_max" ]] ; then _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ @@ -118,12 +111,7 @@ test() { skipped=true fi - _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" - _remove_nvmet_subsystem "${def_subsysnqn}" - _remove_nvmet_port "${port}" - _remove_nvmet_host "${def_hostnqn}" - - rm "${def_file_path}" + _nvmet_target_cleanup "${port}" if [[ "${skipped}" = true ]] ; then return 1 diff --git a/tests/nvme/rc b/tests/nvme/rc index e6ec32285f7a..564d805cf37d 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -359,6 +359,12 @@ _cleanup_nvmet() { if [[ "${nvme_trtype}" == "rdma" ]]; then stop_soft_rdma fi + + blkdev="$(losetup -l | awk '$6 == "'"${def_file_path}"'" { print $1 }')" + for dev in ${blkdev}; do + losetup -d "${dev}" + done + rm -f "${def_file_path}" } _setup_nvmet() { @@ -779,6 +785,66 @@ _find_nvme_passthru_loop_dev() { echo "/dev/${dev}n${nsid}" } +_nvmet_target_setup() { + local blkdev_type="device" + local blkdev + local ctrlkey="" + local hostkey="" + local port + + while [[ $# -gt 0 ]]; do + case $1 in + --blkdev) + blkdev_type="$2" + shift 2 + ;; + --ctrlkey) + ctrlkey="$2" + shift 2 + ;; + --hostkey) + hostkey="$2" + shift 2 + ;; + *) + shift + ;; + esac + done + + truncate -s "${nvme_img_size}" "${def_file_path}" + if [[ "${blkdev_type}" == "device" ]]; then + blkdev="$(losetup -f --show "${def_file_path}")" + else + blkdev="${def_file_path}" + fi + + _create_nvmet_subsystem "${def_subsysnqn}" "${blkdev}" \ + "${def_subsys_uuid}" + port="$(_create_nvmet_port "${nvme_trtype}")" + _add_nvmet_subsys_to_port "${port}" "${def_subsysnqn}" + _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}" \ + "${hostkey}" "${ctrlkey}" + + echo "${port}" +} + +_nvmet_target_cleanup() { + local port=$1 + local blkdev + + _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}" + _remove_nvmet_subsystem "${def_subsysnqn}" + _remove_nvmet_port "${port}" + _remove_nvmet_host "${def_hostnqn}" + + blkdev="$(losetup -l | awk '$6 == "'"${def_file_path}"'" { print $1 }')" + if [[ -n "${blkdev}" ]] ; then + losetup -d "${blkdev}" + fi + rm "${def_file_path}" +} + _nvmet_passthru_target_setup() { local subsys_name=$1