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

Commit db638647 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 2019-09-09

This series contains a variety of cold and hot savoury changes to Intel
drivers.  Some of the fixes could be considered for stable even though
the author did not request it.

Hulk Robert cleans up (i.e. removes) a function that has no caller for
the iavf driver.

Radoslaw fixes an issue when there is no link in the VM after the
hypervisor is restored from a low-power state due to the driver not
properly restoring features in the device that had been disabled during
the suspension for ixgbevf.

Kai-Heng Feng modified e1000e to use mod_delayed_work() to help resolve
a hot plug speed detection issue by adding a deterministic 1 second
delay before running watchdog task after an interrupt.

Sasha moves functions around to avoid forward declarations, since the
forward declarations are not necessary for these static functions in
igc.  Also added a check for igc during driver probe to validate the NVM
checksum.  Cleaned up code defines that were not being used in the igc
driver.  Adds support for IP generic transmit checksum offload in the
igc driver.

Updated the iavf kernel documentation by a developer with no life.

Jake provides another fm10k update to a local variable for ease of code
readability.

Mitch fixes the iavf driver to allow the VF to override the MAC address
set by the host, if the VF is in "trusted" mode.

Mauro S. M. Rodrigues provides several changes for i40e driver, first
with resolving hw_dbg usage and referencing a i40e_hw attribute.  Also
implemented a debug macro using pr_debug, since the use of netdev_dbg
could cause a NULL pointer dereference during probe.  Finally cleaned up
code that is no longer used or needed.

Firo Yang provides a change in the ixgbe driver to ensure we sync the
first fragment unconditionally to help resolve an issue seen in the XEN
environment when the upper network stack could receive an incomplete
network packet.

Mariusz adds a missing device to the i40e PCI table in the driver.

v2: Mauro S. M. Rodrigues updated patches 10 & 11 of the series based on
    feedback from Jakub Kicinski.  Also updated patch 13 description so
    that the "Fixes:" tag was no wrapped.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6703a605 f78787f3

Documentation/networking/device_drivers/intel/iavf.rst

+82 −33
Original line number Diff line number Diff line
@@ -10,11 +10,15 @@ Copyright(c) 2013-2018 Intel Corporation. 
Contents

========



- Overview

- Identifying Your Adapter

- Additional Configurations

- Known Issues/Troubleshooting

- Support



Overview

========



This file describes the iavf Linux* Base Driver. This driver was formerly

called i40evf.
@@ -27,6 +31,7 @@ The guest OS loading the iavf driver must support MSI-X interrupts. 


Identifying Your Adapter

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



The driver in this kernel is compatible with devices based on the following:

 * Intel(R) XL710 X710 Virtual Function

 * Intel(R) X722 Virtual Function
@@ -50,9 +55,10 @@ Link messages will not be displayed to the console if the distribution is 
restricting system messages. In order to see network driver link messages on

your console, set dmesg to eight by entering the following::



  dmesg -n 8

    # dmesg -n 8



NOTE: This setting is not saved across reboots.

NOTE:

  This setting is not saved across reboots.



ethtool

-------
@@ -72,11 +78,11 @@ then requests from that VF to set VLAN tag stripping will be ignored. 
To enable/disable VLAN tag stripping for a VF, issue the following command

from inside the VM in which you are running the VF::



  ethtool -K <if_name> rxvlan on/off

    # ethtool -K <if_name> rxvlan on/off



or alternatively::



  ethtool --offload <if_name> rxvlan on/off

    # ethtool --offload <if_name> rxvlan on/off



Adaptive Virtual Function

-------------------------
@@ -91,21 +97,21 @@ additional features depending on what features are available in the PF with 
which the AVF is associated. The following are base mode features:



- 4 Queue Pairs (QP) and associated Configuration Status Registers (CSRs)

  for Tx/Rx.

- i40e descriptors and ring format.

- Descriptor write-back completion.

- 1 control queue, with i40e descriptors, CSRs and ring format.

- 5 MSI-X interrupt vectors and corresponding i40e CSRs.

- 1 Interrupt Throttle Rate (ITR) index.

- 1 Virtual Station Interface (VSI) per VF.

  for Tx/Rx

- i40e descriptors and ring format

- Descriptor write-back completion

- 1 control queue, with i40e descriptors, CSRs and ring format

- 5 MSI-X interrupt vectors and corresponding i40e CSRs

- 1 Interrupt Throttle Rate (ITR) index

- 1 Virtual Station Interface (VSI) per VF

- 1 Traffic Class (TC), TC0

