netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation
@ 2024-08-29 12:03 Roger Quadros
  2024-08-29 12:03 ` [PATCH net 1/3] net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT Roger Quadros
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Roger Quadros @ 2024-08-29 12:03 UTC (permalink / raw)
  To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
	John Fastabend, Julien Panis, Jacob Keller
  Cc: Siddharth Vadapalli, Md Danish Anwar, Vignesh Raghavendra,
	Govindarajan Sriramakrishnan, netdev, linux-kernel, bpf,
	Roger Quadros

The XDP implementation on am65-cpsw driver is broken in many ways
and this series fixes it.

Below are the current issues that are being fixed:

1)  The following XDP_DROP test from [1] stalls the interface after
    250 packets.
    ~# xdb-bench drop -m native eth0
    This is because new RX requests are never queued. Fix that.

2)  The below XDP_TX test from [1] fails with a warning
    [  499.947381] XDP_WARN: xdp_update_frame_from_buff(line:277): Driver BUG: missing reserved tailroom
    ~# xdb-bench tx -m native eth0
    Fix that by using PAGE_SIZE during xdp_init_buf().

3)  In XDP_REDIRECT case only 1 packet was processed in rx_poll.
    Fix it to process up to budget packets.
    ~# ./xdp-bench redirect -m native eth0 eth0

4)  If number of TX queues are set to 1 we get a NULL pointer
    dereference during XDP_TX.
    ~# ethtool -L eth0 tx 1
    ~# ./xdp-trafficgen udp -A <ipv6-src> -a <ipv6-dst> eth0 -t 2
    Transmitting on eth0 (ifindex 2)
    [  241.135257] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030

5)  Net statistics is broken for XDP_TX and XDP_REDIRECT

[1] xdp-tools suite https://github.com/xdp-project/xdp-tools

Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
Roger Quadros (3):
      net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT
      net: ethernet: ti: am65-cpsw: Fix NULL dereference on XDP_TX
      net: ethernet: ti: am65-cpsw: Fix RX statistics for XDP_TX and XDP_REDIRECT

 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 82 +++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 33 deletions(-)
---
base-commit: 5be63fc19fcaa4c236b307420483578a56986a37
change-id: 20240829-am65-cpsw-xdp-d5876b25335c

Best regards,
-- 
Roger Quadros <rogerq@kernel.org>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH net 1/3] net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT
  2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
@ 2024-08-29 12:03 ` Roger Quadros
  2024-08-29 12:03 ` [PATCH net 2/3] net: ethernet: ti: am65-cpsw: Fix NULL dereference on XDP_TX Roger Quadros
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Roger Quadros @ 2024-08-29 12:03 UTC (permalink / raw)
  To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
	John Fastabend, Julien Panis, Jacob Keller
  Cc: Siddharth Vadapalli, Md Danish Anwar, Vignesh Raghavendra,
	Govindarajan Sriramakrishnan, netdev, linux-kernel, bpf,
	Roger Quadros

The following XDP_DROP test from [1] stalls the interface after
250 packets.
~# xdb-bench drop -m native eth0
This is because new RX requests are never queued. Fix that.

The below XDP_TX test from [1] fails with a warning
[  499.947381] XDP_WARN: xdp_update_frame_from_buff(line:277): Driver BUG: missing reserved tailroom
~# xdb-bench tx -m native eth0
Fix that by using PAGE_SIZE during xdp_init_buf().

In XDP_REDIRECT case only 1 packet was processed in rx_poll.
Fix it to process up to budget packets.

Fix all XDP error cases to call trace_xdp_exception() and drop the packet
in am65_cpsw_run_xdp().

[1] xdp-tools suite https://github.com/xdp-project/xdp-tools

Fixes: 8acacc40f733 ("net: ethernet: ti: am65-cpsw: Add minimal XDP support")
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 62 +++++++++++++++++---------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 81d9f21086ec..9fd2ba26716c 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -156,12 +156,13 @@
 #define AM65_CPSW_CPPI_TX_PKT_TYPE 0x7
 
 /* XDP */
-#define AM65_CPSW_XDP_CONSUMED 2
-#define AM65_CPSW_XDP_REDIRECT 1
+#define AM65_CPSW_XDP_CONSUMED BIT(1)
+#define AM65_CPSW_XDP_REDIRECT BIT(0)
 #define AM65_CPSW_XDP_PASS     0
 
 /* Include headroom compatible with both skb and xdpf */
-#define AM65_CPSW_HEADROOM (max(NET_SKB_PAD, XDP_PACKET_HEADROOM) + NET_IP_ALIGN)
+#define AM65_CPSW_HEADROOM_NA (max(NET_SKB_PAD, XDP_PACKET_HEADROOM) + NET_IP_ALIGN)
+#define AM65_CPSW_HEADROOM ALIGN(AM65_CPSW_HEADROOM_NA, sizeof(long))
 
 static void am65_cpsw_port_set_sl_mac(struct am65_cpsw_port *slave,
 				      const u8 *dev_addr)
@@ -933,7 +934,7 @@ static int am65_cpsw_xdp_tx_frame(struct net_device *ndev,
 	host_desc = k3_cppi_desc_pool_alloc(tx_chn->desc_pool);
 	if (unlikely(!host_desc)) {
 		ndev->stats.tx_dropped++;
-		return -ENOMEM;
+		return AM65_CPSW_XDP_CONSUMED;	/* drop */
 	}
 
 	am65_cpsw_nuss_set_buf_type(tx_chn, host_desc, buf_type);
@@ -942,7 +943,7 @@ static int am65_cpsw_xdp_tx_frame(struct net_device *ndev,
 				 pkt_len, DMA_TO_DEVICE);
 	if (unlikely(dma_mapping_error(tx_chn->dma_dev, dma_buf))) {
 		ndev->stats.tx_dropped++;
-		ret = -ENOMEM;
+		ret = AM65_CPSW_XDP_CONSUMED;	/* drop */
 		goto pool_free;
 	}
 
@@ -977,6 +978,7 @@ static int am65_cpsw_xdp_tx_frame(struct net_device *ndev,
 		/* Inform BQL */
 		netdev_tx_completed_queue(netif_txq, 1, pkt_len);
 		ndev->stats.tx_errors++;
+		ret = AM65_CPSW_XDP_CONSUMED; /* drop */
 		goto dma_unmap;
 	}
 
@@ -1004,6 +1006,7 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 	struct bpf_prog *prog;
 	struct page *page;
 	u32 act;
+	int err;
 
 	prog = READ_ONCE(port->xdp_prog);
 	if (!prog)
@@ -1023,14 +1026,14 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 
 		xdpf = xdp_convert_buff_to_frame(xdp);
 		if (unlikely(!xdpf))
-			break;
+			goto drop;
 
 		__netif_tx_lock(netif_txq, cpu);
-		ret = am65_cpsw_xdp_tx_frame(ndev, tx_chn, xdpf,
+		err = am65_cpsw_xdp_tx_frame(ndev, tx_chn, xdpf,
 					     AM65_CPSW_TX_BUF_TYPE_XDP_TX);
 		__netif_tx_unlock(netif_txq);
-		if (ret)
-			break;
+		if (err)
+			goto drop;
 
 		ndev->stats.rx_bytes += *len;
 		ndev->stats.rx_packets++;
@@ -1038,7 +1041,7 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 		goto out;
 	case XDP_REDIRECT:
 		if (unlikely(xdp_do_redirect(ndev, xdp, prog)))
-			break;
+			goto drop;
 
 		ndev->stats.rx_bytes += *len;
 		ndev->stats.rx_packets++;
@@ -1048,6 +1051,7 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 		bpf_warn_invalid_xdp_action(ndev, prog, act);
 		fallthrough;
 	case XDP_ABORTED:
+drop:
 		trace_xdp_exception(ndev, prog, act);
 		fallthrough;
 	case XDP_DROP:
@@ -1056,7 +1060,6 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 
 	page = virt_to_head_page(xdp->data);
 	am65_cpsw_put_page(rx_chn, page, true, desc_idx);
-
 out:
 	return ret;
 }
@@ -1095,7 +1098,7 @@ static void am65_cpsw_nuss_rx_csum(struct sk_buff *skb, u32 csum_info)
 }
 
 static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_common *common,
-				     u32 flow_idx, int cpu)
+				     u32 flow_idx, int cpu, int *xdp_state)
 {
 	struct am65_cpsw_rx_chn *rx_chn = &common->rx_chns;
 	u32 buf_dma_len, pkt_len, port_id = 0, csum_info;
@@ -1114,6 +1117,7 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_common *common,
 	void **swdata;
 	u32 *psdata;
 
+	*xdp_state = AM65_CPSW_XDP_PASS;
 	ret = k3_udma_glue_pop_rx_chn(rx_chn->rx_chn, flow_idx, &desc_dma);
 	if (ret) {
 		if (ret != -ENODATA)
@@ -1161,15 +1165,13 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_common *common,
 	}
 
 	if (port->xdp_prog) {
-		xdp_init_buff(&xdp, AM65_CPSW_MAX_PACKET_SIZE, &port->xdp_rxq);
-
-		xdp_prepare_buff(&xdp, page_addr, skb_headroom(skb),
+		xdp_init_buff(&xdp, PAGE_SIZE, &port->xdp_rxq);
+		xdp_prepare_buff(&xdp, page_addr, AM65_CPSW_HEADROOM,
 				 pkt_len, false);
-
-		ret = am65_cpsw_run_xdp(common, port, &xdp, desc_idx,
-					cpu, &pkt_len);
-		if (ret != AM65_CPSW_XDP_PASS)
-			return ret;
+		*xdp_state = am65_cpsw_run_xdp(common, port, &xdp, desc_idx,
+					       cpu, &pkt_len);
+		if (*xdp_state != AM65_CPSW_XDP_PASS)
+			goto allocate;
 
 		/* Compute additional headroom to be reserved */
 		headroom = (xdp.data - xdp.data_hard_start) - skb_headroom(skb);
@@ -1193,9 +1195,13 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_common *common,
 	stats->rx_bytes += pkt_len;
 	u64_stats_update_end(&stats->syncp);
 
+allocate:
 	new_page = page_pool_dev_alloc_pages(rx_chn->page_pool);
-	if (unlikely(!new_page))
+	if (unlikely(!new_page)) {
+		dev_err(dev, "page alloc failed\n");
 		return -ENOMEM;
+	}
+
 	rx_chn->pages[desc_idx] = new_page;
 
 	if (netif_dormant(ndev)) {
@@ -1229,8 +1235,9 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget)
 	struct am65_cpsw_common *common = am65_cpsw_napi_to_common(napi_rx);
 	int flow = AM65_CPSW_MAX_RX_FLOWS;
 	int cpu = smp_processor_id();
-	bool xdp_redirect = false;
+	int xdp_state_or = 0;
 	int cur_budget, ret;
+	int xdp_state;
 	int num_rx = 0;
 
 	/* process every flow */
@@ -1238,12 +1245,11 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget)
 		cur_budget = budget - num_rx;
 
 		while (cur_budget--) {
-			ret = am65_cpsw_nuss_rx_packets(common, flow, cpu);
-			if (ret) {
-				if (ret == AM65_CPSW_XDP_REDIRECT)
-					xdp_redirect = true;
+			ret = am65_cpsw_nuss_rx_packets(common, flow, cpu,
+							&xdp_state);
+			xdp_state_or |= xdp_state;
+			if (ret)
 				break;
-			}
 			num_rx++;
 		}
 
@@ -1251,7 +1257,7 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget)
 			break;
 	}
 
-	if (xdp_redirect)
+	if (xdp_state_or & AM65_CPSW_XDP_REDIRECT)
 		xdp_do_flush();
 
 	dev_dbg(common->dev, "%s num_rx:%d %d\n", __func__, num_rx, budget);

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH net 2/3] net: ethernet: ti: am65-cpsw: Fix NULL dereference on XDP_TX
  2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
  2024-08-29 12:03 ` [PATCH net 1/3] net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT Roger Quadros
