Commit 33bf1e86 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: remove switchdev control plane VSI 



For slow-path Rx and Tx PF VSI is used. There is no need to have control
plane VSI. Remove all code related to it.

Eswitch rebuild can't fail without rebuilding control plane VSI. Return
void from ice_eswitch_rebuild().

Reviewed-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9cba6e17

drivers/net/ethernet/intel/ice/ice.h

+0 −1
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ enum ice_misc_thread_tasks { 
};



struct ice_eswitch {

	struct ice_vsi *control_vsi;

	struct ice_vsi *uplink_vsi;

	struct ice_esw_br_offloads *br_offloads;

	struct xarray reprs;

drivers/net/ethernet/intel/ice/ice_base.c

+1 −35
Original line number Diff line number Diff line
@@ -263,30 +263,6 @@ static u16 ice_calc_txq_handle(struct ice_vsi *vsi, struct ice_tx_ring *ring, u8 
	return ring->q_index - vsi->tc_cfg.tc_info[tc].qoffset;

}



/**

 * ice_eswitch_calc_txq_handle

 * @ring: pointer to ring which unique index is needed

 *

 * To correctly work with many netdevs ring->q_index of Tx rings on switchdev

 * VSI can repeat. Hardware ring setup requires unique q_index. Calculate it

 * here by finding index in vsi->tx_rings of this ring.

 *

 * Return ICE_INVAL_Q_INDEX when index wasn't found. Should never happen,

 * because VSI is get from ring->vsi, so it has to be present in this VSI.

 */

static u16 ice_eswitch_calc_txq_handle(struct ice_tx_ring *ring)

{

	const struct ice_vsi *vsi = ring->vsi;

	int i;



	ice_for_each_txq(vsi, i) {

		if (vsi->tx_rings[i] == ring)

			return i;

	}



	return ICE_INVAL_Q_INDEX;

}



/**

 * ice_cfg_xps_tx_ring - Configure XPS for a Tx ring

 * @ring: The Tx ring to configure
@@ -353,9 +329,6 @@ ice_setup_tx_ctx(struct ice_tx_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf 
		tlan_ctx->vmvf_num = hw->func_caps.vf_base_id + vsi->vf->vf_id;

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF;

		break;

	case ICE_VSI_SWITCHDEV_CTRL:

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VMQ;

		break;

	default:

		return;

	}
@@ -919,14 +892,7 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_tx_ring *ring, 
	/* Add unique software queue handle of the Tx queue per

	 * TC into the VSI Tx ring

	 */

	if (vsi->type == ICE_VSI_SWITCHDEV_CTRL) {

		ring->q_handle = ice_eswitch_calc_txq_handle(ring);



		if (ring->q_handle == ICE_INVAL_Q_INDEX)

			return -ENODEV;

	} else {

	ring->q_handle = ice_calc_txq_handle(vsi, ring, tc);

	}



	if (ch)

