From nobody Mon Mar 07 11:03:09 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 E742A1A02D3B; Mon, 7 Mar 2022 11:03:09 +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 4KBwY93swZz4RxV; Mon, 7 Mar 2022 11:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646650989; 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=Rd+/1H0mwsQBwa/Aypwcq3yVFZdwm+A1C4ifpurKiD0=; b=N02miqNwsrvzsHUB6oUefYAFeehrKmgIU68F7436eXLQrtU16507Rno/ccSXJRZPMTOCut +H323Li4OKAUw0T011xkkXSo+H9nJWu/YV77B37N+s5J2bwVfNkK/qWS9U/YzGoDpfCApv 6y8YLnjsIthWLA8gO7RgXjxys+8JEOlwk85uHO9XM/PJO6M4m4bZEZYQFkM/ijc42rKiAX kqHijW2ITzlqMHBE5JZzw4I4/JlFxN6bl+1onPhTNg5D9HtJn0UB2dhnwy5cNLGXoZeu9p 21nU5/5XN+XVIS3U4GuxjrgKMCdJUEMkf7zCRW8nBaiZXI1ibwKOfHxnIy13bA== 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 43F64272DC; Mon, 7 Mar 2022 11:03:09 +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 227B395X070701; Mon, 7 Mar 2022 11:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227B39GX070700; Mon, 7 Mar 2022 11:03:09 GMT (envelope-from git) Date: Mon, 7 Mar 2022 11:03:09 GMT Message-Id: <202203071103.227B39GX070700@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: 120ba9ec7ffb - stable/13 - ocs_fc: Ignore flogi failure when the remote node is pt2pt winner 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/13 X-Git-Reftype: branch X-Git-Commit: 120ba9ec7ffb68b95f3da56cb514db5a2c273169 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646650989; 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=Rd+/1H0mwsQBwa/Aypwcq3yVFZdwm+A1C4ifpurKiD0=; b=p2t5PrQb8mrQeOjfueGorSFEvKochSItj+7TeIdQf++dQnwbYRB8JDjAc0IIzGmQvYT1qh G/X49tmFSJNls5rs3jH4zSKE8F5sUh8P+M5qEpwNX7AgIye4akwrZUDglKIUL3UU18WXiI McsqkxzBJ/ztV46wdJgaXX/+j/RfsXRJaiaHstb9JqBFIGouNMLtqRpc+cug2MVimJEWzD pY6BgafWKkGLd2ifu2jWE23wD0dfVVrf+m05b7dTwGWtmGVJEqUFnZ7QrbWyAw96hXhRhi K9LTwccl7S/kzdL64elPsSdcbHWO4TRZ3R5Pir/lOvDnJQSqSXqB4hPKtQ3U8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646650989; a=rsa-sha256; cv=none; b=ePtq3nUFXvK/TOHKrV/wIuYhJ1QIYEr2UbTYzSW0VT0LcLb77F/Lxa8jh6gqcroWAkdG71 UxixFi29hspvLg+/sk13wFAnpVa1hEJRGX84VSD1oq7FObdVFeoXHa3WQYAMM4VlutxLIU VaHHofZ27TQdGqADF3IVmleD9oJdi7VS0U3ln9aZZE+KjRXPqyKHrht+uGmEXSHbXdwsMd 7WYW55Qj6bKyUy76tFW9026yVwcW8Hb9Aj+xU4Y36xnGsJIyD9KeMP0cT0rdwBAoReL/xJ 3gYiAEvufFduQaJF5c7LRGsAHbiDv+q+ihOmj+MflHzlgDgP2F6zdYDMypvXzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by ram: URL: https://cgit.FreeBSD.org/src/commit/?id=120ba9ec7ffb68b95f3da56cb514db5a2c273169 commit 120ba9ec7ffb68b95f3da56cb514db5a2c273169 Author: Ram Kishore Vegesna AuthorDate: 2022-03-04 14:40:32 +0000 Commit: Ram Kishore Vegesna CommitDate: 2022-03-07 10:55:11 +0000 ocs_fc: Ignore flogi failure when the remote node is pt2pt winner Updated commit 79c56c9af583, do not proceed with discovery if flogi fails in pt2pt winner case. MFC after: 3 days (cherry picked from commit 625a8bfb047a94459b4ab41f08fe5a2c23694039) --- sys/dev/ocs_fc/ocs_fabric.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_fabric.c b/sys/dev/ocs_fc/ocs_fabric.c index 70b240f5de13..4fe5017e90e5 100644 --- a/sys/dev/ocs_fc/ocs_fabric.c +++ b/sys/dev/ocs_fc/ocs_fabric.c @@ -230,18 +230,14 @@ __ocs_fabric_flogi_wait_rsp(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg) } 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); - } + + if (node->sport->topology == OCS_SPORT_TOPOLOGY_P2P && !node->sport->p2p_winner) { + node_printf(node, "FLOGI failed, 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);