ice: fix DFLT Rx rule handling for promisc and switchdev
Subsystems (3)
v4 cover ice: fix DFLT Rx rule handling for promisc and switchdev
Two fixes for the uplink default VSI Rx rule (DFLT) on E810 when the netdev is in IFF_PROMISC.
Patch 1 drops the redundant per-VLAN promisc expansion that exhausts the FLU pool on a wide VLAN trunk across several PFs.
Patch 2 keeps the DFLT Rx rule across a switchdev teardown instead of clobbering the promisc state the operator asked for.
Changes since v3 (review comments from Marcin Szycik):
- Patch 1: reworded the ice_clear_promisc() and the per-VID cleanup comments, and flipped the ice_vsi_clear_vlan_mc_promisc() guard to an early return (noting the clear is best-effort). No functional change.
- Patch 2: no change, added Marcin's and Aleksandr's Reviewed-by.
Link to v3:
https://lore.kernel.org/all/[email protected]/
Link to v2:
https://lore.kernel.org/all/[email protected]/
Link to v1:
https://lore.kernel.org/all/[email protected]/
Petr Oros (2):
ice: skip per-VLAN promisc rules when default VSI Rx rule is set
ice: preserve uplink DFLT Rx rule on switchdev release
drivers/net/ethernet/intel/ice/ice_eswitch.c | 18 ++- drivers/net/ethernet/intel/ice/ice_main.c | 109 +++++++++++++++---- 2 files changed, 102 insertions(+), 25 deletions(-)
Signature · 1 line
2.54.0
PATCH v4 1/2 ice: skip per-VLAN promisc rules when default VSI Rx rule is set
When an ice port in a vlan-filtering bridge goes promiscuous (typical for bond slaves), the driver installs a per-VLAN ICE_SW_LKUP_PROMISC_VLAN rule for every VID on top of the broad ICE_SW_LKUP_DFLT VSI Rx rule. Each rule consumes one of the ~32K Flow Lookup Unit (FLU) entries the device shares across PFs, so a wide trunk (vid 2-4094) over several PFs overruns the
pool: firmware rejects further Add Switch Rules with ENOSPC (AQ 0x10) and the DFLT Rx rule itself fails to install:
ice 0000:5c:00.1: Failed to set VSI 14 as the default forwarding
VSI, error -5
ice 0000:5c:00.1 ens1f1: Error -5 setting default VSI 14 Rx rule
Once a switch context is overrun the retries can also come back as ENOENT (AQ 0x2), which has misled triage toward a perceived recipe binding defect rather than a capacity issue.
The DFLT rule already catches every packet on the port regardless of VLAN tag, so the per-VLAN promisc expansion is redundant while it is installed. Skip it at the two sites that drive it, ice_set_promisc() and ice_vlan_rx_add_vid(), keyed on ice_is_vsi_dflt_vsi() rather than the netdev IFF_PROMISC flag so a failed or LAG-suppressed DFLT install still falls back to the per-VLAN rules.
IFF_ALLMULTI and IFF_PROMISC can reach ice_vsi_sync_fltr() in separate passes (a bridge join sets them through separate calls), so the allmulti pass may expand the per-VID rules before the DFLT rule exists. Drop those now-redundant rules right after ice_set_dflt_vsi() installs the DFLT rule; ice_vsi_exit_dflt_promisc() reinstates them when promisc is cleared.
ice_vsi_sync_fltr() subscribed multicast promiscuity only inside the "default VSI not yet in use" branch, so a promiscuous VSI that finds the default VSI rule already present (owned by another VSI, or preserved across a switchdev session) ended up in unicast promisc with no multicast subscription. Issue ice_set_promisc(ICE_MCAST_PROMISC_BITS) whenever the netdev is promiscuous; it is idempotent and returns 0 if the rule is already present.
---
v4 (review comments from Marcin Szycik):
- Reworded the ice_clear_promisc() and the per-VID cleanup comments.
- Flipped the ice_vsi_clear_vlan_mc_promisc() guard to an early return to reduce indentation, and noted that the clear is best-effort.
No functional change.
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/89efbea9831175e6f57e9fe8557f7a0e48e050b7.1781786935.git.poros@redhat.com/
--- drivers/net/ethernet/intel/ice/ice_main.c | 109 +++++++++++++++++----- 1 file changed, 88 insertions(+), 21 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +88 -21
@@ -274,7 +274,8 @@ static int ice_set_promisc(struct ice_vsi *vsi, u8 promisc_m)if (vsi->type !=ICE_VSI_PF )return 0 ; -if (ice_vsi_has_non_zero_vlans (vsi)) { +/* skip per-VID expansion; the DFLT Rx rule already covers every VID */ +if (ice_vsi_has_non_zero_vlans (vsi) && !ice_is_vsi_dflt_vsi (vsi)) { promisc_m |= (ICE_PROMISC_VLAN_RX |ICE_PROMISC_VLAN_TX ); status =ice_fltr_set_vlan_vsi_promisc (&vsi->back->hw, vsi, promisc_m);
@@ -304,9 +305,20 @@ static int ice_clear_promisc(struct ice_vsi *vsi, u8 promisc_m)return 0 ;if (ice_vsi_has_non_zero_vlans (vsi)) { - promisc_m |= (ICE_PROMISC_VLAN_RX |ICE_PROMISC_VLAN_TX ); +u8 vlan_promisc_m = promisc_m |ICE_PROMISC_VLAN_RX | +ICE_PROMISC_VLAN_TX ; +int vid0_status; + +/* the vid=0 rule may be in either recipe (the recipe used to +* set it is not recorded), so clear both; clearing an absent +* rule returns 0 +*/ status =ice_fltr_clear_vlan_vsi_promisc (&vsi->back->hw, vsi, - promisc_m); + vlan_promisc_m); + vid0_status =ice_fltr_clear_vsi_promisc (&vsi->back->hw, + vsi->idx, promisc_m,0 ); +if (!status) + status = vid0_status; }else { status =ice_fltr_clear_vsi_promisc (&vsi->back->hw, vsi->idx, promisc_m,0 );
@@ -317,6 +329,61 @@ static int ice_clear_promisc(struct ice_vsi *vsi, u8 promisc_m)return status; } +/** +* ice_vsi_exit_dflt_promisc - drop the default VSI Rx rule on promisc off +* @vsi: the VSI leaving promiscuous mode +* +* For an IFF_ALLMULTI VSI with VLANs the per-VID multicast rules are +* reinstated before the default rule is cleared so coverage never lapses; +* the then redundant vid=0 rule is dropped best-effort. The callees log +* their own failures, so error returns are not re-logged here. +* +* Return: 0 on success, negative on error with the default rule left in place. +*/ +static int ice_vsi_exit_dflt_promisc (struct ice_vsi *vsi) +{ +struct ice_vsi_vlan_ops *vlan_ops =ice_get_compat_vsi_vlan_ops (vsi); +struct net_device *netdev = vsi->netdev; +struct ice_hw *hw = &vsi->back->hw; +bool restore_mc; +int err; + + restore_mc = (vsi->current_netdev_flags &IFF_ALLMULTI ) && +ice_vsi_has_non_zero_vlans (vsi); + +if (restore_mc) { + err =ice_fltr_set_vlan_vsi_promisc (hw, vsi, +ICE_MCAST_VLAN_PROMISC_BITS ); +if (err && err != -EEXIST ) +return err; + } + + err =ice_clear_dflt_vsi (vsi); +if (err) +return err; + +if (netdev->features &NETIF_F_HW_VLAN_CTAG_FILTER ) + vlan_ops->ena_rx_filtering (vsi); + +if (restore_mc) +ice_fltr_clear_vsi_promisc (hw, vsi->idx,ICE_MCAST_PROMISC_BITS , +0 ); + +return 0 ; +} + +/* Drop the per-VID multicast promisc rules made redundant by the default +* VSI Rx rule; best-effort, a leftover is harmless while that rule stands. +*/ +static void ice_vsi_clear_vlan_mc_promisc (struct ice_vsi *vsi) +{ +if (!ice_vsi_has_non_zero_vlans (vsi)) +return ; + +ice_fltr_clear_vlan_vsi_promisc (&vsi->back->hw, vsi, +ICE_MCAST_VLAN_PROMISC_BITS ); +} +/** * ice_vsi_sync_fltr - Update the VSI filter list to the HW * @vsi: ptr to the VSI
@@ -429,30 +496,31 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) err =0 ; vlan_ops->dis_rx_filtering (vsi); -/* promiscuous mode implies allmulticast so -* that VSIs that are in promiscuous mode are -* subscribed to multicast packets coming to -* the port +/* a prior allmulti pass may have added per-VID +* rules now covered by the DFLT rule */ - err =ice_set_promisc (vsi, -ICE_MCAST_PROMISC_BITS ); -if (err) - goto out_promisc; +ice_vsi_clear_vlan_mc_promisc (vsi); } + +/* Promiscuous mode implies allmulticast. Subscribe +* the VSI to all multicast even when the default VSI +* rule is already in use and the block above is +* skipped (it may be owned by another VSI, or +* preserved across a switchdev session); the unicast +* catch-all does not cover the multicast subscription. +*/ + err =ice_set_promisc (vsi,ICE_MCAST_PROMISC_BITS ); +if (err) + goto out_promisc; }else {/* Clear Rx filter to remove traffic from wire */ if (ice_is_vsi_dflt_vsi (vsi)) { - err =ice_clear_dflt_vsi (vsi); + err =ice_vsi_exit_dflt_promisc (vsi);if (err) { -netdev_err (netdev,"Error %d clearing default VSI %i Rx rule\n" , - err, vsi->vsi_num); vsi->current_netdev_flags |=IFF_PROMISC ; goto out_promisc; } -if (vsi->netdev->features & -NETIF_F_HW_VLAN_CTAG_FILTER ) - vlan_ops->ena_rx_filtering (vsi); }/* disable allmulti here, but only if allmulti is not
@@ -3676,10 +3744,9 @@ int ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)while (test_and_set_bit (ICE_CFG_BUSY , vsi->state))usleep_range (1000 ,2000 ); -/* Add multicast promisc rule for the VLAN ID to be added if -* all-multicast is currently enabled. -*/ -if (vsi->current_netdev_flags &IFF_ALLMULTI ) { +/* skip the per-VID rule when the DFLT Rx rule already covers this VID */ +if ((vsi->current_netdev_flags &IFF_ALLMULTI ) && + !ice_is_vsi_dflt_vsi (vsi)) { ret =ice_fltr_set_vsi_promisc (&vsi->back->hw, vsi->idx,ICE_MCAST_VLAN_PROMISC_BITS , vid);
Signature · 1 line
2.54.0
Re: [Intel-wired-lan] [PATCH iwl-net v4 1/2] ice: skip per-VLAN promisc rules when default VSI Rx rule is set
Quoted 37 lines · Petr Oros
When an ice port in a vlan-filtering bridge goes promiscuous (typical for bond slaves), the driver installs a per-VLAN
ICE_SW_LKUP_PROMISC_VLANrule for every VID on top of the broadICE_SW_LKUP_DFLTVSI Rx rule. Each rule consumes one of the ~32K Flow Lookup Unit (FLU) entries the device shares across PFs, so a wide trunk (vid 2-4094) over several PFs overruns the
pool: firmware rejects further Add Switch Rules with ENOSPC (AQ0x10) and the DFLT Rx rule itself fails to install:ice 0000:5c:00.1: Failed to set VSI 14 as the default forwarding
VSI, error -5
ice 0000:5c:00.1 ens1f1: Error -5 setting default VSI 14 Rx ruleOnce a switch context is overrun the retries can also come back as ENOENT (AQ
0x2), which has misled triage toward a perceived recipe binding defect rather than a capacity issue.The DFLT rule already catches every packet on the port regardless of VLAN tag, so the per-VLAN promisc expansion is redundant while it is installed. Skip it at the two sites that drive it,
ice_set_promisc()andice_vlan_rx_add_vid(), keyed onice_is_vsi_dflt_vsi()rather than the netdevIFF_PROMISCflag so a failed or LAG-suppressed DFLT install still falls back to the per-VLAN rules.
IFF_ALLMULTIandIFF_PROMISCcan reachice_vsi_sync_fltr()in separate passes (a bridge join sets them through separate calls), so the allmulti pass may expand the per-VID rules before the DFLT rule exists. Drop those now-redundant rules right afterice_set_dflt_vsi()installs the DFLT rule;ice_vsi_exit_dflt_promisc()reinstates them when promisc is cleared.
ice_vsi_sync_fltr()subscribed multicast promiscuity only inside the "default VSI not yet in use" branch, so a promiscuous VSI that finds the default VSI rule already present (owned by another VSI, or preserved across a switchdev session) ended up in unicast promisc with no multicast subscription. Issueice_set_promisc(ICE_MCAST_PROMISC_BITS)whenever the netdev is promiscuous; it is idempotent and returns 0 if the rule is already present.
Quoted 2 lines
Fixes 1273f89578f2 ("ice: Fix broken IFF_ALLMULTI handling")Signed-off-by Petr Oros <[email protected]>
LGTM
Quoted 173 lines
---
v4 (review comments from Marcin Szycik):
- Reworded theice_clear_promisc()and the per-VID cleanup comments.
- Flipped theice_vsi_clear_vlan_mc_promisc()guard to an early return to reduce indentation, and noted that the clear is best-effort.
No functional change.v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/89efbea9831175e6f57e9fe8557f7a0e48e050b7.1781786935.git.poros@redhat.com/--- drivers/net/ethernet/intel/ice/ice_main.c | 109 +++++++++++++++++----- 1 file changed, 88 insertions(+), 21 deletions(-)drivers/net/ethernet/intel/ice/ice_main.c +88
-21@@ -274,7 +274,8 @@ static int ice_set_promisc(struct ice_vsi *vsi, u8 promisc_m)if (vsi->type !=ICE_VSI_PF )return 0 ; -if (ice_vsi_has_non_zero_vlans (vsi)) { +/* skip per-VID expansion; the DFLT Rx rule already covers every VID */ +if (ice_vsi_has_non_zero_vlans (vsi) && !ice_is_vsi_dflt_vsi (vsi)) { promisc_m |= (ICE_PROMISC_VLAN_RX |ICE_PROMISC_VLAN_TX ); status =ice_fltr_set_vlan_vsi_promisc (&vsi->back->hw, vsi, promisc_m);@@ -304,9 +305,20 @@ static int ice_clear_promisc(struct ice_vsi *vsi, u8 promisc_m)return 0 ;if (ice_vsi_has_non_zero_vlans (vsi)) { - promisc_m |= (ICE_PROMISC_VLAN_RX |ICE_PROMISC_VLAN_TX ); +u8 vlan_promisc_m = promisc_m |ICE_PROMISC_VLAN_RX | +ICE_PROMISC_VLAN_TX ; +int vid0_status; + +/* the vid=0 rule may be in either recipe (the recipe used to +* set it is not recorded), so clear both; clearing an absent +* rule returns 0 +*/ status =ice_fltr_clear_vlan_vsi_promisc (&vsi->back->hw, vsi, - promisc_m); + vlan_promisc_m); + vid0_status =ice_fltr_clear_vsi_promisc (&vsi->back->hw, + vsi->idx, promisc_m,0 ); +if (!status) + status = vid0_status; }else { status =ice_fltr_clear_vsi_promisc (&vsi->back->hw, vsi->idx, promisc_m,0 );@@ -317,6 +329,61 @@ static int ice_clear_promisc(struct ice_vsi *vsi, u8 promisc_m)return status; } +/** +* ice_vsi_exit_dflt_promisc - drop the default VSI Rx rule on promisc off +* @vsi: the VSI leaving promiscuous mode +* +* For an IFF_ALLMULTI VSI with VLANs the per-VID multicast rules are +* reinstated before the default rule is cleared so coverage never lapses; +* the then redundant vid=0 rule is dropped best-effort. The callees log +* their own failures, so error returns are not re-logged here. +* +* Return: 0 on success, negative on error with the default rule left in place. +*/ +static int ice_vsi_exit_dflt_promisc (struct ice_vsi *vsi) +{ +struct ice_vsi_vlan_ops *vlan_ops =ice_get_compat_vsi_vlan_ops (vsi); +struct net_device *netdev = vsi->netdev; +struct ice_hw *hw = &vsi->back->hw; +bool restore_mc; +int err; + + restore_mc = (vsi->current_netdev_flags &IFF_ALLMULTI ) && +ice_vsi_has_non_zero_vlans (vsi); + +if (restore_mc) { + err =ice_fltr_set_vlan_vsi_promisc (hw, vsi, +ICE_MCAST_VLAN_PROMISC_BITS ); +if (err && err != -EEXIST ) +return err; + } + + err =ice_clear_dflt_vsi (vsi); +if (err) +return err; + +if (netdev->features &NETIF_F_HW_VLAN_CTAG_FILTER ) + vlan_ops->ena_rx_filtering (vsi); + +if (restore_mc) +ice_fltr_clear_vsi_promisc (hw, vsi->idx,ICE_MCAST_PROMISC_BITS , +0 ); + +return 0 ; +} + +/* Drop the per-VID multicast promisc rules made redundant by the default +* VSI Rx rule; best-effort, a leftover is harmless while that rule stands. +*/ +static void ice_vsi_clear_vlan_mc_promisc (struct ice_vsi *vsi) +{ +if (!ice_vsi_has_non_zero_vlans (vsi)) +return ; + +ice_fltr_clear_vlan_vsi_promisc (&vsi->back->hw, vsi, +ICE_MCAST_VLAN_PROMISC_BITS ); +} +/** * ice_vsi_sync_fltr - Update the VSI filter list to the HW * @vsi: ptr to the VSI @@ -429,30 +496,31 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) err =0 ; vlan_ops->dis_rx_filtering (vsi); -/* promiscuous mode implies allmulticast so -* that VSIs that are in promiscuous mode are -* subscribed to multicast packets coming to -* the port +/* a prior allmulti pass may have added per-VID +* rules now covered by the DFLT rule */ - err =ice_set_promisc (vsi, -ICE_MCAST_PROMISC_BITS ); -if (err) - goto out_promisc; +ice_vsi_clear_vlan_mc_promisc (vsi); } + +/* Promiscuous mode implies allmulticast. Subscribe +* the VSI to all multicast even when the default VSI +* rule is already in use and the block above is +* skipped (it may be owned by another VSI, or +* preserved across a switchdev session); the unicast +* catch-all does not cover the multicast subscription. +*/ + err =ice_set_promisc (vsi,ICE_MCAST_PROMISC_BITS ); +if (err) + goto out_promisc; }else {/* Clear Rx filter to remove traffic from wire */ if (ice_is_vsi_dflt_vsi (vsi)) { - err =ice_clear_dflt_vsi (vsi); + err =ice_vsi_exit_dflt_promisc (vsi);if (err) { -netdev_err (netdev,"Error %d clearing default VSI %i Rx rule\n" , - err, vsi->vsi_num); vsi->current_netdev_flags |=IFF_PROMISC ; goto out_promisc; } -if (vsi->netdev->features & -NETIF_F_HW_VLAN_CTAG_FILTER ) - vlan_ops->ena_rx_filtering (vsi); }/* disable allmulti here, but only if allmulti is not @@ -3676,10 +3744,9 @@ int ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)while (test_and_set_bit (ICE_CFG_BUSY , vsi->state))usleep_range (1000 ,2000 ); -/* Add multicast promisc rule for the VLAN ID to be added if -* all-multicast is currently enabled. -*/ -if (vsi->current_netdev_flags &IFF_ALLMULTI ) { +/* skip the per-VID rule when the DFLT Rx rule already covers this VID */ +if ((vsi->current_netdev_flags &IFF_ALLMULTI ) && + !ice_is_vsi_dflt_vsi (vsi)) { ret =ice_fltr_set_vsi_promisc (&vsi->back->hw, vsi->idx,ICE_MCAST_VLAN_PROMISC_BITS , vid);
RE: [Intel-wired-lan] [PATCH iwl-net v4 1/2] ice: skip per-VLAN promisc rules when default VSI Rx rule is set
In reply to Petr OrosQuoted 33 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Petr Oros
Sent: 08 July 2026 18:28
To: [email protected]
Cc: Vecera, Ivan <[email protected]>; Alice Michael <[email protected]>; Kitszel, Przemyslaw <[email protected]>; Eric Dumazet <[email protected]>; [email protected]; Martyna Szapar-Mudlaw <[email protected]>; Andrew Lunn <[email protected]>; Marcin Szycik <[email protected]>; Nguyen, Anthony L <[email protected]>; Simon Horman <[email protected]>; [email protected]; Keller, Jacob E <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; David S. Miller <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-net v4 1/2] ice: skip per-VLAN promisc rules when default VSI Rx rule is setWhen an ice port in a vlan-filtering bridge goes promiscuous (typical for bond slaves), the driver installs a per-VLAN
ICE_SW_LKUP_PROMISC_VLANrule for every VID on top of the broadICE_SW_LKUP_DFLTVSI Rx rule. Each rule consumes one of > the ~32K Flow Lookup Unit (FLU) entries the device shares across PFs, so a wide trunk (vid 2-4094) over several PFs overruns the
pool: firmware rejects further Add Switch Rules with ENOSPC (AQ0x10) and the DFLT Rx rule itself fails to install:ice 0000:5c:00.1: Failed to set VSI 14 as the default forwarding
VSI, error -5
ice 0000:5c:00.1 ens1f1: Error -5 setting default VSI 14 Rx ruleOnce a switch context is overrun the retries can also come back as ENOENT (AQ
0x2), which has misled triage toward a perceived recipe binding defect rather than a capacity issue.The DFLT rule already catches every packet on the port regardless of VLAN tag, so the per-VLAN promisc expansion is redundant while it is installed.
Skip it at the two sites that drive it,ice_set_promisc()andice_vlan_rx_add_vid(), keyed onice_is_vsi_dflt_vsi()rather than the netdevIFF_PROMISCflag so a failed or LAG-suppressed DFLT install still falls back to the per-VLAN rules.
IFF_ALLMULTIandIFF_PROMISCcan reachice_vsi_sync_fltr()in separate passes (a bridge join sets them through separate calls), so the allmulti pass may expand the per-VID rules before the DFLT rule exists. Drop those now-redundant rules right > afterice_set_dflt_vsi()installs the DFLT rule;ice_vsi_exit_dflt_promisc()reinstates them when promisc is cleared.
ice_vsi_sync_fltr()subscribed multicast promiscuity only inside the "default VSI not yet in use" branch, so a promiscuous VSI that finds the default VSI rule already present (owned by another VSI, or preserved across a switchdev session) ended up > in unicast promisc with no multicast subscription. Issueice_set_promisc(ICE_MCAST_PROMISC_BITS)whenever the netdev is promiscuous; it is idempotent and returns 0 if the rule is already present.Fixes 1273f89578f2 ("ice: Fix broken IFF_ALLMULTI handling")Signed-off-by Petr Oros <[email protected]>---
v4 (review comments from Marcin Szycik):
- Reworded theice_clear_promisc()and the per-VID cleanup comments.
- Flipped theice_vsi_clear_vlan_mc_promisc()guard to an early return to reduce indentation, and noted that the clear is best-effort.
No functional change.
Quoted 7 lines
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/89efbea9831175e6f57e9fe8557f7a0e48e050b7.1781786935.git.poros@redhat.com/
---drivers/net/ethernet/intel/ice/ice_main.c| 109 +++++++++++++++++-----1 file changed, 88 insertions(+), 21 deletions(-)
PATCH v4 2/2 ice: preserve uplink DFLT Rx rule on switchdev release
In reply to Petr OrosWhen the uplink PF is promiscuous, ice_vsi_sync_fltr() installs an ICE_SW_LKUP_DFLT catch-all Rx rule on the uplink VSI. Entering switchdev re-affirms it through the idempotent ice_set_dflt_vsi(), but ice_eswitch_release_env() removed both the Rx and Tx DFLT rules unconditionally on teardown. That clobbered a promisc-owned Rx rule: it disappeared while IFF_PROMISC was still set and the sync path was not retriggered, leaving the uplink without the catch-all the netdev requested.
Skip the Rx DFLT removal when the uplink is promiscuous, both in ice_eswitch_release_env() and the err_def_tx unwind of ice_eswitch_setup_env(); the Tx leg, owned by switchdev, is still removed. Test the live netdev->flags, the same value ena_rx_filtering() -> ice_cfg_vlan_pruning() above already keys on, so the preserved rule and the pruning state stay consistent, including for a promisc change made while switchdev ran (which never reached the gated filter sync).
---
v4:
- No code change, added Marcin's and Aleksandr's Reviewed-by.
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/deef5756e534ef06c12d910c5305d3fd205d30a0.1781786935.git.poros@redhat.com/
--- drivers/net/ethernet/intel/ice/ice_eswitch.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_eswitch.c +14 -4
@@ -66,8 +66,10 @@ static int ice_eswitch_setup_env(struct ice_pf *pf)ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, false,ICE_FLTR_TX ); err_def_tx: -ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, false, -ICE_FLTR_RX ); +/* keep the Rx DFLT rule if the uplink is promiscuous (see release_env) */ +if (!(uplink_vsi->netdev->flags &IFF_PROMISC )) +ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, + false,ICE_FLTR_RX ); err_def_rx:ice_vsi_del_vlan_zero (uplink_vsi); err_vlan_zero:
@@ -276,8 +278,16 @@ static void ice_eswitch_release_env(struct ice_pf *pf) vlan_ops->ena_rx_filtering (uplink_vsi);ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, false,ICE_FLTR_TX ); -ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, false, -ICE_FLTR_RX ); + +/* Keep the Rx DFLT rule if the uplink is promiscuous; it must outlive +* the session. Test the live netdev->flags, the same value +* ena_rx_filtering() -> ice_cfg_vlan_pruning() above keys its decision +* on, so the preserved DFLT rule and the pruning state stay consistent. +*/ +if (!(uplink_vsi->netdev->flags &IFF_PROMISC )) +ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, + false,ICE_FLTR_RX ); +ice_fltr_add_mac_and_broadcast (uplink_vsi, uplink_vsi->port_info->mac.perm_addr,ICE_FWD_TO_VSI );
Signature · 1 line
2.54.0
RE: [Intel-wired-lan] [PATCH iwl-net v4 2/2] ice: preserve uplink DFLT Rx rule on switchdev release
Quoted 95 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Petr Oros
Sent: Wednesday, July 8, 2026 2:58 PM
To: [email protected]
Cc: Vecera, Ivan <[email protected]>; Martyna Szapar-Mudlaw <[email protected]>; Alice Michael <[email protected]>; Kitszel, Przemyslaw <[email protected]>; Eric Dumazet <[email protected]>; [email protected]; Loktionov, Aleksandr <[email protected]>; Andrew Lunn <[email protected]>; Marcin Szycik <[email protected]>; Nguyen, Anthony L <[email protected]>; Simon Horman <[email protected]>; intel- [email protected]; Keller, Jacob E <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; David S. Miller <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-net v4 2/2] ice: preserve uplink DFLT Rx rule on switchdev release
Importance: HighWhen the uplink PF is promiscuous,
ice_vsi_sync_fltr()installs anICE_SW_LKUP_DFLTcatch-all Rx rule on the uplink VSI. Entering switchdev re- affirms it through the idempotentice_set_dflt_vsi(), butice_eswitch_release_env()removed both the Rx and Tx DFLT rules unconditionally on teardown. That clobbered a promisc-owned Rx rule: it disappeared whileIFF_PROMISCwas still set and the sync path was not retriggered, leaving the uplink without the catch-all the netdev requested.Skip the Rx DFLT removal when the uplink is promiscuous, both in
ice_eswitch_release_env()and theerr_def_txunwind ofice_eswitch_setup_env(); the Tx leg, owned by switchdev, is still removed. Test the livenetdev->flags, the same valueena_rx_filtering()->ice_cfg_vlan_pruning()above already keys on, so the preserved rule and the pruning state stay consistent, including for a promisc change made while switchdev ran (which never reached the gated filter sync).Fixes 5c07be96d8b3 ("ice: Avoid setting default Rx VSI twice in switchdevsetup")
Reviewed-by Marcin Szycik <[email protected]>Reviewed-by Aleksandr Loktionov <[email protected]>Signed-off-by Petr Oros <[email protected]>---
v4:
- No code change, added Marcin's and Aleksandr's Reviewed-by.v3: https://lore.kernel.org/all/20260701133601.2118382-3-
[email protected]/
v2: https://lore.kernel.org/all/20260622113428.2565255-3-
[email protected]/
v1:
https://lore.kernel.org/all/deef5756e534ef06c12d910c5305d3fd205d30a0.
[email protected]/--- drivers/net/ethernet/intel/ice/ice_eswitch.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_eswitch.c +4
-2@@ -66,8 +66,10 @@ static int ice_eswitch_setup_env(struct ice_pf *pf)ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, false,ICE_FLTR_TX ); err_def_tx: -ice_cfg_dflt_vsi(uplink_vsi->port_info, uplink_vsi->idx, false, -ICE_FLTR_RX); +/* keep the Rx DFLT rule if the uplink is promiscuous (see release_env) */ +if (!(uplink_vsi->netdev->flags &IFF_PROMISC )) +ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, + false,ICE_FLTR_RX ); err_def_rx:ice_vsi_del_vlan_zero (uplink_vsi);
err_vlan_zero:drivers/net/ethernet/intel/ice/ice_eswitch.c +10
-2@@ -276,8 +278,16 @@ static void ice_eswitch_release_env(struct ice_pf *pf) vlan_ops->ena_rx_filtering (uplink_vsi);ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, false,ICE_FLTR_TX ); -ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, false, -ICE_FLTR_RX ); + +/* Keep the Rx DFLT rule if the uplink is promiscuous; it must outlive +* the session. Test the live netdev->flags, the same value +* ena_rx_filtering() -> ice_cfg_vlan_pruning() above keys its decision +* on, so the preserved DFLT rule and the pruning state stay consistent. +*/ +if (!(uplink_vsi->netdev->flags &IFF_PROMISC )) +ice_cfg_dflt_vsi (uplink_vsi->port_info, uplink_vsi->idx, + false,ICE_FLTR_RX ); + ice_fltr_add_mac_and_broadcast(uplink_vsi, uplink_vsi->port_info->mac.perm_addr,
Quoted 3 lines
ICE_FWD_TO_VSI);
--
2.54.0