github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-09 12:06:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

eth: fbnic: Avoid rounding zero ring sizes

Browse Source 
roundup_pow_of_two() is undefined for zero. ethtool permits a zero ring
size to reach the driver, where the minimum-size check should reject it.

Leave zero unchanged while rounding nonzero ring sizes. The minimum-size
check then rejects zero deterministically without changing the established
behavior for other values.

Fixes: 6cbf18a05c ("eth: fbnic: support ring size configuration")
Reported-by: Sashiko <netdev-bot+sashiko@kernel.org>
Link: https://lore.kernel.org/netdev/178971206933.22033.236948278674126701@kernel.org/
Suggested-by: Alexander Duyck <alexanderduyck@fb.com>
Signed-off-by: Björn Töpel <bjorn@kernel.org>
Reviewed-by: Joe Damato <joe@dama.to>
Link: https://patch.msgid.link/20260918114641.1281172-1-bjorn@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Björn Töpel 2026-09-18 13:46:40 +02:00 committed by Jakub Kicinski
parent f764634137
commit 0160953d8e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
View File

@ -313,6 +313,11 @@ fbnic_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring,
kernel_ring->hds_thresh = fbn->hds_thresh;
}
static u32 fbnic_ring_size_pow2(u32 size)
{
return size ? roundup_pow_of_two(size) : 0;
}
static void fbnic_set_rings(struct fbnic_net *fbn,
struct ethtool_ringparam *ring,
struct kernel_ethtool_ringparam *kernel_ring)
@ -334,10 +339,10 @@ fbnic_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring,
struct fbnic_net *clone;
int err;
ring->rx_pending = roundup_pow_of_two(ring->rx_pending);
ring->rx_mini_pending = roundup_pow_of_two(ring->rx_mini_pending);
ring->rx_jumbo_pending = roundup_pow_of_two(ring->rx_jumbo_pending);
ring->tx_pending = roundup_pow_of_two(ring->tx_pending);
ring->rx_pending = fbnic_ring_size_pow2(ring->rx_pending);
ring->rx_mini_pending = fbnic_ring_size_pow2(ring->rx_mini_pending);
ring->rx_jumbo_pending = fbnic_ring_size_pow2(ring->rx_jumbo_pending);
ring->tx_pending = fbnic_ring_size_pow2(ring->tx_pending);
/* These are absolute minimums allowing the device and driver to operate
* but not necessarily guarantee reasonable performance. Settings below