- Receive Side Scaling (RSS) with 64 entry indirection table and key,

  configured through the PF.

- 1 unicast MAC address reserved per VF.

- 16 MAC address filters for each VF.

- Stateless offloads - non-tunneled checksums.

- AVF device ID.

- HW mailbox is used for VF to PF communications (including on Windows).

  configured through the PF

- 1 unicast MAC address reserved per VF

- 16 MAC address filters for each VF

- Stateless offloads - non-tunneled checksums

- AVF device ID

- HW mailbox is used for VF to PF communications (including on Windows)



IEEE 802.1ad (QinQ) Support

---------------------------
@@ -117,8 +123,8 @@ VLAN ID, among other uses. 


The following are examples of how to configure 802.1ad (QinQ)::



  ip link add link eth0 eth0.24 type vlan proto 802.1ad id 24

  ip link add link eth0.24 eth0.24.371 type vlan proto 802.1Q id 371

    # ip link add link eth0 eth0.24 type vlan proto 802.1ad id 24

    # ip link add link eth0.24 eth0.24.371 type vlan proto 802.1Q id 371



Where "24" and "371" are example VLAN IDs.
@@ -133,6 +139,19 @@ specific application. This can reduce latency for the specified application, 
and allow Tx traffic to be rate limited per application. Follow the steps below

to set ADq.



Requirements:



- The sch_mqprio, act_mirred and cls_flower modules must be loaded

- The latest version of iproute2

- If another driver (for example, DPDK) has set cloud filters, you cannot

  enable ADQ

- Depending on the underlying PF device, ADQ cannot be enabled when the

  following features are enabled:



  + Data Center Bridging (DCB)

  + Multiple Functions per Port (MFP)

  + Sideband Filters



1. Create traffic classes (TCs). Maximum of 8 TCs can be created per interface.

The shaper bw_rlimit parameter is optional.
@@ -141,7 +160,7 @@ to 1Gbit for tc0 and 3Gbit for tc1. 


::



  # tc qdisc add dev <interface> root mqprio num_tc 2 map 0 0 0 0 1 1 1 1

    tc qdisc add dev <interface> root mqprio num_tc 2 map 0 0 0 0 1 1 1 1

    queues 16@0 16@16 hw 1 mode channel shaper bw_rlimit min_rate 1Gbit 2Gbit

    max_rate 1Gbit 3Gbit
@@ -162,6 +181,10 @@ Totals must be equal or less than port speed. 
For example: min_rate 1Gbit 3Gbit: Verify bandwidth limit using network

monitoring tools such as ifstat or sar –n DEV [interval] [number of samples]



NOTE:

  Setting up channels via ethtool (ethtool -L) is not supported when the

  TCs are configured using mqprio.



2. Enable HW TC offload on interface::



    # ethtool -K <interface> hw-tc-offload on
@@ -171,16 +194,16 @@ monitoring tools such as ifstat or sar –n DEV [interval] [number of samples] 
    # tc qdisc add dev <interface> ingress



NOTES:

 - Run all tc commands from the iproute2 <pathtoiproute2>/tc/ directory.

 - ADq is not compatible with cloud filters.

 - Run all tc commands from the iproute2 <pathtoiproute2>/tc/ directory

 - ADq is not compatible with cloud filters

 - Setting up channels via ethtool (ethtool -L) is not supported when the TCs

   are configured using mqprio.

   are configured using mqprio

 - You must have iproute2 latest version

 - NVM version 6.01 or later is required.

 - NVM version 6.01 or later is required

 - ADq cannot be enabled when any the following features are enabled: Data

   Center Bridging (DCB), Multiple Functions per Port (MFP), or Sideband Filters.

   Center Bridging (DCB), Multiple Functions per Port (MFP), or Sideband Filters

 - If another driver (for example, DPDK) has set cloud filters, you cannot

   enable ADq.

   enable ADq

 - Tunnel filters are not supported in ADq. If encapsulated packets do arrive

   in non-tunnel mode, filtering will be done on the inner headers.  For example,

   for VXLAN traffic in non-tunnel mode, PCTYPE is identified as a VXLAN
@@ -198,6 +221,16 @@ NOTES: 
Known Issues/Troubleshooting

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



Bonding fails with VFs bound to an Intel(R) Ethernet Controller 700 series device

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

If you bind Virtual Functions (VFs) to an Intel(R) Ethernet Controller 700

series based device, the VF slaves may fail when they become the active slave.

If the MAC address of the VF is set by the PF (Physical Function) of the

device, when you add a slave, or change the active-backup slave, Linux bonding

