net: bridge: add stp_mode attribute for STP mode selection
Subsystems (6)
v3 cover net: bridge: add stp_mode attribute for STP mode selection
The bridge-stp usermode helper is currently restricted to the initial network namespace, preventing userspace STP daemons like mstpd from operating on bridges in other namespaces. Since commit ff62198553e4 ("bridge: Only call /sbin/bridge-stp for the initial network namespace"), bridges in non-init namespaces silently fall back to kernel STP with no way to request userspace STP.
This series adds a new IFLA_BR_STP_MODE bridge attribute that allows explicit per-bridge control over STP mode selection. Three modes are supported:
- auto (default): existing behavior, try /sbin/bridge-stp in init_net, fall back to kernel STP otherwise
- user: directly enable BR_USER_STP without invoking the helper, works in any network namespace
- kernel: directly enable BR_KERNEL_STP without invoking the helper
The user and kernel modes bypass call_usermodehelper() entirely, addressing the security concerns discussed at [1]. Userspace is responsible for ensuring an STP daemon manages the bridge, rather than relying on the kernel to invoke /sbin/bridge-stp.
Patch 1 adds the kernel support. The mode can only be changed while STP is disabled and is processed before IFLA_BR_STP_STATE in br_changelink() so both can be set atomically in a single netlink message.
Patch 2 adds documentation for the new attribute in the bridge docs.
Patch 3 adds a selftest with 9 test cases. The test requires iproute2 with IFLA_BR_STP_MODE support and can be run with virtme-ng:
vng --run arch/x86/boot/bzImage --skip-modules \
--overlay-rwdir /sbin --overlay-rwdir /tmp --overlay-rwdir /bin \
--exec 'cp /path/to/iproute2-next/ip/ip /bin/ip && \
cd tools/testing/selftests/net && \
bash bridge_stp_mode.sh'iproute2 support can be found here [2].
[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://github.com/aroulin/iproute2-next/tree/bridge-stp-mode
v3:
Patch #1:
* Name enum br_stp_mode for YNL codegen.
* Add enum-name to rt-link.yaml spec.
v2:
Patch #1:
* Add rt-link.yaml netlink spec update.
* Allow idempotent stp_mode set while STP is active.
* Move stp_mode next to root_port to fill a struct hole.
* Rephrase BR_STP_MODE_USER doc.
Patch #3:
* Fix shellcheck CI: add SC2329 suppression.
* Add idempotent stp_mode test.
Andy Roulin (3):
net: bridge: add stp_mode attribute for STP mode selection
docs: net: bridge: document stp_mode attribute
selftests: net: add bridge STP mode selection test
Documentation/netlink/specs/rt-link.yaml | 12 + Documentation/networking/bridge.rst | 22 ++ include/uapi/linux/if_link.h | 39 +++ net/bridge/br_device.c | 1 + net/bridge/br_netlink.c | 18 +- net/bridge/br_private.h | 1 + net/bridge/br_stp_if.c | 17 +- tools/testing/selftests/net/Makefile | 1 + .../testing/selftests/net/bridge_stp_mode.sh | 281 ++++++++++++++++++ 9 files changed, 384 insertions(+), 8 deletions(-) create mode 100755 tools/testing/selftests/net/bridge_stp_mode.sh
--
2.43.0
PATCH v3 1/3 net: bridge: add stp_mode attribute for STP mode selection
The bridge-stp usermode helper is currently restricted to the initial network namespace, preventing userspace STP daemons (e.g. mstpd) from operating on bridges in other network namespaces. Since commit ff62198553e4 ("bridge: Only call /sbin/bridge-stp for the initial network namespace"), bridges in non-init namespaces silently fall back to kernel STP with no way to use userspace STP.
Add a new bridge attribute IFLA_BR_STP_MODE that allows explicit per-bridge control over STP mode selection:
BR_STP_MODE_AUTO (default) - Existing behavior: invoke the
/sbin/bridge-stp helper in init_net only; fall back to kernel STP if it fails or in non-init namespaces.
BR_STP_MODE_USER - Directly enable userspace STP (BR_USER_STP)
without invoking the helper. Works in any network namespace. Userspace is responsible for ensuring an STP daemon manages the bridge.
BR_STP_MODE_KERNEL - Directly enable kernel STP (BR_KERNEL_STP)
without invoking the helper.
The mode can only be changed while STP is disabled, or set to the same value (-EBUSY otherwise). IFLA_BR_STP_MODE is processed before IFLA_BR_STP_STATE in br_changelink(), so both can be set atomically in a single netlink message.
This eliminates the need for call_usermodehelper() in user/kernel modes, addressing the security concerns discussed in the thread at
https://lore.kernel.org/netdev/[email protected]/ and providing a cleaner alternative to extending the helper into namespaces.
---
Notes:
v2:
* Add rt-link.yaml netlink spec update.
* Allow idempotent stp_mode set while STP is active.
* Move stp_mode next to root_port to fill a struct hole.
* Rephrase BR_STP_MODE_USER doc.
v3:
* Name enum br_stp_mode for YNL codegen.
* Add enum-name to rt-link.yaml spec.
Documentation/netlink/specs/rt-link.yaml | 12 ++++++++ include/uapi/linux/if_link.h | 39 ++++++++++++++++++++++++ net/bridge/br_device.c | 1 + net/bridge/br_netlink.c | 18 ++++++++++- net/bridge/br_private.h | 1 + net/bridge/br_stp_if.c | 17 ++++++----- 6 files changed, 80 insertions(+), 8 deletions(-)
Documentation/netlink/specs/rt-link.yaml +12 -0
@@ -833,6 +833,14 @@ definitions: entries: - p2p - mp + - + name: br-stp-mode + type: enum + enum-name: br-stp-mode + entries: + - auto + - user + - kernel attribute-sets: -
@@ -1543,6 +1551,10 @@ attribute-sets: - name: fdb-max-learned type: u32 + - + name: stp-mode + type: u32 + enum: br-stp-mode - name: linkinfo-brport-attrs name-prefix: ifla-brport-
include/uapi/linux/if_link.h +39 -0
@@ -744,6 +744,11 @@ enum in6_addr_gen_mode {* @IFLA_BR_FDB_MAX_LEARNED * Set the number of max dynamically learned FDB entries for the current * bridge. +* +* @IFLA_BR_STP_MODE +* Set the STP mode for the bridge, which controls how the bridge +* selects between userspace and kernel STP. The valid values are +* documented below in the ``BR_STP_MODE_*`` constants. */ enum {IFLA_BR_UNSPEC ,
@@ -796,11 +801,45 @@ enum { IFLA_BR_MCAST_QUERIER_STATE,IFLA_BR_FDB_N_LEARNED ,IFLA_BR_FDB_MAX_LEARNED , +IFLA_BR_STP_MODE , __IFLA_BR_MAX, };#define IFLA_BR_MAX (__IFLA_BR_MAX - 1) +/** +* DOC: Bridge STP mode values +* +* @BR_STP_MODE_AUTO +* Default. The kernel invokes the ``/sbin/bridge-stp`` helper to hand +* the bridge to a userspace STP daemon (e.g. mstpd). Only attempted in +* the initial network namespace; in other namespaces this falls back to +* kernel STP. +* +* @BR_STP_MODE_USER +* Directly enable userspace STP (``BR_USER_STP``) without invoking the +* ``/sbin/bridge-stp`` helper. Works in any network namespace. +* Userspace is responsible for ensuring an STP daemon manages the +* bridge. +* +* @BR_STP_MODE_KERNEL +* Directly enable kernel STP (``BR_KERNEL_STP``) without invoking the +* helper. +* +* The mode controls how the bridge selects between userspace and kernel +* STP when STP is enabled via ``IFLA_BR_STP_STATE``. It can only be +* changed while STP is disabled (``IFLA_BR_STP_STATE`` == 0), returns +* ``-EBUSY`` otherwise. The default value is ``BR_STP_MODE_AUTO``. +*/ +enum br_stp_mode { +BR_STP_MODE_AUTO , +BR_STP_MODE_USER , +BR_STP_MODE_KERNEL , + __BR_STP_MODE_MAX +}; + +#define BR_STP_MODE_MAX (__BR_STP_MODE_MAX - 1) +struct ifla_bridge_id {__u8 prio[2 ];__u8 addr[6 ];/* ETH_ALEN */
net/bridge/br_device.c +1 -0
@@ -518,6 +518,7 @@ void br_dev_setup(struct net_device *dev)ether_addr_copy (br->group_addr, eth_stp_addr); br->stp_enabled =BR_NO_STP ; + br->stp_mode =BR_STP_MODE_AUTO ; br->group_fwd_mask =BR_GROUPFWD_DEFAULT ; br->group_fwd_mask_required =BR_GROUPFWD_DEFAULT ;
net/bridge/br_netlink.c +17 -1
@@ -1270,6 +1270,9 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = { NLA_POLICY_EXACT_LEN(sizeof(struct br_boolopt_multi)), [IFLA_BR_FDB_N_LEARNED] = { .type = NLA_REJECT }, [IFLA_BR_FDB_MAX_LEARNED] = { .type = NLA_U32 }, + [IFLA_BR_STP_MODE ] =NLA_POLICY_RANGE (NLA_U32 , +BR_STP_MODE_AUTO , + BR_STP_MODE_MAX), }; static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
@@ -1306,6 +1309,17 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],return err; } +if (data[IFLA_BR_STP_MODE ]) { +u32 mode =nla_get_u32 (data[IFLA_BR_STP_MODE ]); + +if (br->stp_enabled !=BR_NO_STP && mode != br->stp_mode) { +NL_SET_ERR_MSG_MOD (extack, +"Can't change STP mode while STP is enabled" ); +return -EBUSY ; + } + br->stp_mode = mode; + } +if (data[IFLA_BR_STP_STATE ]) {u32 stp_enabled =nla_get_u32 (data[IFLA_BR_STP_STATE ]);
@@ -1634,6 +1648,7 @@ static size_t br_get_size(const struct net_device *brdev)nla_total_size (sizeof (u8)) +/* IFLA_BR_NF_CALL_ARPTABLES */ #endifnla_total_size (sizeof (struct br_boolopt_multi )) +/* IFLA_BR_MULTI_BOOLOPT */ +nla_total_size (sizeof (u32)) +/* IFLA_BR_STP_MODE */ 0; }
@@ -1686,7 +1701,8 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)nla_put (skb,IFLA_BR_MULTI_BOOLOPT ,sizeof (bm), &bm) ||nla_put_u32 (skb,IFLA_BR_FDB_N_LEARNED ,atomic_read (&br->fdb_n_learned)) || - nla_put_u32(skb, IFLA_BR_FDB_MAX_LEARNED, br->fdb_max_learned)) +nla_put_u32 (skb,IFLA_BR_FDB_MAX_LEARNED , br->fdb_max_learned) || + nla_put_u32(skb, IFLA_BR_STP_MODE, br->stp_mode)) return -EMSGSIZE;#ifdef CONFIG_BRIDGE_VLAN_FILTERING
net/bridge/br_private.h +1 -0
@@ -523,6 +523,7 @@ struct net_bridge {unsigned char topology_change;unsigned char topology_change_detected;u16 root_port; +u32 stp_mode;unsigned long max_age;unsigned long hello_time;unsigned long forward_delay;
net/bridge/br_stp_if.c +10 -7
@@ -149,7 +149,9 @@ static void br_stp_start(struct net_bridge *br) {int err = -ENOENT ; -if (net_eq (dev_net (br->dev), &init_net)) +/* AUTO mode: try bridge-stp helper in init_net only */ +if (br->stp_mode ==BR_STP_MODE_AUTO && +net_eq (dev_net (br->dev), &init_net)) err =br_stp_call_user (br,"start" );if (err && err != -ENOENT )
@@ -162,7 +164,7 @@ static void br_stp_start(struct net_bridge *br)else if (br->bridge_forward_delay >BR_MAX_FORWARD_DELAY )__br_set_forward_delay (br,BR_MAX_FORWARD_DELAY ); -if (!err) { +if (br->stp_mode ==BR_STP_MODE_USER || !err) { br->stp_enabled =BR_USER_STP ;br_debug (br,"userspace STP started\n" ); }else {
@@ -180,12 +182,13 @@ static void br_stp_start(struct net_bridge *br)static void br_stp_stop (struct net_bridge *br) { -int err; -if (br->stp_enabled ==BR_USER_STP ) { - err =br_stp_call_user (br,"stop" ); -if (err) -br_err (br,"failed to stop userspace STP (%d)\n" , err); +if (br->stp_mode ==BR_STP_MODE_AUTO ) { +int err =br_stp_call_user (br,"stop" ); + +if (err) +br_err (br,"failed to stop userspace STP (%d)\n" , err); + }/* To start timers on any ports left in blocking */ spin_lock_bh (&br->lock);
Signature · 1 line
2.43.0
PATCH v3 2/3 docs: net: bridge: document stp_mode attribute
In reply to Andy RoulinAdd documentation for the IFLA_BR_STP_MODE bridge attribute in the "User space STP helper" section of the bridge documentation. Reference the BR_STP_MODE_* values via kernel-doc and describe the use case for network namespace environments.
--- Documentation/networking/bridge.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
Documentation/networking/bridge.rst +22 -0
@@ -148,6 +148,28 @@ called by the kernel when STP is enabled/disabled on a bridge stp_state <0|1>``). The kernel enables user_stp mode if that command returns 0, or enables kernel_stp mode if that command returns any other value. +STP mode selection +------------------ + +The ``IFLA_BR_STP_MODE`` bridge attribute allows explicit control over how +STP operates when enabled, bypassing the ``/sbin/bridge-stp`` helper +entirely for the ``user`` and ``kernel`` modes. + +.. kernel-doc:: include/uapi/linux/if_link.h + :doc: Bridge STP mode values + +The default mode is ``BR_STP_MODE_AUTO``, which preserves the traditional +behavior of invoking the ``/sbin/bridge-stp`` helper. The ``user`` and +``kernel`` modes are particularly useful in network namespace environments +where the helper mechanism is not available, as ``call_usermodehelper()`` +is restricted to the initial network namespace. + +Example:: + + ip link set dev br0 type bridge stp_mode user stp_state 1 + +The mode can only be changed while STP is disabled. + VLAN ====
Signature · 1 line
2.43.0
PATCH v3 3/3 selftests: net: add bridge STP mode selection test
In reply to Andy RoulinAdd a selftest for the IFLA_BR_STP_MODE bridge attribute that verifies:
1. stp_mode defaults to auto on new bridges
2. stp_mode can be toggled between user, kernel, and auto
3. Changing stp_mode while STP is active is rejected with -EBUSY
4. Re-setting the same stp_mode while STP is active succeeds
5. stp_mode user in a network namespace yields userspace STP (stp_state=2)
6. stp_mode kernel forces kernel STP (stp_state=1)
7. stp_mode auto in a netns preserves traditional fallback to kernel STP
8. stp_mode and stp_state can be set atomically in a single message
9. stp_mode persists across STP disable/enable cycles
Test 5 is the key use case: it demonstrates that userspace STP can now be enabled in non-init network namespaces by setting stp_mode to user before enabling STP.
Test 8 verifies the atomic usage pattern where both attributes are set in a single netlink message, which is supported because br_changelink() processes IFLA_BR_STP_MODE before IFLA_BR_STP_STATE.
The test gracefully skips if the installed iproute2 does not support the stp_mode attribute.
---
Notes:
v2:
* Fix shellcheck CI: add SC2329 suppression.
* Add idempotent stp_mode test.
tools/testing/selftests/net/Makefile | 1 + .../testing/selftests/net/bridge_stp_mode.sh | 281 ++++++++++++++++++ 2 files changed, 282 insertions(+) create mode 100755 tools/testing/selftests/net/bridge_stp_mode.sh
tools/testing/selftests/net/Makefile +1 -0
@@ -15,6 +15,7 @@ TEST_PROGS := \ big_tcp.sh \ bind_bhash.sh \ bpf_offload.py \ + bridge_stp_mode.sh \ bridge_vlan_dump.sh \ broadcast_ether_dst.sh \ broadcast_pmtu.sh \
tools/testing/selftests/net/bridge_stp_mode.sh new file +281 -0
281 lines not on this page · raw message
Signature · 1 line
2.43.0
Quoted 5 lines · Andy Roulin
Patch 1 adds the kernel support. The mode can only be changed while STP is disabled and is processed before
IFLA_BR_STP_STATEinbr_changelink()so both can be set atomically in a single netlink message.
https://sashiko.dev/#/patchset/20260330022107.670566-1-aroulin%40nvidia.com
will fix the reported issue in v4.