From nobody Tue Jun 7 03:58:37 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 A1DE21BDFB90; Tue, 7 Jun 2022 03:58:37 +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 4LHGms2VxNz3GQb; Tue, 7 Jun 2022 03:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654574317; 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=nT7zKYkCNgE5TNIfmu/dj0jLFo4YXsPN3J9jLLU+TKo=; b=RZreNtV5F6BVyetWMUg7B1mwzLeNkfdzNw1/GHbvInINaoMAqoNZDH5MipJ2FoeihEGM13 GI+XNDbJ/P5P/isl/zvf4LWd2w4ePfdXDKbIJwGOdwDVLQCMKQFJhm1PJOYba0BhvzPFQc 7dKQKuNmcCSMZ0n29ZkysBh6NY+CoYYjNUG6KZBpDeOe/FJ3GpUTu2T0q5wZTPLNt/otgg jgJWEbD6EIvW1N3EQsxiJw7kcwk+P8eMe55sPJnWKJ2uYELaDf8ybT88wigsClFiUpjQdm JjnpiyzSgvC6g2zfx9YLaOKf4VKB7DhTMMBGhtZZ0Vj5CFktdYv8nAJiHuNjug== 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 2A88B13A27; Tue, 7 Jun 2022 03:58: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 2573wbiO068637; Tue, 7 Jun 2022 03:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2573wb7K068636; Tue, 7 Jun 2022 03:58:37 GMT (envelope-from git) Date: Tue, 7 Jun 2022 03:58:37 GMT Message-Id: <202206070358.2573wb7K068636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wojciech Macek Subject: git: 1315446ba0cd - stable/13 - LACP: Do not wait response for marker messages not sent 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: wma X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1315446ba0cdf7ba66b5bd274c53960bd8b4bc8f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654574317; 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=nT7zKYkCNgE5TNIfmu/dj0jLFo4YXsPN3J9jLLU+TKo=; b=ryGUYI3sJbKakVlNm/Gl+QBa1m6Nc1J0AnUcM8kK36dlUusQIZ2iKW8j3QAt9Jm8nCBjpd A3RpjMcZne7G68486bfM9/btAMSslPNCXNaCbLlWZo3GrAIMFzX/hm0fKcBL+PEo9Ioz2+ PEiqGIZ+e1qHsQvHQgO0JeRDW09qeI/NUDG10NZhMGdUiNl1XnPQvq4SPbhWfJ0g4DbMUN oKunYvXnmTtaniPS0IpX5b7otp+nLXOnLDjvh2iDJCpUpE25E9A5oxpQBbGQ3CJ6zXxIp1 9siQjBM9D1i5omh83K/icRX3TzCImLTQQi0jCpzCi7KRQ23go/Wo5H2v7LOVWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654574317; a=rsa-sha256; cv=none; b=dMOucP7Y73T4afokpAdqtwofy6r1Tf6/p1IrRgKQACSC/ynXrBAj8p9dcR8c3LpiZPtAEe kuoy2sOzrWef7A3k4vAWVk1W79yBSPBYDjhNkadKD37I2FZ1ZJywWMHsOxsKKSud8+OzdK Dv1g430m8aOzJq6DL9TaJkbK0AzA5+cBrAbjiTdL2yLjivOE2jUzF9RyDEsnZURsAkmaZF CND5m7wVIfAvekpkz1+sGgzybwdnmv3gkSaVWozPa7OosYhp+7oL+WnVPv7hLGzOx0VXDj K04WG72BEWUMy2K1rAN3flXdjAD6qnn+hGbopyZAQRhRUNz/QuBv/tn9Fa5ZQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=1315446ba0cdf7ba66b5bd274c53960bd8b4bc8f commit 1315446ba0cdf7ba66b5bd274c53960bd8b4bc8f Author: Arnaud Ysmal AuthorDate: 2021-09-23 08:57:11 +0000 Commit: Wojciech Macek CommitDate: 2022-06-07 03:57:29 +0000 LACP: Do not wait response for marker messages not sent The error returned when a marker message can not be emitted on a port is not handled. This cause the lacp to block all emissions until the timeout of 3 seconds is reached. To fix this issue, I just clear the LACP_PORT_MARK flag when the packet could not be emitted. Differential revision: https://reviews.freebsd.org/D30467 Obtained from: Stormshield (cherry picked from commit 0b92a7fe47a5f7148a494514bfa530ddc6b496bf) --- sys/net/ieee8023ad_lacp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index d1ee6eab4b35..6656ebb2b400 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -920,7 +920,8 @@ lacp_suppress_distributing(struct lacp_softc *lsc, struct lacp_aggregator *la) /* send a marker frame down each port to verify the queues are empty */ LIST_FOREACH(lp, &lsc->lsc_ports, lp_next) { lp->lp_flags |= LACP_PORT_MARK; - lacp_xmit_marker(lp); + if (lacp_xmit_marker(lp) != 0) + lp->lp_flags &= ~LACP_PORT_MARK; } /* set a timeout for the marker frames */