tries to sync the backup slave's MAC address to the same MAC address as the

active slave. Linux bonding will fail at this point. This issue will not occur

if the VF's MAC address is not set by the PF.



Traffic Is Not Being Passed Between VM and Client

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

You may not be able to pass traffic between a client system and a
@@ -215,13 +248,28 @@ Do not unload a port's driver if a Virtual Function (VF) with an active Virtual 
Machine (VM) is bound to it. Doing so will cause the port to appear to hang.

Once the VM shuts down, or otherwise releases the VF, the command will complete.



Using four traffic classes fails

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

Do not try to reserve more than three traffic classes in the iavf driver. Doing

so will fail to set any traffic classes and will cause the driver to write

errors to stdout. Use a maximum of three queues to avoid this issue.



Multiple log error messages on iavf driver removal

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

If you have several VFs and you remove the iavf driver, several instances of

the following log errors are written to the log::



    Unable to send opcode 2 to PF, err I40E_ERR_QUEUE_EMPTY, aq_err ok

    Unable to send the message to VF 2 aq_err 12

    ARQ Overflow Error detected



Virtual machine does not get link

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

If the virtual machine has more than one virtual port assigned to it, and those

virtual ports are bound to different physical ports, you may not get link on

all of the virtual ports. The following command may work around the issue::



  ethtool -r <PF>

    # ethtool -r <PF>



Where <PF> is the PF interface in the host, for example: p5p1. You may need to

run the command more than once to get link on all virtual ports.
@@ -251,9 +299,10 @@ traffic. 
If you have multiple interfaces in a server, either turn on ARP filtering by

entering::



  echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter

    # echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter



NOTE: This setting is not saved across reboots. The configuration change can be

NOTE:

  This setting is not saved across reboots. The configuration change can be

  made permanent by adding the following line to the file /etc/sysctl.conf::



    net.ipv4.conf.all.arp_filter = 1

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

+6 −6
Original line number Diff line number Diff line
@@ -1780,8 +1780,8 @@ static irqreturn_t e1000_intr_msi(int __always_unused irq, void *data) 
		}

		/* guard against interrupt when we're going down */

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

			queue_delayed_work(adapter->e1000_workqueue,

					   &adapter->watchdog_task, 1);

			mod_delayed_work(adapter->e1000_workqueue,

					 &adapter->watchdog_task, HZ);

	}



	/* Reset on uncorrectable ECC error */
@@ -1861,8 +1861,8 @@ static irqreturn_t e1000_intr(int __always_unused irq, void *data) 
		}

		/* guard against interrupt when we're going down */

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

			queue_delayed_work(adapter->e1000_workqueue,

					   &adapter->watchdog_task, 1);

			mod_delayed_work(adapter->e1000_workqueue,

					 &adapter->watchdog_task, HZ);

	}



	/* Reset on uncorrectable ECC error */
@@ -1907,8 +1907,8 @@ static irqreturn_t e1000_msix_other(int __always_unused irq, void *data) 
		hw->mac.get_link_status = true;

		/* guard against interrupt when we're going down */

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

			queue_delayed_work(adapter->e1000_workqueue,

					   &adapter->watchdog_task, 1);

			mod_delayed_work(adapter->e1000_workqueue,

					 &adapter->watchdog_task, HZ);

	}



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

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+5 −3
Original line number Diff line number Diff line
@@ -1073,9 +1073,11 @@ netdev_tx_t fm10k_xmit_frame_ring(struct sk_buff *skb, 
	 *       + 2 desc gap to keep tail from touching head

	 * otherwise try next time

	 */

	for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)

		count += TXD_USE_COUNT(skb_frag_size(

						&skb_shinfo(skb)->frags[f]));

	for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {

		skb_frag_t *frag = &skb_shinfo(skb)->frags[f];



		count += TXD_USE_COUNT(skb_frag_size(frag));

	}



	if (fm10k_maybe_stop_tx(tx_ring, count + 3)) {

		tx_ring->tx_stats.tx_busy++;

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

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ enum i40e_state_t { 
	__I40E_PF_RESET_REQUESTED,

	__I40E_CORE_RESET_REQUESTED,

	__I40E_GLOBAL_RESET_REQUESTED,

	__I40E_EMP_RESET_REQUESTED,

	__I40E_EMP_RESET_INTR_RECEIVED,

	__I40E_SUSPENDED,

	__I40E_PTP_TX_IN_PROGRESS,

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

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */



#include "i40e.h"

#include "i40e_type.h"

#include "i40e_adminq.h"

#include "i40e_prototype.h"