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

Commit 35288486 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/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2018-07-12

This series contains updates to ixgbe and e100/e1000 kernel documentation.

Alex fixes ixgbe to ensure that we are more explicit about the ordering
of updates to the receive address register (RAR) table.

Dan Carpenter fixes an issue where we were reading one element beyond
the end of the array.

Mauro Carvalho Chehab fixes formatting issues in the e100.rst and
e1000.rst that were causing errors during 'make htmldocs'.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 672f5cce 8dc4b1a7

Documentation/networking/e100.rst

+17 −10
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ Driver Configuration Parameters 
The default value for each parameter is generally the recommended setting,

unless otherwise noted.



Rx Descriptors: Number of receive descriptors. A receive descriptor is a data

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
@@ -58,7 +59,8 @@ Rx Descriptors: Number of receive descriptors. A receive descriptor is a data 


   Where n is the number of desired Rx descriptors.



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

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
@@ -69,7 +71,8 @@ Tx Descriptors: Number of transmit descriptors. A transmit descriptor is a data 


   Where n is the number of desired Tx descriptors.



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

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.::



     ethtool -s eth?  autoneg off speed {10|100} duplex {full|half}
@@ -77,7 +80,8 @@ Speed/Duplex: The driver auto-negotiates the link speed and duplex settings by 
   NOTE: setting the speed/duplex to incorrect values will cause the link to

   fail.



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

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::
@@ -92,7 +96,7 @@ Configuring the Driver on Different Distributions 


Configuring a network driver to load properly when the system is started

is distribution dependent.  Typically, the configuration process involves

