ice: move VSI configuration outside repr setup

It is needed because subfunction port representor shouldn't configure
the source VSI during representor creation.

Move the code to separate function and call it only in case the VF port
representor is being created.

Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
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_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c
index 7b57a6561a5a6b150dbaf6e5b4b860aa4896a196..3f73f46111fcc8a3b3f20be78f91f8787f2dc086 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_eswitch.c
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c
@@ -117,17 +117,10 @@ static int ice_eswitch_setup_repr(struct ice_pf *pf, struct ice_repr *repr)
        struct ice_vsi *vsi = repr->src_vsi;
        struct metadata_dst *dst;
 
-       ice_remove_vsi_fltr(&pf->hw, vsi->idx);
        repr->dst = metadata_dst_alloc(0, METADATA_HW_PORT_MUX,
                                       GFP_KERNEL);
        if (!repr->dst)
-               goto err_add_mac_fltr;
-
-       if (ice_vsi_update_security(vsi, ice_vsi_ctx_clear_antispoof))
-               goto err_dst_free;
-
-       if (ice_vsi_add_vlan_zero(vsi))
-               goto err_update_security;
+               return -ENOMEM;
 
        netif_keep_dst(uplink_vsi->netdev);
 
@@ -136,16 +129,48 @@ static int ice_eswitch_setup_repr(struct ice_pf *pf, struct ice_repr *repr)
        dst->u.port_info.lower_dev = uplink_vsi->netdev;
 
        return 0;
+}
 
-err_update_security:
+/**
+ * ice_eswitch_cfg_vsi - configure VSI to work in slow-path
+ * @vsi: VSI structure of representee
+ * @mac: representee MAC
+ *
+ * Return: 0 on success, non-zero on error.
+ */
+int ice_eswitch_cfg_vsi(struct ice_vsi *vsi, const u8 *mac)
+{
+       int err;
+
+       ice_remove_vsi_fltr(&vsi->back->hw, vsi->idx);
+
+       err = ice_vsi_update_security(vsi, ice_vsi_ctx_clear_antispoof);
+       if (err)
+               goto err_update_security;
+
+       err = ice_vsi_add_vlan_zero(vsi);
+       if (err)
+               goto err_vlan_zero;
+
+       return 0;
+
+err_vlan_zero:
        ice_vsi_update_security(vsi, ice_vsi_ctx_set_antispoof);
-err_dst_free:
-       metadata_dst_free(repr->dst);
-       repr->dst = NULL;
-err_add_mac_fltr:
-       ice_fltr_add_mac_and_broadcast(vsi, repr->parent_mac, ICE_FWD_TO_VSI);
+err_update_security:
+       ice_fltr_add_mac_and_broadcast(vsi, mac, ICE_FWD_TO_VSI);
 
-       return -ENODEV;
+       return err;
+}
+
+/**
+ * ice_eswitch_decfg_vsi - unroll changes done to VSI for switchdev
+ * @vsi: VSI structure of representee
+ * @mac: representee MAC
+ */
+void ice_eswitch_decfg_vsi(struct ice_vsi *vsi, const u8 *mac)
+{
+       ice_vsi_update_security(vsi, ice_vsi_ctx_set_antispoof);
+       ice_fltr_add_mac_and_broadcast(vsi, mac, ICE_FWD_TO_VSI);
 }
 
 /**

diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.h b/drivers/net/ethernet/intel/ice/ice_eswitch.h
index e2e5c0c75e7d46ffb2070e0c57df9f04a1a3980b..9a25606e97400b5a6dbf47cfdb234eaa52ca6db6 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_eswitch.h
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.h
@@ -28,6 +28,9 @@ netdev_tx_t
 ice_eswitch_port_start_xmit(struct sk_buff *skb, struct net_device *netdev);
 struct net_device *ice_eswitch_get_target(struct ice_rx_ring *rx_ring,
                                          union ice_32b_rx_flex_desc *rx_desc);
+
+int ice_eswitch_cfg_vsi(struct ice_vsi *vsi, const u8 *mac);
+void ice_eswitch_decfg_vsi(struct ice_vsi *vsi, const u8 *mac);
 #else /* CONFIG_ICE_SWITCHDEV */
 static inline void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf) { }
 
@@ -85,5 +88,12 @@ ice_eswitch_get_target(struct ice_rx_ring *rx_ring,
 {
        return rx_ring->netdev;
 }
+
+static inline int ice_eswitch_cfg_vsi(struct ice_vsi *vsi, const u8 *mac)
+{
+       return -EOPNOTSUPP;
+}
+
+static inline void ice_eswitch_decfg_vsi(struct ice_vsi *vsi, const u8 *mac) { }
 #endif /* CONFIG_ICE_SWITCHDEV */
 #endif /* _ICE_ESWITCH_H_ */

diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index 35a6ac8c0466540853eae6690def786df1fce9a5..bdda3401e3438b2395dfee50207c2057735d2d5c 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -306,6 +306,7 @@ static void ice_repr_rem(struct ice_repr *repr)
 void ice_repr_rem_vf(struct ice_repr *repr)
 {
        ice_repr_remove_node(&repr->vf->devlink_port);
+       ice_eswitch_decfg_vsi(repr->src_vsi, repr->parent_mac);
        unregister_netdev(repr->netdev);
        ice_devlink_destroy_vf_port(repr->vf);
        ice_virtchnl_set_dflt_ops(repr->vf);
@@ -401,11 +402,17 @@ struct ice_repr *ice_repr_add_vf(struct ice_vf *vf)
        if (err)
                goto err_netdev;
 
+       err = ice_eswitch_cfg_vsi(repr->src_vsi, repr->parent_mac);
+       if (err)
+               goto err_cfg_vsi;
+
        ice_virtchnl_set_repr_ops(vf);
        ice_repr_set_tx_topology(vf->pf);
 
        return repr;
 
+err_cfg_vsi:
+       unregister_netdev(repr->netdev);
 err_netdev:
        ice_repr_rem(repr);
 err_repr_add: