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

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



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2018-06-04

This series contains a smorgasbord of updates to documentation, e1000e,
igb, ixgbe, ixgbevf and i40e.

Benjamin Poirier fixes a potential kernel crash due to NULL pointer
dereference in e1000e.

Jeff updates the kernel documentation for e100 and e1000 to correct
default values and URLs which were incorrect in the documentation.  Also
took the time to update these to the new reStructured text format for
kernel documentation.

Joanna Yurdal fixes a missing PTP transmit timestamp by ensuring that
TSICR gets cleared when ICR is cleared.

Sergey updates igb to reset all the transmit queues at one time so that
we only have to wait once for all the queues to be reset.

Alex fixes ixgbevf so that malicious driver detection (MDD) can co-exist
with XDP.

Emil and Tony extend the RTNL lock to ensure we get the most up-to-date
values for the bits and avoid a possible race condition when going down.

YueHaibing from Huawei introduces a helper function in ixgbe for
operation reads to simplify the code a bit more.

Daniel Borkmann adds support for XDP meta data when using build SKB
for i40e.

Shannon Nelson provides twp fixes for the IPSec code in ixgbe, first is
to make sure we do not try to offload the decryption of any incoming
packet that is destined for the management engine.  The other fix is to
resolve a cast problem introduced by a sparse cleanup patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f0b964e5 9a75fa5c

Documentation/networking/e100.txt→Documentation/networking/e100.rst

+27 −33
Original line number Diff line number Diff line 
Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters

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



March 15, 2011

June 1, 2018



Contents

========
@@ -36,16 +36,9 @@ Channel Bonding documentation can be found in the Linux kernel source: 
Identifying Your Adapter

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



For more information on how to identify your adapter, go to the Adapter &

Driver ID Guide at:



  http://support.intel.com/support/network/adapter/pro100/21397.htm



For the latest Intel network drivers for Linux, refer to the following

website. In the search field, enter your adapter name or type, or use the

networking link on the left to search for your adapter:



  http://downloadfinder.intel.com/scripts-df/support_intel.asp

For information on how to identify your adapter, and for the latest Intel

network drivers, refer to the Intel Support website:

http://www.intel.com/support



Driver Configuration Parameters

===============================
@@ -57,22 +50,26 @@ Rx Descriptors: Number of receive descriptors. A receive descriptor is a data 
   structure that describes a receive buffer and its attributes to the network

   controller. The data in the descriptor is used by the controller to write

   data from the controller to host memory. In the 3.x.x driver the valid range

   for this parameter is 64-256. The default value is 64. This parameter can be

   changed using the command:

   for this parameter is 64-256. The default value is 256. This parameter can be

   changed using the command::



   ethtool -G eth? rx n, where n is the number of desired rx descriptors.

   ethtool -G eth? rx n



   Where n is the number of desired Rx descriptors.



Tx Descriptors: Number of transmit descriptors. A transmit descriptor is a data

   structure that describes a transmit buffer and its attributes to the network

   controller. The data in the descriptor is used by the controller to read

   data from the host memory to the controller. In the 3.x.x driver the valid

   range for this parameter is 64-256. The default value is 64. This parameter

   can be changed using the command:

   range for this parameter is 64-256. The default value is 128. This parameter

   can be changed using the command::



   ethtool -G eth? tx n



   ethtool -G eth? tx n, where n is the number of desired tx descriptors.

   Where n is the number of desired Tx descriptors.



Speed/Duplex: The driver auto-negotiates the link speed and duplex settings by

   default. The ethtool utility can be used as follows to force speed/duplex.

   default. The ethtool utility can be used as follows to force speed/duplex.::



   ethtool -s eth?  autoneg off speed {10|100} duplex {full|half}
@@ -81,7 +78,7 @@ Speed/Duplex: The driver auto-negotiates the link speed and duplex settings by 


Event Log Message Level:  The driver uses the message level flag to log events

   to syslog. The message level can be set at driver load time. It can also be

   set using the command:

   set using the command::



   ethtool -s eth? msglvl n
@@ -112,9 +109,9 @@ Additional Configurations 
  ---------------------

  In order to see link messages and other Intel driver information on your

  console, you must set the dmesg level up to six. This can be done by

  entering the following on the command line before loading the e100 driver:

  entering the following on the command line before loading the e100 driver::



       dmesg -n 8

       dmesg -n 6



  If you wish to see all messages issued by the driver, including debug

  messages, set the dmesg level to eight.
@@ -146,7 +143,8 @@ Additional Configurations 


  NAPI (Rx polling mode) is supported in the e100 driver.



  See www.cyberus.ca/~hadi/usenix-paper.tgz for more information on NAPI.

  See https://wiki.linuxfoundation.org/networking/napi for more information

  on NAPI.



  Multiple Interfaces on Same Ethernet Broadcast Network

  ------------------------------------------------------
