From nobody Sun May 01 19:17:51 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 A0E4C1AAB10D; Sun, 1 May 2022 19:17:51 +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 4Krwwb49j2z3QD6; Sun, 1 May 2022 19:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651432671; 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=jEShu+rXV//9xUDLJ3mzD6yqoKL+cZPWLEej67r5KWc=; b=Rb890aAyhguJNMaSaoz6FAPTqbSFIFtg4P698o1WHtKr/2uBAIMq4yR2MNkPVYLTCMgnur J88gAHA/ia+YgVlUeBhcRBSzw1EVcIvre4CT8DsWmnqZwSxvrjn4h47MMire/CrfU28SAT eVUXOEpD8I7R8grdUqtYG742UwJES6agsxyuv0HheYj6htC6AYsDqhTtTqcosw82t3JrLd RLW1eonZIJUgekwpurEfMqbt70EwEVvHQoTWosCWVhdySVRUCxt6TJ0iTDE0+quL2U/4AG IoV5M7TRNKUMlbFqX4WxOgXg17puoQncwR7tZ3tdAA6TwC8wBmxPvQsuEa17Xg== 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 6E9801B7A8; Sun, 1 May 2022 19:17:51 +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 241JHp2k012271; Sun, 1 May 2022 19:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241JHp7L012270; Sun, 1 May 2022 19:17:51 GMT (envelope-from git) Date: Sun, 1 May 2022 19:17:51 GMT Message-Id: <202205011917.241JHp7L012270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ravi Pokala Subject: git: 3fbee9be2563 - stable/13 - lacp: short timeout erroneously declares link-flapping 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: rpokala X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fbee9be25634702bcd3a07f26337b6dca6537ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651432671; 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=jEShu+rXV//9xUDLJ3mzD6yqoKL+cZPWLEej67r5KWc=; b=aV5N46sC0WV9MLxm6wxJZpp5i83plZavDEaIA/CuGurR0BHTEZoyqfu0ZONtUvPdzJoU1+ 0hzjyhb5ZRSTCBGOWI3UU0iq+u/e6Yd4elXu6HTj5LvOy/qZmef0K0Ud795v9QaqrdnHJp lwXEZucSvwkRN+HZWudD2jtXIKKV+lrOLRP3eJghC8ixRg/6gDUkG2EqDNz/QeBrOyULeI xtgRH0+bp79R22VoI/hEvTSHK6I193I+h29LY+DNfrcrevC63b5Xme0vN4QwQkHIWkpS3B FfgadZhAslfgJjUdeJiDHcZpaL7r+RpTv8CaKW0ULrTOmRzjh2i10V/f3thiOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651432671; a=rsa-sha256; cv=none; b=FrLEJlHeUFG3QdCAS1M7mmCRrDmfFyYyAjjOmbtbmpgIMzUaS3iJANvQTEtaxvfpFBEWLL RfN+67DmGluTEZWWQ/EH0dbp9Znju74fPuk5Gq4mRFPQdzzye+YGrVAXxSF9Lurbuz1TJt AcN+nAL0khRlgMSwDigcr6oHGoc55nGUpcy+S+w9BBJpyM6OLgbDeLZdB/61i/P3MkrI60 M7CbWBSyNIzOKGBOU0Z8eunZ6XTXXOzvAFW4n/9KTnpO1NqbwFEp9v/YsBalyuEk5Hl55p ka0Lj92BYlJjzODZL6bWvCtZX//AxFH7DVZcza0R1vfe/sTKXb47qncuLerukw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rpokala: URL: https://cgit.FreeBSD.org/src/commit/?id=3fbee9be25634702bcd3a07f26337b6dca6537ce commit 3fbee9be25634702bcd3a07f26337b6dca6537ce Author: Greg Foster AuthorDate: 2022-04-26 06:38:23 +0000 Commit: Ravi Pokala CommitDate: 2022-05-01 19:16:18 +0000 lacp: short timeout erroneously declares link-flapping Panasas was seeing a higher-than-expected number of link-flap events. After joint debugging with the switch vendor, we determined there were problems on both sides; either of which might cause the occasional event, but together caused lots of them. On the switch side, an internal queuing issue was causing LACP PDUs -- which should be sent every second, in short-timeout mode -- to sometimes be sent slightly later than they should have been. In some cases, two successive PDUs were late, but we never saw three late PDUs in a row. On the FreeBSD side, we saw a link-flap event every time there were two late PDUs, while the spec says that it takes *three* seconds of downtime to trigger that event. It turns out that if a PDU was received shortly before the timer code was run, it would decrement less than a full second after the PDU arrived. Then two delayed PDUs would cause two additional decrements, causing it to reach zero less than three seconds after the most-recent on-time PDU. The solution is to note the time a PDU arrives, and only decrement if at least a full second has elapsed since then. Reported by: Greg Foster Reviewed by: gallatin Tested by: Greg Foster MFC after: 3 days Sponsored by: Panasas Differential Revision: https://reviews.freebsd.org/D35070 (cherry picked from commit 00a80538b4471b2978c5a1990f48189f2c692e24) --- sys/net/ieee8023ad_lacp.c | 18 ++++++++++++++++-- sys/net/ieee8023ad_lacp.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index bdc6113ce2a0..a683669de5dc 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -1730,6 +1731,7 @@ lacp_sm_rx(struct lacp_port *lp, const struct lacpdu *du) * EXPIRED, DEFAULTED, CURRENT -> CURRENT */ + microuptime(&lp->lp_last_lacpdu_rx); lacp_sm_rx_update_selected(lp, du); lacp_sm_rx_update_ntt(lp, du); lacp_sm_rx_record_pdu(lp, du); @@ -1939,14 +1941,26 @@ static void lacp_run_timers(struct lacp_port *lp) { int i; + struct timeval time_diff; for (i = 0; i < LACP_NTIMER; i++) { KASSERT(lp->lp_timer[i] >= 0, ("invalid timer value %d", lp->lp_timer[i])); if (lp->lp_timer[i] == 0) { continue; - } else if (--lp->lp_timer[i] <= 0) { - if (lacp_timer_funcs[i]) { + } else { + if (i == LACP_TIMER_CURRENT_WHILE) { + microuptime(&time_diff); + timevalsub(&time_diff, &lp->lp_last_lacpdu_rx); + if (time_diff.tv_sec) { + /* At least one sec has elapsed since last LACP packet. */ + --lp->lp_timer[i]; + } + } else { + --lp->lp_timer[i]; + } + + if ((lp->lp_timer[i] <= 0) && (lacp_timer_funcs[i])) { (*lacp_timer_funcs[i])(lp); } } diff --git a/sys/net/ieee8023ad_lacp.h b/sys/net/ieee8023ad_lacp.h index f02a9e7d9a43..0610ed855d50 100644 --- a/sys/net/ieee8023ad_lacp.h +++ b/sys/net/ieee8023ad_lacp.h @@ -222,6 +222,7 @@ struct lacp_port { #define lp_key lp_actor.lip_key #define lp_systemid lp_actor.lip_systemid struct timeval lp_last_lacpdu; + struct timeval lp_last_lacpdu_rx; int lp_lacpdu_sent; enum lacp_mux_state lp_mux_state; enum lacp_selected lp_selected;