Commit d7393425 authored by Michal Wilczynski's avatar Michal Wilczynski Committed by Tony Nguyen
Browse files

ice: Introduce enabling promiscuous mode on multiple VF's 



In current implementation default VSI switch filter is only able to
forward traffic to a single VSI. This limits promiscuous mode with
private flag 'vf-true-promisc-support' to a single VF. Enabling it on
the second VF won't work. Also allmulticast support doesn't seem to be
properly implemented when vf-true-promisc-support is true.

Use standard ice_add_rule_internal() function that already implements
forwarding to multiple VSI's instead of constructing AQ call manually.

Add switch filter for allmulticast mode when vf-true-promisc-support is
enabled. The same filter is added regardless of the flag - it doesn't
matter for this case.

Remove unnecessary fields in switch structure. From now on book keeping
will be done by ice_add_rule_internal().

Refactor unnecessarily passed function arguments.

To test:
1) Create 2 VM's, and two VF's. Attach VF's to VM's.
2) Enable promiscuous mode on both of them and check if
   traffic is seen on both of them.

Signed-off-by: default avatarMichal Wilczynski <michal.wilczynski@intel.com>
Tested-by: default avatarMarek Szlosek <marek.szlosek@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 623cd870

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

+0 −2
Original line number Diff line number Diff line
@@ -248,8 +248,6 @@ struct ice_sw { 
	struct ice_pf *pf;

	u16 sw_id;		/* switch ID for this switch */

	u16 bridge_mode;	/* VEB/VEPA/Port Virtualizer */

	struct ice_vsi *dflt_vsi;	/* default VSI for this switch */

	u8 dflt_vsi_ena:1;	/* true if above dflt_vsi is enabled */

};



enum ice_pf_state {

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

+4 −4
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
	if (ice_vsi_add_vlan_zero(uplink_vsi))

		goto err_def_rx;



	if (!ice_is_dflt_vsi_in_use(uplink_vsi->vsw)) {

		if (ice_set_dflt_vsi(uplink_vsi->vsw, uplink_vsi))

	if (!ice_is_dflt_vsi_in_use(uplink_vsi->port_info)) {

		if (ice_set_dflt_vsi(uplink_vsi))

			goto err_def_rx;

		rule_added = true;

	}
@@ -151,7 +151,7 @@ static int ice_eswitch_setup_env(struct ice_pf *pf) 
	ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);

err_override_uplink:

	if (rule_added)

		ice_clear_dflt_vsi(uplink_vsi->vsw);

		ice_clear_dflt_vsi(uplink_vsi);

err_def_rx:

	ice_fltr_add_mac_and_broadcast(uplink_vsi,

				       uplink_vsi->port_info->mac.perm_addr,
@@ -411,7 +411,7 @@ static void ice_eswitch_release_env(struct ice_pf *pf) 


	ice_vsi_update_security(ctrl_vsi, ice_vsi_ctx_clear_allow_override);

	ice_vsi_update_security(uplink_vsi, ice_vsi_ctx_clear_allow_override);

	ice_clear_dflt_vsi(uplink_vsi->vsw);

	ice_clear_dflt_vsi(uplink_vsi);

	ice_fltr_add_mac_and_broadcast(uplink_vsi,

				       uplink_vsi->port_info->mac.perm_addr,

				       ICE_FWD_TO_VSI);

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

+1 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags) 
	 * promiscuous mode because it's not supported

	 */

	if (test_bit(ICE_FLAG_VF_TRUE_PROMISC_ENA, change_flags) &&

	    ice_is_any_vf_in_promisc(pf)) {

	    ice_is_any_vf_in_unicast_promisc(pf)) {

		dev_err(dev, "Changing vf-true-promisc-support flag while VF(s) are in promiscuous mode not supported\n");

		/* toggle bit back to previous state */

		change_bit(ICE_FLAG_VF_TRUE_PROMISC_ENA, pf->flags);

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

+24 −43
Original line number Diff line number Diff line
@@ -3006,8 +3006,8 @@ int ice_vsi_release(struct ice_vsi *vsi) 
		}

	}



	if (ice_is_vsi_dflt_vsi(pf->first_sw, vsi))

		ice_clear_dflt_vsi(pf->first_sw);

	if (ice_is_vsi_dflt_vsi(vsi))

		ice_clear_dflt_vsi(vsi);

	ice_fltr_remove_all(vsi);

	ice_rm_vsi_lan_cfg(vsi->port_info, vsi->idx);

	err = ice_rm_vsi_rdma_cfg(vsi->port_info, vsi->idx);
@@ -3690,116 +3690,97 @@ void ice_update_rx_ring_stats(struct ice_rx_ring *rx_ring, u64 pkts, u64 bytes) 


/**

 * ice_is_dflt_vsi_in_use - check if the default forwarding VSI is being used

 * @sw: switch to check if its default forwarding VSI is free

 * @pi: port info of the switch with default VSI

 *

 * Return true if the default forwarding VSI is already being used, else returns

 * false signalling that it's available to use.

 * Return true if the there is a single VSI in default forwarding VSI list

 */

bool ice_is_dflt_vsi_in_use(struct ice_sw *sw)

bool ice_is_dflt_vsi_in_use(struct ice_port_info *pi)

