mvpp2: XDP support
Subsystems (4)
v2 cover mvpp2: XDP support
From: Matteo Croce <[email protected]>
From: Matteo Croce <[email protected]>
Add XDP support to mvpp2. This series converts the driver to the page_pool API for RX buffer management, and adds native XDP support.
XDP support comes with extack error reporting and statistics as well.
These are the performance numbers, as measured by Sven:
SKB fwd page pool:
Rx bps 390.38 Mbps
Rx pps 762.46 Kpps
XDP fwd:
Rx bps 1.39 Gbps
Rx pps 2.72 Mpps
XDP Drop:
eth0: 12.9 Mpps
eth1: 4.1 Mpps
Matteo Croce (4):
mvpp2: refactor BM pool init percpu code
mvpp2: use page_pool allocator
mvpp2: add basic XDP support
mvpp2: XDP TX support
Sven Auhagen (1):
mvpp2: xdp ethtool stats
drivers/net/ethernet/marvell/Kconfig | 1 + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 57 +- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 730 ++++++++++++++++-- 3 files changed, 718 insertions(+), 70 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/5 mvpp2: refactor BM pool init percpu code
From: Matteo Croce <[email protected]>
In mvpp2_swf_bm_pool_init_percpu(), a reference to a struct mvpp2_bm_pool is obtained traversing multiple structs, when a local variable already points to the same object.
Fix it and, while at it, give the variable a meaningful name.
--- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +11 -12
@@ -907,28 +907,27 @@ static int mvpp2_swf_bm_pool_init_shared(struct mvpp2_port *port)/* Initialize pools for swf, percpu buffers variant */ static int mvpp2_swf_bm_pool_init_percpu (struct mvpp2_port *port) { -struct mvpp2_bm_pool *p; +struct mvpp2_bm_pool *bm_pool;int i;for (i =0 ; i < port->nrxqs; i++) { - p =mvpp2_bm_pool_use_percpu (port,MVPP2_BM_SHORT , i, - mvpp2_pools[MVPP2_BM_SHORT ].pkt_size); -if (!p) + bm_pool =mvpp2_bm_pool_use_percpu (port,MVPP2_BM_SHORT , i, + mvpp2_pools[MVPP2_BM_SHORT ].pkt_size); +if (!bm_pool)return -ENOMEM ; - port->priv->bm_pools[i].port_map |=BIT (port->id); -mvpp2_rxq_short_pool_set (port, i, port->priv->bm_pools[i].id); + bm_pool->port_map |=BIT (port->id); +mvpp2_rxq_short_pool_set (port, i, bm_pool->id); }for (i =0 ; i < port->nrxqs; i++) { - p =mvpp2_bm_pool_use_percpu (port,MVPP2_BM_LONG , i + port->nrxqs, - mvpp2_pools[MVPP2_BM_LONG ].pkt_size); -if (!p) + bm_pool =mvpp2_bm_pool_use_percpu (port,MVPP2_BM_LONG , i + port->nrxqs, + mvpp2_pools[MVPP2_BM_LONG ].pkt_size); +if (!bm_pool)return -ENOMEM ; - port->priv->bm_pools[i + port->nrxqs].port_map |=BIT (port->id); -mvpp2_rxq_long_pool_set (port, i, - port->priv->bm_pools[i + port->nrxqs].id); + bm_pool->port_map |=BIT (port->id); +mvpp2_rxq_long_pool_set (port, i, bm_pool->id); } port->pool_long =NULL ;
Signature · 1 line
2.26.2
PATCH v2 2/5 mvpp2: use page_pool allocator
In reply to Matteo CroceFrom: Matteo Croce <[email protected]>
Use the page_pool API for memory management.
This is a prerequisite for native XDP support.
--- drivers/net/ethernet/marvell/Kconfig | 1 + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 8 + .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 156 +++++++++++++++--- 3 files changed, 140 insertions(+), 25 deletions(-)
drivers/net/ethernet/marvell/Kconfig +1 -0
@@ -87,6 +87,7 @@ config MVPP2 depends on ARCH_MVEBU || COMPILE_TEST select MVMDIO select PHYLINK + select PAGE_POOL help This driver supports the network interface units in the Marvell ARMADA 375, 7K and 8K SoCs.
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +8 -0
@@ -15,6 +15,7 @@#include <linux/phy.h> #include <linux/phylink.h> #include <net/flow_offload.h> +#include <net/page_pool.h> /* Fifo Registers */ #define MVPP2_RX_DATA_FIFO_SIZE_REG (port) (0x00 + 4 * (port))
@@ -820,6 +821,9 @@ struct mvpp2 {/* RSS Indirection tables */ struct mvpp2_rss_table *rss_tables[MVPP22_N_RSS_TABLES ]; + +/* page_pool allocator */ +struct page_pool *page_pool[MVPP2_PORT_MAX_RXQ ]; };struct mvpp2_pcpu_stats {
@@ -1161,6 +1165,10 @@ struct mvpp2_rx_queue {/* Port's logic RXQ number to which physical RXQ is mapped */ int logic_rxq; + +/* XDP memory accounting */ +struct xdp_rxq_info xdp_rxq_short; +struct xdp_rxq_info xdp_rxq_long; };struct mvpp2_bm_pool {
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +131 -25
295 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 3/5 mvpp2: add basic XDP support
In reply to Matteo CroceFrom: Matteo Croce <[email protected]>
Add XDP native support.
By now only XDP_DROP, XDP_PASS and XDP_REDIRECT verdicts are supported.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 28 ++- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 165 +++++++++++++++++- 2 files changed, 185 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +23 -5
@@ -16,6 +16,18 @@#include <linux/phylink.h> #include <net/flow_offload.h> #include <net/page_pool.h> +#include <linux/bpf.h> +#include <net/xdp.h> + +/* The PacketOffset field is measured in units of 32 bytes and is 3 bits wide, +* so the maximum offset is 7 * 32 = 224 +*/ +#define MVPP2_SKB_HEADROOM min(max(XDP_PACKET_HEADROOM, NET_SKB_PAD), 224) + +#define MVPP2_XDP_PASS 0 +#define MVPP2_XDP_DROPPED BIT(0) +#define MVPP2_XDP_TX BIT(1) +#define MVPP2_XDP_REDIR BIT(2)/* Fifo Registers */ #define MVPP2_RX_DATA_FIFO_SIZE_REG (port) (0x00 + 4 * (port))
@@ -629,10 +641,12 @@ALIGN ((mtu) +MVPP2_MH_SIZE +MVPP2_VLAN_TAG_LEN + \ ETH_HLEN + ETH_FCS_LEN, cache_line_size()) -#define MVPP2_RX_BUF_SIZE (pkt_size) ((pkt_size) + NET_SKB_PAD) +#define MVPP2_RX_BUF_SIZE (pkt_size) ((pkt_size) + MVPP2_SKB_HEADROOM)#define MVPP2_RX_TOTAL_SIZE (buf_size) ((buf_size) + MVPP2_SKB_SHINFO_SIZE)#define MVPP2_RX_MAX_PKT_SIZE (total_size) \ - ((total_size) - NET_SKB_PAD - MVPP2_SKB_SHINFO_SIZE) + ((total_size) - MVPP2_SKB_HEADROOM - MVPP2_SKB_SHINFO_SIZE) + +#define MVPP2_MAX_RX_BUF_SIZE (PAGE_SIZE - MVPP2_SKB_SHINFO_SIZE - MVPP2_SKB_HEADROOM)#define MVPP2_BIT_TO_BYTE (bit) ((bit) / 8)#define MVPP2_BIT_TO_WORD (bit) ((bit) / 32)
@@ -690,9 +704,9 @@ enum mvpp2_prs_l3_cast {#define MVPP2_BM_COOKIE_POOL_OFFS 8#define MVPP2_BM_COOKIE_CPU_OFFS 24 -#define MVPP2_BM_SHORT_FRAME_SIZE 512 -#define MVPP2_BM_LONG_FRAME_SIZE 2048 -#define MVPP2_BM_JUMBO_FRAME_SIZE 10240 +#define MVPP2_BM_SHORT_FRAME_SIZE 704/* frame size 128 */ +#define MVPP2_BM_LONG_FRAME_SIZE 2240/* frame size 1664 */ +#define MVPP2_BM_JUMBO_FRAME_SIZE 10432/* frame size 9856 */ /* BM short pool packet size * These value assure that for SWF the total number * of bytes allocated for each buffer will be 512
@@ -913,6 +927,8 @@ struct mvpp2_port {unsigned int ntxqs;struct net_device *dev; +struct bpf_prog *xdp_prog; +int pkt_size;/* Per-CPU port control */
@@ -932,6 +948,8 @@ struct mvpp2_port {struct mvpp2_pcpu_stats __percpu *stats;u64 *ethtool_stats; +unsigned long state; +/* Per-port work and its lock to gather hardware statistics */ struct mutex gather_stats_lock;struct delayed_work stats_work;
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +162 -3
253 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 4/5 mvpp2: XDP TX support
In reply to Matteo CroceFrom: Matteo Croce <[email protected]>
Add the transmit part of XDP support, which includes:
- support for XDP_TX in mvpp2_xdp()
- .ndo_xdp_xmit hook for AF_XDP and XDP_REDIRECT with mvpp2 as destination
mvpp2_xdp_submit_frame() is a generic function which is called by mvpp2_xdp_xmit_back() when doing XDP_TX, and by mvpp2_xdp_xmit when doing AF_XDP or XDP_REDIRECT target.
The buffer allocation has been reworked to be able to map the buffers as DMA_FROM_DEVICE or DMA_BIDIRECTIONAL depending if native XDP is in use or not.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 13 +- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 304 +++++++++++++++--- 2 files changed, 272 insertions(+), 45 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +12 -1
@@ -1082,9 +1082,20 @@ struct mvpp2_rx_desc { }; }; +enum mvpp2_tx_buf_type { +MVPP2_TYPE_SKB , +MVPP2_TYPE_XDP_TX , +MVPP2_TYPE_XDP_NDO , +}; +struct mvpp2_txq_pcpu_buf { +enum mvpp2_tx_buf_type type; +/* Transmitted SKB */ -struct sk_buff *skb; +union { +struct xdp_frame *xdpf; +struct sk_buff *skb; + };/* Physical address of transmitted buffer */ dma_addr_t dma;
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +260 -44
470 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 5/5 mvpp2: xdp ethtool stats
In reply to Matteo CroceFrom: Sven Auhagen <[email protected]>
Add ethtool statistics for XDP.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 8 + .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 158 ++++++++++++++++-- 2 files changed, 148 insertions(+), 18 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +8 -0
@@ -846,6 +846,14 @@ struct mvpp2_pcpu_stats {u64 rx_bytes;u64 tx_packets;u64 tx_bytes; +/* XDP */ +u64 xdp_redirect; +u64 xdp_pass; +u64 xdp_drop; +u64 xdp_xmit; +u64 xdp_xmit_err; +u64 xdp_tx; +u64 xdp_tx_err; };/* Per-CPU port control */
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +140 -18
291 lines not on this page · raw message
Signature · 1 line
2.26.2
Quoted 5 lines · Matteo Croce
From: Matteo Croce <[email protected]>
From: Matteo Croce <[email protected]>
DUP! Sorry.
Signature · 1 line
per aspera ad upstream
David Miller
maintainerFrom: Matteo Croce <[email protected]>
Date: Thu, 2 Jul 2020 16:12:39 +0200
Quoted 15 lines
From: Matteo Croce <[email protected]>
From: Matteo Croce <[email protected]>
Add XDP support to mvpp2. This series converts the driver to the
page_poolAPI for RX buffer management, and adds native XDP support.XDP support comes with extack error reporting and statistics as well.
These are the performance numbers, as measured by Sven:
SKB fwd page pool:
Rx bps 390.38 Mbps
Rx pps 762.46 Kpps
Quoted 7 lines
XDP fwd:
Rx bps 1.39 Gbps
Rx pps 2.72 MppsXDP Drop:
eth0: 12.9 Mpps
eth1: 4.1 Mpps
Series applied, thank you.