From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C5DCD5B86B for ; Tue, 29 Oct 2024 03:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=VP58qHCxrtXU8eOr7aF54itR6KfwyQwAYmFG275d91c=; b=NOkpsiaKwHm3AfLsfUNoEuZyQR cFMAhXAN+2xeWuL9/0VKXdjPZkQdNur/cm4d9FkyI1R0BXI5FPepbLK55dF4eObquDzFyHgFP15/7 8pucxHT3LHptk5h6Xloyey/wyrGF1UkZ14lp9UD/ntvT0a0hS9NMpIX9jbyRGYPkdaSsseBcI3FsP kli/xC5gTH+3DgnjTIYK6+xbo5RBtLvZyE37VVx0cQU8tFBjZ96xzdR+Oiuf5PNMEaILWs3kXizfJ 9W0T2yNKNN8ewBWw9O/QkFHuMbK2S6hLPzfY/+gVpKesfR/fndBTbmXKlF3bDy5lVE98/Gwb4dDai dmiqwOWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t5clq-0000000D4gg-2Uob; Tue, 29 Oct 2024 03:19:50 +0000 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t5clk-0000000D4fo-1bJs for linux-nvme@lists.infradead.org; Tue, 29 Oct 2024 03:19:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1730171978; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=VP58qHCxrtXU8eOr7aF54itR6KfwyQwAYmFG275d91c=; b=YcRko8U6FUm1zn4pPDErEFeBQO8Krv903d/QLjRX2gWfAIxoTDxvY16NH7I6etMqE1vvjjZiNm80UWhcW/l+Vf0rWPoCTZtOasq4a8mxDwHEvPBxwHH/N48ntv6yr51DrC1yDJCkn7KUJS07pmpVp4fCuXv1+CPi/GWTmeN3nhQ= Received: from localhost(mailfrom:kanie@linux.alibaba.com fp:SMTPD_---0WI8eS4r_1730171971 cluster:ay36) by smtp.aliyun-inc.com; Tue, 29 Oct 2024 11:19:37 +0800 From: Guixin Liu To: shinichiro.kawasaki@wdc.com, dwagner@suse.de, chaitanyak@nvidia.com Cc: linux-nvme@lists.infradead.org Subject: [PATCH] nvme/{common/nvme, 051, 052}: introduce def_nsid Date: Tue, 29 Oct 2024 11:19:31 +0800 Message-ID: <20241029031931.118305-1-kanie@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241028_201945_636705_24F0814C X-CRM114-Status: UNSURE ( 9.13 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Use def_nsid instead of hard code, the default of def_nsid is 1. Signed-off-by: Guixin Liu --- common/nvme | 3 ++- tests/nvme/051 | 2 +- tests/nvme/052 | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/nvme b/common/nvme index c1aa8d6..6371efe 100644 --- a/common/nvme +++ b/common/nvme @@ -16,6 +16,7 @@ def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349" def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}" export def_subsysnqn="blktests-subsystem-1" export def_subsys_uuid="91fdba0d-f87b-4c25-b80f-db7be1418b9e" +export def_nsid="1" _check_conflict_and_set_default NVMET_TRTYPES nvme_trtype "loop" _check_conflict_and_set_default NVME_IMG_SIZE nvme_img_size 1G _check_conflict_and_set_default NVME_NUM_ITER nvme_num_iter 1000 @@ -537,7 +538,7 @@ _create_nvmet_subsystem() { mkdir -p "${cfs_path}" echo 0 > "${cfs_path}/attr_allow_any_host" _create_nvmet_ns --subsysnqn "${nvmet_subsystem}" \ - --nsid "1" \ + --nsid "${def_nsid}" \ --blkdev "${blkdev}" \ --uuid "${uuid}" \ ${resv_enable} diff --git a/tests/nvme/051 b/tests/nvme/051 index 624b42f..4757b80 100755 --- a/tests/nvme/051 +++ b/tests/nvme/051 @@ -33,7 +33,7 @@ test() { _setup_nvmet _nvmet_target_setup - ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/1" + ns="${NVMET_CFS}subsystems/${def_subsysnqn}/namespaces/${def_nsid}" # fire off two enable/disable loops concurrently and wait # for them to complete... diff --git a/tests/nvme/052 b/tests/nvme/052 index 1dcda23..781a9f0 100755 --- a/tests/nvme/052 +++ b/tests/nvme/052 @@ -57,10 +57,10 @@ test() { _nvme_connect_subsys - # start iteration from ns-id 2 because ns-id 1 is created - # by default when nvme target is setup. Also ns-id 1 is + # start iteration from def_nsid+1 because def_nsid is created + # by default when nvme target is setup. Also def_nsid is # deleted when nvme target is cleaned up. - for ((i = 2; i <= iterations; i++)); do { + for ((i = $((${def_nsid})) + 1; i <= iterations; i++)); do { truncate -s "${NVME_IMG_SIZE}" "$(_nvme_def_file_path).$i" uuid="$(uuidgen -r)" -- 2.43.0