@@ -160,7 +158,7 @@ Additional Configurations 
  If you have multiple interfaces in a server, either turn on ARP

  filtering by



  (1) entering: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter

  (1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter

      (this only works if your kernel's version is higher than 2.4.5), or



  (2) installing the interfaces in separate broadcast domains (either
@@ -169,15 +167,11 @@ Additional Configurations 


Support

=======



For general information, go to the Intel support website at:



    http://support.intel.com

http://www.intel.com/support/



or the Intel Wired Networking project hosted by Sourceforge at:



http://sourceforge.net/projects/e1000



If an issue is identified with the released source code on the supported

kernel with a supported adapter, email the specific information related to the

issue to e1000-devel@lists.sourceforge.net.
 
If an issue is identified with the released source code on a supported kernel

with a supported adapter, email the specific information related to the issue

to e1000-devel@lists.sf.net.

Documentation/networking/e1000.txt→Documentation/networking/e1000.rst

+10 −49
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ NOTE: When e1000 is loaded with default settings and multiple adapters 
       are in use simultaneously, the CPU utilization may increase non-

       linearly.  In order to limit the CPU utilization without impacting

       the overall throughput, we recommend that you load the driver as

       follows:

       follows::



           modprobe e1000 InterruptThrottleRate=3000,3000,3000
@@ -167,8 +167,8 @@ NOTE: When e1000 is loaded with default settings and multiple adapters 


RxDescriptors

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

Valid Range:   80-256 for 82542 and 82543-based adapters

               80-4096 for all other supported adapters

Valid Range:   48-256 for 82542 and 82543-based adapters

               48-4096 for all other supported adapters

Default Value: 256



This value specifies the number of receive buffer descriptors allocated
@@ -230,8 +230,8 @@ speed. Duplex should also be set when Speed is set to either 10 or 100. 


TxDescriptors

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

Valid Range:   80-256 for 82542 and 82543-based adapters

               80-4096 for all other supported adapters

Valid Range:   48-256 for 82542 and 82543-based adapters

               48-4096 for all other supported adapters

Default Value: 256



This value is the number of transmit descriptors allocated by the driver.
@@ -242,41 +242,10 @@ NOTE: Depending on the available system resources, the request for a 
       higher number of transmit descriptors may be denied.  In this case,

       use a lower number.



TxDescriptorStep

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

Valid Range:    1 (use every Tx Descriptor)

                4 (use every 4th Tx Descriptor)



Default Value:  1 (use every Tx Descriptor)



On certain non-Intel architectures, it has been observed that intense TX

traffic bursts of short packets may result in an improper descriptor

writeback. If this occurs, the driver will report a "TX Timeout" and reset

the adapter, after which the transmit flow will restart, though data may

have stalled for as much as 10 seconds before it resumes.



The improper writeback does not occur on the first descriptor in a system

memory cache-line, which is typically 32 bytes, or 4 descriptors long.



Setting TxDescriptorStep to a value of 4 will ensure that all TX descriptors

are aligned to the start of a system memory cache line, and so this problem

will not occur.



NOTES: Setting TxDescriptorStep to 4 effectively reduces the number of

       TxDescriptors available for transmits to 1/4 of the normal allocation.

       This has a possible negative performance impact, which may be

       compensated for by allocating more descriptors using the TxDescriptors

       module parameter.



       There are other conditions which may result in "TX Timeout", which will

       not be resolved by the use of the TxDescriptorStep parameter. As the

       issue addressed by this parameter has never been observed on Intel

       Architecture platforms, it should not be used on Intel platforms.



TxIntDelay

----------

Valid Range:   0-65535 (0=off)

Default Value: 64

Default Value: 8



This value delays the generation of transmit interrupts in units of

1.024 microseconds.  Transmit interrupt reduction can improve CPU
@@ -288,7 +257,7 @@ TxAbsIntDelay 
-------------

(This parameter is supported only on 82540, 82545 and later adapters.)

Valid Range:   0-65535 (0=off)

Default Value: 64

Default Value: 32



This value, in units of 1.024 microseconds, limits the delay in which a

transmit interrupt is generated.  Useful only if TxIntDelay is non-zero,
@@ -310,7 +279,7 @@ Copybreak 
---------

Valid Range:   0-xxxxxxx (0=off)

Default Value: 256

Usage: insmod e1000.ko copybreak=128

Usage: modprobe e1000.ko copybreak=128



Driver copies all packets below or equaling this size to a fresh RX

buffer before handing it up the stack.
@@ -328,14 +297,6 @@ Default Value: 0 (disabled) 
Allows PHY to turn off in lower power states. The user can turn off

this parameter in supported chipsets.



KumeranLockLoss

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

Valid Range: 0-1

Default Value: 1 (enabled)



This workaround skips resetting the PHY at shutdown for the initial

silicon releases of ICH8 systems.



Speed and Duplex Configuration

==============================
@@ -397,12 +358,12 @@ Additional Configurations 
  ------------

  Jumbo Frames support is enabled by changing the MTU to a value larger than

  the default of 1500.  Use the ifconfig command to increase the MTU size.

  For example:

  For example::



       ifconfig eth<x> mtu 9000 up



  This setting is not saved across reboots.  It can be made permanent if

  you add:

  you add::



       MTU=9000

Documentation/networking/index.rst

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Contents: 
   batman-adv

   can

   dpaa2/index

   e100

   e1000

   kapi

   z8530book

   msg_zerocopy

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7089,8 +7089,8 @@ Q: http://patchwork.ozlabs.org/project/intel-wired-lan/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git

S:	Supported

F:	Documentation/networking/e100.txt

F:	Documentation/networking/e1000.txt

F:	Documentation/networking/e100.rst

F:	Documentation/networking/e1000.rst

F:	Documentation/networking/e1000e.txt

F:	Documentation/networking/igb.txt

F:	Documentation/networking/igbvf.txt

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

+6 −9
Original line number Diff line number Diff line
@@ -3527,15 +3527,12 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) 
		}

		break;

	case e1000_pch_spt:

		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {

		/* Stable 24MHz frequency */

		incperiod = INCPERIOD_24MHZ;

		incvalue = INCVALUE_24MHZ;

		shift = INCVALUE_SHIFT_24MHZ;

		adapter->cc.shift = shift;

		break;

		}

		return -EINVAL;

	case e1000_pch_cnp:

		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {

			/* Stable 24MHz frequency */

CRA Git | Maintained and supported by SUSTech CRA and CCSE