Commit 030141b0 authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-03-08

This series contains updates to iavf, i40e, and ice drivers.

Michal ensures netdev features are properly updated to reflect VLAN
changes received from PF and adds an additional flag for MSI-X
reinitialization as further differentiation of reinitialization
operations is needed for iavf.

Jake stops disabling of VFs due to failed virtchannel responses for
i40e and ice driver.

Dave moves MTU event notification to the service task to prevent issues
with RTNL lock for ice.

Christophe Jaillet corrects an allocation to GFP_ATOMIC instead of
GFP_KERNEL for ice.

Jedrzej fixes the value for link speed comparison which was preventing
the requested value from being set for ice.
---
Note: This will conflict when merging with net-next. Resolution:

diff --cc drivers/net/ethernet/intel/ice/ice.h
index dc42ff92dbad,3121f9b04f59..000000000000
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@@ -484,10 -481,9 +484,11 @@@ enum ice_pf_flags
        ICE_FLAG_LEGACY_RX,
        ICE_FLAG_VF_TRUE_PROMISC_ENA,
        ICE_FLAG_MDD_AUTO_RESET_VF,
 +      ICE_FLAG_VF_VLAN_PRUNING,
        ICE_FLAG_LINK_LENIENT_MODE_ENA,
        ICE_FLAG_PLUG_AUX_DEV,
+       ICE_FLAG_MTU_CHANGED,
 +      ICE_FLAG_GNSS,                  /* GNSS successfully initialized */
        ICE_PF_FLAGS_NBITS              /* must be last */
  };
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c79fcc27 ad35ffa2

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

+2 −4
Original line number Diff line number Diff line
@@ -742,10 +742,8 @@ static void i40e_dbg_dump_vf(struct i40e_pf *pf, int vf_id) 
		vsi = pf->vsi[vf->lan_vsi_idx];

		dev_info(&pf->pdev->dev, "vf %2d: VSI id=%d, seid=%d, qps=%d\n",

			 vf_id, vf->lan_vsi_id, vsi->seid, vf->num_queue_pairs);

		dev_info(&pf->pdev->dev, "       num MDD=%lld, invalid msg=%lld, valid msg=%lld\n",

			 vf->num_mdd_events,

			 vf->num_invalid_msgs,

			 vf->num_valid_msgs);

		dev_info(&pf->pdev->dev, "       num MDD=%lld\n",

			 vf->num_mdd_events);

	} else {

		dev_info(&pf->pdev->dev, "invalid VF id %d\n", vf_id);

	}

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

+7 −50
Original line number Diff line number Diff line
@@ -1917,19 +1917,17 @@ int i40e_pci_sriov_configure(struct pci_dev *pdev, int num_vfs) 
/***********************virtual channel routines******************/



/**

 * i40e_vc_send_msg_to_vf_ex

 * i40e_vc_send_msg_to_vf

 * @vf: pointer to the VF info

 * @v_opcode: virtual channel opcode

 * @v_retval: virtual channel return value

 * @msg: pointer to the msg buffer

 * @msglen: msg length

 * @is_quiet: true for not printing unsuccessful return values, false otherwise

 *

 * send msg to VF

 **/

static int i40e_vc_send_msg_to_vf_ex(struct i40e_vf *vf, u32 v_opcode,

				     u32 v_retval, u8 *msg, u16 msglen,

				     bool is_quiet)

static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode,

				  u32 v_retval, u8 *msg, u16 msglen)