@ 2024-08-29 12:03 ` Roger Quadros
  2024-08-29 12:03 ` [PATCH net 3/3] net: ethernet: ti: am65-cpsw: Fix RX statistics for XDP_TX and XDP_REDIRECT Roger Quadros
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Roger Quadros @ 2024-08-29 12:03 UTC (permalink / raw)
  To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
	John Fastabend, Julien Panis, Jacob Keller
  Cc: Siddharth Vadapalli, Md Danish Anwar, Vignesh Raghavendra,
	Govindarajan Sriramakrishnan, netdev, linux-kernel, bpf,
	Roger Quadros

If number of TX queues are set to 1 we get a NULL pointer
dereference during XDP_TX.

~# ethtool -L eth0 tx 1
~# ./xdp-trafficgen udp -A <ipv6-src> -a <ipv6-dst> eth0 -t 2
Transmitting on eth0 (ifindex 2)
[  241.135257] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030

Fix this by using actual TX queues instead of max TX queues
when picking the TX channel in am65_cpsw_ndo_xdp_xmit().

Fixes: 8acacc40f733 ("net: ethernet: ti: am65-cpsw: Add minimal XDP support")
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 9fd2ba26716c..03577a008df2 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -1924,12 +1924,13 @@ static int am65_cpsw_ndo_bpf(struct net_device *ndev, struct netdev_bpf *bpf)
 static int am65_cpsw_ndo_xdp_xmit(struct net_device *ndev, int n,
 				  struct xdp_frame **frames, u32 flags)
 {
+	struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
 	struct am65_cpsw_tx_chn *tx_chn;
 	struct netdev_queue *netif_txq;
 	int cpu = smp_processor_id();
 	int i, nxmit = 0;
 
-	tx_chn = &am65_ndev_to_common(ndev)->tx_chns[cpu % AM65_CPSW_MAX_TX_QUEUES];
+	tx_chn = &common->tx_chns[cpu % common->tx_ch_num];
 	netif_txq = netdev_get_tx_queue(ndev, tx_chn->id);
 
 	__netif_tx_lock(netif_txq, cpu);

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH net 3/3] net: ethernet: ti: am65-cpsw: Fix RX statistics for XDP_TX and XDP_REDIRECT
  2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
  2024-08-29 12:03 ` [PATCH net 1/3] net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT Roger Quadros
  2024-08-29 12:03 ` [PATCH net 2/3] net: ethernet: ti: am65-cpsw: Fix NULL dereference on XDP_TX Roger Quadros
