Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 069841ef 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/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2019-09-11

This series contains updates to i40e, ixgbe/vf and iavf.

Wenwen Wang fixes a potential memory leak where 3 allocated variables
are not properly cleaned up on failure for ixgbe.

Stefan Assmann fixes a potential kernel panic found when repeatedly
spawning and destroying VFs in i40e when a NULL pointer is dereferenced
due to a race condition.  Fixed up the i40e driver to clear the
__I40E_VIRTCHNL_OP_PENDING bit before returning after an invalid
minimum transmit rate is requested.  Updates the iavf driver to only
apply the MAC address change when the PF ACK's the requested change.

Tonghao Zhang updates ixgbe to use the skb_get_queue_mapping() API call
instead of the driver accessing the queue mapping directly.

Jake updates i40e to use ktime_get_real_ts64() instead of
ktime_to_timespec64().  Removes the define for bit 0x0001 for cloud
filters, since it is a reserved bit and not a valid type.  Also added
code comments to clearly state which bits are reserved and should not be
used or defined for cloud filter adminq command.  Clarify the macros
used to specify the cloud filter fields are individual bits, so use the
BIT() macro.

Aleksandr fixes up the print_link_message() to include the "negotiated"
FEC status for i40e.

Czeslaw also adds additional log message for devices without FEC in the
print_link_message() for i40e.

Colin Ian King reduces the object code size by making the array API
static constant.

Magnus fixes a potential receive buffer starvation issue for AF_XDP by
kicking the NAPI context of any queue with an attached AF_XDP zero-copy
socket.

v2: Removed patch 11 from the original series (Alex Duyck's ITR fix),
    so that it can be sent to the net tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 022c10d6 1f459bdc

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

+5 −5
Original line number Diff line number Diff line
@@ -243,11 +243,11 @@ struct i40e_fdir_filter { 
	u32 fd_id;

};



#define I40E_CLOUD_FIELD_OMAC	0x01

#define I40E_CLOUD_FIELD_IMAC	0x02

#define I40E_CLOUD_FIELD_IVLAN	0x04

#define I40E_CLOUD_FIELD_TEN_ID	0x08

#define I40E_CLOUD_FIELD_IIP	0x10

#define I40E_CLOUD_FIELD_OMAC		BIT(0)

#define I40E_CLOUD_FIELD_IMAC		BIT(1)

#define I40E_CLOUD_FIELD_IVLAN		BIT(2)

#define I40E_CLOUD_FIELD_TEN_ID		BIT(3)

#define I40E_CLOUD_FIELD_IIP		BIT(4)



#define I40E_CLOUD_FILTER_FLAGS_OMAC	I40E_CLOUD_FIELD_OMAC

#define I40E_CLOUD_FILTER_FLAGS_IMAC	I40E_CLOUD_FIELD_IMAC

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

+4 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ struct i40e_aqc_cloud_filters_element_data { 
#define I40E_AQC_ADD_CLOUD_FILTER_MASK	(0x3F << \

					I40E_AQC_ADD_CLOUD_FILTER_SHIFT)

/* 0x0000 reserved */

#define I40E_AQC_ADD_CLOUD_FILTER_OIP			0x0001

/* 0x0001 reserved */

/* 0x0002 reserved */

#define I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN		0x0003

#define I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN_TEN_ID	0x0004
@@ -1394,6 +1394,9 @@ struct i40e_aqc_cloud_filters_element_data { 
#define I40E_AQC_ADD_CLOUD_FILTER_IMAC			0x000A

#define I40E_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC	0x000B

#define I40E_AQC_ADD_CLOUD_FILTER_IIP			0x000C

/* 0x000D reserved */

/* 0x000E reserved */

/* 0x000F reserved */

/* 0x0010 to 0x0017 is for custom filters */

#define I40E_AQC_ADD_CLOUD_FILTER_IP_PORT		0x0010 /* Dest IP + L4 Port */

#define I40E_AQC_ADD_CLOUD_FILTER_MAC_PORT		0x0011 /* Dest MAC + L4 Port */

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

+20 −10
Original line number Diff line number Diff line
@@ -2592,6 +2592,10 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf) 
		return;

	if (!test_and_clear_bit(__I40E_MACVLAN_SYNC_PENDING, pf->state))

		return;

	if (test_and_set_bit(__I40E_VF_DISABLE, pf->state)) {

		set_bit(__I40E_MACVLAN_SYNC_PENDING, pf->state);

		return;

	}



	for (v = 0; v < pf->num_alloc_vsi; v++) {

		if (pf->vsi[v] &&
@@ -2606,6 +2610,7 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf) 
			}

		}

	}

	clear_bit(__I40E_VF_DISABLE, pf->state);

}



/**
@@ -6564,19 +6569,19 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) 
	}



	if (pf->hw.phy.link_info.link_speed == I40E_LINK_SPEED_25GB) {

		req_fec = ", Requested FEC: None";

		fec = ", FEC: None";

		an = ", Autoneg: False";

		req_fec = "None";

		fec = "None";

		an = "False";



		if (pf->hw.phy.link_info.an_info & I40E_AQ_AN_COMPLETED)

			an = ", Autoneg: True";

			an = "True";



		if (pf->hw.phy.link_info.fec_info &

		    I40E_AQ_CONFIG_FEC_KR_ENA)

			fec = ", FEC: CL74 FC-FEC/BASE-R";

			fec = "CL74 FC-FEC/BASE-R";

		else if (pf->hw.phy.link_info.fec_info &

			 I40E_AQ_CONFIG_FEC_RS_ENA)

			fec = ", FEC: CL108 RS-FEC";

			fec = "CL108 RS-FEC";



		/* 'CL108 RS-FEC' should be displayed when RS is requested, or

		 * both RS and FC are requested
@@ -6585,14 +6590,19 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) 
		    (I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS)) {

			if (vsi->back->hw.phy.link_info.req_fec_info &

			    I40E_AQ_REQUEST_FEC_RS)

				req_fec = ", Requested FEC: CL108 RS-FEC";

				req_fec = "CL108 RS-FEC";

			else

				req_fec = ", Requested FEC: CL74 FC-FEC/BASE-R";

				req_fec = "CL74 FC-FEC/BASE-R";

		}

		netdev_info(vsi->netdev,

			    "NIC Link is Up, %sbps Full Duplex, Requested FEC: %s, Negotiated FEC: %s, Autoneg: %s, Flow Control: %s\n",

			    speed, req_fec, fec, an, fc);

	} else {

		netdev_info(vsi->netdev,

			    "NIC Link is Up, %sbps Full Duplex, Flow Control: %s\n",

			    speed, fc);

	}



	netdev_info(vsi->netdev, "NIC Link is Up, %sbps Full Duplex%s%s%s, Flow Control: %s\n",

		    speed, req_fec, fec, an, fc);

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf) 
	pf->tstamp_config.tx_type = HWTSTAMP_TX_OFF;



	/* Set the previous "reset" time to the current Kernel clock time */

	pf->ptp_prev_hw_time = ktime_to_timespec64(ktime_get_real());

	ktime_get_real_ts64(&pf->ptp_prev_hw_time);

	pf->ptp_reset_start = ktime_get();



	return 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -4263,7 +4263,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate, 
	if (min_tx_rate) {

		dev_err(&pf->pdev->dev, "Invalid min tx rate (%d) (greater than 0) specified for VF %d.\n",

			min_tx_rate, vf_id);

		return -EINVAL;

		ret = -EINVAL;

		goto error;

	}



	vf = &pf->vf[vf_id];