From patchwork Wed Jul 26 12:46:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 126393 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp429433vqo; Wed, 26 Jul 2023 07:09:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlF7JGfJa9HvHp47b0I/rHyMNZOcQ8pCL7HPlbDmgzN2yJdrqY8Bb1MHkkdO3NV/anLIU5sV X-Received: by 2002:a05:6a20:441b:b0:131:a21:9f96 with SMTP id ce27-20020a056a20441b00b001310a219f96mr2972293pzb.6.1690380553541; Wed, 26 Jul 2023 07:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690380553; cv=none; d=google.com; s=arc-20160816; b=028JqVVYvhXLwX1fE1lfFTl2wvR7W0RsR8RS81z/k6MTBhITbm+q+TkNEGLFlxb13a lsdNIxKCm/07R183REY3F0N6NV6JE1K/H9E/dbYFEa6VvEN9Tq8iTa96eutMulcARNP3 cXnY8AerDkt6sKI9W20JdKHeF92vm0rmNc1V8JYUh1U1D337iOM+AByGrPbJtXUyXk/D XLQkVN1DMHj0E3QnvoDRt595/yQowhQQm7HjrGgGjXdCKo/QeBtqvK636GTCCVouJSTw KupPxKLfq2MyLG4hB4LWO/5PyAVNpaaMJyzYe4NIPdmii5bMjJJ2FiownUkPtwx4CT/6 ZXWg== 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=yOxxhxcNlYDvRknRRq8NylD2QGGuF+oF8+pXpC2Qo68=; b=014InJB8iv3N53+asmo6Jkoy95H3D4ctFDhXHAiYI/cKJ0j01M0SzPzfs1s41HEY4d /GorGccOcvQsSny/LhVqLdSj1COAGPKx9wSW/ZcvBpdCgekoW4+i/PbZ0LtbBBClb3yn xsi6cqcTPC930Cq3tXlseAfpItjVZ57Ht0a+Yx1tpKsurOY+Ch8rxcQ9hwPFG1xDiHPT vgavdmMrlK/r/Y4wye+AEuG/PRUaqgsHYhkCQNHpbeqloqoymz4sqQVeQqXPtUlpaaYT JwFZxi7bBJ5Y1YM59/IGUC0CgNXT83dIcX6sdL+nSeQ/9J9cTEh2bAPoj53qTVOCBthQ 4k0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=IVpoEmzB; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=zRg8nVC2; 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 o17-20020a656151000000b0054fe07d2f49si13156162pgv.657.2023.07.26.07.08.59; Wed, 26 Jul 2023 07:09:13 -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=IVpoEmzB; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=zRg8nVC2; 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 S231340AbjGZMrP (ORCPT + 99 others); Wed, 26 Jul 2023 08:47:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234041AbjGZMrE (ORCPT ); Wed, 26 Jul 2023 08:47:04 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F1B81BD6; Wed, 26 Jul 2023 05:47:00 -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 12D0521D67; Wed, 26 Jul 2023 12:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690375619; 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=IVpoEmzB618sHE+gXRxUAfpUC+adllHxmEgT/42LjijRnplRIRMd4A4XKcm90hrzoauAd/ nv6TaYDg4TOXegey4m/rzH5Oi66WUukIq2YepAVdzudxpX/8dBz8Ze5pgT80AQvhIP/tMz Gf9pXGIiHB4lJaymmjhZhx+ZNNZC3z8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690375619; 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=zRg8nVC28ELOyWnGUF/wx3Q6cPY3R3jxTLgqsgJjHY2FisvuZ4A9zMYJ5+ORm4tKGUhKCq wdl+9umcw/NZsKAg== 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 04982139BD; Wed, 26 Jul 2023 12:46:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id n+8bAcMVwWRFUAAAMHmgww (envelope-from ); Wed, 26 Jul 2023 12:46:59 +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 , Daniel Wagner Subject: [PATCH blktests v1 10/11] nvme/rc: Add helper for adding/removing to allow list Date: Wed, 26 Jul 2023 14:46:43 +0200 Message-ID: <20230726124644.12619-11-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726124644.12619-1-dwagner@suse.de> References: <20230726124644.12619-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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772492479048023105 X-GMAIL-MSGID: 1772492479048023105 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