| Message ID | 1536130851-34357-1-git-send-email-radoslawx.tyl@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | ixgbe: Fix ixgbe TX hangs with XDP_TX beyond queue limit. | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Radoslaw Tyl > Sent: Wednesday, September 5, 2018 12:01 AM > To: intel-wired-lan@lists.osuosl.org > Cc: Tyl, RadoslawX <radoslawx.tyl@intel.com> > Subject: [Intel-wired-lan] [PATCH] ixgbe: Fix ixgbe TX hangs with XDP_TX > beyond queue limit. > > We have Tx hang when number tx and xdp queues are more than 64. > In XDP always is MTQC == 0x0 (64TxQs). We need more space for Tx queues. > > Signed-off-by: Radoslaw Tyl <radoslawx.tyl@intel.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 604282f..e227549 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3577,12 +3577,18 @@ static void ixgbe_setup_mtqc(struct ixgbe_adapter *adapter) else mtqc |= IXGBE_MTQC_64VF; } else { - if (tcs > 4) + if (tcs > 4) { mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_8TC_8TQ; - else if (tcs > 1) + } else if (tcs > 1) { mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; - else - mtqc = IXGBE_MTQC_64Q_1PB; + } else { + u8 max_txq = adapter->num_tx_queues + + adapter->num_xdp_queues; + if (max_txq > 63) + mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; + else + mtqc = IXGBE_MTQC_64Q_1PB; + } } IXGBE_WRITE_REG(hw, IXGBE_MTQC, mtqc);
We have Tx hang when number tx and xdp queues are more than 64. In XDP always is MTQC == 0x0 (64TxQs). We need more space for Tx queues. Signed-off-by: Radoslaw Tyl <radoslawx.tyl@intel.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)