From nobody Mon Mar 07 11:00:37 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1A3F61A0208C; Mon, 7 Mar 2022 11:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KBwVG0C68z3wJw; Mon, 7 Mar 2022 11:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646650838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wd4MTdpN/UUc6jKdUKPlS4bxa7Lv2LWJ4B9DO3xgOIE=; b=fCwXcVcXJSVdLT8fn7YPlns8pCmuPH0nKn5dykbiPWR/Gzq5dyONxeJkox3rcDk+NFYF6w 24fQJbt7Zfmxh6y8oqBYbY9uuK0RkdYWjU/32cypyM5oKUgK8X8b5rhvQKufA/BEPOrFJ/ bQAGd28IiQpFObLKzffoijVQkpTk2rtUmPupIBl84IqG0kbb7xhfx0MMYefAo3FodLHSTS U5bmGlAWCPPCBwI2S0jyXnlSQDfk0EYsFOKouGyZArYkzyHdiAnHuK0EO79GCyNGiKSrV2 kVOeKJk8liPjI1E8+x+P6Hvd3hbeB7NUmE1VQ+HvqqQUlbFCnUUipVdEk71dSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D04C126CAB; Mon, 7 Mar 2022 11:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227B0b5S066129; Mon, 7 Mar 2022 11:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227B0b8c066128; Mon, 7 Mar 2022 11:00:37 GMT (envelope-from git) Date: Mon, 7 Mar 2022 11:00:37 GMT Message-Id: <202203071100.227B0b8c066128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ram Kishore Vegesna Subject: git: 456c941b7d7e - stable/12 - ocs_fc: Ignore flogi failure when the discovery is already done. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ram X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 456c941b7d7e89a05c380667db9f7fbee23f122f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646650838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wd4MTdpN/UUc6jKdUKPlS4bxa7Lv2LWJ4B9DO3xgOIE=; b=CmdBQeUMbQaEHBUUBeebC7Q9aMXVKHc6adb1FoHbODEsJqfNVKZOa5b/sQrWlhtaDa2bXj zwqPqmBpqYpzubKUm8w3TCSq/x5/FQLm+eAE0PX6uQPL3vqgt9TG9UYDDtQFzN6RACXn9O bBQYjZWMcaRWOdCBNrcJhelgFGC1dGdRUT19SOxYppCrkHVOrbReGODldd13JK09XajgZ9 EB7YHGKBRtNSvAghNsDbggcLTOmXE+rrjCcpUpwoJrLKNLcJA+cxtSmPxKa20I7her1M3M GSMVnmMD4Oao/BlXbdAhUplPncGwT3eD5gwQ/Fqn/5IGYa5NCDx7IOg1YunmIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646650838; a=rsa-sha256; cv=none; b=D42ychJVEkQwOUNinx4wThVHCiVmzmexOmEGg6yD6bTfRap/4t/sNOBVUphvHlPvXrdtUa +KYN7GxdGXRrYk9TxXHU0k/W+Vr5/FJznkbUIyRbT97yk5hvDWpIipRivw9P/lXMbuhmhz MlzY+rjE5GdjtjC1ikUngDgxbw+vg5Gi6A/CyjEdga5cXFVlUU9Borr6rfJxwEXlXqT7S3 79q1EMwVvw2QqS7hzthk2Wy2fnATUkLorlWWzUiKwsM6awttBjhsJ+8R0CH5GECRTjea/4 VyJNU1ljqTafGcx259LkGZDys1e66QsIRBj7u+e3M76zohBTrFTF370cLnmoRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by ram: URL: https://cgit.FreeBSD.org/src/commit/?id=456c941b7d7e89a05c380667db9f7fbee23f122f commit 456c941b7d7e89a05c380667db9f7fbee23f122f Author: Ram Kishore Vegesna AuthorDate: 2022-03-03 11:44:03 +0000 Commit: Ram Kishore Vegesna CommitDate: 2022-03-07 10:48:21 +0000 ocs_fc: Ignore flogi failure when the discovery is already done. Summary: Some targets are not responding to the FLOGI in point-to-point topology, If the pt2pt discovery is done, Ignore the FLOGI failure. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D34422 (cherry picked from commit 79c56c9af583b4c6e079594b7b6ff8176e6bff7d) --- sys/dev/ocs_fc/ocs_fabric.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_fabric.c b/sys/dev/ocs_fc/ocs_fabric.c index 162dd558fc6d..015d6bde8b3f 100644 --- a/sys/dev/ocs_fc/ocs_fabric.c +++ b/sys/dev/ocs_fc/ocs_fabric.c @@ -229,10 +229,22 @@ __ocs_fabric_flogi_wait_rsp(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg) if (node_check_els_req(ctx, evt, arg, FC_ELS_CMD_FLOGI, __ocs_fabric_common, __func__)) { return NULL; } - node_printf(node, "FLOGI failed evt=%s, shutting down sport [%s]\n", ocs_sm_event_name(evt), - sport->display_name); ocs_assert(node->els_req_cnt, NULL); node->els_req_cnt--; + if (node->sport->domain->attached) { + node_printf(node, "FLOGI failed, Domain already attached\n"); + if (node->sport->p2p_winner) { + node_printf(node, "p2p winner, domain already attached\n"); + ocs_node_post_event(node, OCS_EVT_DOMAIN_ATTACH_OK, NULL); + } else { + node_printf(node, "peer p2p winner, shutdown node\n"); + node->shutdown_reason = OCS_NODE_SHUTDOWN_DEFAULT; + ocs_fabric_initiate_shutdown(node); + } + break; + } + node_printf(node, "FLOGI failed evt=%s, shutting down sport [%s]\n", ocs_sm_event_name(evt), + sport->display_name); ocs_sm_post_event(&sport->sm, OCS_EVT_SHUTDOWN, NULL); break; }