		status = ice_ena_vsi_txq(vsi->port_info, ch->ch_vsi->idx, 0,

drivers/net/ethernet/intel/ice/ice_dcb_lib.c

+1 −3
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ static void ice_dcb_ena_dis_vsi(struct ice_pf *pf, bool ena, bool locked) 


		switch (vsi->type) {

		case ICE_VSI_CHNL:

		case ICE_VSI_SWITCHDEV_CTRL:

		case ICE_VSI_PF:

			if (ena)

				ice_ena_vsi(vsi, locked);
@@ -776,8 +775,7 @@ void ice_pf_dcb_recfg(struct ice_pf *pf, bool locked) 
		/* no need to proceed with remaining cfg if it is CHNL

		 * or switchdev VSI

		 */

		if (vsi->type == ICE_VSI_CHNL ||

		    vsi->type == ICE_VSI_SWITCHDEV_CTRL)

		if (vsi->type == ICE_VSI_CHNL)

			continue;



		ice_vsi_map_rings_to_vectors(vsi);

drivers/net/ethernet/intel/ice/ice_eswitch.c

+4 −159
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
static int ice_eswitch_setup_env(struct ice_pf *pf)

{

	struct ice_vsi *uplink_vsi = pf->eswitch.uplink_vsi;

	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;

	struct net_device *netdev = uplink_vsi->netdev;

	struct ice_vsi_vlan_ops *vlan_ops;
@@ -49,17 +48,12 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
	if (ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_set_allow_override))

		goto err_override_uplink;



	if (ice_vsi_update_security(ctrl_vsi, ice_vsi_ctx_set_allow_override))

		goto err_override_control;



	if (ice_vsi_update_local_lb(uplink_vsi, true))

		goto err_override_local_lb;



	return 0;



err_override_local_lb:

	ice_vsi_update_security(ctrl_vsi, ice_vsi_ctx_clear_allow_override);

err_override_control:

	ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);

err_override_uplink:

	vlan_ops->ena_rx_filtering(uplink_vsi);
@@ -78,61 +72,6 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
	return -ENODEV;

}



/**

 * ice_eswitch_remap_rings_to_vectors - reconfigure rings of eswitch ctrl VSI

 * @eswitch: pointer to eswitch struct

 *

 * In eswitch number of allocated Tx/Rx rings is equal.

 *

 * This function fills q_vectors structures associated with representor and

 * move each ring pairs to port representor netdevs. Each port representor

 * will have dedicated 1 Tx/Rx ring pair, so number of rings pair is equal to

 * number of VFs.

 */

static void ice_eswitch_remap_rings_to_vectors(struct ice_eswitch *eswitch)

{

	struct ice_vsi *vsi = eswitch->control_vsi;

	unsigned long repr_id = 0;

	int q_id;



	ice_for_each_txq(vsi, q_id) {

		struct ice_q_vector *q_vector;

		struct ice_tx_ring *tx_ring;

		struct ice_rx_ring *rx_ring;

		struct ice_repr *repr;



		repr = xa_find(&eswitch->reprs, &repr_id, U32_MAX,

			       XA_PRESENT);

		if (!repr)

			break;



		repr_id += 1;

		repr->q_id = q_id;

		q_vector = repr->q_vector;

		tx_ring = vsi->tx_rings[q_id];

		rx_ring = vsi->rx_rings[q_id];



		q_vector->vsi = vsi;

		q_vector->reg_idx = vsi->q_vectors[0]->reg_idx;



		q_vector->num_ring_tx = 1;

		q_vector->tx.tx_ring = tx_ring;

		tx_ring->q_vector = q_vector;

		tx_ring->next = NULL;

		tx_ring->netdev = repr->netdev;

		/* In switchdev mode, from OS stack perspective, there is only

		 * one queue for given netdev, so it needs to be indexed as 0.

		 */

		tx_ring->q_index = 0;



		q_vector->num_ring_rx = 1;

		q_vector->rx.rx_ring = rx_ring;

		rx_ring->q_vector = q_vector;

		rx_ring->next = NULL;

		rx_ring->netdev = repr->netdev;

	}

}



/**

 * ice_eswitch_release_repr - clear PR VSI configuration

 * @pf: poiner to PF struct
@@ -152,8 +91,6 @@ ice_eswitch_release_repr(struct ice_pf *pf, struct ice_repr *repr) 
	repr->dst = NULL;

	ice_fltr_add_mac_and_broadcast(vsi, repr->parent_mac,

				       ICE_FWD_TO_VSI);



	netif_napi_del(&repr->q_vector->napi);

}



/**
@@ -179,9 +116,6 @@ static int ice_eswitch_setup_repr(struct ice_pf *pf, struct ice_repr *repr) 
	if (ice_vsi_add_vlan_zero(vsi))

		goto err_update_security;



	netif_napi_add(repr->netdev, &repr->q_vector->napi,

		       ice_napi_poll);



	netif_keep_dst(uplink_vsi->netdev);



	dst = repr->dst;
@@ -287,13 +221,11 @@ ice_eswitch_set_target_vsi(struct sk_buff *skb, 
static void ice_eswitch_release_env(struct ice_pf *pf)

{

	struct ice_vsi *uplink_vsi = pf->eswitch.uplink_vsi;

	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;

	struct ice_vsi_vlan_ops *vlan_ops;



	vlan_ops = ice_get_compat_vsi_vlan_ops(uplink_vsi);



	ice_vsi_update_local_lb(uplink_vsi, false);

	ice_vsi_update_security(ctrl_vsi, ice_vsi_ctx_clear_allow_override);

	ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);

	vlan_ops->ena_rx_filtering(uplink_vsi);

	ice_clear_dflt_vsi(uplink_vsi);
@@ -302,56 +234,13 @@ static void ice_eswitch_release_env(struct ice_pf *pf) 
				       ICE_FWD_TO_VSI);

}



/**

 * ice_eswitch_vsi_setup - configure eswitch control VSI

 * @pf: pointer to PF structure

 * @pi: pointer to port_info structure

 */

static struct ice_vsi *

ice_eswitch_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi)

{

	struct ice_vsi_cfg_params params = {};



	params.type = ICE_VSI_SWITCHDEV_CTRL;

	params.pi = pi;

	params.flags = ICE_VSI_FLAG_INIT;



	return ice_vsi_setup(pf, &params);

}



/**

 * ice_eswitch_napi_enable - enable NAPI for all port representors

 * @reprs: xarray of reprs

 */

static void ice_eswitch_napi_enable(struct xarray *reprs)

{

	struct ice_repr *repr;

	unsigned long id;



	xa_for_each(reprs, id, repr)

		napi_enable(&repr->q_vector->napi);

}



/**

 * ice_eswitch_napi_disable - disable NAPI for all port representors

 * @reprs: xarray of reprs

 */

static void ice_eswitch_napi_disable(struct xarray *reprs)