@ 2024-08-29 12:03 ` Roger Quadros
  2024-08-29 20:15 ` [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Jacob Keller
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Roger Quadros @ 2024-08-29 12:03 UTC (permalink / raw)
  To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
	John Fastabend, Julien Panis, Jacob Keller
  Cc: Siddharth Vadapalli, Md Danish Anwar, Vignesh Raghavendra,
	Govindarajan Sriramakrishnan, netdev, linux-kernel, bpf,
	Roger Quadros

We are not using ndev->stats for rx_packets and rx_bytes anymore.
Instead, we use per CPU stats which are collated in
am65_cpsw_nuss_ndo_get_stats().

Fix RX statistics for XDP_TX and XDP_REDIRECT cases.

Fixes: 8acacc40f733 ("net: ethernet: ti: am65-cpsw: Add minimal XDP support")
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 03577a008df2..b06b8872b4eb 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -998,7 +998,9 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 			     int desc_idx, int cpu, int *len)
 {
 	struct am65_cpsw_rx_chn *rx_chn = &common->rx_chns;
+	struct am65_cpsw_ndev_priv *ndev_priv;
 	struct net_device *ndev = port->ndev;
+	struct am65_cpsw_ndev_stats *stats;
 	int ret = AM65_CPSW_XDP_CONSUMED;
 	struct am65_cpsw_tx_chn *tx_chn;
 	struct netdev_queue *netif_txq;
@@ -1016,6 +1018,9 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 	/* XDP prog might have changed packet data and boundaries */
 	*len = xdp->data_end - xdp->data;
 
+	ndev_priv = netdev_priv(ndev);
+	stats = this_cpu_ptr(ndev_priv->stats);
+
 	switch (act) {
 	case XDP_PASS:
 		ret = AM65_CPSW_XDP_PASS;
@@ -1035,16 +1040,20 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_common *common,
 		if (err)
 			goto drop;
 
-		ndev->stats.rx_bytes += *len;
-		ndev->stats.rx_packets++;
+		u64_stats_update_begin(&stats->syncp);
+		stats->rx_bytes += *len;
+		stats->rx_packets++;
+		u64_stats_update_end(&stats->syncp);
 		ret = AM65_CPSW_XDP_CONSUMED;
 		goto out;
 	case XDP_REDIRECT:
 		if (unlikely(xdp_do_redirect(ndev, xdp, prog)))
 			goto drop;
 
-		ndev->stats.rx_bytes += *len;
-		ndev->stats.rx_packets++;
+		u64_stats_update_begin(&stats->syncp);
+		stats->rx_bytes += *len;
+		stats->rx_packets++;
+		u64_stats_update_end(&stats->syncp);
 		ret = AM65_CPSW_XDP_REDIRECT;
 		goto out;
 	default:

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation
  2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
                   ` (2 preceding siblings ...)
  2024-08-29 12:03 ` [PATCH net 3/3] net: ethernet: ti: am65-cpsw: Fix RX statistics for XDP_TX and XDP_REDIRECT Roger Quadros
@ 2024-08-29 20:15 ` Jacob Keller
  2024-08-30  7:36 ` Julien Panis
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Jacob Keller @ 2024-08-29 20:15 UTC (permalink / raw)
  To: Roger Quadros, David S. Miller, Eric Dumazet, Jakub Kicinski,
	Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
	Jesper Dangaard Brouer, John Fastabend, Julien Panis
  Cc: Siddharth Vadapalli, Md Danish Anwar, Vignesh Raghavendra,
	Govindarajan Sriramakrishnan, netdev, linux-kernel, bpf



On 8/29/2024 5:03 AM, Roger Quadros wrote:
> The XDP implementation on am65-cpsw driver is broken in many ways
> and this series fixes it.
> 
> Below are the current issues that are being fixed:
> 
> 1)  The following XDP_DROP test from [1] stalls the interface after
>     250 packets.
>     ~# xdb-bench drop -m native eth0
>     This is because new RX requests are never queued. Fix that.
> 
> 2)  The below XDP_TX test from [1] fails with a warning
>     [  499.947381] XDP_WARN: xdp_update_frame_from_buff(line:277): Driver BUG: missing reserved tailroom
>     ~# xdb-bench tx -m native eth0
>     Fix that by using PAGE_SIZE during xdp_init_buf().
> 
> 3)  In XDP_REDIRECT case only 1 packet was processed in rx_poll.
>     Fix it to process up to budget packets.
>     ~# ./xdp-bench redirect -m native eth0 eth0
> 
> 4)  If number of TX queues are set to 1 we get a NULL pointer
>     dereference during XDP_TX.
>     ~# ethtool -L eth0 tx 1
>     ~# ./xdp-trafficgen udp -A <ipv6-src> -a <ipv6-dst> eth0 -t 2
>     Transmitting on eth0 (ifindex 2)
>     [  241.135257] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030
> 
> 5)  Net statistics is broken for XDP_TX and XDP_REDIRECT
> 
> [1] xdp-tools suite https://github.com/xdp-project/xdp-tools
> 

