Commit 8e679021 authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher

ixgbe: incorrect XDP ring accounting in ethtool tx_frame param

Changing the TX ring parameters with an XDP program attached may
cause the XDP queues to be cleared and the TX rings to be incorrectly
configured.

Fix by doing correct ring accounting in setup call.

Fixes: 33fdc82f ("ixgbe: add support for XDP_TX action")
Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5e0fac63
...@@ -1048,7 +1048,7 @@ static int ixgbe_set_ringparam(struct net_device *netdev, ...@@ -1048,7 +1048,7 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
struct ixgbe_ring *temp_ring; struct ixgbe_ring *temp_ring;
int i, err = 0; int i, j, err = 0;
u32 new_rx_count, new_tx_count; u32 new_rx_count, new_tx_count;
if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending)) if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
...@@ -1085,8 +1085,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev, ...@@ -1085,8 +1085,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
} }
/* allocate temporary buffer to store rings in */ /* allocate temporary buffer to store rings in */
i = max_t(int, adapter->num_tx_queues, adapter->num_rx_queues); i = max_t(int, adapter->num_tx_queues + adapter->num_xdp_queues,
i = max_t(int, i, adapter->num_xdp_queues); adapter->num_rx_queues);
temp_ring = vmalloc(i * sizeof(struct ixgbe_ring)); temp_ring = vmalloc(i * sizeof(struct ixgbe_ring));
if (!temp_ring) { if (!temp_ring) {
...@@ -1118,8 +1118,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev, ...@@ -1118,8 +1118,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
} }
} }
for (i = 0; i < adapter->num_xdp_queues; i++) { for (j = 0; j < adapter->num_xdp_queues; j++, i++) {
memcpy(&temp_ring[i], adapter->xdp_ring[i], memcpy(&temp_ring[i], adapter->xdp_ring[j],
sizeof(struct ixgbe_ring)); sizeof(struct ixgbe_ring));
temp_ring[i].count = new_tx_count; temp_ring[i].count = new_tx_count;
...@@ -1139,10 +1139,10 @@ static int ixgbe_set_ringparam(struct net_device *netdev, ...@@ -1139,10 +1139,10 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
memcpy(adapter->tx_ring[i], &temp_ring[i], memcpy(adapter->tx_ring[i], &temp_ring[i],
sizeof(struct ixgbe_ring)); sizeof(struct ixgbe_ring));
} }
for (i = 0; i < adapter->num_xdp_queues; i++) { for (j = 0; j < adapter->num_xdp_queues; j++, i++) {
ixgbe_free_tx_resources(adapter->xdp_ring[i]); ixgbe_free_tx_resources(adapter->xdp_ring[j]);
memcpy(adapter->xdp_ring[i], &temp_ring[i], memcpy(adapter->xdp_ring[j], &temp_ring[i],
sizeof(struct ixgbe_ring)); sizeof(struct ixgbe_ring));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment