Commit 9af80090 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2018-11-21

This series contains updates to all of the Intel LAN drivers and
documentation.

Shannon Nelson updates the ixgbe kernel documentation to include IPsec
hardware offload.

Joe Perches cleans up whitespace issues in the igb driver.

Jesse update the netdev kernel documentation for NETIF_F_GSO_UDP_L4 to
align with the actual code.  Also aligned all the NAPI driver code for
all of the Intel drivers to implement the recommendations of Eric
Dumazet to check the return code of the napi_complete_done() to
determine whether or not to enable interrupts or exit poll.

Paul E. McKenney replaces synchronize_sched() with synchronize_rcu() for
ixgbe.

Sasha implements suggestions made by Joe Perches to remove obsolete code
and to use the dev_err() method.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 42519ede 6ed4babe

Documentation/networking/ixgbe.rst

+13 −0
Original line number Diff line number Diff line
@@ -501,6 +501,19 @@ NOTE: This feature can be disabled for a specific Virtual Function (VF):: 


  ip link set <pf dev> vf <vf id> spoofchk {off|on}



IPsec Offload

-------------

The ixgbe driver supports IPsec Hardware Offload.  When creating Security

Associations with "ip xfrm ..." the 'offload' tag option can be used to

register the IPsec SA with the driver in order to get higher throughput in

the secure communications.



The offload is also supported for ixgbe's VFs, but the VF must be set as

'trusted' and the support must be enabled with::



  ethtool --set-priv-flags eth<x> vf-ipsec on

  ip link set eth<x> vf <y> trust on





Known Issues/Troubleshooting

============================

Documentation/networking/netdev-features.txt

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ set, be it TCPv4 (when NETIF_F_TSO is enabled) or TCPv6 (NETIF_F_TSO6). 


 * Transmit UDP segmentation offload



NETIF_F_GSO_UDP_GSO_L4 accepts a single UDP header with a payload that exceeds

NETIF_F_GSO_UDP_L4 accepts a single UDP header with a payload that exceeds

gso_size. On segmentation, it segments the payload on gso_size boundaries and

replicates the network and UDP headers (fixing up the last one if less than

gso_size).

drivers/net/ethernet/intel/e100.c

+6 −4
Original line number Diff line number Diff line
@@ -2225,11 +2225,13 @@ static int e100_poll(struct napi_struct *napi, int budget) 
	e100_rx_clean(nic, &work_done, budget);

	e100_tx_clean(nic);



	/* If budget not fully consumed, exit the polling mode */

	if (work_done < budget) {

		napi_complete_done(napi, work_done);

	/* If budget fully consumed, continue polling */

	if (work_done == budget)

		return budget;



	/* only re-enable interrupt if stack agrees polling is really done */

	if (likely(napi_complete_done(napi, work_done)))

		e100_enable_irq(nic);

	}



	return work_done;

}

drivers/net/ethernet/intel/e1000/e1000_main.c

+6 −5
Original line number Diff line number Diff line
@@ -3803,14 +3803,15 @@ static int e1000_clean(struct napi_struct *napi, int budget) 


	adapter->clean_rx(adapter, &adapter->rx_ring[0], &work_done, budget);



	if (!tx_clean_complete)

		work_done = budget;

	if (!tx_clean_complete || work_done == budget)

		return budget;



	/* If budget not fully consumed, exit the polling mode */

	if (work_done < budget) {

	/* Exit the polling mode, but don't re-enable interrupts if stack might

	 * poll us due to busy-polling

	 */

	if (likely(napi_complete_done(napi, work_done))) {

		if (likely(adapter->itr_setting & 3))

			e1000_set_itr(adapter);

		napi_complete_done(napi, work_done);

		if (!test_bit(__E1000_DOWN, &adapter->flags))

			e1000_irq_enable(adapter);

	}

drivers/net/ethernet/intel/e1000e/netdev.c

+9 −8
Original line number Diff line number Diff line
@@ -2651,9 +2651,9 @@ err: 
/**

 * e1000e_poll - NAPI Rx polling callback

 * @napi: struct associated with this polling callback

 * @weight: number of packets driver is allowed to process this poll

 * @budget: number of packets driver is allowed to process this poll

 **/

static int e1000e_poll(struct napi_struct *napi, int weight)

static int e1000e_poll(struct napi_struct *napi, int budget)

{

	struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter,

						     napi);
@@ -2667,16 +2667,17 @@ static int e1000e_poll(struct napi_struct *napi, int weight) 
	    (adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))

		tx_cleaned = e1000_clean_tx_irq(adapter->tx_ring);



	adapter->clean_rx(adapter->rx_ring, &work_done, weight);

	adapter->clean_rx(adapter->rx_ring, &work_done, budget);



	if (!tx_cleaned)

		work_done = weight;

	if (!tx_cleaned || work_done == budget)

		return budget;



	/* If weight not fully consumed, exit the polling mode */

	if (work_done < weight) {

	/* Exit the polling mode, but don't re-enable interrupts if stack might

	 * poll us due to busy-polling

	 */

	if (likely(napi_complete_done(napi, work_done))) {

		if (adapter->itr_setting & 3)

			e1000_set_itr(adapter);

		napi_complete_done(napi, work_done);

		if (!test_bit(__E1000_DOWN, &adapter->state)) {

			if (adapter->msix_entries)

				ew32(IMS, adapter->rx_ring->ims_val);

CRA Git | Maintained and supported by SUSTech CRA and CCSE