Everything in this series looks good to me.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation
  2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
                   ` (3 preceding siblings ...)
  2024-08-29 20:15 ` [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Jacob Keller
@ 2024-08-30  7:36 ` Julien Panis
  2024-08-30 10:10 ` MD Danish Anwar
  2024-09-03  9:00 ` patchwork-bot+netdevbpf
  6 siblings, 0 replies; 8+ messages in thread
From: Julien Panis @ 2024-08-30  7:36 UTC (permalink / raw)
  To: Roger Quadros, David S. Miller, Eric Dumazet, Jakub Kicinski,
	Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
	Jesper Dangaard Brouer, John Fastabend, Jacob Keller
  Cc: Siddharth Vadapalli, Md Danish Anwar, Vignesh Raghavendra,
	Govindarajan Sriramakrishnan, netdev, linux-kernel, bpf

On 8/29/24 14:03, Roger Quadros wrote:
> The XDP implementation on am65-cpsw driver is broken in many ways
> and this series fixes it.
>
> Below are the current issues that are being fixed:
>
> 1)  The following XDP_DROP test from [1] stalls the interface after
>      250 packets.
>      ~# xdb-bench drop -m native eth0
>      This is because new RX requests are never queued. Fix that.
>
> 2)  The below XDP_TX test from [1] fails with a warning
>      [  499.947381] XDP_WARN: xdp_update_frame_from_buff(line:277): Driver BUG: missing reserved tailroom
>      ~# xdb-bench tx -m native eth0
>      Fix that by using PAGE_SIZE during xdp_init_buf().
>
> 3)  In XDP_REDIRECT case only 1 packet was processed in rx_poll.
>      Fix it to process up to budget packets.
>      ~# ./xdp-bench redirect -m native eth0 eth0
>
> 4)  If number of TX queues are set to 1 we get a NULL pointer
>      dereference during XDP_TX.
>      ~# ethtool -L eth0 tx 1
>      ~# ./xdp-trafficgen udp -A <ipv6-src> -a <ipv6-dst> eth0 -t 2
>      Transmitting on eth0 (ifindex 2)
>      [  241.135257] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030
>
> 5)  Net statistics is broken for XDP_TX and XDP_REDIRECT
>
> [1] xdp-tools suite https://github.com/xdp-project/xdp-tools
>
> Signed-off-by: Roger Quadros <rogerq@kernel.org>
> ---
> Roger Quadros (3):
>        net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT
>        net: ethernet: ti: am65-cpsw: Fix NULL dereference on XDP_TX
>        net: ethernet: ti: am65-cpsw: Fix RX statistics for XDP_TX and XDP_REDIRECT
>
>   drivers/net/ethernet/ti/am65-cpsw-nuss.c | 82 +++++++++++++++++++-------------
>   1 file changed, 49 insertions(+), 33 deletions(-)
> ---
> base-commit: 5be63fc19fcaa4c236b307420483578a56986a37
> change-id: 20240829-am65-cpsw-xdp-d5876b25335c
>
> Best regards,

Thank you for the fixes Roger.

Acked-by: Julien Panis <jpanis@baylibre.com>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation
  2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
                   ` (4 preceding siblings ...)
  2024-08-30  7:36 ` Julien Panis
@ 2024-08-30 10:10 ` MD Danish Anwar
  2024-09-03  9:00 ` patchwork-bot+netdevbpf
  6 siblings, 0 replies; 8+ messages in thread
From: MD Danish Anwar @ 2024-08-30 10:10 UTC (permalink / raw)
  To: Roger Quadros, David S. Miller, Eric Dumazet, Jakub Kicinski,
	Paolo Abeni, Alexei Starovoitov, Daniel Borkmann,
	Jesper Dangaard Brouer, John Fastabend, Julien Panis,
	Jacob Keller
  Cc: Siddharth Vadapalli, Vignesh Raghavendra,
	Govindarajan Sriramakrishnan, netdev, linux-kernel, bpf



On 29/08/24 5:33 pm, Roger Quadros wrote:
> The XDP implementation on am65-cpsw driver is broken in many ways
> and this series fixes it.
> 
> Below are the current issues that are being fixed:
> 
> 1)  The following XDP_DROP test from [1] stalls the interface after
>     250 packets.
>     ~# xdb-bench drop -m native eth0
>     This is because new RX requests are never queued. Fix that.
> 
> 2)  The below XDP_TX test from [1] fails with a warning
>     [  499.947381] XDP_WARN: xdp_update_frame_from_buff(line:277): Driver BUG: missing reserved tailroom
>     ~# xdb-bench tx -m native eth0
>     Fix that by using PAGE_SIZE during xdp_init_buf().
> 
> 3)  In XDP_REDIRECT case only 1 packet was processed in rx_poll.
>     Fix it to process up to budget packets.
>     ~# ./xdp-bench redirect -m native eth0 eth0
> 
> 4)  If number of TX queues are set to 1 we get a NULL pointer
>     dereference during XDP_TX.
>     ~# ethtool -L eth0 tx 1
>     ~# ./xdp-trafficgen udp -A <ipv6-src> -a <ipv6-dst> eth0 -t 2
>     Transmitting on eth0 (ifindex 2)
>     [  241.135257] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030
> 
> 5)  Net statistics is broken for XDP_TX and XDP_REDIRECT
> 
> [1] xdp-tools suite https://github.com/xdp-project/xdp-tools
> 
> Signed-off-by: Roger Quadros <rogerq@kernel.org>

This series looks good to me.

Reviewed-by: MD Danish Anwar <danishanwar@ti.com>

-- 
Thanks and Regards,
Danish

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation
  2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
                   ` (5 preceding siblings ...)
  2024-08-30 10:10 ` MD Danish Anwar
@ 2024-09-03  9:00 ` patchwork-bot+netdevbpf
  6 siblings, 0 replies; 8+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-09-03  9:00 UTC (permalink / raw)
  To: Roger Quadros
  Cc: davem, edumazet, kuba, pabeni, ast, daniel, hawk, john.fastabend,
	jpanis, jacob.e.keller, s-vadapalli, danishanwar, vigneshr, srk,
	netdev, linux-kernel, bpf

Hello:

This series was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:

On Thu, 29 Aug 2024 15:03:18 +0300 you wrote:
> The XDP implementation on am65-cpsw driver is broken in many ways
> and this series fixes it.
> 
> Below are the current issues that are being fixed:
> 
> 1)  The following XDP_DROP test from [1] stalls the interface after
>     250 packets.
>     ~# xdb-bench drop -m native eth0
>     This is because new RX requests are never queued. Fix that.
> 
> [...]

