Skip to content

mlxsw: Set port STP state on bridge enslavement

Petr Machata netdev 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 1 replyApplied 2/2

Patches in v1 All 2 applied

#Subject and filesSizeRepliesApplied
1/2mlxsw: Set port STP state on bridge enslavementdrivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c+1 -10 repliesApplied
2/2selftests: mlxsw: router_bridge_lag: Add a new selftesttools/testing/selftests/drivers/net/mlxsw/router_bridge_lag.sh+50 -00 repliesApplied

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDanielle RatsonIdo SchimmelSimon Horman
SeriesR-b
1/2R-b
2/2R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH net-next 0/2] mlxsw: Set port STP state on bridge enslavement

When the first port joins a LAG that already has a bridge upper, an instance of struct mlxsw_sp_bridge_port is created for the LAG to keep track of it as a bridge port. The bridge_port's STP state is initialized to BR_STATE_DISABLED. This made sense previously, because mlxsw would only ever allow a port to join a LAG if the LAG had no uppers. Thus if a bridge_port was instantiated, it must have been because the LAG as such is joining a bridge, and the STP state is correspondingly disabled.

However as of commit 2c5ffe8d7226 ("mlxsw: spectrum: Permit enslavement to netdevices with uppers"), mlxsw allows a port to join a LAG that is already a member of a bridge. The STP state may be different than disabled in that case. Initialize it properly by querying the actual state.

This bug may cause an issue as traffic on ports attached to a bridged LAG gets dropped on ingress with discard_ingress_general counter bumped.

The above fix in patch #1. Patch #2 contains a selftest that would sporadically reproduce the issue.

Petr Machata (2):
mlxsw: Set port STP state on bridge enslavement
selftests: mlxsw: router_bridge_lag: Add a new selftest

 .../mellanox/mlxsw/spectrum_switchdev.c       |  2 +-
 .../drivers/net/mlxsw/router_bridge_lag.sh    | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100755 tools/testing/selftests/drivers/net/mlxsw/router_bridge_lag.sh
Signature · 1 line
2.41.0