{

	struct ice_repr *repr;

	unsigned long id;



	xa_for_each(reprs, id, repr)

		napi_disable(&repr->q_vector->napi);

}



/**

 * ice_eswitch_enable_switchdev - configure eswitch in switchdev mode

 * @pf: pointer to PF structure

 */

static int ice_eswitch_enable_switchdev(struct ice_pf *pf)

{

	struct ice_vsi *ctrl_vsi, *uplink_vsi;

	struct ice_vsi *uplink_vsi;



	uplink_vsi = ice_get_main_vsi(pf);

	if (!uplink_vsi)
@@ -363,15 +252,10 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf) 
		return -EINVAL;

	}



	pf->eswitch.control_vsi = ice_eswitch_vsi_setup(pf, pf->hw.port_info);

	if (!pf->eswitch.control_vsi)

		return -ENODEV;



	ctrl_vsi = pf->eswitch.control_vsi;

	pf->eswitch.uplink_vsi = uplink_vsi;



	if (ice_eswitch_setup_env(pf))

		goto err_vsi;

		return -ENODEV;



	if (ice_eswitch_br_offloads_init(pf))

		goto err_br_offloads;
@@ -382,8 +266,6 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf) 


err_br_offloads:

	ice_eswitch_release_env(pf);

err_vsi:

	ice_vsi_release(ctrl_vsi);

	return -ENODEV;

}
@@ -393,11 +275,8 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf) 
 */

static void ice_eswitch_disable_switchdev(struct ice_pf *pf)

{

	struct ice_vsi *ctrl_vsi = pf->eswitch.control_vsi;



	ice_eswitch_br_offloads_deinit(pf);

	ice_eswitch_release_env(pf);

	ice_vsi_release(ctrl_vsi);



	pf->eswitch.is_running = false;

}
@@ -513,40 +392,17 @@ void ice_eswitch_stop_all_tx_queues(struct ice_pf *pf) 
static void ice_eswitch_stop_reprs(struct ice_pf *pf)

{

	ice_eswitch_stop_all_tx_queues(pf);

	ice_eswitch_napi_disable(&pf->eswitch.reprs);

}



static void ice_eswitch_start_reprs(struct ice_pf *pf)

{

	ice_eswitch_napi_enable(&pf->eswitch.reprs);

	ice_eswitch_start_all_tx_queues(pf);

}



static void

ice_eswitch_cp_change_queues(struct ice_eswitch *eswitch, int change)

{

	struct ice_vsi *cp = eswitch->control_vsi;

	int queues = 0;



	if (queues) {

		cp->req_txq = queues;

		cp->req_rxq = queues;

		ice_vsi_close(cp);

		ice_vsi_rebuild(cp, ICE_VSI_FLAG_NO_INIT);

		ice_vsi_open(cp);

	} else if (!change) {

		/* change == 0 means that VSI wasn't open, open it here */

		ice_vsi_open(cp);

	}



	ice_eswitch_remap_rings_to_vectors(eswitch);

}



int

ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf)

{

	struct ice_repr *repr;

	int change = 1;

	int err;



	if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY)
@@ -556,7 +412,6 @@ ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf) 
		err = ice_eswitch_enable_switchdev(pf);

		if (err)

			return err;

		change = 0;

	}



	ice_eswitch_stop_reprs(pf);
@@ -578,7 +433,6 @@ ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf) 


	vf->repr_id = repr->id;



	ice_eswitch_cp_change_queues(&pf->eswitch, change);

	ice_eswitch_start_reprs(pf);



	return 0;
@@ -608,8 +462,6 @@ void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf) 


	if (xa_empty(&pf->eswitch.reprs))

		ice_eswitch_disable_switchdev(pf);

	else

		ice_eswitch_cp_change_queues(&pf->eswitch, -1);



	ice_eswitch_release_repr(pf, repr);

	ice_repr_rem_vf(repr);
@@ -631,21 +483,14 @@ void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf) 
 * ice_eswitch_rebuild - rebuild eswitch

 * @pf: pointer to PF structure

 */

int ice_eswitch_rebuild(struct ice_pf *pf)

void ice_eswitch_rebuild(struct ice_pf *pf)

{

	struct ice_repr *repr;

	unsigned long id;

	int err;



	if (!ice_is_switchdev_running(pf))

		return 0;



	err = ice_vsi_rebuild(pf->eswitch.control_vsi, ICE_VSI_FLAG_INIT);

	if (err)

		return err;

		return;



	xa_for_each(&pf->eswitch.reprs, id, repr)

		ice_eswitch_detach(pf, repr->vf);



	return 0;

}

drivers/net/ethernet/intel/ice/ice_eswitch.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf);

int

ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf);

int ice_eswitch_rebuild(struct ice_pf *pf);

void ice_eswitch_rebuild(struct ice_pf *pf);



int ice_eswitch_mode_get(struct devlink *devlink, u16 *mode);

int