{

	return (sw->dflt_vsi && sw->dflt_vsi_ena);

	bool exists = false;



	ice_check_if_dflt_vsi(pi, 0, &exists);

	return exists;

}



/**

 * ice_is_vsi_dflt_vsi - check if the VSI passed in is the default VSI

 * @sw: switch for the default forwarding VSI to compare against

 * @vsi: VSI to compare against default forwarding VSI

 *

 * If this VSI passed in is the default forwarding VSI then return true, else

 * return false

 */

bool ice_is_vsi_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi)

bool ice_is_vsi_dflt_vsi(struct ice_vsi *vsi)

{

	return (sw->dflt_vsi == vsi && sw->dflt_vsi_ena);

	return ice_check_if_dflt_vsi(vsi->port_info, vsi->idx, NULL);

}



/**

 * ice_set_dflt_vsi - set the default forwarding VSI

 * @sw: switch used to assign the default forwarding VSI

 * @vsi: VSI getting set as the default forwarding VSI on the switch

 *

 * If the VSI passed in is already the default VSI and it's enabled just return

 * success.

 *

 * If there is already a default VSI on the switch and it's enabled then return

 * -EEXIST since there can only be one default VSI per switch.

 *

 * Otherwise try to set the VSI passed in as the switch's default VSI and

 * return the result.

 */

int ice_set_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi)

int ice_set_dflt_vsi(struct ice_vsi *vsi)

{

	struct device *dev;

	int status;



	if (!sw || !vsi)

	if (!vsi)

		return -EINVAL;



	dev = ice_pf_to_dev(vsi->back);



	/* the VSI passed in is already the default VSI */

	if (ice_is_vsi_dflt_vsi(sw, vsi)) {

	if (ice_is_vsi_dflt_vsi(vsi)) {

		dev_dbg(dev, "VSI %d passed in is already the default forwarding VSI, nothing to do\n",

			vsi->vsi_num);

		return 0;

	}



	/* another VSI is already the default VSI for this switch */

	if (ice_is_dflt_vsi_in_use(sw)) {

		dev_err(dev, "Default forwarding VSI %d already in use, disable it and try again\n",

			sw->dflt_vsi->vsi_num);

		return -EEXIST;

	}



	status = ice_cfg_dflt_vsi(&vsi->back->hw, vsi->idx, true, ICE_FLTR_RX);

	status = ice_cfg_dflt_vsi(vsi->port_info, vsi->idx, true, ICE_FLTR_RX);

	if (status) {

		dev_err(dev, "Failed to set VSI %d as the default forwarding VSI, error %d\n",

			vsi->vsi_num, status);

		return status;

	}



	sw->dflt_vsi = vsi;

	sw->dflt_vsi_ena = true;



	return 0;

}



/**

 * ice_clear_dflt_vsi - clear the default forwarding VSI

 * @sw: switch used to clear the default VSI

 * @vsi: VSI to remove from filter list

 *

 * If the switch has no default VSI or it's not enabled then return error.

 *

 * Otherwise try to clear the default VSI and return the result.

 */

int ice_clear_dflt_vsi(struct ice_sw *sw)

int ice_clear_dflt_vsi(struct ice_vsi *vsi)

{

	struct ice_vsi *dflt_vsi;

	struct device *dev;

	int status;



	if (!sw)

	if (!vsi)

		return -EINVAL;



	dev = ice_pf_to_dev(sw->pf);



	dflt_vsi = sw->dflt_vsi;

	dev = ice_pf_to_dev(vsi->back);



	/* there is no default VSI configured */

	if (!ice_is_dflt_vsi_in_use(sw))

	if (!ice_is_dflt_vsi_in_use(vsi->port_info))

		return -ENODEV;



	status = ice_cfg_dflt_vsi(&dflt_vsi->back->hw, dflt_vsi->idx, false,

	status = ice_cfg_dflt_vsi(vsi->port_info, vsi->idx, false,

				  ICE_FLTR_RX);

	if (status) {

		dev_err(dev, "Failed to clear the default forwarding VSI %d, error %d\n",

			dflt_vsi->vsi_num, status);

			vsi->vsi_num, status);

		return -EIO;

	}



	sw->dflt_vsi = NULL;

	sw->dflt_vsi_ena = false;



	return 0;

}

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

+4 −7
Original line number Diff line number Diff line
@@ -102,13 +102,10 @@ int ice_vsi_cfg_mac_fltr(struct ice_vsi *vsi, const u8 *macaddr, bool set); 


bool ice_is_safe_mode(struct ice_pf *pf);

bool ice_is_rdma_ena(struct ice_pf *pf);

bool ice_is_dflt_vsi_in_use(struct ice_sw *sw);



bool ice_is_vsi_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi);



int ice_set_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi);



int ice_clear_dflt_vsi(struct ice_sw *sw);

bool ice_is_dflt_vsi_in_use(struct ice_port_info *pi);

bool ice_is_vsi_dflt_vsi(struct ice_vsi *vsi);

int ice_set_dflt_vsi(struct ice_vsi *vsi);

int ice_clear_dflt_vsi(struct ice_vsi *vsi);

int ice_set_min_bw_limit(struct ice_vsi *vsi, u64 min_tx_rate);

int ice_set_max_bw_limit(struct ice_vsi *vsi, u64 max_tx_rate);

int ice_get_link_speed_kbps(struct ice_vsi *vsi);