ice: Fix VSI list rule with ICE_SW_LKUP_LAST type
Subsystems (3)
PATCH 1/1 ice: Fix VSI list rule with ICE_SW_LKUP_LAST type
Adding/updating VSI list rule, as well as allocating/freeing VSI list resource are called several times with type ICE_SW_LKUP_LAST, which fails because ice_update_vsi_list_rule() and ice_aq_alloc_free_vsi_list() consider it invalid. Allow calling these functions with ICE_SW_LKUP_LAST.
This fixes at least one issue in switchdev mode, where the same rule with different action cannot be added, e.g.:
tc filter add dev $PF1 ingress protocol arp prio 0 flower skip_sw \
dst_mac ff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF1_PR
tc filter add dev $PF1 ingress protocol arp prio 0 flower skip_sw \
dst_mac ff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF2_PR
--- drivers/net/ethernet/intel/ice/ice_switch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_switch.c +4 -2
@@ -1899,7 +1899,8 @@ ice_aq_alloc_free_vsi_list(struct ice_hw *hw, u16 *vsi_list_id, lkup_type ==ICE_SW_LKUP_ETHERTYPE_MAC || lkup_type ==ICE_SW_LKUP_PROMISC || lkup_type ==ICE_SW_LKUP_PROMISC_VLAN || - lkup_type == ICE_SW_LKUP_DFLT) { + lkup_type ==ICE_SW_LKUP_DFLT || + lkup_type == ICE_SW_LKUP_LAST) { sw_buf->res_type = cpu_to_le16(ICE_AQC_RES_TYPE_VSI_LIST_REP); } else if (lkup_type == ICE_SW_LKUP_VLAN) {if (opc == ice_aqc_opc_alloc_res)
@@ -2922,7 +2923,8 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi, lkup_type ==ICE_SW_LKUP_ETHERTYPE_MAC || lkup_type ==ICE_SW_LKUP_PROMISC || lkup_type ==ICE_SW_LKUP_PROMISC_VLAN || - lkup_type == ICE_SW_LKUP_DFLT) + lkup_type ==ICE_SW_LKUP_DFLT || + lkup_type == ICE_SW_LKUP_LAST) rule_type = remove ? ICE_AQC_SW_RULES_T_VSI_LIST_CLEAR :ICE_AQC_SW_RULES_T_VSI_LIST_SET ; else if (lkup_type == ICE_SW_LKUP_VLAN)
Signature · 1 line
2.45.0
Quoted 13 lines · Marcin Szycik
Adding/updating VSI list rule, as well as allocating/freeing VSI list resource are called several times with type
ICE_SW_LKUP_LAST, which fails becauseice_update_vsi_list_rule()andice_aq_alloc_free_vsi_list()consider it invalid. Allow calling these functions withICE_SW_LKUP_LAST.This fixes at least one issue in switchdev mode, where the same rule with different action cannot be added, e.g.:
tc filter add dev $PF1 ingress protocol arp prio 0 flower
skip_sw\
dst_macff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF1_PR
tc filter add dev $PF1 ingress protocol arp prio 0 flowerskip_sw\
dst_macff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF2_PR
Quoted 6 lines
Fixes 0f94570d0cae ("ice: allow adding advanced rules")Suggested-by Michal Swiatkowski <[email protected]>Reviewed-by Michal Swiatkowski <[email protected]>Reviewed-by Przemek Kitszel <[email protected]>Signed-off-by Marcin Szycik <[email protected]>---
Quoted 13 lines · Marcin Szycik
Adding/updating VSI list rule, as well as allocating/freeing VSI list resource are called several times with type
ICE_SW_LKUP_LAST, which fails becauseice_update_vsi_list_rule()andice_aq_alloc_free_vsi_list()consider it invalid. Allow calling these functions withICE_SW_LKUP_LAST.This fixes at least one issue in switchdev mode, where the same rule with different action cannot be added, e.g.:
tc filter add dev $PF1 ingress protocol arp prio 0 flower
skip_sw\
dst_macff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF1_PR
tc filter add dev $PF1 ingress protocol arp prio 0 flowerskip_sw\
dst_macff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF2_PR
Quoted 5 lines
Fixes 0f94570d0cae ("ice: allow adding advanced rules")Suggested-by Michal Swiatkowski <[email protected]>Reviewed-by Michal Swiatkowski <[email protected]>Reviewed-by Przemek Kitszel <[email protected]>Signed-off-by Marcin Szycik <[email protected]>
Quoted 24 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Marcin Szycik
Sent: Wednesday, June 5, 2024 7:48 PM
To: [email protected]
Cc: [email protected]; Marcin Szycik <[email protected]>; Kitszel, Przemyslaw <[email protected]>; Michal Swiatkowski <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-net] ice: Fix VSI list rule withICE_SW_LKUP_LASTtypeAdding/updating VSI list rule, as well as allocating/freeing VSI list resource are called several times with type
ICE_SW_LKUP_LAST, which fails becauseice_update_vsi_list_rule()andice_aq_alloc_free_vsi_list()consider it invalid. Allow calling these functions withICE_SW_LKUP_LAST.This fixes at least one issue in switchdev mode, where the same rule with different action cannot be added, e.g.:
tc filter add dev $PF1 ingress protocol arp prio 0 flower
skip_sw\
dst_macff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF1_PR
tc filter add dev $PF1 ingress protocol arp prio 0 flowerskip_sw\
dst_macff:ff:ff:ff:ff:ff action mirred egress redirect dev $VF2_PR
Quoted 9 lines
Fixes 0f94570d0cae ("ice: allow adding advanced rules")Suggested-by Michal Swiatkowski <[email protected]>Reviewed-by Michal Swiatkowski <[email protected]>Reviewed-by Przemek Kitszel <[email protected]>Signed-off-by Marcin Szycik <[email protected]>--- drivers/net/ethernet/intel/ice/ice_switch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)