From nobody Mon Mar 07 11:00:41 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 035A11A02117; Mon, 7 Mar 2022 11:00:42 +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 4KBwVK3Nc8z3wK9; Mon, 7 Mar 2022 11:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646650841; 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=rYomXfHJu3oLFA9nsPl0BrmJsC/0EcOud4DpjREP/j0=; b=i/vc+j5kpE5xtGkY8fgrhIxGt/uTHCMdZkDXmt9vmnp2hYomDmpI63XHKx/i4RCPtFHi6y yU3ZdK4DgjaqQN1yrT4UNlA2asvsDrpTp2w/WCiXV0UMCWZTgU3XrPyG2OsP8Onsbg4qE5 UeTUTihSv2yMxmTbG+e/tgJXjVdUBmBul/XEavNt7wQ9ZhhyLY9f0wyULhaZMPxxVJx1Rl 244eSMMVc1QU04RhmRzaWsRNj3qCrdM4Rl+jtHuLfrVM7VXf9EFWdcGxQiHPDkHEvC6LI6 1fSyuTx4rXobuzkMUyNuaA6V1+PfklGN4Vx+JIKWnUZsDwo1eVOMU/IC6WzC2Q== 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 430D526A4C; Mon, 7 Mar 2022 11:00:41 +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 227B0fXU066201; Mon, 7 Mar 2022 11:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227B0fiV066200; Mon, 7 Mar 2022 11:00:41 GMT (envelope-from git) Date: Mon, 7 Mar 2022 11:00:41 GMT Message-Id: <202203071100.227B0fiV066200@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: 30dfb85abb17 - stable/12 - ocs_fc: Ignore flogi failure when the remote node is pt2pt winner 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 30dfb85abb17cf06a62499183b346cfc1d8d8f55 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646650841; 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=rYomXfHJu3oLFA9nsPl0BrmJsC/0EcOud4DpjREP/j0=; b=FGzNNstHH7w9qhQ0HcocA5EAhs3v9qJw3y8pCS2pnL6Q7zJmYCEftj6nhl6Vt/kZ0teWUf lad6B+ywRBOYniJzOZIxGBiquHoKFH//9na8OqmoFjEFXz1L8Ct3F9Ybf5iD8j2rijzOGd zegplfuooAOXhg2fUZk55ExSQuk4VPy/+bguzb8LI62xSerlPs+GIDvW3iYokPnm9EuWul xGU7pvryWRG304dpYwJ+Kb41C7VxW0eJaUQf5iQ70C2+4eNikGepoT92BkKfUkofZEOr+w r4XY5ioW/1C1JPI14Tn96S/HQl0rWH9v0hg7IvofemkLgqKc18/32fafGNZ0bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646650841; a=rsa-sha256; cv=none; b=xvZeMLDkvQ2oJJHOYulFgVGdg2p+U6uFGppgP4Nc/YjKXTZx9dTcUDvRPw3pn4g2q46Awz Z8Ar9Hh1oMMLipczYxYY5FQK3ox7+scaaCRRUZ1CWu9mewW4ZoHmjBu0UttFDeEcuK1jb0 L8OLwiuWs8o47RypLDLay63YvIQgmRYuapu0HGGA2aztkCjSrChVNIJSWT0ndGsrlrprA2 mMzWVWDQsX3TB9LnPkWHSTLjLVtEyMPW+tA0wNclIg6TU9NGHFk88nKrbObnR1v6/QFM8H /3AC0uXc9GMdXNq/3OwlQ6t/69Z7QCUf4U/UnQxQEnc1BF41FzfwGW3Ni+K2+Q== 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=30dfb85abb17cf06a62499183b346cfc1d8d8f55 commit 30dfb85abb17cf06a62499183b346cfc1d8d8f55 Author: Ram Kishore Vegesna AuthorDate: 2022-03-04 14:40:32 +0000 Commit: Ram Kishore Vegesna CommitDate: 2022-03-07 10:52:52 +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 015d6bde8b3f..0d6e91f2ffd6 100644 --- a/sys/dev/ocs_fc/ocs_fabric.c +++ b/sys/dev/ocs_fc/ocs_fabric.c @@ -231,18 +231,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);