Here is the summary with links:
  - [net,1/3] net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT
    https://git.kernel.org/netdev/net/c/5e24db550bd6
  - [net,2/3] net: ethernet: ti: am65-cpsw: Fix NULL dereference on XDP_TX
    https://git.kernel.org/netdev/net/c/0a50c35277f9
  - [net,3/3] net: ethernet: ti: am65-cpsw: Fix RX statistics for XDP_TX and XDP_REDIRECT
    https://git.kernel.org/netdev/net/c/624d3291484f

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-09-03  9:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-29 12:03 [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Roger Quadros
2024-08-29 12:03 ` [PATCH net 1/3] net: ethernet: ti: am65-cpsw: fix XDP_DROP, XDP_TX and XDP_REDIRECT Roger Quadros
2024-08-29 12:03 ` [PATCH net 2/3] net: ethernet: ti: am65-cpsw: Fix NULL dereference on XDP_TX Roger Quadros
2024-08-29 12:03 ` [PATCH net 3/3] net: ethernet: ti: am65-cpsw: Fix RX statistics for XDP_TX and XDP_REDIRECT Roger Quadros
2024-08-29 20:15 ` [PATCH net 0/3] net: ethernet: ti: am65-cpsw: Fix XDP implementation Jacob Keller
2024-08-30  7:36 ` Julien Panis
2024-08-30 10:10 ` MD Danish Anwar
2024-09-03  9:00 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).