ice: control default Tx rule in lag

Tx rule in switchdev was changed to use PF instead of additional control
plane VSI. Because of that during lag we should control it. Control
means to add and remove the default Tx rule during lag active/inactive
switching.

It can be done the same way as default Rx rule.

Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_lag.c b/drivers/net/ethernet/intel/ice/ice_lag.c
index 467372d541d21f9c26416275f945b12e684079ef..7b802884440ce164591190cf802730ff597ac428 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lag.c
+++ b/drivers/net/ethernet/intel/ice/ice_lag.c
@@ -202,11 +202,12 @@ static struct ice_lag *ice_lag_find_primary(struct ice_lag *lag)
  * @act: rule action
  * @recipe_id: recipe id for the new rule
  * @rule_idx: pointer to rule index
+ * @direction: ICE_FLTR_RX or ICE_FLTR_TX
  * @add: boolean on whether we are adding filters
  */
 static int
 ice_lag_cfg_fltr(struct ice_lag *lag, u32 act, u16 recipe_id, u16 *rule_idx,
-                bool add)
+                u8 direction, bool add)
 {
        struct ice_sw_rule_lkup_rx_tx *s_rule;
        u16 s_rule_sz, vsi_num;
@@ -231,9 +232,16 @@ ice_lag_cfg_fltr(struct ice_lag *lag, u32 act, u16 recipe_id, u16 *rule_idx,
 
                act |= FIELD_PREP(ICE_SINGLE_ACT_VSI_ID_M, vsi_num);
 
-               s_rule->hdr.type = cpu_to_le16(ICE_AQC_SW_RULES_T_LKUP_RX);
                s_rule->recipe_id = cpu_to_le16(recipe_id);
-               s_rule->src = cpu_to_le16(hw->port_info->lport);
+               if (direction == ICE_FLTR_RX) {
+                       s_rule->hdr.type =
+                               cpu_to_le16(ICE_AQC_SW_RULES_T_LKUP_RX);
+                       s_rule->src = cpu_to_le16(hw->port_info->lport);
+               } else {
+                       s_rule->hdr.type =
+                               cpu_to_le16(ICE_AQC_SW_RULES_T_LKUP_TX);
+                       s_rule->src = cpu_to_le16(vsi_num);
+               }
                s_rule->act = cpu_to_le32(act);
                s_rule->hdr_len = cpu_to_le16(DUMMY_ETH_HDR_LEN);
                opc = ice_aqc_opc_add_sw_rules;
@@ -266,9 +274,27 @@ ice_lag_cfg_dflt_fltr(struct ice_lag *lag, bool add)
 {
        u32 act = ICE_SINGLE_ACT_VSI_FORWARDING |
                ICE_SINGLE_ACT_VALID_BIT | ICE_SINGLE_ACT_LAN_ENABLE;
+       int err;
+
+       err = ice_lag_cfg_fltr(lag, act, lag->pf_recipe, &lag->pf_rx_rule_id,
+                              ICE_FLTR_RX, add);
+       if (err)
+               goto err_rx;
 
-       return ice_lag_cfg_fltr(lag, act, lag->pf_recipe,
-                               &lag->pf_rule_id, add);
+       act = ICE_SINGLE_ACT_VSI_FORWARDING | ICE_SINGLE_ACT_VALID_BIT |
+             ICE_SINGLE_ACT_LB_ENABLE;
+       err = ice_lag_cfg_fltr(lag, act, lag->pf_recipe, &lag->pf_tx_rule_id,
+                              ICE_FLTR_TX, add);
+       if (err)
+               goto err_tx;
+
+       return 0;
+
+err_tx:
+       ice_lag_cfg_fltr(lag, act, lag->pf_recipe, &lag->pf_rx_rule_id,
+                        ICE_FLTR_RX, !add);
+err_rx:
+       return err;
 }
 
 /**
@@ -284,7 +310,7 @@ ice_lag_cfg_drop_fltr(struct ice_lag *lag, bool add)
                  ICE_SINGLE_ACT_DROP;
 
        return ice_lag_cfg_fltr(lag, act, lag->lport_recipe,
-                               &lag->lport_rule_idx, add);
+                               &lag->lport_rule_idx, ICE_FLTR_RX, add);
 }
 
 /**
@@ -310,7 +336,7 @@ ice_lag_cfg_pf_fltrs(struct ice_lag *lag, void *ptr)
        dev = ice_pf_to_dev(lag->pf);
 
        /* interface not active - remove old default VSI rule */
-       if (bonding_info->slave.state && lag->pf_rule_id) {
+       if (bonding_info->slave.state && lag->pf_rx_rule_id) {
                if (ice_lag_cfg_dflt_fltr(lag, false))
                        dev_err(dev, "Error removing old default VSI filter\n");
                if (ice_lag_cfg_drop_fltr(lag, true))
@@ -319,7 +345,7 @@ ice_lag_cfg_pf_fltrs(struct ice_lag *lag, void *ptr)
        }
 
        /* interface becoming active - add new default VSI rule */
-       if (!bonding_info->slave.state && !lag->pf_rule_id) {
+       if (!bonding_info->slave.state && !lag->pf_rx_rule_id) {
                if (ice_lag_cfg_dflt_fltr(lag, true))
                        dev_err(dev, "Error adding new default VSI filter\n");
                if (lag->lport_rule_idx && ice_lag_cfg_drop_fltr(lag, false))
@@ -2149,7 +2175,7 @@ void ice_lag_rebuild(struct ice_pf *pf)
 
        ice_lag_cfg_cp_fltr(lag, true);
 
-       if (lag->pf_rule_id)
+       if (lag->pf_rx_rule_id)
                if (ice_lag_cfg_dflt_fltr(lag, true))
                        dev_err(ice_pf_to_dev(pf), "Error adding default VSI rule in rebuild\n");
 

diff --git a/drivers/net/ethernet/intel/ice/ice_lag.h b/drivers/net/ethernet/intel/ice/ice_lag.h
index 183b38792ef22d9ac54daa0ea4a8156039681e7c..bab2c83142a1a523d29db5ec7c0447455fea9b66 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lag.h
+++ b/drivers/net/ethernet/intel/ice/ice_lag.h
@@ -43,7 +43,8 @@ struct ice_lag {
        u8 primary:1; /* this is primary */
        u16 pf_recipe;
        u16 lport_recipe;
-       u16 pf_rule_id;
+       u16 pf_rx_rule_id;
+       u16 pf_tx_rule_id;
        u16 cp_rule_idx;
        u16 lport_rule_idx;
        u8 role;