|
 |
f95c89 |
From 21e44965c1de18146e7d7b29612751eeac02968a Mon Sep 17 00:00:00 2001
|
|
|
f95c89 |
From: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
f95c89 |
Date: Wed, 2 Oct 2019 18:22:44 -0400
|
|
|
f95c89 |
Subject: [PATCH 29/96] [netdrv] bnxt_en: Refactor __bnxt_xmit_xdp()
|
|
|
f95c89 |
|
|
|
f95c89 |
Message-id: <da1238f5df4b80f5906517c6bbc1dcf7939ce6ba.1570027456.git.jtoppins@redhat.com>
|
|
|
f95c89 |
Patchwork-id: 276447
|
|
|
f95c89 |
O-Subject: [RHEL-8.2 PATCH 22/78] bnxt_en: Refactor __bnxt_xmit_xdp().
|
|
|
f95c89 |
Bugzilla: 1724766
|
|
|
f95c89 |
RH-Acked-by: John Linville <linville@redhat.com>
|
|
|
f95c89 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
f95c89 |
|
|
|
f95c89 |
__bnxt_xmit_xdp() is used by XDP_TX and ethtool loopback packet transmit.
|
|
|
f95c89 |
Refactor it so that it can be re-used by the XDP_REDIRECT logic.
|
|
|
f95c89 |
Restructure the TX interrupt handler logic to cleanly separate XDP_TX
|
|
|
f95c89 |
logic in preparation for XDP_REDIRECT.
|
|
|
f95c89 |
|
|
|
f95c89 |
Acked-by: Andy Gospodarek <gospo@broadcom.com>
|
|
|
f95c89 |
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
|
|
|
f95c89 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
f95c89 |
(cherry picked from commit c1ba92a86db24dc9ca2648473d4820979a0d8a4c)
|
|
|
f95c89 |
Bugzilla: 1724766
|
|
|
f95c89 |
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=23809532
|
|
|
f95c89 |
Tested: build, boot, basic ping
|
|
|
f95c89 |
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
f95c89 |
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
|
|
|
f95c89 |
---
|
|
|
f95c89 |
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
|
|
|
f95c89 |
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +-
|
|
|
f95c89 |
drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 33 ++++++++++++++++-------
|
|
|
f95c89 |
drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 5 ++--
|
|
|
f95c89 |
4 files changed, 28 insertions(+), 13 deletions(-)
|
|
|
f95c89 |
|
|
|
f95c89 |
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt.h
|
|
|
f95c89 |
===================================================================
|
|
|
f95c89 |
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt.h 2020-02-06 16:23:13.662531951 +0100
|
|
|
f95c89 |
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt.h 2020-02-06 16:23:14.227526765 +0100
|
|
|
f95c89 |
@@ -596,6 +596,7 @@
|
|
|
f95c89 |
DEFINE_DMA_UNMAP_ADDR(mapping);
|
|
|
f95c89 |
u8 is_gso;
|
|
|
f95c89 |
u8 is_push;
|
|
|
f95c89 |
+ u8 action;
|
|
|
f95c89 |
union {
|
|
|
f95c89 |
unsigned short nr_frags;
|
|
|
f95c89 |
u16 rx_prod;
|
|
|
f95c89 |
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
|
|
|
f95c89 |
===================================================================
|
|
|
f95c89 |
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c 2020-02-06 16:23:14.076528151 +0100
|
|
|
f95c89 |
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c 2020-02-06 16:23:14.228526755 +0100
|
|
|
f95c89 |
@@ -2799,7 +2799,7 @@
|
|
|
f95c89 |
dev_kfree_skb(skb);
|
|
|
f95c89 |
return -EIO;
|
|
|
f95c89 |
}
|
|
|
f95c89 |
- __bnxt_xmit_xdp(bp, txr, map, pkt_size, 0);
|
|
|
f95c89 |
+ bnxt_xmit_bd(bp, txr, map, pkt_size);
|
|
|
f95c89 |
|
|
|
f95c89 |
/* Sync BD data before updating doorbell */
|
|
|
f95c89 |
wmb();
|
|
|
f95c89 |
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
|
|
|
f95c89 |
===================================================================
|
|
|
f95c89 |
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c 2020-02-06 16:23:14.076528151 +0100
|
|
|
f95c89 |
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c 2020-02-06 16:23:14.228526755 +0100
|
|
|
f95c89 |
@@ -19,8 +19,9 @@
|
|
|
f95c89 |
#include "bnxt.h"
|
|
|
f95c89 |
#include "bnxt_xdp.h"
|
|
|
f95c89 |
|
|
|
f95c89 |
-void __bnxt_xmit_xdp(struct bnxt *bp, struct bnxt_tx_ring_info *txr,
|
|
|
f95c89 |
- dma_addr_t mapping, u32 len, u16 rx_prod)
|
|
|
f95c89 |
+struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp,
|
|
|
f95c89 |
+ struct bnxt_tx_ring_info *txr,
|
|
|
f95c89 |
+ dma_addr_t mapping, u32 len)
|
|
|
f95c89 |
{
|
|
|
f95c89 |
struct bnxt_sw_tx_bd *tx_buf;
|
|
|
f95c89 |
struct tx_bd *txbd;
|
|
|
f95c89 |
@@ -29,7 +30,6 @@
|
|
|
f95c89 |
|
|
|
f95c89 |
prod = txr->tx_prod;
|
|
|
f95c89 |
tx_buf = &txr->tx_buf_ring[prod];
|
|
|
f95c89 |
- tx_buf->rx_prod = rx_prod;
|
|
|
f95c89 |
|
|
|
f95c89 |
txbd = &txr->tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];
|
|
|
f95c89 |
flags = (len << TX_BD_LEN_SHIFT) | (1 << TX_BD_FLAGS_BD_CNT_SHIFT) |
|
|
|
f95c89 |
@@ -40,30 +40,43 @@
|
|
|
f95c89 |
|
|
|
f95c89 |
prod = NEXT_TX(prod);
|
|
|
f95c89 |
txr->tx_prod = prod;
|
|
|
f95c89 |
+ return tx_buf;
|
|
|
f95c89 |
+}
|
|
|
f95c89 |
+
|
|
|
f95c89 |
+static void __bnxt_xmit_xdp(struct bnxt *bp, struct bnxt_tx_ring_info *txr,
|
|
|
f95c89 |
+ dma_addr_t mapping, u32 len, u16 rx_prod)
|
|
|
f95c89 |
+{
|
|
|
f95c89 |
+ struct bnxt_sw_tx_bd *tx_buf;
|
|
|
f95c89 |
+
|
|
|
f95c89 |
+ tx_buf = bnxt_xmit_bd(bp, txr, mapping, len);
|
|
|
f95c89 |
+ tx_buf->rx_prod = rx_prod;
|
|
|
f95c89 |
+ tx_buf->action = XDP_TX;
|
|
|
f95c89 |
}
|
|
|
f95c89 |
|
|
|
f95c89 |
void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts)
|
|
|
f95c89 |
{
|
|
|
f95c89 |
struct bnxt_tx_ring_info *txr = bnapi->tx_ring;
|
|
|
f95c89 |
struct bnxt_rx_ring_info *rxr = bnapi->rx_ring;
|
|
|
f95c89 |
+ bool rx_doorbell_needed = false;
|
|
|
f95c89 |
struct bnxt_sw_tx_bd *tx_buf;
|
|
|
f95c89 |
u16 tx_cons = txr->tx_cons;
|
|
|
f95c89 |
u16 last_tx_cons = tx_cons;
|
|
|
f95c89 |
- u16 rx_prod;
|
|
|
f95c89 |
int i;
|
|
|
f95c89 |
|
|
|
f95c89 |
for (i = 0; i < nr_pkts; i++) {
|
|
|
f95c89 |
- last_tx_cons = tx_cons;
|
|
|
f95c89 |
+ tx_buf = &txr->tx_buf_ring[tx_cons];
|
|
|
f95c89 |
+
|
|
|
f95c89 |
+ if (tx_buf->action == XDP_TX) {
|
|
|
f95c89 |
+ rx_doorbell_needed = true;
|
|
|
f95c89 |
+ last_tx_cons = tx_cons;
|
|
|
f95c89 |
+ }
|
|
|
f95c89 |
tx_cons = NEXT_TX(tx_cons);
|
|
|
f95c89 |
}
|
|
|
f95c89 |
txr->tx_cons = tx_cons;
|
|
|
f95c89 |
- if (bnxt_tx_avail(bp, txr) == bp->tx_ring_size) {
|
|
|
f95c89 |
- rx_prod = rxr->rx_prod;
|
|
|
f95c89 |
- } else {
|
|
|
f95c89 |
+ if (rx_doorbell_needed) {
|
|
|
f95c89 |
tx_buf = &txr->tx_buf_ring[last_tx_cons];
|
|
|
f95c89 |
- rx_prod = tx_buf->rx_prod;
|
|
|
f95c89 |
+ bnxt_db_write(bp, &rxr->rx_db, tx_buf->rx_prod);
|
|
|
f95c89 |
}
|
|
|
f95c89 |
- bnxt_db_write(bp, &rxr->rx_db, rx_prod);
|
|
|
f95c89 |
}
|
|
|
f95c89 |
|
|
|
f95c89 |
/* returns the following:
|
|
|
f95c89 |
Index: src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h
|
|
|
f95c89 |
===================================================================
|
|
|
f95c89 |
--- src.orig/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h 2020-02-06 16:23:14.076528151 +0100
|
|
|
f95c89 |
+++ src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h 2020-02-06 16:23:14.228526755 +0100
|
|
|
f95c89 |
@@ -10,8 +10,9 @@
|
|
|
f95c89 |
#ifndef BNXT_XDP_H
|
|
|
f95c89 |
#define BNXT_XDP_H
|
|
|
f95c89 |
|
|
|
f95c89 |
-void __bnxt_xmit_xdp(struct bnxt *bp, struct bnxt_tx_ring_info *txr,
|
|
|
f95c89 |
- dma_addr_t mapping, u32 len, u16 rx_prod);
|
|
|
f95c89 |
+struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp,
|
|
|
f95c89 |
+ struct bnxt_tx_ring_info *txr,
|
|
|
f95c89 |
+ dma_addr_t mapping, u32 len);
|
|
|
f95c89 |
void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts);
|
|
|
f95c89 |
bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
|
|
|
f95c89 |
struct page *page, u8 **data_ptr, unsigned int *len,
|