Commit 5a841e4e authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: rename switchdev to eswitch 



Eswitch is used as a prefix for related functions. Main structure
storing all data related to eswitch should also be named as eswitch
instead of ice_switchdev_info. Rename it.

Also rename switchdev to eswitch where the context is not about eswitch
mode.

::uplink_netdev was changed to netdev for simplicity. There is no other
netdev in function scope so it is obvious.

Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: default avatarPiotr Raczynski <piotr.raczynski@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 89cdf9d5

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

+3 −3
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ enum ice_misc_thread_tasks { 
	ICE_MISC_THREAD_NBITS		/* must be last */

};



struct ice_switchdev_info {

struct ice_eswitch {

	struct ice_vsi *control_vsi;

	struct ice_vsi *uplink_vsi;

	struct ice_esw_br_offloads *br_offloads;
@@ -637,7 +637,7 @@ struct ice_pf { 
	struct ice_link_default_override_tlv link_dflt_override;

	struct ice_lag *lag; /* Link Aggregation information */



	struct ice_switchdev_info switchdev;

	struct ice_eswitch eswitch;

	struct ice_esw_br_port *br_port;



#define ICE_INVALID_AGG_NODE_ID		0
@@ -846,7 +846,7 @@ static inline struct ice_vsi *ice_find_vsi(struct ice_pf *pf, u16 vsi_num) 
 */

static inline bool ice_is_switchdev_running(struct ice_pf *pf)

{

	return pf->switchdev.is_running;

	return pf->eswitch.is_running;

}



#define ICE_FD_STAT_CTR_BLOCK_COUNT	256

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

+32 −31
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
 * @vf: pointer to VF struct

 *

 * This function adds advanced rule that forwards packets with

 * VF's VSI index to the corresponding switchdev ctrl VSI queue.

 * VF's VSI index to the corresponding eswitch ctrl VSI queue.

 */

static int

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

{

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

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

	struct ice_adv_rule_info rule_info = { 0 };

	struct ice_adv_lkup_elem *list;

	struct ice_hw *hw = &pf->hw;
@@ -59,7 +59,7 @@ ice_eswitch_add_vf_sp_rule(struct ice_pf *pf, struct ice_vf *vf) 
 * @vf: pointer to the VF struct

 *

 * Delete the advanced rule that was used to forward packets with the VF's VSI

 * index to the corresponding switchdev ctrl VSI queue.

 * index to the corresponding eswitch ctrl VSI queue.

 */

static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf)

{
@@ -70,7 +70,7 @@ static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf) 
}



/**

 * ice_eswitch_setup_env - configure switchdev HW filters

 * ice_eswitch_setup_env - configure eswitch HW filters

 * @pf: pointer to PF struct

 *

 * This function adds HW filters configuration specific for switchdev
@@ -78,18 +78,18 @@ static void ice_eswitch_del_vf_sp_rule(struct ice_vf *vf) 
 */

static int ice_eswitch_setup_env(struct ice_pf *pf)

{

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

	struct net_device *uplink_netdev = uplink_vsi->netdev;

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

	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;

	bool rule_added = false;



	ice_remove_vsi_fltr(&pf->hw, uplink_vsi->idx);



	netif_addr_lock_bh(uplink_netdev);

	__dev_uc_unsync(uplink_netdev, NULL);

	__dev_mc_unsync(uplink_netdev, NULL);

	netif_addr_unlock_bh(uplink_netdev);

	netif_addr_lock_bh(netdev);

	__dev_uc_unsync(netdev, NULL);

	__dev_mc_unsync(netdev, NULL);

	netif_addr_unlock_bh(netdev);



	if (ice_vsi_add_vlan_zero(uplink_vsi))

		goto err_def_rx;
@@ -132,10 +132,10 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
}



/**

 * ice_eswitch_remap_rings_to_vectors - reconfigure rings of switchdev ctrl VSI

 * ice_eswitch_remap_rings_to_vectors - reconfigure rings of eswitch ctrl VSI

 * @pf: pointer to PF struct

 *

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

 * 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
@@ -144,7 +144,7 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
 */

static void ice_eswitch_remap_rings_to_vectors(struct ice_pf *pf)

{

	struct ice_vsi *vsi = pf->switchdev.control_vsi;

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

	int q_id;



	ice_for_each_txq(vsi, q_id) {
@@ -189,7 +189,7 @@ static void ice_eswitch_remap_rings_to_vectors(struct ice_pf *pf) 
/**

 * ice_eswitch_release_reprs - clear PR VSIs configuration

 * @pf: poiner to PF struct

 * @ctrl_vsi: pointer to switchdev control VSI

 * @ctrl_vsi: pointer to eswitch control VSI

 */

static void

ice_eswitch_release_reprs(struct ice_pf *pf, struct ice_vsi *ctrl_vsi)
@@ -223,7 +223,7 @@ ice_eswitch_release_reprs(struct ice_pf *pf, struct ice_vsi *ctrl_vsi) 
 */

static int ice_eswitch_setup_reprs(struct ice_pf *pf)

{

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

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

	int max_vsi_num = 0;

	struct ice_vf *vf;

	unsigned int bkt;
@@ -359,7 +359,7 @@ ice_eswitch_port_start_xmit(struct sk_buff *skb, struct net_device *netdev) 
}



/**

 * ice_eswitch_set_target_vsi - set switchdev context in Tx context descriptor

 * ice_eswitch_set_target_vsi - set eswitch context in Tx context descriptor

 * @skb: pointer to send buffer

 * @off: pointer to offload struct

 */
@@ -382,7 +382,7 @@ ice_eswitch_set_target_vsi(struct sk_buff *skb, 
}



/**

 * ice_eswitch_release_env - clear switchdev HW filters

 * ice_eswitch_release_env - clear eswitch HW filters

 * @pf: pointer to PF struct

 *

 * This function removes HW filters configuration specific for switchdev
@@ -390,8 +390,8 @@ 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->switchdev.uplink_vsi;

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

	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);
@@ -407,7 +407,7 @@ static void ice_eswitch_release_env(struct ice_pf *pf) 
}



/**

 * ice_eswitch_vsi_setup - configure switchdev control VSI

 * ice_eswitch_vsi_setup - configure eswitch control VSI

 * @pf: pointer to PF structure

 * @pi: pointer to port_info structure

 */
@@ -486,12 +486,12 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf) 
		return -EINVAL;

	}



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

