Message ID | 20230613121610.137654-1-ivecera@redhat.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next,1/2] i40e: Add helper for VF inited state check with timeout | expand |
On Tue, Jun 13, 2023 at 02:16:09PM +0200, Ivan Vecera wrote: > Move the check for VF inited state (with optional up-to 300ms > timeout to separate helper i40e_check_vf_init_timeout() that > will be used in the following commit. > > Tested-by: Ma Yuying <yuma@redhat.com> > Signed-off-by: Ivan Vecera <ivecera@redhat.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Simon Horman > Sent: środa, 14 czerwca 2023 10:26 > To: ivecera <ivecera@redhat.com> > Cc: Ma Yuying <yuma@redhat.com>; netdev@vger.kernel.org; Brandeburg, > Jesse <jesse.brandeburg@intel.com>; open list <linux- > kernel@vger.kernel.org>; Eric Dumazet <edumazet@google.com>; Nguyen, > Anthony L <anthony.l.nguyen@intel.com>; moderated list:INTEL ETHERNET > DRIVERS <intel-wired-lan@lists.osuosl.org>; Jakub Kicinski > <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; David S. Miller > <davem@davemloft.net> > Subject: Re: [Intel-wired-lan] [PATCH net-next 1/2] i40e: Add helper for VF > inited state check with timeout > > On Tue, Jun 13, 2023 at 02:16:09PM +0200, Ivan Vecera wrote: > > Move the check for VF inited state (with optional up-to 300ms timeout > > to separate helper i40e_check_vf_init_timeout() that will be used in > > the following commit. > > > > Tested-by: Ma Yuying <yuma@redhat.com> > > Signed-off-by: Ivan Vecera <ivecera@redhat.com> > > Reviewed-by: Simon Horman <simon.horman@corigine.com> > > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan@osuosl.org > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index be59ba3774e1..b84b6b675fa7 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -4304,6 +4304,36 @@ static int i40e_validate_vf(struct i40e_pf *pf, int vf_id) return ret; } +/** + * i40e_check_vf_init_timeout + * @vf: the virtual function + * + * Check that the VF's initialization was successfully done and if not + * wait up to 300ms for its finish. + * + * Returns true when VF is initialized, false on timeout + **/ +static bool i40e_check_vf_init_timeout(struct i40e_vf *vf) +{ + int i; + + /* When the VF is resetting wait until it is done. + * It can take up to 200 milliseconds, but wait for + * up to 300 milliseconds to be safe. + */ + for (i = 0; i < 15; i++) { + if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) + return true; + + msleep(20); + } + + dev_err(&vf->pf->pdev->dev, "VF %d still in reset. Try again.\n", + vf->vf_id); + + return false; +} + /** * i40e_ndo_set_vf_mac * @netdev: network interface device structure @@ -4322,7 +4352,6 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) int ret = 0; struct hlist_node *h; int bkt; - u8 i; if (test_and_set_bit(__I40E_VIRTCHNL_OP_PENDING, pf->state)) { dev_warn(&pf->pdev->dev, "Unable to configure VFs, other operation is pending.\n"); @@ -4335,21 +4364,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) goto error_param; vf = &pf->vf[vf_id]; - - /* When the VF is resetting wait until it is done. - * It can take up to 200 milliseconds, - * but wait for up to 300 milliseconds to be safe. - * Acquire the VSI pointer only after the VF has been - * properly initialized. - */ - for (i = 0; i < 15; i++) { - if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) - break; - msleep(20); - } - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { - dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", - vf_id); + if (!i40e_check_vf_init_timeout(vf)) { ret = -EAGAIN; goto error_param; }