Commit 138d1862 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-08-17 (ice)

This series contains updates to ice driver only.

Grzegorz prevents modifications to VLAN 0 when setting VLAN promiscuous
as it will already be set. He also ignores -EEXIST error when attempting
to set promiscuous and ensures promiscuous mode is properly cleared from
the hardware when being removed.

Benjamin ignores additional -EEXIST errors when setting promiscuous mode
since the existing mode is the desired mode.

Sylwester fixes VFs to allow sending of tagged traffic when no VLAN filters
exist.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: Fix VF not able to send tagged traffic with no VLAN filters
  ice: Ignore error message when setting same promiscuous mode
  ice: Fix clearing of promisc mode with bridge over bond
  ice: Ignore EEXIST when setting promisc mode
  ice: Fix double VLAN error when entering promisc mode
====================

Link: https://lore.kernel.org/r/20220817171329.65285-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8aa48ade 664d4646

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

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ ice_fltr_set_vlan_vsi_promisc(struct ice_hw *hw, struct ice_vsi *vsi, 
	int result;



	result = ice_set_vlan_vsi_promisc(hw, vsi->idx, promisc_mask, false);

	if (result)

	if (result && result != -EEXIST)

		dev_err(ice_pf_to_dev(pf),

			"Error setting promisc mode on VSI %i (rc=%d)\n",

			vsi->vsi_num, result);
@@ -86,7 +86,7 @@ ice_fltr_clear_vlan_vsi_promisc(struct ice_hw *hw, struct ice_vsi *vsi, 
	int result;



	result = ice_set_vlan_vsi_promisc(hw, vsi->idx, promisc_mask, true);

	if (result)

	if (result && result != -EEXIST)

		dev_err(ice_pf_to_dev(pf),

			"Error clearing promisc mode on VSI %i (rc=%d)\n",

			vsi->vsi_num, result);
@@ -109,7 +109,7 @@ ice_fltr_clear_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, 
	int result;



	result = ice_clear_vsi_promisc(hw, vsi_handle, promisc_mask, vid);

	if (result)

	if (result && result != -EEXIST)

		dev_err(ice_pf_to_dev(pf),

			"Error clearing promisc mode on VSI %i for VID %u (rc=%d)\n",

			ice_get_hw_vsi_num(hw, vsi_handle), vid, result);
@@ -132,7 +132,7 @@ ice_fltr_set_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, 
	int result;



	result = ice_set_vsi_promisc(hw, vsi_handle, promisc_mask, vid);

	if (result)

	if (result && result != -EEXIST)

		dev_err(ice_pf_to_dev(pf),

			"Error setting promisc mode on VSI %i for VID %u (rc=%d)\n",

			ice_get_hw_vsi_num(hw, vsi_handle), vid, result);

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

+5 −1
Original line number Diff line number Diff line
@@ -4062,7 +4062,11 @@ int ice_vsi_del_vlan_zero(struct ice_vsi *vsi) 
	if (err && err != -EEXIST)

		return err;



	return 0;

	/* when deleting the last VLAN filter, make sure to disable the VLAN

	 * promisc mode so the filter isn't left by accident

	 */

	return ice_clear_vsi_promisc(&vsi->back->hw, vsi->idx,

				    ICE_MCAST_VLAN_PROMISC_BITS, 0);

}



/**

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

+11 −1
Original line number Diff line number Diff line
@@ -267,8 +267,10 @@ static int ice_set_promisc(struct ice_vsi *vsi, u8 promisc_m) 
		status = ice_fltr_set_vsi_promisc(&vsi->back->hw, vsi->idx,

						  promisc_m, 0);

	}



	if (status && status != -EEXIST)

		return status;



	return 0;

}



/**
@@ -3573,6 +3575,14 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid) 
	while (test_and_set_bit(ICE_CFG_BUSY, vsi->state))

		usleep_range(1000, 2000);



	ret = ice_clear_vsi_promisc(&vsi->back->hw, vsi->idx,

				    ICE_MCAST_VLAN_PROMISC_BITS, vid);

	if (ret) {

		netdev_err(netdev, "Error clearing multicast promiscuous mode on VSI %i\n",

			   vsi->vsi_num);

		vsi->current_netdev_flags |= IFF_ALLMULTI;

	}



	vlan_ops = ice_get_compat_vsi_vlan_ops(vsi);



	/* Make sure VLAN delete is successful before updating VLAN

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

+8 −1
Original line number Diff line number Diff line
@@ -4445,6 +4445,13 @@ ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, 
		goto free_fltr_list;



	list_for_each_entry(list_itr, &vsi_list_head, list_entry) {

		/* Avoid enabling or disabling VLAN zero twice when in double

		 * VLAN mode

		 */

		if (ice_is_dvm_ena(hw) &&

		    list_itr->fltr_info.l_data.vlan.tpid == 0)

			continue;



		vlan_id = list_itr->fltr_info.l_data.vlan.vlan_id;

		if (rm_vlan_promisc)

			status = ice_clear_vsi_promisc(hw, vsi_handle,
@@ -4452,7 +4459,7 @@ ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, 
		else

			status = ice_set_vsi_promisc(hw, vsi_handle,

						     promisc_mask, vlan_id);

		if (status)

		if (status && status != -EEXIST)

			break;

	}

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

+7 −4
Original line number Diff line number Diff line
@@ -764,13 +764,16 @@ static int ice_cfg_mac_antispoof(struct ice_vsi *vsi, bool enable) 
static int ice_vsi_ena_spoofchk(struct ice_vsi *vsi)

{

	struct ice_vsi_vlan_ops *vlan_ops;

	int err;

	int err = 0;



	vlan_ops = ice_get_compat_vsi_vlan_ops(vsi);



	/* Allow VF with VLAN 0 only to send all tagged traffic */

	if (vsi->type != ICE_VSI_VF || ice_vsi_has_non_zero_vlans(vsi)) {

		err = vlan_ops->ena_tx_filtering(vsi);

		if (err)

			return err;

	}



	return ice_cfg_mac_antispoof(vsi, true);

}