	if (!pf->switchdev.control_vsi)

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

	if (!pf->eswitch.control_vsi)

		return -ENODEV;



	ctrl_vsi = pf->switchdev.control_vsi;

	pf->switchdev.uplink_vsi = uplink_vsi;

	ctrl_vsi = pf->eswitch.control_vsi;

	pf->eswitch.uplink_vsi = uplink_vsi;



	if (ice_eswitch_setup_env(pf))

		goto err_vsi;
@@ -526,12 +526,12 @@ static int ice_eswitch_enable_switchdev(struct ice_pf *pf) 
}



/**

 * ice_eswitch_disable_switchdev - disable switchdev resources

 * ice_eswitch_disable_switchdev - disable eswitch resources

 * @pf: pointer to PF structure

 */

static void ice_eswitch_disable_switchdev(struct ice_pf *pf)

{

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

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



	ice_eswitch_napi_disable(pf);

	ice_eswitch_br_offloads_deinit(pf);
@@ -625,7 +625,7 @@ void ice_eswitch_release(struct ice_pf *pf) 
		return;



	ice_eswitch_disable_switchdev(pf);

	pf->switchdev.is_running = false;

	pf->eswitch.is_running = false;

}



/**
@@ -636,14 +636,15 @@ int ice_eswitch_configure(struct ice_pf *pf) 
{

	int status;



	if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY || pf->switchdev.is_running)

	if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY ||

	    pf->eswitch.is_running)

		return 0;



	status = ice_eswitch_enable_switchdev(pf);

	if (status)

		return status;



	pf->switchdev.is_running = true;

	pf->eswitch.is_running = true;

	return 0;

}
@@ -693,7 +694,7 @@ void ice_eswitch_stop_all_tx_queues(struct ice_pf *pf) 
 */

int ice_eswitch_rebuild(struct ice_pf *pf)

{

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

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

	int status;



	ice_eswitch_napi_disable(pf);

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

+6 −6
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ ice_eswitch_br_vf_repr_port_init(struct ice_esw_br *bridge, 
static int

ice_eswitch_br_uplink_port_init(struct ice_esw_br *bridge, struct ice_pf *pf)

{

	struct ice_vsi *vsi = pf->switchdev.uplink_vsi;

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

	struct ice_esw_br_port *br_port;

	int err;
@@ -1185,7 +1185,7 @@ ice_eswitch_br_port_event(struct notifier_block *nb, 
static void

ice_eswitch_br_offloads_dealloc(struct ice_pf *pf)

{

	struct ice_esw_br_offloads *br_offloads = pf->switchdev.br_offloads;

	struct ice_esw_br_offloads *br_offloads = pf->eswitch.br_offloads;



	ASSERT_RTNL();
@@ -1194,7 +1194,7 @@ ice_eswitch_br_offloads_dealloc(struct ice_pf *pf) 


	ice_eswitch_br_deinit(br_offloads, br_offloads->bridge);



	pf->switchdev.br_offloads = NULL;

	pf->eswitch.br_offloads = NULL;

	kfree(br_offloads);

}
@@ -1205,14 +1205,14 @@ ice_eswitch_br_offloads_alloc(struct ice_pf *pf) 


	ASSERT_RTNL();



	if (pf->switchdev.br_offloads)

	if (pf->eswitch.br_offloads)

		return ERR_PTR(-EEXIST);



	br_offloads = kzalloc(sizeof(*br_offloads), GFP_KERNEL);

	if (!br_offloads)

		return ERR_PTR(-ENOMEM);



	pf->switchdev.br_offloads = br_offloads;

	pf->eswitch.br_offloads = br_offloads;

	br_offloads->pf = pf;



	return br_offloads;
@@ -1223,7 +1223,7 @@ ice_eswitch_br_offloads_deinit(struct ice_pf *pf) 
{

	struct ice_esw_br_offloads *br_offloads;



	br_offloads = pf->switchdev.br_offloads;

	br_offloads = pf->eswitch.br_offloads;

	if (!br_offloads)

		return;

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

+2 −2
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int ice_tc_setup_redirect_action(struct net_device *filter_dev, 
		   ice_tc_is_dev_uplink(target_dev)) {

		repr = ice_netdev_to_repr(filter_dev);



		fltr->dest_vsi = repr->src_vsi->back->switchdev.uplink_vsi;

		fltr->dest_vsi = repr->src_vsi->back->eswitch.uplink_vsi;

		fltr->direction = ICE_ESWITCH_FLTR_EGRESS;

	} else if (ice_tc_is_dev_uplink(filter_dev) &&

		   ice_is_port_repr_netdev(target_dev)) {
@@ -765,7 +765,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr) 
		rule_info.sw_act.src = hw->pf_id;

		rule_info.flags_info.act = ICE_SINGLE_ACT_LB_ENABLE;

	} else if (fltr->direction == ICE_ESWITCH_FLTR_EGRESS &&

		   fltr->dest_vsi == vsi->back->switchdev.uplink_vsi) {

		   fltr->dest_vsi == vsi->back->eswitch.uplink_vsi) {

		/* VF to Uplink */

		rule_info.sw_act.flag |= ICE_FLTR_TX;

		rule_info.sw_act.src = vsi->idx;