iavf: Fix error when changing ring parameters on ice PF
Subsystems (2)
PATCH v3 1/1 iavf: Fix error when changing ring parameters on ice PF
Reset is triggered when ring parameters are being changed through ethtool and queues are reconfigured for VF's VSI. If ring is changed again immediately, then the next reset could be executed before queues could be properly reinitialized on VF's VSI. It caused ice PF to mess up the VSI resource tree.
Add a check in iavf_set_ringparam for adapter and VF's queue state. If VF is currently resetting or queues are disabled for the VF return with EAGAIN error.
---
v3: Correct patch to be send on right tree
v2: Changed unnecessary parentheses
---
--- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +5 -0
@@ -631,6 +631,11 @@ static int iavf_set_ringparam(struct net_device *netdev,if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))return -EINVAL ; +if (adapter->state == __IAVF_RESETTING || + adapter->state == __IAVF_RUNNING && + (adapter->flags &IAVF_FLAG_QUEUES_DISABLED )) +return -EAGAIN ; + if (ring->tx_pending > IAVF_MAX_TXD || ring->tx_pending < IAVF_MIN_TXD || ring->rx_pending > IAVF_MAX_RXD ||
Signature · 1 line
2.27.0
Tony Nguyen
maintainerPATCH v3 1/1 iavf: Fix error when changing ring parameters on ice PF
Quoted 10 lines · Michal Maloszewski
Reset is triggered when ring parameters are being changed through ethtool and queues are reconfigured for VF's VSI. If ring is changed again immediately, then the next reset could be executed before queues could be properly reinitialized on VF's VSI. It caused ice PF to mess up the VSI resource tree.
Add a check in
iavf_set_ringparamfor adapter and VF's queue state. If VF is currently resetting or queues are disabled for the VF return with EAGAIN error.
Quoted 6 lines
Fixes d732a1844507 ("i40evf: fix crash when changing ring sizes")Signed-off-by Sylwester Dziedziuch<[email protected]>Signed-off-by Michal Maloszewski<[email protected]>---
v3: Correct patch to be send on right tree
v2: Changed unnecessary parentheses
As I mentioned in v2, this still does not address any of the comments from netdev[1]
- Tony
[1] https://lore.kernel.org/netdev/20220422154752.1fab6496 at kernel.org/
Quoted 11 lines
---
--- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/net/ethernet/intel/iavf/iavf_ethtool.c +0
-0@@ -631,6 +631,11 @@ static int iavf_set_ringparam(struct net_device *netdev,if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
drivers/net/ethernet/intel/iavf/iavf_ethtool.c static int iavf_set_ringparam(struct net_device *netdev, · line 641
Quoted 10 lines
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +5
-0return -EINVAL ; +if (adapter->state == __IAVF_RESETTING || + adapter->state == __IAVF_RUNNING && + (adapter->flags &IAVF_FLAG_QUEUES_DISABLED )) +return -EAGAIN ; + if (ring->tx_pending > IAVF_MAX_TXD || ring->tx_pending < IAVF_MIN_TXD || ring->rx_pending > IAVF_MAX_RXD ||
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20220427/43d324ec/attachment-0001.html>