Commit 5ae3a25b 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 

Anthony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-01-26

This series contains updates to the ice, i40e, and igc driver.

Henry corrects setting an unspecified protocol to IPPROTO_NONE instead of
0 for IPv6 flexbytes filters for ice.

Nick fixes the IPv6 extension header being processed incorrectly and
updates the netdev->dev_addr if it exists in hardware as it may have been
modified outside the ice driver.

Brett ensures a user cannot request more channels than available LAN MSI-X
and fixes the minimum allocation logic as it was incorrectly trying to use
more MSI-X than allocated for ice.

Stefan Assmann minimizes the delay between getting and using the VSI
pointer to prevent a possible crash for i40e.

Corinna Vinschen fixes link speed advertising for igc.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  igc: fix link speed advertising
  i40e: acquire VSI pointer only after VF is initialized
  ice: Fix MSI-X vector fallback logic
  ice: Don't allow more channels than LAN MSI-X available
  ice: update dev_addr in ice_set_mac_address even if HW filter exists
  ice: Implement flow for IPv6 next header (extension header)
  ice: fix FDir IPv6 flexbyte
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3f96d644 329a3678

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+4 −7
Original line number Diff line number Diff line
@@ -4046,20 +4046,16 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 
		goto error_param;



	vf = &pf->vf[vf_id];

	vsi = pf->vsi[vf->lan_vsi_idx];



	/* When the VF is resetting wait until it is done.

	 * It can take up to 200 milliseconds,

	 * but wait for up to 300 milliseconds to be safe.

	 * If the VF is indeed in reset, the vsi pointer has

	 * to show on the newly loaded vsi under pf->vsi[id].

	 * Acquire the VSI pointer only after the VF has been

	 * properly initialized.

	 */

	for (i = 0; i < 15; i++) {

		if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

			if (i > 0)

				vsi = pf->vsi[vf->lan_vsi_idx];

		if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states))

			break;

		}

		msleep(20);

	}

	if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
@@ -4068,6 +4064,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 
		ret = -EAGAIN;

		goto error_param;

	}

	vsi = pf->vsi[vf->lan_vsi_idx];



	if (is_multicast_ether_addr(mac)) {

		dev_err(&pf->pdev->dev,

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

+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ 
#define ICE_INT_NAME_STR_LEN	(IFNAMSIZ + 16)

#define ICE_AQ_LEN		64

#define ICE_MBXSQ_LEN		64

#define ICE_MIN_MSIX		2

#define ICE_MIN_LAN_TXRX_MSIX	1

#define ICE_MIN_LAN_OICR_MSIX	1

#define ICE_MIN_MSIX		(ICE_MIN_LAN_TXRX_MSIX + ICE_MIN_LAN_OICR_MSIX)

#define ICE_FDIR_MSIX		1

#define ICE_NO_VSI		0xffff

#define ICE_VSI_MAP_CONTIG	0

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

+4 −4
Original line number Diff line number Diff line
@@ -3258,8 +3258,8 @@ ice_set_rxfh(struct net_device *netdev, const u32 *indir, const u8 *key, 
 */

static int ice_get_max_txq(struct ice_pf *pf)

{

	return min_t(int, num_online_cpus(),

		     pf->hw.func_caps.common_cap.num_txq);

	return min3(pf->num_lan_msix, (u16)num_online_cpus(),

		    (u16)pf->hw.func_caps.common_cap.num_txq);

}



/**
@@ -3268,8 +3268,8 @@ static int ice_get_max_txq(struct ice_pf *pf) 
 */

static int ice_get_max_rxq(struct ice_pf *pf)

{

	return min_t(int, num_online_cpus(),

		     pf->hw.func_caps.common_cap.num_rxq);

	return min3(pf->num_lan_msix, (u16)num_online_cpus(),

		    (u16)pf->hw.func_caps.common_cap.num_rxq);

}



/**

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

+7 −1
Original line number Diff line number Diff line
@@ -1576,7 +1576,13 @@ ice_set_fdir_input_set(struct ice_vsi *vsi, struct ethtool_rx_flow_spec *fsp, 
		       sizeof(struct in6_addr));

		input->ip.v6.l4_header = fsp->h_u.usr_ip6_spec.l4_4_bytes;

		input->ip.v6.tc = fsp->h_u.usr_ip6_spec.tclass;



		/* if no protocol requested, use IPPROTO_NONE */

		if (!fsp->m_u.usr_ip6_spec.l4_proto)

			input->ip.v6.proto = IPPROTO_NONE;

		else

			input->ip.v6.proto = fsp->h_u.usr_ip6_spec.l4_proto;



		memcpy(input->mask.v6.dst_ip, fsp->m_u.usr_ip6_spec.ip6dst,

		       sizeof(struct in6_addr));

		memcpy(input->mask.v6.src_ip, fsp->m_u.usr_ip6_spec.ip6src,

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

+9 −5
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id) 


	switch (vsi->type) {

	case ICE_VSI_PF:

		vsi->alloc_txq = min_t(int, ice_get_avail_txq_count(pf),

				       num_online_cpus());

		vsi->alloc_txq = min3(pf->num_lan_msix,

				      ice_get_avail_txq_count(pf),

				      (u16)num_online_cpus());

		if (vsi->req_txq) {

			vsi->alloc_txq = vsi->req_txq;

			vsi->num_txq = vsi->req_txq;
@@ -174,8 +175,9 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id) 
		if (!test_bit(ICE_FLAG_RSS_ENA, pf->flags)) {

			vsi->alloc_rxq = 1;

		} else {

			vsi->alloc_rxq = min_t(int, ice_get_avail_rxq_count(pf),

					       num_online_cpus());

			vsi->alloc_rxq = min3(pf->num_lan_msix,

					      ice_get_avail_rxq_count(pf),

					      (u16)num_online_cpus());

			if (vsi->req_rxq) {

				vsi->alloc_rxq = vsi->req_rxq;

				vsi->num_rxq = vsi->req_rxq;
@@ -184,7 +186,9 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi, u16 vf_id) 


		pf->num_lan_rx = vsi->alloc_rxq;



		vsi->num_q_vectors = max_t(int, vsi->alloc_rxq, vsi->alloc_txq);

		vsi->num_q_vectors = min_t(int, pf->num_lan_msix,

					   max_t(int, vsi->alloc_rxq,

						 vsi->alloc_txq));

		break;

	case ICE_VSI_VF:

		vf = &pf->vf[vsi->vf_id];