linux.git/drivers/net/ethernet/intel, branch v5.10

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

2020-12-10T02:48:29+00:00

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2020-12-09

This series contains updates to igb, ixgbe, i40e, and ice drivers.

Sven Auhagen fixes issues with igb XDP: return correct error value in XDP
xmit back, increase header padding to include space for double VLAN, add
an extack error when Rx buffer is too small for frame size, set metasize if
it is set in xdp, change xdp_do_flush_map to xdp_do_flush, and update
trans_start to avoid possible Tx timeout.

Björn fixes an issue where an Rx buffer can be reused prematurely with
XDP redirect for ixgbe, i40e, and ice drivers.

The following are changes since commit 323a391a220c4a234cb1e678689d7f4c3b73f863:
  can: isotp: isotp_setsockopt(): block setsockopt on bound sockets
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 1GbE
====================

Signed-off-by: David S. Miller

e1000e: fix S0ix flow to allow S0i3.2 subset entry

2020-12-09T23:41:34+00:00

Changed a configuration in the flows to align with
architecture requirements to achieve S0i3.2 substate.

This helps both i219V and i219LM configurations.

Also fixed a typo in the previous commit 632fbd5eb5b0
("e1000e: fix S0ix flows for cable connected case").

Fixes: 632fbd5eb5b0 ("e1000e: fix S0ix flows for cable connected case").
Signed-off-by: Vitaly Lifshits 
Tested-by: Aaron Brown 
Signed-off-by: Tony Nguyen 
Reviewed-by: Alexander Duyck 
Signed-off-by: Mario Limonciello 
Link: https://lore.kernel.org/r/20201208185632.151052-1-mario.limonciello@dell.com
Signed-off-by: Jakub Kicinski

ice: avoid premature Rx buffer reuse

2020-12-09T23:26:58+00:00

The page recycle code, incorrectly, relied on that a page fragment
could not be freed inside xdp_do_redirect(). This assumption leads to
that page fragments that are used by the stack/XDP redirect can be
reused and overwritten.

To avoid this, store the page count prior invoking xdp_do_redirect().

Fixes: efc2214b6047 ("ice: Add support for XDP")
Reported-and-analyzed-by: Li RongQing 
Signed-off-by: Björn Töpel 
Tested-by: George Kuruvinakunnel 
Signed-off-by: Tony Nguyen

ixgbe: avoid premature Rx buffer reuse

2020-12-09T23:26:58+00:00

The page recycle code, incorrectly, relied on that a page fragment
could not be freed inside xdp_do_redirect(). This assumption leads to
that page fragments that are used by the stack/XDP redirect can be
reused and overwritten.

To avoid this, store the page count prior invoking xdp_do_redirect().

Fixes: 6453073987ba ("ixgbe: add initial support for xdp redirect")
Reported-and-analyzed-by: Li RongQing 
Signed-off-by: Björn Töpel 
Tested-by: Sandeep Penigalapati 
Signed-off-by: Tony Nguyen

i40e: avoid premature Rx buffer reuse

2020-12-09T23:26:58+00:00

The page recycle code, incorrectly, relied on that a page fragment
could not be freed inside xdp_do_redirect(). This assumption leads to
that page fragments that are used by the stack/XDP redirect can be
reused and overwritten.

To avoid this, store the page count prior invoking xdp_do_redirect().

Longer explanation:

Intel NICs have a recycle mechanism. The main idea is that a page is
split into two parts. One part is owned by the driver, one part might
be owned by someone else, such as the stack.

t0: Page is allocated, and put on the Rx ring
              +---------------
used by NIC ->| upper buffer
(rx_buffer)   +---------------
              | lower buffer
              +---------------
  page count  == USHRT_MAX
  rx_buffer->pagecnt_bias == USHRT_MAX

t1: Buffer is received, and passed to the stack (e.g.)
              +---------------
              | upper buff (skb)
              +---------------
used by NIC ->| lower buffer
(rx_buffer)   +---------------
  page count  == USHRT_MAX
  rx_buffer->pagecnt_bias == USHRT_MAX - 1

