From patchwork Wed Apr 19 08:47:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 85268 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp234556vqo; Wed, 19 Apr 2023 02:08:10 -0700 (PDT) X-Google-Smtp-Source: AKy350YT3oRXekKXVSxgoQADR7vK6JoLnboFA41oFKKZr3BJZqTM/24qbosmzwQxaHA56uipzP8b X-Received: by 2002:a05:6a20:269c:b0:ef:a31b:af88 with SMTP id h28-20020a056a20269c00b000efa31baf88mr2399226pze.20.1681895289927; Wed, 19 Apr 2023 02:08:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681895289; cv=none; d=google.com; s=arc-20160816; b=DzLviiqUG1aZITU3XMiAv9RBR2Twn2vUmyCljp5rKJ5EIftKZNX0/i9TpS4EMY7TFt G4Au3Mrj4oQw0OmkP6Q3EP8gC/i1KgXq3fIffNCEBm5ecPQiE8QOy9a4OglCu2qzzory 183uaGsTTFTFr8FzXElKB1vCN6onWXQQgxNkHCJPDCUs0p6PihPgwlSqTYMqDpWRQ0x1 KC7EvJk8E9TsM9EhcnEhMZ9O9jZIp3FU0xhfClLFm5qcpihWyHJT1d4K7MkVZJk70d2Y tRXxLAegXiL0TzZaOONpUvLQLvBhnL83rqI9DM4UhAk+EfkV+JXtEpsNZmY/EzhwpVEI BFYw== 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=3QiWi7xEJCHdkqRRP7ZvqBGwdGpiUG8vH8kiotRokzk=; b=JFnu7AAIEbCBdtTyxjsih0lPn7aM2visGWLfm4l2p1PQnQ+NaeIP4LRs1NoaoSGdvY I9WxvcUyY7CT8CVhZbuLT6OHd2nsEXqIKJPCZIPU4aduLM+YCdV2bKyAbHLixMlZVM2+ WebXvKMPrriV7JmTkhCDsxSPJzH1s6TiKy2ikInVm4noR35dGuHqny78D6BhlGYyRvGi XWBR316oawYOik1H1q1Eyq7nxZaLpT6AXWrAhlAGk6BHzru3S8BzsSf7zqu7SEQq+hwT UU+qRYS6jKAZQTuBHyPdFZPu54tCJyjk+UjAkjNd3u/6GhH2KP7BM9KlMa0UJIaNJ1pG rZBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=sqVWNsJV; 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 pf4-20020a17090b1d8400b002449fd20726si1462400pjb.64.2023.04.19.02.07.57; Wed, 19 Apr 2023 02:08:09 -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=sqVWNsJV; 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 S232749AbjDSIsJ (ORCPT + 99 others); Wed, 19 Apr 2023 04:48:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231591AbjDSIsE (ORCPT ); Wed, 19 Apr 2023 04:48:04 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1ADE3C32; Wed, 19 Apr 2023 01:48:03 -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 84E301FD8B; Wed, 19 Apr 2023 08:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1681894082; 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=3QiWi7xEJCHdkqRRP7ZvqBGwdGpiUG8vH8kiotRokzk=; b=sqVWNsJVUjiYb2VzNHizjNmqeNLQlqmarcx3NSnHE26XF92d6u3XLIvXHIH0ew5yONpe6G YlZIgnisan2J/iH7obtvt0j6SFBsN9wphlq+BvYq9TZzFY+ZU05s+Jb+ckEasTUBI3ZQVZ ZEaQh26OZbecg/F5RPbOy5pFezbfrXw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1681894082; 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=3QiWi7xEJCHdkqRRP7ZvqBGwdGpiUG8vH8kiotRokzk=; b=BTEsn7kckP73UTb6IJD67Y1DsdfIczHtODopk79FLqTb4vLl5abEG1zMBlE/PKXXq/l8qh Mq3D2X36dTLJWHAQ== 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 762A91390E; Wed, 19 Apr 2023 08:48:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XB5YHMKqP2S5dQAAMHmgww (envelope-from ); Wed, 19 Apr 2023 08:48:02 +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 , Daniel Wagner Subject: [PATCH blktests v2 1/2] nvme-rc: Cleanup fc ports in reverse order Date: Wed, 19 Apr 2023 10:47:56 +0200 Message-Id: <20230419084757.24846-2-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230419084757.24846-1-dwagner@suse.de> References: <20230419084757.24846-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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763595035644364070?= X-GMAIL-MSGID: =?utf-8?q?1763595035644364070?= We need to free the resources in the opposite order as we allocate them. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/nvme/rc b/tests/nvme/rc index b44239446dcf..ec0cc2d8d8cc 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -204,10 +204,10 @@ _cleanup_fcloop() { local remote_wwnn="${3:-$def_remote_wwnn}" local remote_wwpn="${4:-$def_remote_wwpn}" - _nvme_fcloop_del_rport "${local_wwnn}" "${local_wwpn}" \ - "${remote_wwnn}" "${remote_wwpn}" _nvme_fcloop_del_tport "${remote_wwnn}" "${remote_wwpn}" _nvme_fcloop_del_lport "${local_wwnn}" "${local_wwpn}" + _nvme_fcloop_del_rport "${local_wwnn}" "${local_wwpn}" \ + "${remote_wwnn}" "${remote_wwpn}" } _cleanup_nvmet() { From patchwork Wed Apr 19 08:47:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 85273 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp246987vqo; Wed, 19 Apr 2023 02:31:31 -0700 (PDT) X-Google-Smtp-Source: AKy350YhcohrgffJggIasl8Y06YPOZZbxoGZuxd+h+ElFDcaR8+rsAlp4rAMxJ9Gg3TGJidbWVkK X-Received: by 2002:a05:6a20:8e19:b0:f0:3987:7b33 with SMTP id y25-20020a056a208e1900b000f039877b33mr2552323pzj.42.1681896691187; Wed, 19 Apr 2023 02:31:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681896691; cv=none; d=google.com; s=arc-20160816; b=u05BUAcfouLo6g6KxN+WOvCjNU6X7eSoQFb+L06R0otsYeCxiCywdg5W/Z9U0HioCk QUrZhmzqN0cggVtj6RTRoFJ6Fx9a+IUOp7U/X/iGnxaKDYR21IwICMvUjmgYU0Iz5P9A ZVwpRaZStTYRXm+1i7pOZGrqG01Ymjyp17lFychmlSlxhCv8nUVInrVQhvygvSJ2PDY5 hx6El0upcCbGThrF0DlW3OLhHqpLOGEkjtoZ1OiLrq5cywqL3MCZvIp5NOCypsnGd3qS EM8ENYfdknsTSr8siIG5TrZc/bzJw8TvIF0eV7+YYXYrf3KcSN2oBUqxfVX9AQZUUhcU 8GFg== 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=NEnZ644JL7BzqvU0sxbGAoBWYjk3iv5CXkJiuBwPN/c=; b=PK59X5k4vg7ab6+ClRDViRr4g+ZWrARdsOCH2mdzv4TKUP8idZWc2LiYu4wJdg9IEh mKIj01JddG4+Jz+C4AOepu2WFqXFSyoBntPbO31yah6WZpVRjqzi7WDzxk8LWvMS8d3r +M0iB0mogB8mPu7j9l2cN7RoKi6sBxzIJehrBSiSZUBdE+nWEtAldO/j1imUBKDCzhu4 rHFObepsphMhKNUDV64LsCA+oyWJtQ2uDPNUwtyiW+D7ls53uSXQg1vQguwcoBRWb41P Ndmt5ZB6m8eCB2YOlcbngF92vTAwTnbF+W/rd9XISBePUqZhRp2x8E8EdEr5tvJBQpw/ vzqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=M8tPaWGN; 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 x24-20020a63db58000000b005193a2c7b1esi2770487pgi.447.2023.04.19.02.31.18; Wed, 19 Apr 2023 02:31:31 -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=M8tPaWGN; 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 S232757AbjDSIsL (ORCPT + 99 others); Wed, 19 Apr 2023 04:48:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232730AbjDSIsF (ORCPT ); Wed, 19 Apr 2023 04:48:05 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F29E1A4; Wed, 19 Apr 2023 01:48:04 -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 203E321908; Wed, 19 Apr 2023 08:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1681894083; 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=NEnZ644JL7BzqvU0sxbGAoBWYjk3iv5CXkJiuBwPN/c=; b=M8tPaWGNuTcM0+4I5u+VLunpNCH8/cK5wAYTEPICSez2IJ173pcGHxIEgnWuXF/lZE2ZIS 3TyNEuKQ+TzkG6vjv5A5Gn/d+vsINCs4VC6Y8mnBxfCoUfRq5wOewasrdEfwpvrVCeBe+V FJMcsL7No4pmM/LALJEENsiuc1prKSM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1681894083; 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=NEnZ644JL7BzqvU0sxbGAoBWYjk3iv5CXkJiuBwPN/c=; b=FHGWW/rllpupFShePGQj1O4dUlE0IMPgumOX32O9iG61oeSYDLecrcR+QYrvAf3mtcmTuO HF8gZr+O13sZBjBw== 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 118961390E; Wed, 19 Apr 2023 08:48:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yasgBMOqP2S7dQAAMHmgww (envelope-from ); Wed, 19 Apr 2023 08:48:03 +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 , Daniel Wagner Subject: [PATCH blktests v2 2/2] nvme-rc: Cleanup fc resource before module unloading Date: Wed, 19 Apr 2023 10:47:57 +0200 Message-Id: <20230419084757.24846-3-dwagner@suse.de> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230419084757.24846-1-dwagner@suse.de> References: <20230419084757.24846-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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763596504585955640?= X-GMAIL-MSGID: =?utf-8?q?1763596504585955640?= Before we unload the module we should cleanup the fc resources first, basically reorder the shutdown sequence to be in reverse order of the setup path. Also unload the nvme-fcloop after usage. While at it also update the rdma stop_soft_rdma before the module unloading for the same reasoning. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/nvme/rc b/tests/nvme/rc index ec0cc2d8d8cc..41f196b037d6 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -260,18 +260,20 @@ _cleanup_nvmet() { shopt -u nullglob trap SIGINT - modprobe -rq nvme-"${nvme_trtype}" 2>/dev/null - if [[ "${nvme_trtype}" != "loop" ]]; then - modprobe -rq nvmet-"${nvme_trtype}" 2>/dev/null - fi - modprobe -rq nvmet 2>/dev/null if [[ "${nvme_trtype}" == "rdma" ]]; then stop_soft_rdma fi if [[ "${nvme_trtype}" == "fc" ]]; then _cleanup_fcloop "${def_local_wwnn}" "${def_local_wwpn}" \ "${def_remote_wwnn}" "${def_remote_wwpn}" + modprobe -rq nvme-fcloop fi + + modprobe -rq nvme-"${nvme_trtype}" 2>/dev/null + if [[ "${nvme_trtype}" != "loop" ]]; then + modprobe -rq nvmet-"${nvme_trtype}" 2>/dev/null + fi + modprobe -rq nvmet 2>/dev/null } _setup_nvmet() {