* [PATCH net v3] net: xilinx: axienet: Fix IRQ coalescing packet count overflow
@ 2025-01-09 22:42 Sean Anderson
2025-01-09 23:24 ` Sean Anderson
0 siblings, 1 reply; 2+ messages in thread
From: Sean Anderson @ 2025-01-09 22:42 UTC (permalink / raw)
To: Radhey Shyam Pandey, Shannon Nelson, David S . Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev
Cc: Michal Simek, Simon Horman, Daniel Borkmann, Andy Chiu,
linux-arm-kernel, linux-kernel, Sean Anderson
If coalece_count is greater than 255 it will not fit in the register and
will overflow. This can be reproduced by running
# ethtool -C ethX rx-frames 256
which will result in a timeout of 0us instead. Fix this by checking for
invalid values and reporting an error.
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Fixes: 8a3b7a252dca ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver")
---
Changes in v3:
- Validate and reject instead of silently clamping
Changes in v2:
- Use FIELD_MAX to extract the max value from the mask
- Expand the commit message with an example on how to reproduce this
issue
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 0f4b02fe6f85..c2991aeccf2b 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -2056,6 +2056,12 @@ axienet_ethtools_set_coalesce(struct net_device *ndev,
return -EBUSY;
}
+ if (ecoalesce->rx_max_coalesced_frames > 255 ||
+ ecoalesce->rx_max_coalesced_frames > 255) {
+ NL_SET_ERR_MSG(extack, "frames must be less than 256");
+ return -EINVAL;
+ }
+
if (ecoalesce->rx_max_coalesced_frames)
lp->coalesce_count_rx = ecoalesce->rx_max_coalesced_frames;
if (ecoalesce->rx_coalesce_usecs)
--
2.35.1.1320.gc452695387.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net v3] net: xilinx: axienet: Fix IRQ coalescing packet count overflow
2025-01-09 22:42 [PATCH net v3] net: xilinx: axienet: Fix IRQ coalescing packet count overflow Sean Anderson
@ 2025-01-09 23:24 ` Sean Anderson
0 siblings, 0 replies; 2+ messages in thread
From: Sean Anderson @ 2025-01-09 23:24 UTC (permalink / raw)
To: Radhey Shyam Pandey, Shannon Nelson, David S . Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev
Cc: Michal Simek, Simon Horman, Daniel Borkmann, Andy Chiu,
linux-arm-kernel, linux-kernel
On 1/9/25 17:42, Sean Anderson wrote:
> If coalece_count is greater than 255 it will not fit in the register and
> will overflow. This can be reproduced by running
>
> # ethtool -C ethX rx-frames 256
>
> which will result in a timeout of 0us instead. Fix this by checking for
> invalid values and reporting an error.
>
> Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
> Fixes: 8a3b7a252dca ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver")
> ---
>
> Changes in v3:
> - Validate and reject instead of silently clamping
>
> Changes in v2:
> - Use FIELD_MAX to extract the max value from the mask
> - Expand the commit message with an example on how to reproduce this
> issue
>
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 0f4b02fe6f85..c2991aeccf2b 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -2056,6 +2056,12 @@ axienet_ethtools_set_coalesce(struct net_device *ndev,
> return -EBUSY;
> }
>
> + if (ecoalesce->rx_max_coalesced_frames > 255 ||
> + ecoalesce->rx_max_coalesced_frames > 255) {
The second line should be for tx and not rx.
Will resend tomorrow if no other feedback.
--Sean
> + NL_SET_ERR_MSG(extack, "frames must be less than 256");
> + return -EINVAL;
> + }
> +
> if (ecoalesce->rx_max_coalesced_frames)
> lp->coalesce_count_rx = ecoalesce->rx_max_coalesced_frames;
> if (ecoalesce->rx_coalesce_usecs)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-09 23:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-09 22:42 [PATCH net v3] net: xilinx: axienet: Fix IRQ coalescing packet count overflow Sean Anderson
2025-01-09 23:24 ` Sean Anderson
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).