* [PATCH net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit
@ 2025-05-21 18:16 Suraj Gupta
2025-05-23 16:20 ` Sean Anderson
2025-05-27 6:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 4+ messages in thread
From: Suraj Gupta @ 2025-05-21 18:16 UTC (permalink / raw)
To: andrew+netdev, davem, edumazet, kuba, pabeni, michal.simek,
sean.anderson, radhey.shyam.pandey, horms
Cc: netdev, linux-arm-kernel, linux-kernel, git, harini.katakam
In Dmaengine flow, driver maintains struct skbuf_dma_descriptor rings each
element of which corresponds to a skb. In Tx datapath, compare available
space in skb ring with number of skbs instead of skb fragments.
Replace x * (MAX_SKB_FRAGS) in netif_txq_completed_wake() and
netif_txq_maybe_stop() with x * (1 skb) to fix the comparison.
Fixes: 6a91b846af85 ("net: axienet: Introduce dmaengine support")
Signed-off-by: Suraj Gupta <suraj.gupta2@amd.com>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 1b7a653c1f4e..6011d7eae0c7 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -880,7 +880,7 @@ static void axienet_dma_tx_cb(void *data, const struct dmaengine_result *result)
dev_consume_skb_any(skbuf_dma->skb);
netif_txq_completed_wake(txq, 1, len,
CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX),
- 2 * MAX_SKB_FRAGS);
+ 2);
}
/**
@@ -914,7 +914,7 @@ axienet_start_xmit_dmaengine(struct sk_buff *skb, struct net_device *ndev)
dma_dev = lp->tx_chan->device;
sg_len = skb_shinfo(skb)->nr_frags + 1;
- if (CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX) <= sg_len) {
+ if (CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX) <= 1) {
netif_stop_queue(ndev);
if (net_ratelimit())
netdev_warn(ndev, "TX ring unexpectedly full\n");
@@ -964,7 +964,7 @@ axienet_start_xmit_dmaengine(struct sk_buff *skb, struct net_device *ndev)
txq = skb_get_tx_queue(lp->ndev, skb);
netdev_tx_sent_queue(txq, skb->len);
netif_txq_maybe_stop(txq, CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX),
- MAX_SKB_FRAGS + 1, 2 * MAX_SKB_FRAGS);
+ 1, 2);
dmaengine_submit(dma_tx_desc);
dma_async_issue_pending(lp->tx_chan);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit
2025-05-21 18:16 [PATCH net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit Suraj Gupta
@ 2025-05-23 16:20 ` Sean Anderson
2025-05-23 16:21 ` Sean Anderson
2025-05-27 6:30 ` patchwork-bot+netdevbpf
1 sibling, 1 reply; 4+ messages in thread
From: Sean Anderson @ 2025-05-23 16:20 UTC (permalink / raw)
To: Suraj Gupta, andrew+netdev, davem, edumazet, kuba, pabeni,
michal.simek, radhey.shyam.pandey, horms
Cc: netdev, linux-arm-kernel, linux-kernel, git, harini.katakam
On 5/21/25 14:16, Suraj Gupta wrote:
> In Dmaengine flow, driver maintains struct skbuf_dma_descriptor rings each
> element of which corresponds to a skb. In Tx datapath, compare available
> space in skb ring with number of skbs instead of skb fragments.
> Replace x * (MAX_SKB_FRAGS) in netif_txq_completed_wake() and
> netif_txq_maybe_stop() with x * (1 skb) to fix the comparison.
>
> Fixes: 6a91b846af85 ("net: axienet: Introduce dmaengine support")
> Signed-off-by: Suraj Gupta <suraj.gupta2@amd.com>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 1b7a653c1f4e..6011d7eae0c7 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -880,7 +880,7 @@ static void axienet_dma_tx_cb(void *data, const struct dmaengine_result *result)
> dev_consume_skb_any(skbuf_dma->skb);
> netif_txq_completed_wake(txq, 1, len,
> CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX),
> - 2 * MAX_SKB_FRAGS);
> + 2);
> }
>
> /**
> @@ -914,7 +914,7 @@ axienet_start_xmit_dmaengine(struct sk_buff *skb, struct net_device *ndev)
>
> dma_dev = lp->tx_chan->device;
> sg_len = skb_shinfo(skb)->nr_frags + 1;
> - if (CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX) <= sg_len) {
> + if (CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX) <= 1) {
> netif_stop_queue(ndev);
> if (net_ratelimit())
> netdev_warn(ndev, "TX ring unexpectedly full\n");
> @@ -964,7 +964,7 @@ axienet_start_xmit_dmaengine(struct sk_buff *skb, struct net_device *ndev)
> txq = skb_get_tx_queue(lp->ndev, skb);
> netdev_tx_sent_queue(txq, skb->len);
> netif_txq_maybe_stop(txq, CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX),
> - MAX_SKB_FRAGS + 1, 2 * MAX_SKB_FRAGS);
> + 1, 2);
>
> dmaengine_submit(dma_tx_desc);
> dma_async_issue_pending(lp->tx_chan);
Reviwed-by: Sean Anderson <sean.anderson@linux.dev>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit
2025-05-23 16:20 ` Sean Anderson
@ 2025-05-23 16:21 ` Sean Anderson
0 siblings, 0 replies; 4+ messages in thread
From: Sean Anderson @ 2025-05-23 16:21 UTC (permalink / raw)
To: Suraj Gupta, andrew+netdev, davem, edumazet, kuba, pabeni,
michal.simek, radhey.shyam.pandey, horms
Cc: netdev, linux-arm-kernel, linux-kernel, git, harini.katakam
On 5/23/25 12:20, Sean Anderson wrote:
> On 5/21/25 14:16, Suraj Gupta wrote:
>> In Dmaengine flow, driver maintains struct skbuf_dma_descriptor rings each
>> element of which corresponds to a skb. In Tx datapath, compare available
>> space in skb ring with number of skbs instead of skb fragments.
>> Replace x * (MAX_SKB_FRAGS) in netif_txq_completed_wake() and
>> netif_txq_maybe_stop() with x * (1 skb) to fix the comparison.
>>
>> Fixes: 6a91b846af85 ("net: axienet: Introduce dmaengine support")
>> Signed-off-by: Suraj Gupta <suraj.gupta2@amd.com>
>> ---
>> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>> index 1b7a653c1f4e..6011d7eae0c7 100644
>> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>> @@ -880,7 +880,7 @@ static void axienet_dma_tx_cb(void *data, const struct dmaengine_result *result)
>> dev_consume_skb_any(skbuf_dma->skb);
>> netif_txq_completed_wake(txq, 1, len,
>> CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX),
>> - 2 * MAX_SKB_FRAGS);
>> + 2);
>> }
>>
>> /**
>> @@ -914,7 +914,7 @@ axienet_start_xmit_dmaengine(struct sk_buff *skb, struct net_device *ndev)
>>
>> dma_dev = lp->tx_chan->device;
>> sg_len = skb_shinfo(skb)->nr_frags + 1;
>> - if (CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX) <= sg_len) {
>> + if (CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX) <= 1) {
>> netif_stop_queue(ndev);
>> if (net_ratelimit())
>> netdev_warn(ndev, "TX ring unexpectedly full\n");
>> @@ -964,7 +964,7 @@ axienet_start_xmit_dmaengine(struct sk_buff *skb, struct net_device *ndev)
>> txq = skb_get_tx_queue(lp->ndev, skb);
>> netdev_tx_sent_queue(txq, skb->len);
>> netif_txq_maybe_stop(txq, CIRC_SPACE(lp->tx_ring_head, lp->tx_ring_tail, TX_BD_NUM_MAX),
>> - MAX_SKB_FRAGS + 1, 2 * MAX_SKB_FRAGS);
>> + 1, 2);
>>
>> dmaengine_submit(dma_tx_desc);
>> dma_async_issue_pending(lp->tx_chan);
>
> Reviwed-by: Sean Anderson <sean.anderson@linux.dev>
Reviewed-by: Sean Anderson <sean.anderson@linux.dev>
*spelling
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit
2025-05-21 18:16 [PATCH net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit Suraj Gupta
2025-05-23 16:20 ` Sean Anderson
@ 2025-05-27 6:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-05-27 6:30 UTC (permalink / raw)
To: Suraj Gupta
Cc: andrew+netdev, davem, edumazet, kuba, pabeni, michal.simek,
sean.anderson, radhey.shyam.pandey, horms, netdev,
linux-arm-kernel, linux-kernel, git, harini.katakam
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:
On Wed, 21 May 2025 23:46:08 +0530 you wrote:
> In Dmaengine flow, driver maintains struct skbuf_dma_descriptor rings each
> element of which corresponds to a skb. In Tx datapath, compare available
> space in skb ring with number of skbs instead of skb fragments.
> Replace x * (MAX_SKB_FRAGS) in netif_txq_completed_wake() and
> netif_txq_maybe_stop() with x * (1 skb) to fix the comparison.
>
> Fixes: 6a91b846af85 ("net: axienet: Introduce dmaengine support")
> Signed-off-by: Suraj Gupta <suraj.gupta2@amd.com>
>
> [...]
Here is the summary with links:
- [net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit
https://git.kernel.org/netdev/net/c/32374234ab01
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] 4+ messages in thread
end of thread, other threads:[~2025-05-27 6:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-21 18:16 [PATCH net] net: xilinx: axienet: Fix Tx skb circular buffer occupancy check in dmaengine xmit Suraj Gupta
2025-05-23 16:20 ` Sean Anderson
2025-05-23 16:21 ` Sean Anderson
2025-05-27 6:30 ` 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).