{

	struct i40e_pf *pf;

	struct i40e_hw *hw;
@@ -1944,25 +1942,6 @@ static int i40e_vc_send_msg_to_vf_ex(struct i40e_vf *vf, u32 v_opcode, 
	hw = &pf->hw;

	abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;



	/* single place to detect unsuccessful return values */

	if (v_retval && !is_quiet) {

		vf->num_invalid_msgs++;

		dev_info(&pf->pdev->dev, "VF %d failed opcode %d, retval: %d\n",

			 vf->vf_id, v_opcode, v_retval);

		if (vf->num_invalid_msgs >

		    I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED) {

			dev_err(&pf->pdev->dev,

				"Number of invalid messages exceeded for VF %d\n",

				vf->vf_id);

			dev_err(&pf->pdev->dev, "Use PF Control I/F to enable the VF\n");

			set_bit(I40E_VF_STATE_DISABLED, &vf->vf_states);

		}

	} else {

		vf->num_valid_msgs++;

		/* reset the invalid counter, if a valid message is received. */

		vf->num_invalid_msgs = 0;

	}



	aq_ret = i40e_aq_send_msg_to_vf(hw, abs_vf_id,	v_opcode, v_retval,

					msg, msglen, NULL);

	if (aq_ret) {
@@ -1975,23 +1954,6 @@ static int i40e_vc_send_msg_to_vf_ex(struct i40e_vf *vf, u32 v_opcode, 
	return 0;

}



/**

 * i40e_vc_send_msg_to_vf

 * @vf: pointer to the VF info

 * @v_opcode: virtual channel opcode

 * @v_retval: virtual channel return value

 * @msg: pointer to the msg buffer

 * @msglen: msg length

 *

 * send msg to VF

 **/

static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode,

				  u32 v_retval, u8 *msg, u16 msglen)

{

	return i40e_vc_send_msg_to_vf_ex(vf, v_opcode, v_retval,

					 msg, msglen, false);

}



/**

 * i40e_vc_send_resp_to_vf

 * @vf: pointer to the VF info
@@ -2822,7 +2784,6 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg) 
 * i40e_check_vf_permission

 * @vf: pointer to the VF info

 * @al: MAC address list from virtchnl

 * @is_quiet: set true for printing msg without opcode info, false otherwise

 *

 * Check that the given list of MAC addresses is allowed. Will return -EPERM

 * if any address in the list is not valid. Checks the following conditions:
@@ -2837,8 +2798,7 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg) 
 * addresses might not be accurate.

 **/

static inline int i40e_check_vf_permission(struct i40e_vf *vf,

					   struct virtchnl_ether_addr_list *al,

					   bool *is_quiet)

					   struct virtchnl_ether_addr_list *al)

{

	struct i40e_pf *pf = vf->pf;

	struct i40e_vsi *vsi = pf->vsi[vf->lan_vsi_idx];
@@ -2846,7 +2806,6 @@ static inline int i40e_check_vf_permission(struct i40e_vf *vf, 
	int mac2add_cnt = 0;

	int i;



	*is_quiet = false;

	for (i = 0; i < al->num_elements; i++) {

		struct i40e_mac_filter *f;

		u8 *addr = al->list[i].addr;
@@ -2870,7 +2829,6 @@ static inline int i40e_check_vf_permission(struct i40e_vf *vf, 
		    !ether_addr_equal(addr, vf->default_lan_addr.addr)) {

			dev_err(&pf->pdev->dev,

				"VF attempting to override administratively set MAC address, bring down and up the VF interface to resume normal operation\n");

			*is_quiet = true;

			return -EPERM;

		}
@@ -2921,7 +2879,6 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg) 
	    (struct virtchnl_ether_addr_list *)msg;

	struct i40e_pf *pf = vf->pf;

	struct i40e_vsi *vsi = NULL;

	bool is_quiet = false;

	i40e_status ret = 0;

	int i;
@@ -2938,7 +2895,7 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg) 
	 */

	spin_lock_bh(&vsi->mac_filter_hash_lock);



	ret = i40e_check_vf_permission(vf, al, &is_quiet);

	ret = i40e_check_vf_permission(vf, al);

	if (ret) {

		spin_unlock_bh(&vsi->mac_filter_hash_lock);

		goto error_param;
@@ -2976,8 +2933,8 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg) 


error_param:

	/* send the response to the VF */

	return i40e_vc_send_msg_to_vf_ex(vf, VIRTCHNL_OP_ADD_ETH_ADDR,

				       ret, NULL, 0, is_quiet);

	return i40e_vc_send_msg_to_vf(vf, VIRTCHNL_OP_ADD_ETH_ADDR,

				      ret, NULL, 0);

}



/**

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

+0 −5
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 


#define I40E_VIRTCHNL_SUPPORTED_QTYPES 2



#define I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED	10



#define I40E_VLAN_PRIORITY_SHIFT	13

#define I40E_VLAN_MASK			0xFFF

#define I40E_PRIORITY_MASK		0xE000
@@ -92,9 +90,6 @@ struct i40e_vf { 
	u8 num_queue_pairs;	/* num of qps assigned to VF vsis */

	u8 num_req_queues;	/* num of requested qps */

	u64 num_mdd_events;	/* num of mdd events detected */

	/* num of continuous malformed or invalid msgs detected */

	u64 num_invalid_msgs;

	u64 num_valid_msgs;	/* num of valid msgs detected */



	unsigned long vf_caps;	/* vf's adv. capabilities */

	unsigned long vf_states;	/* vf's runtime states */

drivers/net/ethernet/intel/iavf/iavf.h

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ struct iavf_adapter { 
#define IAVF_FLAG_REINIT_ITR_NEEDED		BIT(16)

#define IAVF_FLAG_QUEUES_DISABLED		BIT(17)

#define IAVF_FLAG_SETUP_NETDEV_FEATURES		BIT(18)

#define IAVF_FLAG_REINIT_MSIX_NEEDED		BIT(20)

/* duplicates for common code */

#define IAVF_FLAG_DCB_ENABLED			0

	/* flags for admin queue service task */

drivers/net/ethernet/intel/iavf/iavf_main.c

+9 −4
Original line number Diff line number Diff line
@@ -2120,7 +2120,7 @@ int iavf_parse_vf_resource_msg(struct iavf_adapter *adapter) 
			"Requested %d queues, but PF only gave us %d.\n",

			num_req_queues,

			adapter->vsi_res->num_queue_pairs);

		adapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;

		adapter->flags |= IAVF_FLAG_REINIT_MSIX_NEEDED;

		adapter->num_req_queues = adapter->vsi_res->num_queue_pairs;

		iavf_schedule_reset(adapter);
@@ -2727,7 +2727,8 @@ static void iavf_reset_task(struct work_struct *work) 
			 err);

	adapter->aq_required = 0;



	if (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED) {

	if ((adapter->flags & IAVF_FLAG_REINIT_MSIX_NEEDED) ||

	    (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED)) {

		err = iavf_reinit_interrupt_scheme(adapter);

		if (err)

			goto reset_err;
@@ -2799,12 +2800,13 @@ static void iavf_reset_task(struct work_struct *work) 
		if (err)

			goto reset_err;



		if (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED) {

		if ((adapter->flags & IAVF_FLAG_REINIT_MSIX_NEEDED) ||

		    (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED)) {

			err = iavf_request_traffic_irqs(adapter, netdev->name);

			if (err)

				goto reset_err;



			adapter->flags &= ~IAVF_FLAG_REINIT_ITR_NEEDED;

			adapter->flags &= ~IAVF_FLAG_REINIT_MSIX_NEEDED;

		}



		iavf_configure(adapter);
@@ -2819,6 +2821,9 @@ static void iavf_reset_task(struct work_struct *work) 
		iavf_change_state(adapter, __IAVF_DOWN);

		wake_up(&adapter->down_waitqueue);

	}



	adapter->flags &= ~IAVF_FLAG_REINIT_ITR_NEEDED;



	mutex_unlock(&adapter->client_lock);

	mutex_unlock(&adapter->crit_lock);