From patchwork Fri Aug 18 14:15:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13357888 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44807C71150 for ; Fri, 18 Aug 2023 14:16:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241268AbjHROQR (ORCPT ); Fri, 18 Aug 2023 10:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352770AbjHROPq (ORCPT ); Fri, 18 Aug 2023 10:15:46 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7333E2D79; Fri, 18 Aug 2023 07:15:45 -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 31C452188E; Fri, 18 Aug 2023 14:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692368144; 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; bh=d/7zqkRLWIWxWvda4BWwDf8i+W56yQsa+BJdqTLnd8E=; b=do5QGAvAdPsbSHggbhL0312MUN/DIt7IlQ6WomwCO9yk/n9jeJItQfkjobeAxuPFZlonfT HDrova9KA68dB4o+xwgAxYGohfZFDwhzq2p//+5c43IerJggsuWoGhdmDqxBWaq63nOVum egoFvcGeH6yGiQbRZQYuvmf+vNMkWtU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692368144; 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; bh=d/7zqkRLWIWxWvda4BWwDf8i+W56yQsa+BJdqTLnd8E=; b=RDwzUzcOKBuzzpG96ATXIu+uSlJfbBDFYr5vJacXJXMGayHLQjF6U1zZYH5tdvccqVYjIf 52ase1XHVpvOjuCg== 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 228F413441; Fri, 18 Aug 2023 14:15:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id zehmCBB932SXOwAAMHmgww (envelope-from ); Fri, 18 Aug 2023 14:15:44 +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 , Hannes Reinecke , Sagi Grimberg , Jason Gunthorpe , Daniel Wagner Subject: [PATCH blktests v2 0/1] Introduce nvmet target setup/cleanup helpers Date: Fri, 18 Aug 2023 16:15:34 +0200 Message-ID: <20230818141537.22332-1-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org I've decided to at two cleanup patches for the passthru tests. Initially I tried to get rid of the arguments when calling the helpers. Instead _nvmet_passthru_target_setup "${def_subsysnqn}" just _nvmet_passthru_target_setup but I run into the problem that ShellCheck seems to have a bug when default arguments are used in the function: fn() { local -i a=${1:-42} printf '%d\n' "$a" } fn will trigger SC2119 and SC2120. This has been reported but not fixed yet: https://github.com/koalaman/shellcheck/issues/2511 Thus I decided to leave it as it is, unless someone has a clever idea how to get this working. original cover letter: Introduce helpers to setup nvmet targets. This is spin off from the refactoring patches and the allowed_host patches [1]. Sagi suggested to record all resources allocated by nvmet_target_setup and then later clean them up in nvmet_target_cleanup. I opted to figure out in nvmet_target_cleanup what was allocated via the newly introdcuded _get_nvmet_ports helper. The reason being, Hannes told me offline that he would like to add ANA tests which will add some more ports to the subsystem. I hope with this the code is more future proof. BTW, while looking at this I saw that the passthru code is using the awkward return value port when calling nvmet_passthru_target_setup. It seems some more refactoring is in order... [1] https://lore.kernel.org/linux-nvme/5h333eqhtw252sjw6axjewlb5bbb5ze7awekczxe3kie2lnhw6@manyer42khct/ changes v2: - drop local subsys variable in passthru tests - do not use port as handle in passthru tests - free port after unregistering from subsys v1: - https://lore.kernel.org/linux-nvme/20230818095744.24619-1-dwagner@suse.de/ Daniel Wagner (3): nvme/{033,034,035,036}: use default subsysnqn variable directly nvme/{033,034,035,036,37}: drop port handle between passthru target setup and cleanup nvme: introduce nvmet_target_{setup/cleanup} common code tests/nvme/003 | 14 ++----- tests/nvme/004 | 21 ++--------- tests/nvme/005 | 20 +--------- tests/nvme/006 | 19 +--------- tests/nvme/007 | 14 +------ tests/nvme/008 | 21 +---------- tests/nvme/009 | 16 +------- tests/nvme/010 | 21 +---------- tests/nvme/011 | 16 +------- tests/nvme/012 | 21 +---------- tests/nvme/013 | 16 +------- tests/nvme/014 | 21 +---------- tests/nvme/015 | 16 +------- tests/nvme/018 | 16 +------- tests/nvme/019 | 21 +---------- tests/nvme/020 | 16 +------- tests/nvme/021 | 16 +------- tests/nvme/022 | 16 +------- tests/nvme/023 | 21 +---------- tests/nvme/024 | 16 +------- tests/nvme/025 | 16 +------- tests/nvme/026 | 16 +------- tests/nvme/027 | 17 ++------- tests/nvme/028 | 17 ++------- tests/nvme/029 | 21 +---------- tests/nvme/033 | 10 ++--- tests/nvme/034 | 10 ++--- tests/nvme/035 | 10 ++--- tests/nvme/036 | 12 +++--- tests/nvme/037 | 5 +-- tests/nvme/040 | 19 +--------- tests/nvme/041 | 18 +-------- tests/nvme/042 | 17 +-------- tests/nvme/043 | 17 +-------- tests/nvme/044 | 19 ++-------- tests/nvme/045 | 18 ++------- tests/nvme/047 | 21 +---------- tests/nvme/048 | 17 +-------- tests/nvme/rc | 99 +++++++++++++++++++++++++++++++++++++++++++++++--- 39 files changed, 184 insertions(+), 553 deletions(-)