From nobody Fri Mar 04 04:57:07 2022 X-Original-To: dev-commits-src-all@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 92E661A01BEF; Fri, 4 Mar 2022 04:57:07 +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 4K8wZC3hgYz3M7n; Fri, 4 Mar 2022 04:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646369827; 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=rPObu+5Jk6griMwzofhuY0yvHszyctxg8u575fut/vw=; b=Gmbiec6iTE1RblyzaNHnVmV32YtaC/s6n4GMab9AvH2IHXGMCqVFxoX43Fi501eLbs2dm2 DUIWSYaAvSUAaWDJ+SXMSJ4Q2QCuyUb548ByYM1DJob/3RfOr6c+8hQeKJh8sWm3fuTTyA Lm6OG7FhmyHCwdwfeju5D9Gvm4N5ljl1xlIywpIenK+kS1/kooLKlhHn532WIvCrRObOEY JUfq/U2+frdzJ/F/53Weudga5UqfWGRdphPcZA3ckWeZyFCy58l3KgJo4VBLIRBrzo4kKA Uy4UmgL9Wxy0pE2vNn/TSYsUgYwV8fPLIpor514HBXTVrUM2s37ycCXXl2g17A== 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 5F00425B93; Fri, 4 Mar 2022 04:57:07 +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 2244v7qM070580; Fri, 4 Mar 2022 04:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2244v7bu070579; Fri, 4 Mar 2022 04:57:07 GMT (envelope-from git) Date: Fri, 4 Mar 2022 04:57:07 GMT Message-Id: <202203040457.2244v7bu070579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ram Kishore Vegesna Subject: git: 79c56c9af583 - main - ocs_fc: Ignore flogi failure when the discovery is already done. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 79c56c9af583b4c6e079594b7b6ff8176e6bff7d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646369827; 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=rPObu+5Jk6griMwzofhuY0yvHszyctxg8u575fut/vw=; b=vhcnw+8SBhXwwHuXbGcxFTcym95Gyope9wT2YqJnn4uM11Kw3p6aWPYWBdMU8SNuJIOnOM PcS/ymWNMnCr9zNMAWo7uWO3li45gT4pGY4Vg8w/GMcbyshCemKA61X3gPI79IFTErpYGE LIJyKkz3zdSgpsrKcQ1FpPrmqoxiPN7auV/kAeFrSY/zdkzB8h9Owxc9HSEY0AusqSah72 Qezrp0V4bNAF4BUhPllRoDlDb05sUOiZGH9LOaBl8l3Zc+1lQVUEs5mMoZhMrJuLiPk5ek C6eOqn56zQpgCgThipHpL50g1G8p8fORPBOMDEW6DbdqL64WjY2Z7XyB6kLKmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646369827; a=rsa-sha256; cv=none; b=wqIY8ThOswSAmG4w5smEF1EljgubAdIEdwc3Jkw/m3l+flqd63Ap3LkPX/vj1/9j6YLp3D +JjBYVTP/7oe89ecLbxP5FVq36NQl3SXBoqUD7WGq2KOoveB2GntOCa6x0JTPCfaTohXBP Gx+wHm7QmKmXUZRCjb9i5qk/yaXWd5nCyYFtZoNHIFRavZZ9ZGF58tP1luo5/3NWEsjMAW ckmWkH5DoSPwnynizpouhdLK7vcKzsZqNeBsocSIZuRtKYaA+dQ/GNhVQWgeP4o79VKHqh UrN5wzBSVyn+7MhKhmWQK7pKetXC6WzKsXPt3p8IqHsUb3lULcAuduMq/CoAiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ram: URL: https://cgit.FreeBSD.org/src/commit/?id=79c56c9af583b4c6e079594b7b6ff8176e6bff7d commit 79c56c9af583b4c6e079594b7b6ff8176e6bff7d Author: Ram Kishore Vegesna AuthorDate: 2022-03-03 11:44:03 +0000 Commit: Ram Kishore Vegesna CommitDate: 2022-03-04 04:49:03 +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 --- 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 4a5d6820fcb6..70b240f5de13 100644 --- a/sys/dev/ocs_fc/ocs_fabric.c +++ b/sys/dev/ocs_fc/ocs_fabric.c @@ -228,10 +228,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; }