t2: Buffer is received, and redirected
              +---------------
              | upper buff (skb)
              +---------------
used by NIC ->| lower buffer
(rx_buffer)   +---------------

Now, prior calling xdp_do_redirect():
  page count  == USHRT_MAX
  rx_buffer->pagecnt_bias == USHRT_MAX - 2

This means that buffer *cannot* be flipped/reused, because the skb is
still using it.

The problem arises when xdp_do_redirect() actually frees the
segment. Then we get:
  page count  == USHRT_MAX - 1
  rx_buffer->pagecnt_bias == USHRT_MAX - 2

From a recycle perspective, the buffer can be flipped and reused,
which means that the skb data area is passed to the Rx HW ring!

To work around this, the page count is stored prior calling
xdp_do_redirect().

Note that this is not optimal, since the NIC could actually reuse the
"lower buffer" again. However, then we need to track whether
XDP_REDIRECT consumed the buffer or not.

Fixes: d9314c474d4f ("i40e: add support for XDP_REDIRECT")
Reported-and-analyzed-by: Li RongQing 
Signed-off-by: Björn Töpel 
Tested-by: George Kuruvinakunnel 
Signed-off-by: Tony Nguyen

igb: avoid transmit queue timeout in xdp path

2020-12-09T23:26:58+00:00

Since we share the transmit queue with the network stack,
it is possible that we run into a transmit queue timeout.
This will reset the queue.
This happens under high load when XDP is using the
transmit queue pretty much exclusively.

netdev_start_xmit() sets the trans_start variable of the
transmit queue to jiffies which is later utilized by dev_watchdog(),
so to avoid timeout, let stack know that XDP xmit happened by
bumping the trans_start within XDP Tx routines to jiffies.

Fixes: 9cbc948b5a20 ("igb: add XDP support")
Acked-by: Maciej Fijalkowski 
Signed-off-by: Sven Auhagen 
Tested-by: Sandeep Penigalapati 
Signed-off-by: Tony Nguyen

igb: use xdp_do_flush

2020-12-09T23:26:58+00:00

Since it is a new XDP implementation change xdp_do_flush_map
to xdp_do_flush.

Fixes: 9cbc948b5a20 ("igb: add XDP support")
Suggested-by: Maciej Fijalkowski 
Reviewed-by: Maciej Fijalkowski 
Acked-by: Maciej Fijalkowski 
Signed-off-by: Sven Auhagen 
Tested-by: Sandeep Penigalapati 
Signed-off-by: Tony Nguyen

igb: skb add metasize for xdp

2020-12-09T23:26:58+00:00

add metasize if it is set in xdp

Fixes: 9cbc948b5a20 ("igb: add XDP support")
Suggested-by: Maciej Fijalkowski 
Reviewed-by: Maciej Fijalkowski 
Acked-by: Maciej Fijalkowski 
Signed-off-by: Sven Auhagen 
Tested-by: Sandeep Penigalapati 
Signed-off-by: Tony Nguyen

igb: XDP extack message on error

2020-12-09T23:26:58+00:00

Add an extack error message when the RX buffer size is too small
for the frame size.

Fixes: 9cbc948b5a20 ("igb: add XDP support")
Suggested-by: Maciej Fijalkowski 
Reviewed-by: Maciej Fijalkowski 
Acked-by: Maciej Fijalkowski 
Signed-off-by: Sven Auhagen 
Tested-by: Sandeep Penigalapati 
Signed-off-by: Tony Nguyen

igb: take VLAN double header into account

2020-12-09T23:26:58+00:00

Increase the packet header padding to include double VLAN tagging.
This patch uses a macro for this.

Fixes: 9cbc948b5a20 ("igb: add XDP support")
Suggested-by: Maciej Fijalkowski 
Reviewed-by: Maciej Fijalkowski 
Acked-by: Maciej Fijalkowski 
Signed-off-by: Sven Auhagen 
Tested-by: Sandeep Penigalapati 
Signed-off-by: Tony Nguyen