| Message ID | 20231212092903.446491-1-larysa.zaremba@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | [iwl-net] ice: Fix PF with enabled XDP going no-carrier after reset | expand |
On Tue, Dec 12, 2023 at 10:29:01AM +0100, Larysa Zaremba wrote: > Commit 6624e780a577fc596788 ("ice: split ice_vsi_setup into smaller > functions") has refactored a bunch of code involved in PFR. In this > process, TC queue number adjustment for XDP was lost. Bring it back. > > Lack of such adjustment causes interface to go into no-carrier after a > reset, if XDP program is attached, with the following message: > > ice 0000:b1:00.0: Failed to set LAN Tx queue context, error: -22 > ice 0000:b1:00.0 ens801f0np0: Failed to open VSI 0x0006 on switch 0x0001 > ice 0000:b1:00.0: enable VSI failed, err -22, VSI index 0, type ICE_VSI_PF > ice 0000:b1:00.0: PF VSI rebuild failed: -22 > ice 0000:b1:00.0: Rebuild failed, unload and reload driver > > Fixes: 6624e780a577 ("ice: split ice_vsi_setup into smaller functions") > Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> Reviewed-by: Simon Horman <horms@kernel.org>
>-----Original Message----- >From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of >Zaremba, Larysa >Sent: Tuesday, December 12, 2023 2:59 PM >To: intel-wired-lan@lists.osuosl.org >Cc: Zaremba, Larysa <larysa.zaremba@intel.com>; netdev@vger.kernel.org; >Brandeburg, Jesse <jesse.brandeburg@intel.com>; Nguyen, Anthony L ><anthony.l.nguyen@intel.com>; Kitszel, Przemyslaw ><przemyslaw.kitszel@intel.com>; Keller, Jacob E <jacob.e.keller@intel.com>; >Michal Swiatkowski <michal.swiatkowski@linux.intel.com> >Subject: [Intel-wired-lan] [PATCH iwl-net] ice: Fix PF with enabled XDP going >no-carrier after reset > >Commit 6624e780a577fc596788 ("ice: split ice_vsi_setup into smaller >functions") has refactored a bunch of code involved in PFR. In this process, TC >queue number adjustment for XDP was lost. Bring it back. > >Lack of such adjustment causes interface to go into no-carrier after a reset, if >XDP program is attached, with the following message: > >ice 0000:b1:00.0: Failed to set LAN Tx queue context, error: -22 ice >0000:b1:00.0 ens801f0np0: Failed to open VSI 0x0006 on switch 0x0001 ice >0000:b1:00.0: enable VSI failed, err -22, VSI index 0, type ICE_VSI_PF ice >0000:b1:00.0: PF VSI rebuild failed: -22 ice 0000:b1:00.0: Rebuild failed, >unload and reload driver > >Fixes: 6624e780a577 ("ice: split ice_vsi_setup into smaller functions") >Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> >Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> >--- > drivers/net/ethernet/intel/ice/ice_lib.c | 3 +++ > 1 file changed, 3 insertions(+) > Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com> (A Contingent Worker at Intel)
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 626577c7d5b2..2b6ac37ae0b3 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -2376,6 +2376,9 @@ static int ice_vsi_cfg_tc_lan(struct ice_pf *pf, struct ice_vsi *vsi) } else { max_txqs[i] = vsi->alloc_txq; } + + if (vsi->type == ICE_VSI_PF) + max_txqs[i] += vsi->num_xdp_txq; } dev_dbg(dev, "vsi->tc_cfg.ena_tc = %d\n", vsi->tc_cfg.ena_tc);
Commit 6624e780a577fc596788 ("ice: split ice_vsi_setup into smaller functions") has refactored a bunch of code involved in PFR. In this process, TC queue number adjustment for XDP was lost. Bring it back. Lack of such adjustment causes interface to go into no-carrier after a reset, if XDP program is attached, with the following message: ice 0000:b1:00.0: Failed to set LAN Tx queue context, error: -22 ice 0000:b1:00.0 ens801f0np0: Failed to open VSI 0x0006 on switch 0x0001 ice 0000:b1:00.0: enable VSI failed, err -22, VSI index 0, type ICE_VSI_PF ice 0000:b1:00.0: PF VSI rebuild failed: -22 ice 0000:b1:00.0: Rebuild failed, unload and reload driver Fixes: 6624e780a577 ("ice: split ice_vsi_setup into smaller functions") Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> --- drivers/net/ethernet/intel/ice/ice_lib.c | 3 +++ 1 file changed, 3 insertions(+)