* [PATCH v4] net: fec: using the standard return codes when xdp xmit errors
@ 2023-05-12 13:20 Shenwei Wang
2023-05-12 14:00 ` Horatiu Vultur
0 siblings, 1 reply; 2+ messages in thread
From: Shenwei Wang @ 2023-05-12 13:20 UTC (permalink / raw)
To: Wei Fang, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: Shenwei Wang, Clark Wang, NXP Linux Team, Alexei Starovoitov,
Daniel Borkmann, Jesper Dangaard Brouer, John Fastabend,
Alexander Lobakin, Horatiu Vultur, Simon Horman, netdev,
linux-kernel, imx, Simon Horman
This patch standardizes the inconsistent return values for unsuccessful
XDP transmits by using standardized error codes (-EBUSY or -ENOMEM).
Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
---
v4:
- remove the fix of double call of xdp_return_frame in this patch and
will correct it in another patch for net.
v3:
- remove the fix tag.
- resend to net-next
v2:
- focusing on code clean up per Simon's feedback.
drivers/net/ethernet/freescale/fec_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 42ec6ca3bf03..cd215ab20ff9 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3799,7 +3799,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
if (entries_free < MAX_SKB_FRAGS + 1) {
netdev_err(fep->netdev, "NOT enough BD for SG!\n");
xdp_return_frame(frame);
- return NETDEV_TX_BUSY;
+ return -EBUSY;
}
/* Fill in a Tx ring entry */
@@ -3813,7 +3813,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
dma_addr = dma_map_single(&fep->pdev->dev, frame->data,
frame->len, DMA_TO_DEVICE);
if (dma_mapping_error(&fep->pdev->dev, dma_addr))
- return FEC_ENET_XDP_CONSUMED;
+ return -ENOMEM;
status |= (BD_ENET_TX_INTR | BD_ENET_TX_LAST);
if (fep->bufdesc_ex)
@@ -3869,7 +3869,7 @@ static int fec_enet_xdp_xmit(struct net_device *dev,
__netif_tx_lock(nq, cpu);
for (i = 0; i < num_frames; i++) {
- if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) != 0)
+ if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) < 0)
break;
sent_frames++;
}
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v4] net: fec: using the standard return codes when xdp xmit errors
2023-05-12 13:20 [PATCH v4] net: fec: using the standard return codes when xdp xmit errors Shenwei Wang
@ 2023-05-12 14:00 ` Horatiu Vultur
0 siblings, 0 replies; 2+ messages in thread
From: Horatiu Vultur @ 2023-05-12 14:00 UTC (permalink / raw)
To: Shenwei Wang
Cc: Wei Fang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Clark Wang, NXP Linux Team, Alexei Starovoitov,
Daniel Borkmann, Jesper Dangaard Brouer, John Fastabend,
Alexander Lobakin, Simon Horman, netdev, linux-kernel, imx,
Simon Horman
The 05/12/2023 08:20, Shenwei Wang wrote:
>
> This patch standardizes the inconsistent return values for unsuccessful
> XDP transmits by using standardized error codes (-EBUSY or -ENOMEM).
Just a small thing, you have forgot to add net-next in the subject.
I think you should hold back this patch until the fix that you have sent
to net will reach net-next, otherwise will be a small conflict.
Other than that it looks great. Thanks!
Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
>
> Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> ---
> v4:
> - remove the fix of double call of xdp_return_frame in this patch and
> will correct it in another patch for net.
>
> v3:
> - remove the fix tag.
> - resend to net-next
>
> v2:
> - focusing on code clean up per Simon's feedback.
>
> drivers/net/ethernet/freescale/fec_main.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index 42ec6ca3bf03..cd215ab20ff9 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -3799,7 +3799,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
> if (entries_free < MAX_SKB_FRAGS + 1) {
> netdev_err(fep->netdev, "NOT enough BD for SG!\n");
> xdp_return_frame(frame);
> - return NETDEV_TX_BUSY;
> + return -EBUSY;
> }
>
> /* Fill in a Tx ring entry */
> @@ -3813,7 +3813,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
> dma_addr = dma_map_single(&fep->pdev->dev, frame->data,
> frame->len, DMA_TO_DEVICE);
> if (dma_mapping_error(&fep->pdev->dev, dma_addr))
> - return FEC_ENET_XDP_CONSUMED;
> + return -ENOMEM;
>
> status |= (BD_ENET_TX_INTR | BD_ENET_TX_LAST);
> if (fep->bufdesc_ex)
> @@ -3869,7 +3869,7 @@ static int fec_enet_xdp_xmit(struct net_device *dev,
> __netif_tx_lock(nq, cpu);
>
> for (i = 0; i < num_frames; i++) {
> - if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) != 0)
> + if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) < 0)
> break;
> sent_frames++;
> }
> --
> 2.34.1
>
--
/Horatiu
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-12 14:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-12 13:20 [PATCH v4] net: fec: using the standard return codes when xdp xmit errors Shenwei Wang
2023-05-12 14:00 ` Horatiu Vultur
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®