From patchwork Mon Feb 12 10:40:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13552932 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EDE72BAEA for ; Mon, 12 Feb 2024 10:40:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734454; cv=none; b=SNdFqtxvckDw+TPqnl40EV9WIvcSn1TjyegUHNctgxH6zdEF2oyFou6On/G/J+0XXviaSIg5i8BQ3Bvq8A8b2/G9kAqbmm6DY27872MepUJmLOiCZp5zv7U5nmAwx9r8jscUQkDdumyWOUeVxHUctXhEt0Ca16CgIV+Fh45bR8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734454; c=relaxed/simple; bh=QQX/gFLZw0E3ZbYXUfbyjG/vXICMOAV3CegaXTLpnWI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r5p2JwWix9gzdUujaTavcjEVjiNOPDhYsI3cWbCauJsCiArYO5E3XiOvWGhIoslxPUO7htP9+WuQ0KjCbIUJWTqdc3dNaIZKQ/eB8Imrwv6lPybI+rxDz7qqH6/0Y+j/w5bhuPpKMR4+NPSm5lce+cHimVm2js2hJKqj6NpViKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=M0kUZE9s; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=hva6xSIA; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=M0kUZE9s; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=hva6xSIA; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="M0kUZE9s"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="hva6xSIA"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="M0kUZE9s"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="hva6xSIA" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 2E3391F7B5; Mon, 12 Feb 2024 10:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734451; 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=0/YGKQaQ+HjwGpY382o6YRw3SpaQ9+GiCV7RLR8wcCM=; b=M0kUZE9sziBJ/3Jiy0/i9HB6TY1U5hJYb3fyf725qhiOKq/PNMUMfK8QFpCkOOH63+DvUm reRWOAK1xNyw6cK+Kq+7uDpf1I3/7LYnNA09WcJgcyd8GlqQR7oevCgJojcApuPx6WsI5u nyusMOs+Uk0k1cW3YcqkwSoOsSDizpQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734451; 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=0/YGKQaQ+HjwGpY382o6YRw3SpaQ9+GiCV7RLR8wcCM=; b=hva6xSIAnJ/VMIFQ8q95GlvRdSulHH0bRDgcX78kCKVOc6thez649+QcwjFEdQDjvBDbag LauaxQ6ithR4oRCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734451; 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=0/YGKQaQ+HjwGpY382o6YRw3SpaQ9+GiCV7RLR8wcCM=; b=M0kUZE9sziBJ/3Jiy0/i9HB6TY1U5hJYb3fyf725qhiOKq/PNMUMfK8QFpCkOOH63+DvUm reRWOAK1xNyw6cK+Kq+7uDpf1I3/7LYnNA09WcJgcyd8GlqQR7oevCgJojcApuPx6WsI5u nyusMOs+Uk0k1cW3YcqkwSoOsSDizpQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734451; 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=0/YGKQaQ+HjwGpY382o6YRw3SpaQ9+GiCV7RLR8wcCM=; b=hva6xSIAnJ/VMIFQ8q95GlvRdSulHH0bRDgcX78kCKVOc6thez649+QcwjFEdQDjvBDbag LauaxQ6ithR4oRCg== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 1BEDE13A0E; Mon, 12 Feb 2024 10:40:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id UCddBbP1yWXrCwAAn2gu4w (envelope-from ); Mon, 12 Feb 2024 10:40:51 +0000 From: Daniel Wagner To: Shin'ichiro Kawasaki Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Chaitanya Kulkarni , Daniel Wagner , Chaitanya Kulkarni Subject: [PATCH blktests v2 1/5] nvme/029: fix local variable declarations Date: Mon, 12 Feb 2024 11:40:42 +0100 Message-ID: <20240212104046.13127-2-dwagner@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212104046.13127-1-dwagner@suse.de> References: <20240212104046.13127-1-dwagner@suse.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [4.81 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[nvidia.com:email,suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.09)[64.17%] X-Spam-Level: **** X-Spam-Score: 4.81 X-Spam-Flag: NO The syntax for local variables declarations uses whitespace as separator and not commas: tests/nvme/029: line 24: local: `bs,': not a valid identifier tests/nvme/029: line 24: local: `size,': not a valid identifier tests/nvme/029: line 24: local: `img,': not a valid identifier Reviewed-by: Chaitanya Kulkarni Signed-off-by: Daniel Wagner --- tests/nvme/029 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nvme/029 b/tests/nvme/029 index caed0f7ec476..db6e8b91f707 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -21,7 +21,7 @@ test_user_io() local disk="$1" local start=$2 local cnt=$3 - local bs, size, img, img1 + local bs size img img1 bs="$(blockdev --getss "$disk")" size=$((cnt * bs)) From patchwork Mon Feb 12 10:40:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13552933 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96E502BAE3 for ; Mon, 12 Feb 2024 10:40:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734455; cv=none; b=kDIqfTRFbiUW3VExHBEZkhQ8terouBacDBkArBAg3Gw+Pv8yE0xoPZ1lAj7VSWN6ZtYyn+JFXqlvv+pNZX+NjKuCSnilIwGCPjNtnUa4QiWGNlKAOO6ul2mMr+U6M72Kz6nklUXnNRcgzCH7vjVfgr//PLIVPXNIYJXVdNPUC4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734455; c=relaxed/simple; bh=0e7qnMi4iDs30y9LcEpAjotTvJ2Ld9cm6VRChGZN5DA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P2tXKfKy5yDfKxicUctZl8ktEDtVh5pzswt5x/A3QCevt6PDsDoeGZ6186cehkIbrvrn/qIdZZbDHEfamQzhjOVE1MnFJWiRGgwqzaK5umXlw3+En7/vrszFgdH/2TDFJcROl5Jyyv8zrFc6hVwoCKev0Kg/wbrq4paykCZvyXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=feXXkulG; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RYaeIo1y; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=feXXkulG; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=RYaeIo1y; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="feXXkulG"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RYaeIo1y"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="feXXkulG"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="RYaeIo1y" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C84C71FBAF; Mon, 12 Feb 2024 10:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734451; 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=1MZGe7xbvFWzEvcOYAPbHp3XTRaDLXD1TMzZeTrCBNs=; b=feXXkulG+ZmbY3LZrDlJ4DVbmLQPxHyXlMg1lC+cGqDDk/Fl9jISd6y6pTBreAuJmMDNja AcNKFlG+KD7JbexZ6pICKw34MGYNrqRggLtp2UTUx2bGV4Vtn72sKrJuwkh/AbK8OJozQW 4RP863Tbt9o+oaLAxUabVxbOkeShqzA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734451; 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=1MZGe7xbvFWzEvcOYAPbHp3XTRaDLXD1TMzZeTrCBNs=; b=RYaeIo1yAg/+y5PmxEP1W4TgCVLeQ98BXFf/PDsm+B0zmgIeuRZWf7UsFTwBYcoRCmfdP7 s6zvetRxM2EwN7BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734451; 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=1MZGe7xbvFWzEvcOYAPbHp3XTRaDLXD1TMzZeTrCBNs=; b=feXXkulG+ZmbY3LZrDlJ4DVbmLQPxHyXlMg1lC+cGqDDk/Fl9jISd6y6pTBreAuJmMDNja AcNKFlG+KD7JbexZ6pICKw34MGYNrqRggLtp2UTUx2bGV4Vtn72sKrJuwkh/AbK8OJozQW 4RP863Tbt9o+oaLAxUabVxbOkeShqzA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734451; 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=1MZGe7xbvFWzEvcOYAPbHp3XTRaDLXD1TMzZeTrCBNs=; b=RYaeIo1yAg/+y5PmxEP1W4TgCVLeQ98BXFf/PDsm+B0zmgIeuRZWf7UsFTwBYcoRCmfdP7 s6zvetRxM2EwN7BQ== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id B741113A0E; Mon, 12 Feb 2024 10:40:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id Ny9KK7P1yWXtCwAAn2gu4w (envelope-from ); Mon, 12 Feb 2024 10:40:51 +0000 From: Daniel Wagner To: Shin'ichiro Kawasaki Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Chaitanya Kulkarni , Daniel Wagner Subject: [PATCH blktests v2 2/5] nvme/rc: filter out errors from cat when reading files Date: Mon, 12 Feb 2024 11:40:43 +0100 Message-ID: <20240212104046.13127-3-dwagner@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212104046.13127-1-dwagner@suse.de> References: <20240212104046.13127-1-dwagner@suse.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=feXXkulG; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RYaeIo1y X-Spamd-Result: default: False [-0.31 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -0.31 X-Rspamd-Queue-Id: C84C71FBAF X-Spam-Level: X-Spam-Flag: NO X-Spamd-Bar: / When running the tests with FC as transport and the udev auto connect enabled, discovery controllers are created and destroyed while the tests are running. This races with the cleanup code and also the _find_nvme_dev() which iterates over all device entries and tries to read the connect of transport and subsysnqn sysfs attributes. Since these steps are not locked in anyway, the resources can go away in between. Thus filter out 'cat' reporting non existing subsysnqn or transport attributes. The tests will still fail if they can't find the device etc. But without filtering these errors out the tests fail randomly. 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 e0461f1cd53a..9cc83afe0668 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -350,7 +350,7 @@ _cleanup_nvmet() { for dev in /sys/class/nvme/nvme*; do dev="$(basename "$dev")" - transport="$(cat "/sys/class/nvme/${dev}/transport")" + transport="$(cat "/sys/class/nvme/${dev}/transport" 2>/dev/null)" if [[ "$transport" == "${nvme_trtype}" ]]; then echo "WARNING: Test did not clean up ${nvme_trtype} device: ${dev}" _nvme_disconnect_ctrl "${dev}" @@ -840,7 +840,7 @@ _find_nvme_dev() { for dev in /sys/class/nvme/nvme*; do [ -e "$dev" ] || continue dev="$(basename "$dev")" - subsysnqn="$(cat "/sys/class/nvme/${dev}/subsysnqn")" + subsysnqn="$(cat "/sys/class/nvme/${dev}/subsysnqn" 2>/dev/null)" if [[ "$subsysnqn" == "$subsys" ]]; then echo "$dev" fi From patchwork Mon Feb 12 10:40:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13552934 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45E29182AF for ; Mon, 12 Feb 2024 10:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734455; cv=none; b=Z1vTj/QahUL6Eb27ld4OfYJpyZPq4/KDasnZnRukPKlbu+yncIMqsFOHSGZ0TY+h+aeL7r+ps9DXq4I7QICbjN2J0IrK4Mefhy08D0+/ijY3CUw8Nih81odw6UKB8uvSRUNpoTPpjD5zR40FuQkAWbYVppFaDQNW8UU+pp8miCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734455; c=relaxed/simple; bh=oxeaNWNsnhmZdUEh0uAZugNTufXfGKDIZ5hLL8jqLC4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YYGY3t2D/QY+4JfL1lehVNKYHnP0A5rIL/Yq6JI9rwyp0LCSrUadCLvUPWIgx8JWCmGeY0sFhcWaCG/uo3Am/LRnLCQzmeIVgHkihX817b/JeRYQ3/eQ4h3YwM9GoJSi/G/meal1EkWkOz8nwxaK7FZAYuzwcZc8nd1G1bpnDHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=NJS/GzaP; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=3O8XBbnm; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=NJS/GzaP; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=3O8XBbnm; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="NJS/GzaP"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="3O8XBbnm"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="NJS/GzaP"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="3O8XBbnm" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6CA591FBB3; Mon, 12 Feb 2024 10:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734452; 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=FebT9pXx4EWS9DDD7uGtIJAl/WWtPHNBTe8inii0ClQ=; b=NJS/GzaP5+MmixUWmNcy7fXMDekdIP9FgRTfe7JRMKmBBgLSAhjlMhqzDJciqcemGi18bK ca9HnM3cbwQbmN23keP8+247IuHG7yIoWW7lkO7kpKQW/ug7mcFEeOllHbYQtn7Fetb7Du A0op10tBTqfpLIwYCX/ONpChQmZ8wII= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734452; 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=FebT9pXx4EWS9DDD7uGtIJAl/WWtPHNBTe8inii0ClQ=; b=3O8XBbnmLkKmg3A2sl8y7K+0lXbtUIGOK8lqMelxLTE9EJJXLzu0ap/KhOsAZMfhoBLFib RGjFEbcHx7kixvBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734452; 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=FebT9pXx4EWS9DDD7uGtIJAl/WWtPHNBTe8inii0ClQ=; b=NJS/GzaP5+MmixUWmNcy7fXMDekdIP9FgRTfe7JRMKmBBgLSAhjlMhqzDJciqcemGi18bK ca9HnM3cbwQbmN23keP8+247IuHG7yIoWW7lkO7kpKQW/ug7mcFEeOllHbYQtn7Fetb7Du A0op10tBTqfpLIwYCX/ONpChQmZ8wII= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734452; 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=FebT9pXx4EWS9DDD7uGtIJAl/WWtPHNBTe8inii0ClQ=; b=3O8XBbnmLkKmg3A2sl8y7K+0lXbtUIGOK8lqMelxLTE9EJJXLzu0ap/KhOsAZMfhoBLFib RGjFEbcHx7kixvBA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 5A67A13A0E; Mon, 12 Feb 2024 10:40:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id PvegFLT1yWXvCwAAn2gu4w (envelope-from ); Mon, 12 Feb 2024 10:40:52 +0000 From: Daniel Wagner To: Shin'ichiro Kawasaki Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Chaitanya Kulkarni , Daniel Wagner Subject: [PATCH blktests v2 3/5] nvme/rc: do not issue warnings on cleanup when using fc transport Date: Mon, 12 Feb 2024 11:40:44 +0100 Message-ID: <20240212104046.13127-4-dwagner@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212104046.13127-1-dwagner@suse.de> References: <20240212104046.13127-1-dwagner@suse.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: * X-Spamd-Bar: + Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="NJS/GzaP"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3O8XBbnm X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [1.39 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.10)[65.61%] X-Spam-Score: 1.39 X-Rspamd-Queue-Id: 6CA591FBB3 X-Spam-Flag: NO When running the tests with FC as transport and the udev auto connect enabled, discovery controllers are created and destroyed while the tests are running. The cleanup code expects that all devices are under blktests control, but this isn't the case. So just disable the warning as it is reporting a lot of false positives. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/nvme/rc b/tests/nvme/rc index 9cc83afe0668..ca6a284a1e25 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -352,7 +352,10 @@ _cleanup_nvmet() { dev="$(basename "$dev")" transport="$(cat "/sys/class/nvme/${dev}/transport" 2>/dev/null)" if [[ "$transport" == "${nvme_trtype}" ]]; then - echo "WARNING: Test did not clean up ${nvme_trtype} device: ${dev}" + # if udev auto connect is enabled for FC we get false positives + if [[ "$transport" != "fc" ]]; then + echo "WARNING: Test did not clean up ${nvme_trtype} device: ${dev}" + fi _nvme_disconnect_ctrl "${dev}" fi done From patchwork Mon Feb 12 10:40:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13552935 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDA3838DE0 for ; Mon, 12 Feb 2024 10:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734456; cv=none; b=uczxfd2zI2rDrmVBnPy95b/D3KqSWRqhPtO4/mFOmdnuBiIjz3nOk/k3QwBsGqRmxkER/lPqzxbCD3ucI3Bx3NWjLubNjQe+xdL7Hc1PvM1M68pDge9Fzpth8R4gRp078Ht0Pvt2MOwjWssKuXMnoYpGJp2ci4IWhdTG3ndTSsQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734456; c=relaxed/simple; bh=an6wMHi9l/AjaIBGt2xbeSsRIe0SwRCRMEs6P214p4I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WCayWRK9kGLSOIg5iPWbn1ox7XNWBZl8uJ2+ey+jK+f2dQsRMg7hu5wsbhG+TmeTYG82EH087K0mVjH3yo2dXkywenfgbxdgBlWykOkzabLwVwrT8AIkM5l66rrrYt5Ed/eUsMELTKYcbdAg1ig9r2JPZivcJJJjPPUVyx78gZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=xtiuk9NO; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=lJkMiqkx; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=xtiuk9NO; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=lJkMiqkx; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="xtiuk9NO"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="lJkMiqkx"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="xtiuk9NO"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="lJkMiqkx" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1DB3622156; Mon, 12 Feb 2024 10:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734453; 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=FFggav3UdwphxqxkITKQjzcWtQGpfLWKc9311B20mcI=; b=xtiuk9NOpemU3uORvgcriN7381bzxyPbmSc7Unpeahcts0tYRG4d5XmIGxCkjgIF141CVn q+d3ary0uXW03uKtEr99wbAfplyKaaAQZwkNNjWvVVmALX19huHA8tKrqhe5EVd03DqW8G MQMUyC2UmShvBTd6qHp0alq8oQ3YwKc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734453; 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=FFggav3UdwphxqxkITKQjzcWtQGpfLWKc9311B20mcI=; b=lJkMiqkx2bbwFf0k/qAHaIHynMCMqEg1gTZIpgbDeDXuSNoOIbfWyq5jX5FCxLWDcArrq6 FkoJdJTYoZv5W+Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734453; 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=FFggav3UdwphxqxkITKQjzcWtQGpfLWKc9311B20mcI=; b=xtiuk9NOpemU3uORvgcriN7381bzxyPbmSc7Unpeahcts0tYRG4d5XmIGxCkjgIF141CVn q+d3ary0uXW03uKtEr99wbAfplyKaaAQZwkNNjWvVVmALX19huHA8tKrqhe5EVd03DqW8G MQMUyC2UmShvBTd6qHp0alq8oQ3YwKc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734453; 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=FFggav3UdwphxqxkITKQjzcWtQGpfLWKc9311B20mcI=; b=lJkMiqkx2bbwFf0k/qAHaIHynMCMqEg1gTZIpgbDeDXuSNoOIbfWyq5jX5FCxLWDcArrq6 FkoJdJTYoZv5W+Dg== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 0092913A0E; Mon, 12 Feb 2024 10:40:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id 4pJKOrT1yWXxCwAAn2gu4w (envelope-from ); Mon, 12 Feb 2024 10:40:52 +0000 From: Daniel Wagner To: Shin'ichiro Kawasaki Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Chaitanya Kulkarni , Daniel Wagner Subject: [PATCH blktests v2 4/5] nvme/rc: do not issue errors when disconnecting when using fc transport Date: Mon, 12 Feb 2024 11:40:45 +0100 Message-ID: <20240212104046.13127-5-dwagner@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212104046.13127-1-dwagner@suse.de> References: <20240212104046.13127-1-dwagner@suse.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Level: *** X-Spam-Score: 3.55 X-Spamd-Result: default: False [3.55 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.15)[68.81%] X-Spam-Flag: NO When running the tests with FC as transport and the udev auto connect enabled, discovery controllers are created and destroyed while the tests are running. The cleanup code expects that all devices are under blktests control, but this isn't the case. Thus filter out disconnect failures as well. Signed-off-by: Daniel Wagner --- tests/nvme/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nvme/rc b/tests/nvme/rc index ca6a284a1e25..cdfc738d3aec 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -356,7 +356,7 @@ _cleanup_nvmet() { if [[ "$transport" != "fc" ]]; then echo "WARNING: Test did not clean up ${nvme_trtype} device: ${dev}" fi - _nvme_disconnect_ctrl "${dev}" + _nvme_disconnect_ctrl "${dev}" 2>/dev/null fi done From patchwork Mon Feb 12 10:40:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13552936 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88B3C38DFA for ; Mon, 12 Feb 2024 10:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734457; cv=none; b=rgLQQAStmmNponxLBnxMeqX/Iwz6UTjWXVyuxTH9lUL3iNhdD2o/16eaDF9ZGrWg3NoDyLB1W9JuXf4BqtN1XdOAP0a+h+V7mVF8GRzUz3io/UvNezzdSKauRzh0RPY6JaKro7pjApXTWkSR1WZeqS0j0e8lvBAdwYQ3g6pCcvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707734457; c=relaxed/simple; bh=UEYknxtIQjRWS/tYmot9NYFFLx51f+oUQAc74WEY4RU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rg/8BguaQLwbOSfVdILLSGydCujupbLn9V320JWur1UITVySqsvWo1Mpk+OEB/LnriqkC6DqeOcU9aVhcmTQbGJzStC3vcWcDllc0mm+ZP8Wqd6i8qFsty8Y/SuTFeijbtPy6z1fD4lHVPs3ZME6qUyx0+QJHD56ef/t6Ae3kRQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=urQMEDf+; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ztqwqiAX; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=urQMEDf+; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ztqwqiAX; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="urQMEDf+"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ztqwqiAX"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="urQMEDf+"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ztqwqiAX" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AA02A1FBB6; Mon, 12 Feb 2024 10:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734453; 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=/tUgVZPpKQtpnPdnm1mUMfI+3j25667VECTSsnvZnqQ=; b=urQMEDf+aJspl9Pn/RJ0MMlU2Fa8BuWWWWv+W157g3igIG29ZJuTtUHFyG2LmpU5JXiJ6N 3IjW2DvibZqfKM61kHf/7M521BE5ZLmpSS+BD3Y1cT4b9XSnwQSuCcYXGkhWZ6KnGLt1Kg b912dBjYSN9x6i9iz/BqaSdw0D6WKRE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734453; 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=/tUgVZPpKQtpnPdnm1mUMfI+3j25667VECTSsnvZnqQ=; b=ztqwqiAX0zLd95XJfQb5SzN8nt53ChZowbWmT8ZM0i78ZvYw8Ir4YXCs2KJ7dPjQishoTf pT5j6hbHUGj+c7CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707734453; 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=/tUgVZPpKQtpnPdnm1mUMfI+3j25667VECTSsnvZnqQ=; b=urQMEDf+aJspl9Pn/RJ0MMlU2Fa8BuWWWWv+W157g3igIG29ZJuTtUHFyG2LmpU5JXiJ6N 3IjW2DvibZqfKM61kHf/7M521BE5ZLmpSS+BD3Y1cT4b9XSnwQSuCcYXGkhWZ6KnGLt1Kg b912dBjYSN9x6i9iz/BqaSdw0D6WKRE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707734453; 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=/tUgVZPpKQtpnPdnm1mUMfI+3j25667VECTSsnvZnqQ=; b=ztqwqiAX0zLd95XJfQb5SzN8nt53ChZowbWmT8ZM0i78ZvYw8Ir4YXCs2KJ7dPjQishoTf pT5j6hbHUGj+c7CA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 98DFA13A0E; Mon, 12 Feb 2024 10:40:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id HzbkI7X1yWX0CwAAn2gu4w (envelope-from ); Mon, 12 Feb 2024 10:40:53 +0000 From: Daniel Wagner To: Shin'ichiro Kawasaki Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Chaitanya Kulkarni , Daniel Wagner , Chaitanya Kulkarni Subject: [PATCH blktests v2 5/5] nvme/rc: revert nvme-cli context tracking Date: Mon, 12 Feb 2024 11:40:46 +0100 Message-ID: <20240212104046.13127-6-dwagner@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212104046.13127-1-dwagner@suse.de> References: <20240212104046.13127-1-dwagner@suse.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=urQMEDf+; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=ztqwqiAX X-Spamd-Result: default: False [2.58 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email,nvidia.com:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.11)[66.35%] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: 2.58 X-Rspamd-Queue-Id: AA02A1FBB6 X-Spam-Level: ** X-Spam-Flag: NO X-Spamd-Bar: ++ This feature is not needed anymore, after fixing nvmet-fc. The nvmet target code is able to handle parallel operations and doesn't crash anymore. Furthermore, it can't prevent from discovery controller created by the udev rules, so let's rip it out. Reviewed-by: Chaitanya Kulkarni Signed-off-by: Daniel Wagner --- tests/nvme/rc | 62 --------------------------------------------------- 1 file changed, 62 deletions(-) diff --git a/tests/nvme/rc b/tests/nvme/rc index cdfc738d3aec..dfc4c1ef1975 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -189,57 +189,6 @@ _nvme_calc_rand_io_size() { echo "${io_size_kb}k" } -_have_nvme_cli_context() { - # ignore all non-fc transports for now - if [[ "${nvme_trtype}" != "fc" ]] || - ! nvme connect --help 2>&1 | grep -q -- '--context=' > /dev/null; then - return 1 - fi - return 0 -} - -_setup_nvme_cli() { - local local_wwnn="${1}" - local local_wwpn="${2}" - local remote_wwnn="${3}" - local remote_wwpn="${4}" - - if ! _have_nvme_cli_context; then - return - fi - - mkdir -p /run/nvme - cat >> /run/nvme/blktests.json <<-EOF - [ - { - "hostnqn": "${def_hostnqn}", - "hostid": "${def_hostid}", - "subsystems": [ - { - "application": "blktests", - "nqn": "blktests-subsystem-1", - "ports": [ - { - "transport": "fc", - "traddr": "nn-${remote_wwnn}:pn-${remote_wwpn}", - "host_traddr": "nn-${local_wwnn}:pn-${local_wwpn}" - } - ] - } - ] - } - ] - EOF -} - -_cleanup_nvme_cli() { - if ! _have_nvme_cli_context; then - return - fi - - rm -f /run/nvme/blktests.json -} - _nvme_fcloop_add_rport() { local local_wwnn="$1" local local_wwpn="$2" @@ -272,9 +221,6 @@ _setup_fcloop() { local remote_wwnn="${3:-$def_remote_wwnn}" local remote_wwpn="${4:-$def_remote_wwpn}" - _setup_nvme_cli "${local_wwnn}" "${local_wwpn}" \ - "${remote_wwnn}" "${remote_wwpn}" - _nvme_fcloop_add_tport "${remote_wwnn}" "${remote_wwpn}" _nvme_fcloop_add_lport "${local_wwnn}" "${local_wwpn}" _nvme_fcloop_add_rport "${local_wwnn}" "${local_wwpn}" \ @@ -317,8 +263,6 @@ _cleanup_fcloop() { _nvme_fcloop_del_lport "${local_wwnn}" "${local_wwpn}" _nvme_fcloop_del_rport "${local_wwnn}" "${local_wwpn}" \ "${remote_wwnn}" "${remote_wwpn}" - - _cleanup_nvme_cli } _cleanup_blkdev() { @@ -544,9 +488,6 @@ _nvme_connect_subsys() { subsysnqn="$2" ARGS=(-t "${trtype}" -n "${subsysnqn}") - if _have_nvme_cli_context; then - ARGS+=(--context="blktests") - fi if [[ "${trtype}" == "fc" ]] ; then ARGS+=(-a "${traddr}" -w "${host_traddr}") elif [[ "${trtype}" != "loop" ]]; then @@ -618,9 +559,6 @@ _nvme_discover() { ARGS=(-t "${trtype}") ARGS+=(--hostnqn="${def_hostnqn}") ARGS+=(--hostid="${def_hostid}") - if _have_nvme_cli_context; then - ARGS+=(--context="blktests") - fi if [[ "${trtype}" = "fc" ]]; then ARGS+=(-a "${traddr}" -w "${host_traddr}") elif [[ "${trtype}" != "loop" ]]; then