| Message ID | 20220427115220.163736-1-michal.maloszewski@intel.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [net,v3] iavf: Fix error when changing ring parameters on ice PF | expand |
On 4/27/2022 4:52 AM, Michal Maloszewski wrote: > 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. > > Fixes: d732a1844507 ("i40evf: fix crash when changing ring sizes") > Signed-off-by: Sylwester Dziedziuch<sylwesterx.dziedziuch@intel.com> > Signed-off-by: Michal Maloszewski<michal.maloszewski@intel.com> > --- > 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@kernel.org/ > --- > --- > drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > index 3bb56714beb0..a27df8af5cff 100644 > --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c > @@ -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 ||
diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c index 3bb56714beb0..a27df8af5cff 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c @@ -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 ||
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. Fixes: d732a1844507 ("i40evf: fix crash when changing ring sizes") Signed-off-by: Sylwester Dziedziuch <sylwesterx.dziedziuch@intel.com> Signed-off-by: Michal Maloszewski <michal.maloszewski@intel.com> --- 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(+)