From patchwork Thu Aug 10 11:13: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: 133964 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp386099vqi; Thu, 10 Aug 2023 05:32:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRY+7TSpwnFNrgGl4b6aIlZn03DyG6jS7XIXKcVTSZijBsmRcfW01gAkNX2xD4QvN8Rlyp X-Received: by 2002:a17:906:20dc:b0:999:37ff:be94 with SMTP id c28-20020a17090620dc00b0099937ffbe94mr1708591ejc.71.1691670769685; Thu, 10 Aug 2023 05:32:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691670769; cv=none; d=google.com; s=arc-20160816; b=QXa16ImupFFW2a23RVEfP+ocuHqjCpLAkc/3Jr5FW4rE6YJWw4whB1Tc7kwF5atLRJ BLDEk+/jF/bCceBtzeJv0BM9nErsHu9Yrxs9g6iBajDGLfy9hVRKxh85Fth32MjH+A1C rwZeAuZO8M0/Nmoiz/28f9disoW4EQ/14W8hn4fxcX2YNSwfG8W+gIUfrbySOvCzw/9i G+2n92NyZoL1uPB+u/mqiRgQjld8vA/4pHOCp29+kBX4aZ6wVAZsYwUP1+68c/pDKeP8 5ZeZ/QUiu//sF7mHOZAspNszICw8PC6s2ECxxE2g0aZA01Tv5/UQpaFe6qqVWBnSB8Jy K7nQ== 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=oGHbROsPqUHSnQ92MaYPzno9d7VfWyBi87l2/Rulq02UxYAm9qfCLncfOJUZtuvLh2 KA0o5GBtAq/NRwv6yUrHUy0OeN6ZQf0mLShkCpR4GIhHMTa+izcZzpjNieTlmIP+bkBN b4NUPCQwEcd4AnnrZWf2IplUbbG88oQkfCOV+9y2EzEBa9Mv9gKBDUMAKtkFl+CfPMTW 3wwQTjrjV+D5y4ZFkb7J14sJ76SScmnVimxj7eom42eutO5e0sPlzidCPCLuUHlBoqyN tBn4GzC33h+hnGNtQoGHKwQFXnkcjqtIUcBz8vgVaVtlLe3EL/7wL04Qoa7aQhpHRCvC GI4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=A2mn1HPz; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="Jc/IUxiJ"; 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 l16-20020a170906079000b0099d6353e7edsi1394795ejc.702.2023.08.10.05.32.22; Thu, 10 Aug 2023 05:32:49 -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=A2mn1HPz; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="Jc/IUxiJ"; 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 S234259AbjHJLN0 (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233890AbjHJLNY (ORCPT ); Thu, 10 Aug 2023 07:13:24 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17A0C2694; Thu, 10 Aug 2023 04:13:24 -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 D09F41F45B; Thu, 10 Aug 2023 11:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666002; 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=A2mn1HPzcuw3tZZBfLUW5seoHyYW9QW2Ryli+b0yyByjeiEP7ASfvebMwVxi1XxfmMxEJk qIrwkw/PllrAvxIpjaeyQmadAtJgFtxu5fRSMBT5maJBKWcpLNm1+46Tqp6mzi4NVvABEB T1ImTa6aHCUcr6ochRqzD+ofptNhyt4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666002; 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=Jc/IUxiJJWnoNNM60p3ovitCIonhd5gzoCUrb5mihaseaOdPbKS9WlXJwtVJjYMCq8bo87 Qwgk1OG6qhHPQuBA== 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 C1862138E2; Thu, 10 Aug 2023 11:13:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id FdD1LlLG1GQ1LwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:22 +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 v2 01/12] nvme/{003,004,005,013,046,049}: Group all variables declarations Date: Thu, 10 Aug 2023 13:13:06 +0200 Message-ID: <20230810111317.25273-2-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773845369306650258 X-GMAIL-MSGID: 1773845369306650258 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 Thu Aug 10 11:13: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: 133941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp365775vqi; Thu, 10 Aug 2023 05:01:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuMDyP9sWmkzMSY52ux0aq5JvATp6nnz2MuIuzckwvhh9MwOPTxYgX9mV24rH0pWm2Vzbq X-Received: by 2002:a17:902:d484:b0:1b8:936f:c34d with SMTP id c4-20020a170902d48400b001b8936fc34dmr2255839plg.27.1691668866448; Thu, 10 Aug 2023 05:01:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691668866; cv=none; d=google.com; s=arc-20160816; b=yKnJpx/Bx+Z+xxqT81MqeaWyt6QAemrxkHZN0y+AfAiyUphbeNIxsAyusQjfLzdrbh b4v2wgvldCLwhuANTyRQSmoDryZKveozH3VEK4Ra4d/dunrkiOoVYtrwYkacIPo7jd3W RwsqXbGd4xMMiw8dkJ5Pe2pCiAPa0NH1FwJpATWvaXnQ1UlSt8ENnVd/Juo93Mg87PRf zonFJPJ76E9iCegkkbfFdjPRX3JDxa/A2hQbkQOVS/9w0yG0a7T6M6j1Y+Xyrjde7LCF k6jkmL1Z0/U8WlTTMC3io4nP6lxnv8rHUA6UZCWQPUR70YyCiLsh//mX7MECAID6LvAb tUrQ== 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=qUNQqGu6hKSVtifkLN6Yne/f9Ja5RQrMYOJg/RFh8N/yqfdBtEHDIG7FM74HsdX9vT d0b4NxYQ/M0efMoN5y041f1ZKHsfh+mgGJGBpNq8lvQnf622wTvFbusq/lBf8rR6MSq2 v7IAaBcr9KB9W7r3Y3hdzdBRCRPLTxtEDsRXurQb9gjlseTPvlYQCtsgWXfhlUXm0nFm RQoagRn9o7QZC2HK8/t4OxZgc2k5kmm0RdsezjBmLNMRobVZTUX+ceFN9Hjq1UlZKlfy cLvgly5UfnzxgFykNGu1wtSwbLFVCLgW+mEMd93MQK+/3oZvq4tyGS3tl+rFHUEaXylv OKfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=1KJzQHtd; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="DSx1hN/8"; 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 r11-20020a1709028bcb00b001b801bd7fbasi1299138plo.417.2023.08.10.05.00.21; Thu, 10 Aug 2023 05:01:06 -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=1KJzQHtd; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="DSx1hN/8"; 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 S234843AbjHJLNa (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234525AbjHJLN0 (ORCPT ); Thu, 10 Aug 2023 07:13:26 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE6282684; Thu, 10 Aug 2023 04:13:24 -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 6F61A21867; Thu, 10 Aug 2023 11:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666003; 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=1KJzQHtd2yEoQ9RANk+oHFA5qS3HkdIzzmFgXLjh8dAw9eWFuFVi/jDftrH9KAOYZXbLn+ NKKH9sFtiPB+PCtZsFSBmf9MQ3pp1cR8IJT+/I8qFhNOF5qYCKas2aeFuCbYG5vVJfYt3u dRldxAeOEY37B2Zy7G/c7y8YjoWhKUM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666003; 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=DSx1hN/81uIOJzcpJh2ArzA9ZSPo1MDRm9DAVGFwzTkIB+j6sLiaKGSnmXWmUg5uhwPHJN obE+g3Fjp/uL/qDw== 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 54187138E2; Thu, 10 Aug 2023 11:13:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id P/iDFFPG1GQ3LwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:23 +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 v2 02/12] nvme: Reorganize test preamble code section Date: Thu, 10 Aug 2023 13:13:07 +0200 Message-ID: <20230810111317.25273-3-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773843373420371942 X-GMAIL-MSGID: 1773843373420371942 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 Thu Aug 10 11:13: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: 133948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp370810vqi; Thu, 10 Aug 2023 05:07:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzSCvlxe71h2aHJInhsRGrXQ0RV7SB5WQ8zFy/8I04jAhOQHiz59+AWPPY5woo4HAOI5km X-Received: by 2002:a05:6a00:1827:b0:687:9ba5:e3fe with SMTP id y39-20020a056a00182700b006879ba5e3femr3081991pfa.23.1691669238776; Thu, 10 Aug 2023 05:07:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691669238; cv=none; d=google.com; s=arc-20160816; b=cWHoc58Zx/znsh6NmFp79TxIVfR8CWj5FAItS4lZu4uluZSkMO3GfRwiDkr7rFfVGC ughCtQ5yleCeezDCBrsg4TafG/tOuRJ0mw2kYJC/LcZNnHUkdHQGGYskBIsdGc452sPK MPRJve+mNc94SJJKcbjUKlJ1r6U3+EdTmalfckZaFbg708x/By+NSP9d6rpeSNPm+qF4 ogeVKkrIXW3VPJIqv0uwFzMwLsMa/KOIdUPcWtDSFwTYnxpaFDkfuzO5+ZC0w2hvH2Rw NEXMtxgkK1LT9VaVfTQoRoOySsl/JukZkeJ2q9ZEHlR2kJ5/B2paSVQ4Vywlkkmz7abq OVkQ== 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=Crrcg1I7Kf7HA01GM/fuY6YbKT1f9QOEoPs6cIpm2eN7x4WKnjrR/R87j9djW9kg4C oOox9QaRJtcAcvbxcfB1tuq3Njg9QtqYtrrR518R+5dOKsEP8PIGiFQg9f46r00WGedn FnzSedj/E43RxlLVkF2xXiz6vSSGXjC9zhlouCQHB611ZCBbXdX8zGJtI+WSV9HgtEcY 4M4cwshh9TP+sgkVGtvcvTRNnrW1wVtbrKicJ/UcmiIImnxIghBCNw5EsEw0hKfGJ8IN vTK7Ho9yIUaxrhsqBiQljesOebaY0s3g6sMcjmCXzecW23wpe0YoaFAXlkY+mnJ/rpBL FKYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=0zl5ZoB9; 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 n50-20020a056a000d7200b00686f351bdf3si1401143pfv.294.2023.08.10.05.07.04; Thu, 10 Aug 2023 05:07:18 -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=0zl5ZoB9; 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 S234928AbjHJLNc (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234475AbjHJLN0 (ORCPT ); Thu, 10 Aug 2023 07:13:26 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 490372127; Thu, 10 Aug 2023 04:13:25 -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 DFAA32186C; Thu, 10 Aug 2023 11:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666003; 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=0zl5ZoB9tGmAAsDkFBE3TZIhVEnSei+sKnsz13yH6ruKO7a+ktb5Abp/isenQucv3qyjyZ 9XYDZm8OeKOfOCZvyiHn7yLlYnOaAzlbZFMYerA4PmVAB0ZAotLT5Du1pDlwmz5mdVZSLc U8VdOU3i/5K4EdmLh5Uufa/jFBbFpfY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666003; 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=qnLmABrDYI4xOL723VUNdBawiiOI21d0YZA7f6JWgK8GxBVA06G2t0R44HOIx+gaUveV6z BdhhLJLvdAPEKaBA== 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 D1D15138E2; Thu, 10 Aug 2023 11:13:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id rxY5M1PG1GQ7LwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:23 +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 v2 03/12] nvme/rc: Add common subsystem nqn define Date: Thu, 10 Aug 2023 13:13:08 +0200 Message-ID: <20230810111317.25273-4-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773843763288738669 X-GMAIL-MSGID: 1773843763288738669 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 Thu Aug 10 11:13: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: 133926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp350906vqi; Thu, 10 Aug 2023 04:32:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGV9xwNZ8r4njmwaliIKoEctSj8headMAfph/yBFOsjfsSqdHwinbKLfK0I8u8IpOI4n2Rb X-Received: by 2002:a2e:9295:0:b0:2b9:20fe:4bc4 with SMTP id d21-20020a2e9295000000b002b920fe4bc4mr1559114ljh.40.1691667131569; Thu, 10 Aug 2023 04:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691667131; cv=none; d=google.com; s=arc-20160816; b=TVkvfoUP6PQ6TS4/4AA800DNYcD22/HVoSfPsrfFGBIH6lLdnWWhAYZpGdOnvtUCGF fxyQ0heAEITz2GFhCjS2PU1+aYycJGeUSCYSMhnmCI1IDAiuSE7xtIYgbFk797CS/HYR WHAgySrK8J2P0M9dQdvcGVzi9iqyV3t9MxGDrUofCRQtdkL0AG/Kvp2vcfwnjxA4ybit tG24VsNZlTbXleI/VamxUHmz8zVjGAW9qKRSpy5yENtIol1bqaOgkQe1Sj4ISvtwCY7p d/P4U0DWLwF7CJVMx2xnV5OKXXAFnYy6CFJdIsBG3kJiCZiG8dOikFGgGovbmC3wK1xZ Z5vQ== 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=xuVTgiPNHtm81E56o06X9CeBH8SajSsSbCDIqRyYjxc=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=kZYjtfgSWCS0KQbdou9sBnQJBdoc+pDyTJs7MqPEPpLnrTt1Hc96i/vuhenwOCr+gL N7xxVF4DCWexQW/H06zgYU72wuK8USZvbqQwr6Vd42DcYcwxmswD4iyj4C9w1VlSICRS m48uqwXBbbj3FUPdLCZYlV97PX2l+dEQ+NZZLACdiQScU2hlvgqb4iDI0njMfqimjnDn Nmbggbtew/fn6FjLz7U0iAYFn2JR15W4qbTlr+ZnXRFUJY4Yjug4W5CL3OCCTSAe6HjJ yijQSUNheZaZRtlVpJK4pb21MQq1bndaZ8toG4fpusJ6JPMTJnoZU41XVWhff9aPxT7N M2rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Rxff0To3; dkim=neutral (no key) header.i=@suse.de header.b=4Mrncnod; 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 rn16-20020a170906d93000b0099334262e18si1387930ejb.49.2023.08.10.04.31.37; Thu, 10 Aug 2023 04:32:11 -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=Rxff0To3; dkim=neutral (no key) header.i=@suse.de header.b=4Mrncnod; 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 S235235AbjHJLNn (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234569AbjHJLN2 (ORCPT ); Thu, 10 Aug 2023 07:13:28 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD8D1268D; Thu, 10 Aug 2023 04:13:25 -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 729FE1F74B; Thu, 10 Aug 2023 11:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666004; 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=xuVTgiPNHtm81E56o06X9CeBH8SajSsSbCDIqRyYjxc=; b=Rxff0To3p16XqcWSennoKrrfwjprNRnIQ5pZCHPN3/PHMT13bvNuS/pp7KSJiaO2V8EgJZ H/SN4ok4XoDl0F+Vn8zTdxNy+73m8XcNEPdTp+v5uCGix6tRXKmTmkkYSzet6u3rKUPOwF Yx2QRIqAgcH2k1svt5Z8K6veLHGkpK0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666004; 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=xuVTgiPNHtm81E56o06X9CeBH8SajSsSbCDIqRyYjxc=; b=4MrncnodqGEFoDztSPFudopgw3DNUSui1R11VNT6lY1wAnVgmGxJoLj0VtD7XJD/uKE+WI yrNBBuUFd9dycCCw== 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 5D1DB138E2; Thu, 10 Aug 2023 11:13:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 7TOWFlTG1GQ9LwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:24 +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 v2 04/12] nvme: Use def_subsysnqn variable instead local variable Date: Thu, 10 Aug 2023 13:13:09 +0200 Message-ID: <20230810111317.25273-5-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773841554424905757 X-GMAIL-MSGID: 1773841554424905757 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 4a37f91e50c3..3dc543fd55d3 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 Thu Aug 10 11:13: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: 133955 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp377198vqi; Thu, 10 Aug 2023 05:17:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaXmf+VMp7k2w+aITm91sSavTnzhnthepT3QVTuyev+hDQAKbiLPQ+xkWRXuhl6BjmCJCF X-Received: by 2002:a17:907:7630:b0:99b:ce6d:fc90 with SMTP id jy16-20020a170907763000b0099bce6dfc90mr2384499ejc.2.1691669848723; Thu, 10 Aug 2023 05:17:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691669848; cv=none; d=google.com; s=arc-20160816; b=acIqPZfbk9y+vThp59z5TqObs/iW6EuCo6cvAdADHx8reYH+VwM7Z6QuJC/dEJi7Kj cE1NMg1a9YD1qAjLLZ5QawVHNAbDXNTIzBg+e+UHnC9mgqaxHQXGuZTO7q0K8SkWB+dp UtWHbmQDIKoUd1zrMelWZIkp7a9zlV4/cogtRq8INoD8tqV469AiWjp1V4qTUcISYpNp G5ZjmBOHa1Zvt4+GT5tWBbXt18xFGQKFwsTKrKX9xo0vj0dYbKTp8DEvXcHJTCZfmrY2 5NSWFW0uc/C2cwGdF6H8fOHaBWSBBguytdASJgKdd4HcVEm+OmBT5TVL+iZrL3ewM5ns WlVw== 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=ac4SZIHJuwditUTgeiRbiLy7q3HhMjFvWfM/zdhxKuw=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=VYw4jnjn43n3SkcmQp0x6gtB+4a8uNmYspwx5/ngk11w8ksJgo4/UrSV7KWjS+okKr V7BmXbjm6H798ejkdMZtRZ8u2+K5M203cJ7e88xUyd9RMM1lPgPSKaGPTeSN9e7Ml1uQ 7uXC65i3MstCgnbpirXXMsxEuMlV3jdPvMAI+oOKv94E7EB5u1pia3kWB80LmO3qXVqC 9tzpHZi3deGIoz6XHSfdJ/7Yx9KX82+qYewm/xXGkPgzFnNHPdQ2gvmjMuoYwh/5xglR 3yhstidFfhQR+wU62uNCsTI6Rae5/hrGg+nl1Kujvl1Oj5TkgFl1DBT9d10ahJOn1/Rz hPIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=H+Qh0u6P; 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 g1-20020a1709063b0100b0099b41fa79f3si1291124ejf.331.2023.08.10.05.17.02; Thu, 10 Aug 2023 05:17:28 -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=H+Qh0u6P; 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 S235142AbjHJLNh (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234657AbjHJLN1 (ORCPT ); Thu, 10 Aug 2023 07:13:27 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 501CF26A2; Thu, 10 Aug 2023 04:13:26 -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 05EF01F74D; Thu, 10 Aug 2023 11:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666005; 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=ac4SZIHJuwditUTgeiRbiLy7q3HhMjFvWfM/zdhxKuw=; b=H+Qh0u6PdS0fCbyQLhBlSkv0tS8ihVDxCqja53s6iZ30jBOo9B7bDupG21BsuBcI9vvEKs +dWE+XqMEBNteK8Ffr8jJNZX8UgZkbTpnTvU36whLI0v/v69kFG6xROFy1ER54weAh86JR 5JE/qwVTedXaqBS99Zt84zPtYcxjEEg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666005; 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=ac4SZIHJuwditUTgeiRbiLy7q3HhMjFvWfM/zdhxKuw=; b=Mm+pVfkBJ4ojvPKEfQ4Pw72b3tbTVY4eemulSPdqpPT9bg2gZ3LFg1RVLO7Ya93jLdijJy y8gPYvjEmjPLzNDA== 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 E9C03138E2; Thu, 10 Aug 2023 11:13:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id hdPyOFTG1GQ/LwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:24 +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 v2 05/12] nvme/{041,042,043,044,045,048}: Remove local variable hostnqn and hostid Date: Thu, 10 Aug 2023 13:13:10 +0200 Message-ID: <20230810111317.25273-6-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773844403400280261 X-GMAIL-MSGID: 1773844403400280261 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 3dc543fd55d3..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 ${subsys_name} 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 Thu Aug 10 11:13: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: 133954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp376928vqi; Thu, 10 Aug 2023 05:17:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqoLpzOpuPA+p9kvO1K7zDtM11lR0bj9abkzqIdAVH1UaTf0B1GzTX92Umoa2IgK3oO6fQ X-Received: by 2002:a2e:9b51:0:b0:2b9:dd96:5340 with SMTP id o17-20020a2e9b51000000b002b9dd965340mr1774630ljj.50.1691669821581; Thu, 10 Aug 2023 05:17:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691669821; cv=none; d=google.com; s=arc-20160816; b=NWZ9VuuU/oraZVlFjq62IJWuVYo8MYTUDUc5p7EhBCyIRUWXzdqStLNS2BQHYgMXqi 1Cvam4PSFIUzAtIqmn6VwpQ6cstZzB8tBieiQGHoRre9jU1tx3bRPGUQSgpJppWIDdHa zIvRqnKTyIT3OPgFh9dZFhhG+mUJoIdHvS8tsCjYleNqehN+sT5jVzWatWgXO+UPlKSG Rj232e1S2G4Da4J1x0w9xQOEotSq1EdO3ZBQRNFLmmNmRTGS52oNXPfW3ZN+75qL73JD EPbZdGejCa4OJjvnfUpdxycl56dqpzhgxoEddxhMBOykEmqCi7MO6uNxRn8JRYhYwucq 42wg== 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=Xh/WB+iVMgprgJudL8eK6ilsqGCYF5x2OMe97dtEmRqMnILF/gD83a45E0bvOYCH29 nyE5hL1bF74M94HHsvhOtfgEcIdLMdfqZjmbiv5QM3X7UxW4gwcGfEM32i0WplmHs7RU ctXdpkgGvNEdzLL1nbjNF/Fs0DZrwmoAmW1BYDE0niJuAwkVgRMfHAHuHvnkRIugnh9D bGjM6GNYCOTDettH+07m8YdxFuJhpdEQJuhjZ3947urlhAznZ/Rhiwf8HU4fTR6GGPT7 6J7SPgASdeDFkZeQIIXRXMe825xCWbpB8OtK32FBWmOIqBr5LSm2LtR7dTzqSkdWWzJe qSig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=iNSWxDwb; dkim=neutral (no key) header.i=@suse.de header.b=r2uhimQo; 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 y1-20020a1709063da100b00988c051a9edsi1255962ejh.651.2023.08.10.05.16.36; Thu, 10 Aug 2023 05:17: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=iNSWxDwb; dkim=neutral (no key) header.i=@suse.de header.b=r2uhimQo; 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 S235084AbjHJLNk (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234685AbjHJLN2 (ORCPT ); Thu, 10 Aug 2023 07:13:28 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5A302686; Thu, 10 Aug 2023 04:13:26 -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 8B8321F750; Thu, 10 Aug 2023 11:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666005; 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=iNSWxDwbI5YWOgytBD2w8fJhctY80Ap97iKeaB+PWfxKUfF5n99NkqMjcWSvSJTuIbRvk5 e4Jb8MX2zpBbQhKahRE9Yu8JNXS5LakQlquF8ATmwCq7if2+bz0n0EAFXxdsec3yx2uIYO z9UVN9AG7lHrK8DDHpuGl1U2yePV2hc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666005; 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=r2uhimQoS1CRCfdAXdRFl6qrNxhdWT93Y4/cpGTize+3oE6oavZ7GC1WhV4gjBfh/bRJYb SYg9B8xpW5HQSqAg== 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 7D627138E2; Thu, 10 Aug 2023 11:13:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id J39bHlXG1GRBLwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:25 +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 v2 06/12] nvme/rc: Add common file_path name define Date: Thu, 10 Aug 2023 13:13:11 +0200 Message-ID: <20230810111317.25273-7-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773844375130792126 X-GMAIL-MSGID: 1773844375130792126 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 Thu Aug 10 11:13: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: 133931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp360740vqi; Thu, 10 Aug 2023 04:51:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKnSsiiGtXjpmRTimMe9TLsZ0xnNSKgGn7wN7nx09HHgiMROY2TW0zxAlqsOa0ME/OA/kH X-Received: by 2002:a17:906:10dd:b0:99c:40f2:a3fd with SMTP id v29-20020a17090610dd00b0099c40f2a3fdmr1988898ejv.13.1691668296714; Thu, 10 Aug 2023 04:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691668296; cv=none; d=google.com; s=arc-20160816; b=l2sw53VovKMJaBgVvWw/YOO4ar90whCWMiLkyWztv2Wq0nK25d444jUzjo50TipXUR 2kBbhTsQGth1BCDavjNkrvHAl6iVJCky4Ha6YsAYejZof0v3nkOb6uHhHAHn99QVOmgd JHb2crN0dHBT1M8wwDDbxOjfeOgaI7hygEPR5ackAMj3bKO2MVdF3cZP8IopNsLHPIq8 lXW5VHQayCtfPmVtTelcfT4OvRZbn6HWUbZFGTA0ayt/7O8xoEV+Q/iFpgEoIEo4bU7c neacP7+O9OvW0qBGwe9Q1BaW6EBDssp0lMBQKKGxIL6TL/TnKmcXydC7NVaiO3rICvsH KJCw== 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=NYfH9UC0xzGofBNFNWDbJHxbKUSrJZsN+bJYT4k8a8jhzaZM7kmHIj4p+acCnV8jBB FmQBVn5hL+caiW1/DkZIs6wrP60hHfpwCL1qVWF/FjKaVt2PDnttHklfNSNDnPzWWiyw wYrsOII1OmC8usvre+fOw8ilsvqJmOPG4xWwKJwSrlxXnbEBAHJMP7dkT8ntIFyeom/S VU9U8sYcpULERkfw95Or72+i7yuC/Q4AR3uSlqrh7LXGZ+qGKj/7AC4Lb8pnOfZD5yt8 CnepOeTZVeG1kfNhpsWkACWq7Emot4ZToihjNaeQBI4LRBF1f9FSZ1u2npd568JM1/xL xmjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=dRAmSZDU; 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 lu5-20020a170906fac500b0098f99532db0si1300795ejb.660.2023.08.10.04.51.12; Thu, 10 Aug 2023 04:51:36 -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=dRAmSZDU; 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 S233794AbjHJLNs (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234898AbjHJLNc (ORCPT ); Thu, 10 Aug 2023 07:13:32 -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 77C862127; Thu, 10 Aug 2023 04:13:27 -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 289C621870; Thu, 10 Aug 2023 11:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666006; 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=dRAmSZDUj3HurW4QAPH4R86MhicoS8leHw828QSUtZGC71Kwkx0ojwQApYuTGeGKn5DRBO vLWxaU5xbF518psaIrmrzVoOCzGgnKM8RR4M6Cj/NzCRK5xmu4C5Evvi12eJNvnIoOJFBU LgYL1SbsZMohfGqo23ehiOLVQmTALng= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666006; 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=SnU2p72aIeyULjl1zkHLxKvu0F/jAJIf0LivJ4QTESexfPvqCQrPpW8N2RYxad+5D9ykUp UlPcsh4RQu2pRsAA== 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 12723138E2; Thu, 10 Aug 2023 11:13:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2JZlBFbG1GRDLwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13: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 v2 07/12] nvme: Use def_file_path variable instead local variable Date: Thu, 10 Aug 2023 13:13:12 +0200 Message-ID: <20230810111317.25273-8-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773842775823128101 X-GMAIL-MSGID: 1773842775823128101 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 Thu Aug 10 11:13: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: 133934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp362722vqi; Thu, 10 Aug 2023 04:55:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrGIz/nxfUADkBzBqjHzTAr45M2TGS6T6WpNz7pCQyeCsXmvCzzoLo4dzlQW62GfgNEyal X-Received: by 2002:a05:6a00:1745:b0:666:8cbb:6e0f with SMTP id j5-20020a056a00174500b006668cbb6e0fmr2363971pfc.3.1691668528718; Thu, 10 Aug 2023 04:55:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691668528; cv=none; d=google.com; s=arc-20160816; b=m0IHrkcSa1T+5HiXoZhJ+vdWDh08//bfjnMxhTRbKpO5PM/j9v0QhYAw7PDFmpNpY+ GDimCy/P9JCeb49potLpNlXKvSs6m04bFXd0gm6adm3Rz6lOvIJDcXQXnX4wlVK+Op6/ 1XJ/RCDvKCZg4EIEoXgpE0ZbFhZlbi4xZiAzxzkAv/2AXL9OjtW5I5w8uiIfekI9q2bf bMmkMbzXE3DWw9bpQ7rTg0bFv1OdDvIrnrejhvZZKeMmP+0KYBuzyI9TuaiQj8/JwVki K4qE1tsrXhsfpq8PWEg9OMcgidK6vD0to5ywKI3q8/csO4diR3m+T4GeIIRU6IPajkjt VdJQ== 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=ExeZo40hqbFDt0MdC/7W3UqJVedUhoyqhCF8UNIy2ixsEU5ksmp0YXW6UIyHEUrmKW dqkQsuTO3K2/x2vh07T0I8T4bQZ9Uj7hOn0u2o04S8EiHgPsOuy82lLY27JhAYt6FxfP PepC1eopRttcIXzF3l19uRE8WkZJ3bhUvsu3Ren0BhZkG01jHbGnrPNXewHNaV/Ed/Qk ZRA9mwk2vzLqlyDa+W+GWgYPAR5uEio+Qg1MVD/cyDG69+naXH7h8nBAXPsaMBCYj+Xq XNP9NKupQ5QFDEtbONGmrDkmZuELFhREG37Bv2eJbrXQ7JirgDTlODH9VslDq6OpwrNe AuwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=AOpQl8+8; 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 bd30-20020a056a00279e00b00686dd813934si1417257pfb.82.2023.08.10.04.55.12; Thu, 10 Aug 2023 04:55:28 -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=AOpQl8+8; 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 S234282AbjHJLNp (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234781AbjHJLN3 (ORCPT ); Thu, 10 Aug 2023 07:13:29 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 080742683; Thu, 10 Aug 2023 04:13: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 9FFB81F855; Thu, 10 Aug 2023 11:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666006; 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=AOpQl8+89eqzlfIWTWjwDsP9LcXln3P7aexnhhPJ2L3kzsX9s0YjjUPUSOEWs18t/YE6IF fkSmqWblAFqhiqSI0K4TZZ4rdPjiZjDZeo8FkYT0KletVgOOFSSuasqWqAxCu8FfHAn+jB J79/NwbYKmbj5ONgStzO0FBxbqldKqA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666006; 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=NBrGIbaDfGqcl727f2RvU870BuNabfYmmy2/vtR4ZhSrKQdLvRbea+0FRat/DAkOKp2VRt D7MFGhhUHuypoVDQ== 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 92D92138E2; Thu, 10 Aug 2023 11:13:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qdK1I1bG1GRFLwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13: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 v2 08/12] nvme/rc: Add common def_subsys_uuid define Date: Thu, 10 Aug 2023 13:13:13 +0200 Message-ID: <20230810111317.25273-9-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773843019281182507 X-GMAIL-MSGID: 1773843019281182507 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 Thu Aug 10 11:13: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: 133997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp424025vqi; Thu, 10 Aug 2023 06:34:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/noCQDGb0lnHN/Eq8gm2BhZ7cp5OglwORi24CwZ8Gge/UrrmU7BoceEZOgU9OxLLwAEI5 X-Received: by 2002:a17:907:77c5:b0:993:e752:1a6f with SMTP id kz5-20020a17090777c500b00993e7521a6fmr2166737ejc.6.1691674452957; Thu, 10 Aug 2023 06:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691674452; cv=none; d=google.com; s=arc-20160816; b=bSnDEo2htOVqG90gvp0uaTIoCg83/DqvtPlYGk1MsNt3oeHsp/Mv4iHcABg8qIfrN/ +qUxEh+XZ3rWovFd9+O/b1ie4RyRliAes6lPP1gZU66dEycjV8r4zt89TFIV4XkPYcTG baXc7ilwHdHYqgPa9PA/iGGgFFyrXJ3/1jIPxOyEAjFrXwWW6W80lrISqTW9Zu+tMVV7 9/DXW6Z25+1FHqTvi1Rt40y02EGpORQvQ3cOIuWwTi7U3JsrnpaEnrN+XUl0Dia/K2sk Hf+ZaqWo3RYVERUEPT81bM75eeAMMOPnpsfl06x+PhKw8Ewjz15McY52f8PgMl6hYots rkhQ== 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=trAVZuu2PKi2BDggKN9LCz+W9onZuOwbuVmQo2agQYiLCPn+9Xq8qZimEfuw4jCP65 laFoGT7ubqCpFpp0SX5hPvxyrOF+BerO8SLJHJ0MkwauQz/g9bdJzA2PEji1Y4XkJ5iw Iulnpk4aOvRhnomRbxxHqjWrhTJlrpjQ+ML0P7GiJXLJVpu9MVdzZ1t+XrJw6EfCIIMs 0AMrvhvmdmvxR7hrMbBTMItMG2TI59w81Y9EwPhwktGJ3yMb5Cx34udaJxZYYCe3KhEV URv+uZ9uj3qhpI3caRuhvoRf38+41CK/QqpBSwTr96AkzwxNbSHJ4kxtqkgcAkt3ve3k co8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=d3PuPv22; 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 hb23-20020a170906b89700b0098804fbcff0si1453850ejb.709.2023.08.10.06.33.39; Thu, 10 Aug 2023 06:34:12 -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=d3PuPv22; 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 S232960AbjHJLNv (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234917AbjHJLNc (ORCPT ); Thu, 10 Aug 2023 07:13:32 -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 717E12691; Thu, 10 Aug 2023 04:13: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-out1.suse.de (Postfix) with ESMTPS id 2C0FE21872; Thu, 10 Aug 2023 11:13:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666007; 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=d3PuPv22fKAzdkerCTR2aU6h2Tfd+FwmRzr8uA0VIfhVc/nwREJfYo0vtwINa8sKX7jwVw uT5FJ7yi71Gc82eUWmXekg67W58hVWcGzhejph6yoGOo4zzlWfqbxK6/1BWT4R6z5x7XE6 swp4AMECrilJLjcl+3118kr5UTID1fc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666007; 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=lfvEvn/HQiME80KbUIG/nn67BT5CMIOjPAsSLJp5DYTPdFC71kczJQTrTeYmtiyZ7zR/hC OgPJYKSGkdX7GWDA== 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 1DCC0138E2; Thu, 10 Aug 2023 11:13:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id T04wB1fG1GRHLwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13: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 v2 09/12] nvme: Use def_subsys_uuid variable Date: Thu, 10 Aug 2023 13:13:14 +0200 Message-ID: <20230810111317.25273-10-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773849230844098663 X-GMAIL-MSGID: 1773849230844098663 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 Thu Aug 10 11:13:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 133935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp362744vqi; Thu, 10 Aug 2023 04:55:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFtGTp3ZV9603+WW3tQmotnOXVzgEM3EwcPDkinIeeZKQUE+haeUooDJjJwDktQOcF2lN8 X-Received: by 2002:a05:6808:2389:b0:3a7:1e3e:7f97 with SMTP id bp9-20020a056808238900b003a71e3e7f97mr3087120oib.4.1691668530931; Thu, 10 Aug 2023 04:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691668530; cv=none; d=google.com; s=arc-20160816; b=VOcfZnQLsJqGbdRQmSVZf+DP8SXH/qAl+34MST4J6Q1Dsue2Zld/hykOc5QDvBo3Hj oJxv7NnKxfcNjgyzNWChga/BTNkkrSMqc3vakgcBTdrwl4B5IBWrka8v7b2d1s1QyVc4 LsfWZUy+H4ygfWkeD6bd8fqyFFbfsEyeaRqiFzVpyOaV0xy0BvgGY2UkpvYwytSjDkI2 frtlFiDqMjS/4CLassrLCl8X5zZTk3xKi/AFxiFq6GYcqMuYZ4GjZT781um9NO3ZkFN6 3VnzgCklR/tA0gkv0ChmJ4OkcVmsxN0n4xFXLfWlhcimVYDEFrocAyLYSTUJnT/2tLFc qpSA== 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=rbDYNVvlsfmPp7vHYHFE4FO2z3fiEokDrLA+6DaLKtM=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=XCfPljDrRD+pUFNf7oruU0Y7nx6kPZpNitOU5cXOmh+xj8CkPQiC8ZFEiDvdo+qqSM z+GHMcO9Udtuk7T0JSSzBLwVANUIB9/06vCcD0eCatq5u1AkhOPFuWMi8KeWkXClTovh PQIoFbcgzvr885aAf6HGl7HCHg7HO3CTFK8vcKzABK8ahj9SeMWAin/sqlU3Jou4itQC 6ILhACTg9Z/gsoKvNxV90dbfRCBGl7SMIYoUm8oxenHZtNe5trlU9/j8vUw8KhIKj87E 0jF3dZWp9QpDSByexDyY3H4QrsDzJXtzQ1aTeurtvQFxwj2YSxhX0F33pO/EM8L4aqXG qLqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eD32g5e7; 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 s30-20020a63925e000000b00563eff1b064si1441757pgn.504.2023.08.10.04.55.17; Thu, 10 Aug 2023 04:55: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=eD32g5e7; 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 S234186AbjHJLNz (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234957AbjHJLNg (ORCPT ); Thu, 10 Aug 2023 07:13:36 -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 F405626A5; Thu, 10 Aug 2023 04:13: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 B3F971F86C; Thu, 10 Aug 2023 11:13:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666007; 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=rbDYNVvlsfmPp7vHYHFE4FO2z3fiEokDrLA+6DaLKtM=; b=eD32g5e7+DejaklZmtWfypKG0DHy38hs7P30hFzCJwNei9dwT1sccO8UFdoGbvyemj6Fz3 XbXjlxlEykaPx9zmHROUn8vi9yw9WsndbBFdk/GB0dRoc7H2fXO1klLAulJlc1tsa6zVRn LrugcSF2cfz4d7B0sVF+fXcg4AkhKh4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666007; 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=rbDYNVvlsfmPp7vHYHFE4FO2z3fiEokDrLA+6DaLKtM=; b=88V9IPQgLUdSdgN8/3+8sO6R3vYyROmPLAB+Q1exLZ8Y5c7w8hFGYX9Ip1YSJFQkKUB+pp Ce3ZLNk/XgFNCrAg== 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 A4913138E2; Thu, 10 Aug 2023 11:13:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XOYAKFfG1GRKLwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13: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 v2 10/12] nvme/rc: Add helper for adding/removing to allow list Date: Thu, 10 Aug 2023 13:13:15 +0200 Message-ID: <20230810111317.25273-11-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773843021644825123 X-GMAIL-MSGID: 1773843021644825123 Add two helpers to add or remove the host from the allow list of the subsystem. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/nvme/rc b/tests/nvme/rc index 7f5829a2e58d..706f95d74a4b 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -612,6 +612,23 @@ _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" @@ -621,8 +638,7 @@ _create_nvmet_host() { 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 Thu Aug 10 11:13:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 133972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp390058vqi; Thu, 10 Aug 2023 05:40:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7mb8x86JOZxAPw26FlWW2n0APQQvF8GvWLU4ydUUarjl4QyHMa++nTF/R+zeUGkmbD3Vn X-Received: by 2002:a17:90a:a585:b0:268:8ff2:5c0d with SMTP id b5-20020a17090aa58500b002688ff25c0dmr2722453pjq.17.1691671205186; Thu, 10 Aug 2023 05:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691671205; cv=none; d=google.com; s=arc-20160816; b=tRtAaMYjYnziQ7WHlfXfVS92Qzsi/K0o7/gJEO55LCPA7onCYrlzx5b5bsVO8Oxard llRFLsgKMe62+M2eCZdFKGoFh26iehrInCrkLmdz4KMuAUkC/LiabEEvQDUZJ4gOlvV9 fbn3n+N/iZoxEPPKGjmO21bu/bZEPd4geO0AKyhRMsXb4vbF5acjTeuZcG3x3zQoSxGY JhRXto36EFVHsGHUQzJjRo7qA2w8zKhPir8+YvaQWeoJCFxIeqQzThfK/vBx8+oXdxYZ o705Kzsjm342L4sQdBgFAIIgzQhIbl3evx0rjhBAEj+PpgeL7TGYL4yjQr6t4+7urNEj DSCQ== 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=aQBcsh+FyPbDNoSK+ENnlxq1RffYuE+RoAlftBVeRYs=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=Gzwxd9JIXkOuHtOkuTHGow1GBkoBUZzEbNHriabAs/3fXUWKfUXbbbSqkl3+X9D9PE Npq43IyksR1ttIMM9L0AlsxkZ17O+uKe4C43FO6+Y3FG6i6Q3viboreJWBw+Oof7jruZ lANjXI0OG3qWcgh/zQ2b+aWADZxyaXtVGi9fT7mAYJ6jW5y+sYmMjDsm6NcHIYzZ0Pr2 QQGlAtch6C/bCmzlcK2TTOFahOOoMNOCN12iI/xKj00wHv7rTC+u07NUi/KjDmWiLbhH gglgGAb73UwebTOjyhF9W7TQknCwScrt2ZOMmvWXTO54Kujko5PSrjsAC6epMIw1L2s3 2ZmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=MC2016lT; 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 r1-20020a17090aad0100b00250ce1755e9si1457828pjq.14.2023.08.10.05.39.12; Thu, 10 Aug 2023 05:40: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=MC2016lT; 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 S235319AbjHJLN4 (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235008AbjHJLNg (ORCPT ); Thu, 10 Aug 2023 07:13:36 -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 7B4F626AA; Thu, 10 Aug 2023 04:13:29 -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 3EE361F889; Thu, 10 Aug 2023 11:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666008; 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=aQBcsh+FyPbDNoSK+ENnlxq1RffYuE+RoAlftBVeRYs=; b=MC2016lTEGQkxEE9jgx/AVV5vnk2VW1gLeUcKgoszsBNUQuIm0Ps/ctyFEI4EFh+x41Z4j TwyPZB97m8pPyDCSKm1WaVvo8dF/i1ykzYpd91kgDL3Mn6EHJPGeO5Ck37e/TgVGXqdW2V Jk0bajCKlkeiNZSODYBDJRTFsI4dIUc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666008; 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=aQBcsh+FyPbDNoSK+ENnlxq1RffYuE+RoAlftBVeRYs=; b=2f6/Nr1kaxkUJUphY+WT2ud2Bkm1JA6vJ1Ph17y8M5pSLCsYmFlEl48M2/2NsBL6090S+/ PIS/1KJMDeCkw5Dw== 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 2E78A138E2; Thu, 10 Aug 2023 11:13:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XQVDC1jG1GRMLwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:28 +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 v2 11/12] nvme: Add explicitly host to allow_host list Date: Thu, 10 Aug 2023 13:13:16 +0200 Message-ID: <20230810111317.25273-12-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773845825368512269 X-GMAIL-MSGID: 1773845825368512269 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 706f95d74a4b..0000254da731 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}" } @@ -679,7 +679,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" @@ -694,6 +694,7 @@ _remove_nvmet_passhtru() { local passthru_path="${subsys_path}/passthru" echo 0 > "${passthru_path}/enable" + rm -f "${subsys_path}"/allowed_hosts/* rmdir "${subsys_path}" } @@ -785,6 +786,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" } @@ -811,6 +813,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 Thu Aug 10 11:13:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 133982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp406940vqi; Thu, 10 Aug 2023 06:07:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDUyawi0q+fnjVjpe9lxcNs9OgDzzS3lt2zsRwIirGD/bXd8JYU6fY8GTKZZlKsTQnBgtL X-Received: by 2002:a17:907:7754:b0:99b:4bab:2844 with SMTP id kx20-20020a170907775400b0099b4bab2844mr2123935ejc.55.1691672827284; Thu, 10 Aug 2023 06:07:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691672827; cv=none; d=google.com; s=arc-20160816; b=c5S/kHtS2bMQ67VcZXZXfBHtezLCFhzFtwbOFZRZ7Y0Pc4gTWxjantBwoK35kHbPKm oBym9fURqUl5Z0Eg1Xh1KtcWBEBVkDJBvrf0yaTTa2kC4fHMwu+SfFT7CvDzbCA5lKIY /QG0iPzbyf1Vd8oPtyGV86gyUYVfTUJDuwNtJbQ9YxdrQROkWD6GnVV4RWn0kW/ToCcE VWUU11Bax6pECTds35HJTGbWIpzjlYCwJmCSSdeJt+zJ4e0Y1pErUoRPKiPh3QSSAqE9 eQES5JDu0se6ElsBw+tufWPcuxrckHdWASTk3WKJBhFIAGpCvFIGLgtQ/ohWFPWxPndd 3aCQ== 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=0qYlbMP7EGyuj7E+Wt2OmGFStTU/ph1ju7ElPzsNg2I=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=KQRXMPAMRafCmAaC7aLhhNJezHOxtG74w3cTtTvSvXzqmfQPwmCcxljDkM6NJlk4WX p1OHJtMtjgkcAIVu8/pOs/AmiKfQtmOWp1Mawce9rG2+ABVtul360gZ2AOw1Hwo+waMP pDJcYjZvtNjlW6OEfH+ZmbyaQzKWGHLkUgH88bfgZeXcJkhxpFQj9mS0UHyfF/rvAFQs jwH0IoTSqG6xPEGzfN7o7qwAi22e9Ic4YRIoTxLmoHs7vFe5SnpWLpSiRmJEoNpKB2tc 22GhvfKHbvo6gP04MRS1i3yfKVTTw4mD3YXCNSeNVPEQZyvM1Dq0ythfAMj0gRXRee1P Mv8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="EYZs/HvC"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="UknVee/A"; 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 v8-20020a1709060b4800b0099bc98ccef6si1321765ejg.446.2023.08.10.06.06.30; Thu, 10 Aug 2023 06:07: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="EYZs/HvC"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="UknVee/A"; 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 S235323AbjHJLN7 (ORCPT + 99 others); Thu, 10 Aug 2023 07:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234767AbjHJLNh (ORCPT ); Thu, 10 Aug 2023 07:13:37 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A65A26AB; Thu, 10 Aug 2023 04:13: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-out2.suse.de (Postfix) with ESMTPS id C1BD31F88C; Thu, 10 Aug 2023 11:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691666008; 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=0qYlbMP7EGyuj7E+Wt2OmGFStTU/ph1ju7ElPzsNg2I=; b=EYZs/HvCSgydWnDuThyP7Fq0wCjCys1tpoQXhMpPprzBFWZSDFbystFKMSXtDckZKe3Kz7 v2QlJOd5Tv62fEz3gmnHV1zlSVI3pv+0cuLMrYdDaUybNKcOe4kqSy4Re3CuRJQwKjMzrb czk6O4kba9izwy1ET29+jKiIxzEHzDw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691666008; 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=0qYlbMP7EGyuj7E+Wt2OmGFStTU/ph1ju7ElPzsNg2I=; b=UknVee/AHTlJGUE2tbWaEjF9qIUPRDa8WF5XF5WQXIR/xUFvFuqC6aMqeaetXYvs4o3Sy+ e3ADfeLnaG3uFoDg== 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 AD860138E2; Thu, 10 Aug 2023 11:13:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EXFbKljG1GRTLwAAMHmgww (envelope-from ); Thu, 10 Aug 2023 11:13:28 +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 v2 12/12] nvme: Introduce nvmet_target_{setup/cleanup} common code Date: Thu, 10 Aug 2023 13:13:17 +0200 Message-ID: <20230810111317.25273-13-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810111317.25273-1-dwagner@suse.de> References: <20230810111317.25273-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 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: 1773847526264020325 X-GMAIL-MSGID: 1773847526264020325 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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 34 files changed, 132 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 0000254da731..7a5a370f8a48 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -780,6 +780,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