adding an alias line to /etc/modprobe.d/*.conf as well as editing other

adding an alias line to `/etc/modprobe.d/*.conf` as well as editing other

system startup scripts and/or configuration files.  Many popular Linux

distributions ship with tools to make these changes for you.  To learn

the proper way to configure a network device for your system, refer to
@@ -160,7 +164,10 @@ This results in unbalanced receive traffic. 
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

Documentation/networking/e1000.rst

+112 −75
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ Command Line Parameters 
The default value for each parameter is generally the recommended setting,

unless otherwise noted.



NOTES:  For more information about the AutoNeg, Duplex, and Speed

NOTES:

	For more information about the AutoNeg, Duplex, and Speed

        parameters, see the "Speed and Duplex Configuration" section in

        this document.
@@ -45,22 +46,27 @@ NOTES: For more information about the AutoNeg, Duplex, and Speed 


AutoNeg

-------



(Supported only on adapters with copper connections)

Valid Range:   0x01-0x0F, 0x20-0x2F

Default Value: 0x2F



:Valid Range:   0x01-0x0F, 0x20-0x2F

:Default Value: 0x2F



This parameter is a bit-mask that specifies the speed and duplex settings

advertised by the adapter.  When this parameter is used, the Speed and

Duplex parameters must not be specified.



NOTE:  Refer to the Speed and Duplex section of this readme for more

NOTE:

       Refer to the Speed and Duplex section of this readme for more

       information on the AutoNeg parameter.



Duplex

------



(Supported only on adapters with copper connections)

Valid Range:   0-2 (0=auto-negotiate, 1=half, 2=full)

Default Value: 0



:Valid Range:   0-2 (0=auto-negotiate, 1=half, 2=full)

:Default Value: 0



This defines the direction in which data is allowed to flow.  Can be

either one or two-directional.  If both Duplex and the link partner are
@@ -70,18 +76,22 @@ duplex. 


FlowControl

-----------

Valid Range:   0-3 (0=none, 1=Rx only, 2=Tx only, 3=Rx&Tx)

Default Value: Reads flow control settings from the EEPROM



:Valid Range:   0-3 (0=none, 1=Rx only, 2=Tx only, 3=Rx&Tx)

:Default Value: Reads flow control settings from the EEPROM



This parameter controls the automatic generation(Tx) and response(Rx)

to Ethernet PAUSE frames.



InterruptThrottleRate

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



(not supported on Intel(R) 82542, 82543 or 82544-based adapters)

Valid Range:   0,1,3,4,100-100000 (0=off, 1=dynamic, 3=dynamic conservative,



:Valid Range:

   0,1,3,4,100-100000 (0=off, 1=dynamic, 3=dynamic conservative,

   4=simplified balancing)

Default Value: 3

:Default Value: 3



The driver can limit the amount of interrupts per second that the adapter

will generate for incoming packets. It does this by writing a value to the
@@ -135,13 +145,15 @@ Setting InterruptThrottleRate to 0 turns off any interrupt moderation 
and may improve small packet latency, but is generally not suitable

for bulk throughput traffic.



NOTE:  InterruptThrottleRate takes precedence over the TxAbsIntDelay and

NOTE:

       InterruptThrottleRate takes precedence over the TxAbsIntDelay and

       RxAbsIntDelay parameters.  In other words, minimizing the receive

       and/or transmit absolute delays does not force the controller to

       generate more interrupts than what the Interrupt Throttle Rate

       allows.



CAUTION:  If you are using the Intel(R) PRO/1000 CT Network Connection

CAUTION:

          If you are using the Intel(R) PRO/1000 CT Network Connection

          (controller 82547), setting InterruptThrottleRate to a value

          greater than 75,000, may hang (stop transmitting) adapters

          under certain network conditions.  If this occurs a NETDEV
@@ -151,7 +163,8 @@ CAUTION: If you are using the Intel(R) PRO/1000 CT Network Connection 
          hang, ensure that InterruptThrottleRate is set no greater

          than 75,000 and is not set to 0.



NOTE:  When e1000 is loaded with default settings and multiple adapters

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
@@ -168,9 +181,11 @@ NOTE: When e1000 is loaded with default settings and multiple adapters 


RxDescriptors

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

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

               48-4096 for all other supported adapters

Default Value: 256



: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

by the driver.  Increasing this value allows the driver to buffer more
@@ -180,15 +195,17 @@ Each descriptor is 16 bytes. A receive buffer is also allocated for each 
descriptor and can be either 2048, 4096, 8192, or 16384 bytes, depending

on the MTU setting. The maximum MTU size is 16110.



NOTE:  MTU designates the frame size.  It only needs to be set for Jumbo

NOTE:

       MTU designates the frame size.  It only needs to be set for Jumbo

       Frames.  Depending on the available system resources, the request

       for a higher number of receive descriptors may be denied.  In this

       case, use a lower number.



RxIntDelay

----------

Valid Range:   0-65535 (0=off)

Default Value: 0



:Valid Range:   0-65535 (0=off)

:Default Value: 0



This value delays the generation of receive interrupts in units of 1.024

microseconds.  Receive interrupt reduction can improve CPU efficiency if
@@ -198,7 +215,8 @@ of TCP traffic. If the system is reporting dropped receives, this value 
may be set too high, causing the driver to run out of available receive

descriptors.



CAUTION:  When setting RxIntDelay to a value other than 0, adapters may

CAUTION:

          When setting RxIntDelay to a value other than 0, adapters may

          hang (stop transmitting) under certain network conditions.  If

          this occurs a NETDEV WATCHDOG message is logged in the system

          event log.  In addition, the controller is automatically reset,
@@ -207,9 +225,11 @@ CAUTION: When setting RxIntDelay to a value other than 0, adapters may 


RxAbsIntDelay

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



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

Valid Range:   0-65535 (0=off)

Default Value: 128



:Valid Range:   0-65535 (0=off)

:Default Value: 128



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

receive interrupt is generated.  Useful only if RxIntDelay is non-zero,
@@ -220,9 +240,11 @@ conditions. 


Speed

-----



(This parameter is supported only on adapters with copper connections.)

Valid Settings: 0, 10, 100, 1000

Default Value:  0 (auto-negotiate at all supported speeds)



:Valid Settings: 0, 10, 100, 1000

:Default Value:  0 (auto-negotiate at all supported speeds)



Speed forces the line speed to the specified value in megabits per second

(Mbps).  If this parameter is not specified or is set to 0 and the link
@@ -231,22 +253,26 @@ speed. Duplex should also be set when Speed is set to either 10 or 100. 


TxDescriptors

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

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

               48-4096 for all other supported adapters

Default Value: 256



: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.

Increasing this value allows the driver to queue more transmits.  Each

descriptor is 16 bytes.



NOTE:  Depending on the available system resources, the request for a

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.



TxIntDelay

----------

Valid Range:   0-65535 (0=off)

Default Value: 8



:Valid Range:   0-65535 (0=off)

:Default Value: 8



This value delays the generation of transmit interrupts in units of

1.024 microseconds.  Transmit interrupt reduction can improve CPU
@@ -256,9 +282,11 @@ causing the driver to run out of available transmit descriptors. 


TxAbsIntDelay

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



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

Valid Range:   0-65535 (0=off)

Default Value: 32



:Valid Range:   0-65535 (0=off)

: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,
@@ -269,18 +297,21 @@ network conditions. 


XsumRX

------



(This parameter is NOT supported on the 82542-based adapter.)

Valid Range:   0-1

Default Value: 1



:Valid Range:   0-1

:Default Value: 1



A value of '1' indicates that the driver should enable IP checksum

offload for received packets (both UDP and TCP) to the adapter hardware.



Copybreak

---------

Valid Range:   0-xxxxxxx (0=off)

Default Value: 256

Usage: modprobe e1000.ko copybreak=128



:Valid Range:   0-xxxxxxx (0=off)

:Default Value: 256

: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.
@@ -292,8 +323,9 @@ it is also available during runtime at 


SmartPowerDownEnable

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

Valid Range: 0-1

Default Value:  0 (disabled)



:Valid Range: 0-1

:Default Value:  0 (disabled)



Allows PHY to turn off in lower power states. The user can turn off

this parameter in supported chipsets.
@@ -309,14 +341,14 @@ fiber interface board only links at 1000 Mbps full-duplex. 


For copper-based boards, the keywords interact as follows:



  The default operation is auto-negotiate.  The board advertises all

- The default operation is auto-negotiate.  The board advertises all

  supported speed and duplex combinations, and it links at the highest

  common speed and duplex mode IF the link partner is set to auto-negotiate.



  If Speed = 1000, limited auto-negotiation is enabled and only 1000 Mbps

- If Speed = 1000, limited auto-negotiation is enabled and only 1000 Mbps

  is advertised (The 1000BaseT spec requires auto-negotiation.)



  If Speed = 10 or 100, then both Speed and Duplex should be set.  Auto-

- If Speed = 10 or 100, then both Speed and Duplex should be set.  Auto-

  negotiation is disabled, and the AutoNeg parameter is ignored.  Partner

  SHOULD also be forced.
@@ -328,13 +360,15 @@ process. 
The parameter may be specified as either a decimal or hexadecimal value as

determined by the bitmap below.



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

Bit position   7      6      5       4       3      2      1       0

Decimal Value  128    64     32      16      8      4      2       1

Hex value      80     40     20      10      8      4      2       1

Speed (Mbps)   N/A    N/A    1000    N/A     100    100    10      10

Duplex                       Full            Full   Half   Full    Half

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



Some examples of using AutoNeg:

Some examples of using AutoNeg::



  modprobe e1000 AutoNeg=0x01 (Restricts autonegotiation to 10 Half)

  modprobe e1000 AutoNeg=1 (Same as above)
@@ -357,9 +391,10 @@ Additional Configurations 


Jumbo Frames

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

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::



  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::



       ifconfig eth<x> mtu 9000 up
@@ -372,26 +407,28 @@ to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>. This example 
  applies to the Red Hat distributions; other distributions may store this

  setting in a different location.



Notes: Degradation in throughput performance may be observed in some

Jumbo frames environments.  If this is observed, increasing the

application's socket buffer size and/or increasing the

/proc/sys/net/ipv4/tcp_*mem entry values may help.  See the specific

application manual and /usr/src/linux*/Documentation/

