* [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08
@ 2021-02-09 2:23 Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 1/5] i40e: remove unnecessary memory writes of the next to clean pointer Tony Nguyen
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Tony Nguyen @ 2021-02-09 2:23 UTC (permalink / raw)
To: davem, kuba
Cc: Tony Nguyen, netdev, sassmann, bjorn.topel, maciej.fijalkowski,
magnus.karlsson
This series contains updates to i40e driver only.
Cristian makes improvements to driver XDP path. Avoids writing
next-to-clean pointer on every update, removes redundant updates of
cleaned_count and buffer info, creates a helper function to consolidate
XDP actions and simplifies some of the behavior.
Eryk adds messages to inform the user when MTU is larger than supported
v2:
- Drop XDP_REDIRECT messaging patch (previously patch 5)
- Use only extack for XDP MTU error
The following are changes since commit 08cbabb77e9098ec6c4a35911effac53e943c331:
Merge tag 'mlx5-updates-2021-02-04' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 40GbE
Cristian Dumitrescu (4):
i40e: remove unnecessary memory writes of the next to clean pointer
i40e: remove unnecessary cleaned_count updates
i40e: remove the redundant buffer info updates
i40e: consolidate handling of XDP program actions
Eryk Rybak (1):
i40e: Log error for oversized MTU on device
drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +-
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 149 +++++++++++---------
2 files changed, 86 insertions(+), 74 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next v2 1/5] i40e: remove unnecessary memory writes of the next to clean pointer
2021-02-09 2:23 [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Tony Nguyen
@ 2021-02-09 2:23 ` Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 2/5] i40e: remove unnecessary cleaned_count updates Tony Nguyen
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tony Nguyen @ 2021-02-09 2:23 UTC (permalink / raw)
To: davem, kuba
Cc: Cristian Dumitrescu, netdev, sassmann, anthony.l.nguyen,
bjorn.topel, maciej.fijalkowski, magnus.karlsson, Kiran Bhandare
From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
For performance reasons, avoid writing the ring next-to-clean pointer
value back to memory on every update, as it is not really necessary.
Instead, simply read it at initialization into a local copy, update
the local copy as necessary and write the local copy back to memory
after the last update.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 30 ++++++++--------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 492ce213208d..87d43407653c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -261,18 +261,6 @@ static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring,
return skb;
}
-/**
- * i40e_inc_ntc: Advance the next_to_clean index
- * @rx_ring: Rx ring
- **/
-static void i40e_inc_ntc(struct i40e_ring *rx_ring)
-{
- u32 ntc = rx_ring->next_to_clean + 1;
-
- ntc = (ntc < rx_ring->count) ? ntc : 0;
- rx_ring->next_to_clean = ntc;
-}
-
/**
* i40e_clean_rx_irq_zc - Consumes Rx packets from the hardware ring
* @rx_ring: Rx ring
@@ -284,6 +272,8 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
{
unsigned int total_rx_bytes = 0, total_rx_packets = 0;
u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);
+ u16 next_to_clean = rx_ring->next_to_clean;
+ u16 count_mask = rx_ring->count - 1;
unsigned int xdp_res, xdp_xmit = 0;
bool failure = false;
struct sk_buff *skb;
@@ -294,7 +284,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
unsigned int size;
u64 qword;
- rx_desc = I40E_RX_DESC(rx_ring, rx_ring->next_to_clean);
+ rx_desc = I40E_RX_DESC(rx_ring, next_to_clean);
qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
/* This memory barrier is needed to keep us from reading
@@ -307,11 +297,11 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
i40e_clean_programming_status(rx_ring,
rx_desc->raw.qword[0],
qword);
- bi = i40e_rx_bi(rx_ring, rx_ring->next_to_clean);
+ bi = i40e_rx_bi(rx_ring, next_to_clean);
xsk_buff_free(*bi);
*bi = NULL;
cleaned_count++;
- i40e_inc_ntc(rx_ring);
+ next_to_clean = (next_to_clean + 1) & count_mask;
continue;
}
@@ -320,7 +310,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
if (!size)
break;
- bi = i40e_rx_bi(rx_ring, rx_ring->next_to_clean);
+ bi = i40e_rx_bi(rx_ring, next_to_clean);
(*bi)->data_end = (*bi)->data + size;
xsk_buff_dma_sync_for_cpu(*bi, rx_ring->xsk_pool);
@@ -336,7 +326,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
total_rx_packets++;
cleaned_count++;
- i40e_inc_ntc(rx_ring);
+ next_to_clean = (next_to_clean + 1) & count_mask;
continue;
}
@@ -355,7 +345,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
*bi = NULL;
cleaned_count++;
- i40e_inc_ntc(rx_ring);
+ next_to_clean = (next_to_clean + 1) & count_mask;
if (eth_skb_pad(skb))
continue;
@@ -367,6 +357,8 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
napi_gro_receive(&rx_ring->q_vector->napi, skb);
}
+ rx_ring->next_to_clean = next_to_clean;
+
if (cleaned_count >= I40E_RX_BUFFER_WRITE)
failure = !i40e_alloc_rx_buffers_zc(rx_ring, cleaned_count);
@@ -374,7 +366,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
i40e_update_rx_stats(rx_ring, total_rx_bytes, total_rx_packets);
if (xsk_uses_need_wakeup(rx_ring->xsk_pool)) {
- if (failure || rx_ring->next_to_clean == rx_ring->next_to_use)
+ if (failure || next_to_clean == rx_ring->next_to_use)
xsk_set_rx_need_wakeup(rx_ring->xsk_pool);
else
xsk_clear_rx_need_wakeup(rx_ring->xsk_pool);
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next v2 2/5] i40e: remove unnecessary cleaned_count updates
2021-02-09 2:23 [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 1/5] i40e: remove unnecessary memory writes of the next to clean pointer Tony Nguyen
@ 2021-02-09 2:23 ` Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 3/5] i40e: remove the redundant buffer info updates Tony Nguyen
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tony Nguyen @ 2021-02-09 2:23 UTC (permalink / raw)
To: davem, kuba
Cc: Cristian Dumitrescu, netdev, sassmann, anthony.l.nguyen,
bjorn.topel, maciej.fijalkowski, magnus.karlsson, Kiran Bhandare
From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
For performance reasons, remove the redundant updates of the cleaned_count
variable, as its value can be computed based on the ring next-to-clean
variable, which is consistently updated.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 87d43407653c..99082abd3000 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -300,7 +300,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
bi = i40e_rx_bi(rx_ring, next_to_clean);
xsk_buff_free(*bi);
*bi = NULL;
- cleaned_count++;
next_to_clean = (next_to_clean + 1) & count_mask;
continue;
}
@@ -325,7 +324,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
total_rx_bytes += size;
total_rx_packets++;
- cleaned_count++;
next_to_clean = (next_to_clean + 1) & count_mask;
continue;
}
@@ -344,7 +342,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
}
*bi = NULL;
- cleaned_count++;
next_to_clean = (next_to_clean + 1) & count_mask;
if (eth_skb_pad(skb))
@@ -358,6 +355,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
}
rx_ring->next_to_clean = next_to_clean;
+ cleaned_count = (next_to_clean - rx_ring->next_to_use - 1) & count_mask;
if (cleaned_count >= I40E_RX_BUFFER_WRITE)
failure = !i40e_alloc_rx_buffers_zc(rx_ring, cleaned_count);
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next v2 3/5] i40e: remove the redundant buffer info updates
2021-02-09 2:23 [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 1/5] i40e: remove unnecessary memory writes of the next to clean pointer Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 2/5] i40e: remove unnecessary cleaned_count updates Tony Nguyen
@ 2021-02-09 2:23 ` Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 4/5] i40e: consolidate handling of XDP program actions Tony Nguyen
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tony Nguyen @ 2021-02-09 2:23 UTC (permalink / raw)
To: davem, kuba
Cc: Cristian Dumitrescu, netdev, sassmann, anthony.l.nguyen,
bjorn.topel, maciej.fijalkowski, magnus.karlsson, Kiran Bhandare
From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
For performance reasons, remove the redundant buffer info updates
(*bi = NULL). The buffers ready to be cleaned can easily be tracked
based on the ring next-to-clean variable, which is consistently
updated.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 33 +++++++++-------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 99082abd3000..1167496a2e08 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -280,7 +280,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
while (likely(total_rx_packets < (unsigned int)budget)) {
union i40e_rx_desc *rx_desc;
- struct xdp_buff **bi;
+ struct xdp_buff *bi;
unsigned int size;
u64 qword;
@@ -297,9 +297,8 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
i40e_clean_programming_status(rx_ring,
rx_desc->raw.qword[0],
qword);
- bi = i40e_rx_bi(rx_ring, next_to_clean);
- xsk_buff_free(*bi);
- *bi = NULL;
+ bi = *i40e_rx_bi(rx_ring, next_to_clean);
+ xsk_buff_free(bi);
next_to_clean = (next_to_clean + 1) & count_mask;
continue;
}
@@ -309,18 +308,17 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
if (!size)
break;
- bi = i40e_rx_bi(rx_ring, next_to_clean);
- (*bi)->data_end = (*bi)->data + size;
- xsk_buff_dma_sync_for_cpu(*bi, rx_ring->xsk_pool);
+ bi = *i40e_rx_bi(rx_ring, next_to_clean);
+ bi->data_end = bi->data + size;
+ xsk_buff_dma_sync_for_cpu(bi, rx_ring->xsk_pool);
- xdp_res = i40e_run_xdp_zc(rx_ring, *bi);
+ xdp_res = i40e_run_xdp_zc(rx_ring, bi);
if (xdp_res) {
if (xdp_res & (I40E_XDP_TX | I40E_XDP_REDIR))
xdp_xmit |= xdp_res;
else
- xsk_buff_free(*bi);
+ xsk_buff_free(bi);
- *bi = NULL;
total_rx_bytes += size;
total_rx_packets++;
@@ -335,13 +333,12 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
* BIT(I40E_RXD_QW1_ERROR_SHIFT). This is due to that
* SBP is *not* set in PRT_SBPVSI (default not set).
*/
- skb = i40e_construct_skb_zc(rx_ring, *bi);
+ skb = i40e_construct_skb_zc(rx_ring, bi);
if (!skb) {
rx_ring->rx_stats.alloc_buff_failed++;
break;
}
- *bi = NULL;
next_to_clean = (next_to_clean + 1) & count_mask;
if (eth_skb_pad(skb))
@@ -594,16 +591,14 @@ int i40e_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags)
void i40e_xsk_clean_rx_ring(struct i40e_ring *rx_ring)
{
- u16 i;
-
- for (i = 0; i < rx_ring->count; i++) {
- struct xdp_buff *rx_bi = *i40e_rx_bi(rx_ring, i);
+ u16 count_mask = rx_ring->count - 1;
+ u16 ntc = rx_ring->next_to_clean;
+ u16 ntu = rx_ring->next_to_use;
- if (!rx_bi)
- continue;
+ for ( ; ntc != ntu; ntc = (ntc + 1) & count_mask) {
+ struct xdp_buff *rx_bi = *i40e_rx_bi(rx_ring, ntc);
xsk_buff_free(rx_bi);
- rx_bi = NULL;
}
}
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next v2 4/5] i40e: consolidate handling of XDP program actions
2021-02-09 2:23 [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Tony Nguyen
` (2 preceding siblings ...)
2021-02-09 2:23 ` [PATCH net-next v2 3/5] i40e: remove the redundant buffer info updates Tony Nguyen
@ 2021-02-09 2:23 ` Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 5/5] i40e: Log error for oversized MTU on device Tony Nguyen
2021-02-09 2:50 ` [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Jakub Kicinski
5 siblings, 0 replies; 7+ messages in thread
From: Tony Nguyen @ 2021-02-09 2:23 UTC (permalink / raw)
To: davem, kuba
Cc: Cristian Dumitrescu, netdev, sassmann, anthony.l.nguyen,
bjorn.topel, maciej.fijalkowski, magnus.karlsson, Kiran Bhandare
From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Consolidate the actions performed on the packet based on the XDP
program result into a separate function that is easier to read and
maintain. Simplify the i40e_construct_skb_zc function, so that the
input xdp buffer is always freed, regardless of whether the output
skb is successfully created or not. Simplify the behavior of the
i40e_clean_rx_irq_zc function, so that the current packet descriptor
is dropped when function i40_construct_skb_zc returns an error as
opposed to re-processing the same description on the next invocation.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 98 ++++++++++++++--------
1 file changed, 61 insertions(+), 37 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 1167496a2e08..470b8600adb1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -250,17 +250,70 @@ static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring,
xdp->data_end - xdp->data_hard_start,
GFP_ATOMIC | __GFP_NOWARN);
if (unlikely(!skb))
- return NULL;
+ goto out;
skb_reserve(skb, xdp->data - xdp->data_hard_start);
memcpy(__skb_put(skb, datasize), xdp->data, datasize);
if (metasize)
skb_metadata_set(skb, metasize);
+out:
xsk_buff_free(xdp);
return skb;
}
+static void i40e_handle_xdp_result_zc(struct i40e_ring *rx_ring,
+ struct xdp_buff *xdp_buff,
+ union i40e_rx_desc *rx_desc,
+ unsigned int *rx_packets,
+ unsigned int *rx_bytes,
+ unsigned int size,
+ unsigned int xdp_res)
+{
+ struct sk_buff *skb;
+
+ *rx_packets = 1;
+ *rx_bytes = size;
+
+ if (likely(xdp_res == I40E_XDP_REDIR) || xdp_res == I40E_XDP_TX)
+ return;
+
+ if (xdp_res == I40E_XDP_CONSUMED) {
+ xsk_buff_free(xdp_buff);
+ return;
+ }
+
+ if (xdp_res == I40E_XDP_PASS) {
+ /* NB! We are not checking for errors using
+ * i40e_test_staterr with
+ * BIT(I40E_RXD_QW1_ERROR_SHIFT). This is due to that
+ * SBP is *not* set in PRT_SBPVSI (default not set).
+ */
+ skb = i40e_construct_skb_zc(rx_ring, xdp_buff);
+ if (!skb) {
+ rx_ring->rx_stats.alloc_buff_failed++;
+ *rx_packets = 0;
+ *rx_bytes = 0;
+ return;
+ }
+
+ if (eth_skb_pad(skb)) {
+ *rx_packets = 0;
+ *rx_bytes = 0;
+ return;
+ }
+
+ *rx_bytes = skb->len;
+ i40e_process_skb_fields(rx_ring, rx_desc, skb);
+ napi_gro_receive(&rx_ring->q_vector->napi, skb);
+ return;
+ }
+
+ /* Should never get here, as all valid cases have been handled already.
+ */
+ WARN_ON_ONCE(1);
+}
+
/**
* i40e_clean_rx_irq_zc - Consumes Rx packets from the hardware ring
* @rx_ring: Rx ring
@@ -276,10 +329,11 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
u16 count_mask = rx_ring->count - 1;
unsigned int xdp_res, xdp_xmit = 0;
bool failure = false;
- struct sk_buff *skb;
while (likely(total_rx_packets < (unsigned int)budget)) {
union i40e_rx_desc *rx_desc;
+ unsigned int rx_packets;
+ unsigned int rx_bytes;
struct xdp_buff *bi;
unsigned int size;
u64 qword;
@@ -313,42 +367,12 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
xsk_buff_dma_sync_for_cpu(bi, rx_ring->xsk_pool);
xdp_res = i40e_run_xdp_zc(rx_ring, bi);
- if (xdp_res) {
- if (xdp_res & (I40E_XDP_TX | I40E_XDP_REDIR))
- xdp_xmit |= xdp_res;
- else
- xsk_buff_free(bi);
-
- total_rx_bytes += size;
- total_rx_packets++;
-
- next_to_clean = (next_to_clean + 1) & count_mask;
- continue;
- }
-
- /* XDP_PASS path */
-
- /* NB! We are not checking for errors using
- * i40e_test_staterr with
- * BIT(I40E_RXD_QW1_ERROR_SHIFT). This is due to that
- * SBP is *not* set in PRT_SBPVSI (default not set).
- */
- skb = i40e_construct_skb_zc(rx_ring, bi);
- if (!skb) {
- rx_ring->rx_stats.alloc_buff_failed++;
- break;
- }
-
+ i40e_handle_xdp_result_zc(rx_ring, bi, rx_desc, &rx_packets,
+ &rx_bytes, size, xdp_res);
+ total_rx_packets += rx_packets;
+ total_rx_bytes += rx_bytes;
+ xdp_xmit |= xdp_res & (I40E_XDP_TX | I40E_XDP_REDIR);
next_to_clean = (next_to_clean + 1) & count_mask;
-
- if (eth_skb_pad(skb))
- continue;
-
- total_rx_bytes += skb->len;
- total_rx_packets++;
-
- i40e_process_skb_fields(rx_ring, rx_desc, skb);
- napi_gro_receive(&rx_ring->q_vector->napi, skb);
}
rx_ring->next_to_clean = next_to_clean;
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next v2 5/5] i40e: Log error for oversized MTU on device
2021-02-09 2:23 [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Tony Nguyen
` (3 preceding siblings ...)
2021-02-09 2:23 ` [PATCH net-next v2 4/5] i40e: consolidate handling of XDP program actions Tony Nguyen
@ 2021-02-09 2:23 ` Tony Nguyen
2021-02-09 2:50 ` [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Jakub Kicinski
5 siblings, 0 replies; 7+ messages in thread
From: Tony Nguyen @ 2021-02-09 2:23 UTC (permalink / raw)
To: davem, kuba
Cc: Eryk Rybak, netdev, sassmann, anthony.l.nguyen, bjorn.topel,
maciej.fijalkowski, magnus.karlsson, Aleksandr Loktionov,
Kiran Bhandare
From: Eryk Rybak <eryk.roch.rybak@intel.com>
When attempting to link XDP prog with MTU larger than supported,
user is not informed why XDP linking fails. Adding proper
error message: "MTU too large to enable XDP".
Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Eryk Rybak <eryk.roch.rybak@intel.com>
Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 521ea9df38d5..3e241681ddd5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -12448,9 +12448,10 @@ static netdev_features_t i40e_features_check(struct sk_buff *skb,
* i40e_xdp_setup - add/remove an XDP program
* @vsi: VSI to changed
* @prog: XDP program
+ * @extack: netlink extended ack
**/
-static int i40e_xdp_setup(struct i40e_vsi *vsi,
- struct bpf_prog *prog)
+static int i40e_xdp_setup(struct i40e_vsi *vsi, struct bpf_prog *prog,
+ struct netlink_ext_ack *extack)
{
int frame_size = vsi->netdev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
struct i40e_pf *pf = vsi->back;
@@ -12459,8 +12460,10 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi,
int i;
/* Don't allow frames that span over multiple buffers */
- if (frame_size > vsi->rx_buf_len)
+ if (frame_size > vsi->rx_buf_len) {
+ NL_SET_ERR_MSG_MOD(extack, "MTU too large to enable XDP");
return -EINVAL;
+ }
if (!i40e_enabled_xdp_vsi(vsi) && !prog)
return 0;
@@ -12769,7 +12772,7 @@ static int i40e_xdp(struct net_device *dev,
switch (xdp->command) {
case XDP_SETUP_PROG:
- return i40e_xdp_setup(vsi, xdp->prog);
+ return i40e_xdp_setup(vsi, xdp->prog, xdp->extack);
case XDP_SETUP_XSK_POOL:
return i40e_xsk_pool_setup(vsi, xdp->xsk.pool,
xdp->xsk.queue_id);
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08
2021-02-09 2:23 [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Tony Nguyen
` (4 preceding siblings ...)
2021-02-09 2:23 ` [PATCH net-next v2 5/5] i40e: Log error for oversized MTU on device Tony Nguyen
@ 2021-02-09 2:50 ` Jakub Kicinski
5 siblings, 0 replies; 7+ messages in thread
From: Jakub Kicinski @ 2021-02-09 2:50 UTC (permalink / raw)
To: Tony Nguyen
Cc: davem, netdev, sassmann, bjorn.topel, maciej.fijalkowski,
magnus.karlsson
On Mon, 8 Feb 2021 18:23:18 -0800 Tony Nguyen wrote:
> This series contains updates to i40e driver only.
>
> Cristian makes improvements to driver XDP path. Avoids writing
> next-to-clean pointer on every update, removes redundant updates of
> cleaned_count and buffer info, creates a helper function to consolidate
> XDP actions and simplifies some of the behavior.
>
> Eryk adds messages to inform the user when MTU is larger than supported
>
> v2:
> - Drop XDP_REDIRECT messaging patch (previously patch 5)
> - Use only extack for XDP MTU error
Acked-by: Jakub Kicinski <kuba@kernel.org>
Thanks for the changes!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-02-09 2:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-09 2:23 [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 1/5] i40e: remove unnecessary memory writes of the next to clean pointer Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 2/5] i40e: remove unnecessary cleaned_count updates Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 3/5] i40e: remove the redundant buffer info updates Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 4/5] i40e: consolidate handling of XDP program actions Tony Nguyen
2021-02-09 2:23 ` [PATCH net-next v2 5/5] i40e: Log error for oversized MTU on device Tony Nguyen
2021-02-09 2:50 ` [PATCH net-next v2 0/5][pull request] 40GbE Intel Wired LAN Driver Updates 2021-02-08 Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.