Notes:

  Degradation in throughput performance may be observed in some Jumbo frames

  environments. If this is observed, increasing the application's socket buffer

  size and/or increasing the /proc/sys/net/ipv4/tcp_*mem entry values may help.

  See the specific application manual and /usr/src/linux*/Documentation/

  networking/ip-sysctl.txt for more details.



- The maximum MTU setting for Jumbo Frames is 16110.  This value

  coincides with the maximum Jumbo Frames size of 16128.

  - The maximum MTU setting for Jumbo Frames is 16110.  This value coincides

    with the maximum Jumbo Frames size of 16128.



- Using Jumbo frames at 10 or 100 Mbps is not supported and may result

  in poor performance or loss of link.

  - Using Jumbo frames at 10 or 100 Mbps is not supported and may result in

    poor performance or loss of link.



  - Adapters based on the Intel(R) 82542 and 82573V/E controller do not

  support Jumbo Frames.  These correspond to the following product names:

  Intel(R) PRO/1000 Gigabit Server Adapter Intel(R) PRO/1000 PM Network

  Connection

    support Jumbo Frames. These correspond to the following product names::



     Intel(R) PRO/1000 Gigabit Server Adapter

     Intel(R) PRO/1000 PM Network Connection



ethtool

-------



  The driver utilizes the ethtool interface for driver configuration and

  diagnostics, as well as displaying statistical information.  The ethtool

  version 1.6 or later is required for this functionality.
@@ -401,13 +438,13 @@ https://www.kernel.org/pub/software/network/ethtool/ 


Enabling Wake on LAN* (WoL)

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



  WoL is configured through the ethtool* utility.



  WoL will be enabled on the system during the next shut down or reboot.

  For this driver version, in order to enable WoL, the e1000 driver must be

  loaded when shutting down or rebooting the system.





Support

=======

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+11 −1
Original line number Diff line number Diff line
@@ -1871,7 +1871,12 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq, 
	if (enable_addr != 0)

		rar_high |= IXGBE_RAH_AV;



	/* Record lower 32 bits of MAC address and then make

	 * sure that write is flushed to hardware before writing

	 * the upper 16 bits and setting the valid bit.

	 */

	IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);

	IXGBE_WRITE_FLUSH(hw);

	IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);



	return 0;
@@ -1903,8 +1908,13 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index) 
	rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));

	rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);



	IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);

	/* Clear the address valid bit and upper 16 bits of the address

	 * before clearing the lower bits. This way we aren't updating

	 * a live filter.

	 */

	IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);

	IXGBE_WRITE_FLUSH(hw);

	IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);



	/* clear VMDq pool/queue selection for this RAR */

	hw->mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);

drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ int ixgbe_ipsec_tx(struct ixgbe_ring *tx_ring, 
	}



	itd->sa_idx = xs->xso.offload_handle - IXGBE_IPSEC_BASE_TX_INDEX;

	if (unlikely(itd->sa_idx > IXGBE_IPSEC_MAX_SA_COUNT)) {

	if (unlikely(itd->sa_idx >= IXGBE_IPSEC_MAX_SA_COUNT)) {

		netdev_err(tx_ring->netdev, "%s: bad sa_idx=%d handle=%lu\n",

			   __func__, itd->sa_idx, xs->xso.offload_handle);

		return 0;