Hi, > -----Original Message----- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Michael Lilja > Sent: Wednesday, May 17, 2017 10:58 PM > To: Zhang, Helin <helin.zh...@intel.com>; Wu, Jingjing > <jingjing...@intel.com> > Cc: dev@dpdk.org; Michael Lilja <m...@napatech.com> > Subject: [dpdk-dev] [PATCH v8] net/i40e: improved FDIR programming times > > Previously, the FDIR programming time is +11ms on i40e. > This patch will result in an average programming time of 22usec with a max of > 60usec . > > Signed-off-by: Michael Lilja <m...@napatech.com> > > --- > v8: > * Merged two defines into one handling max wait time > > v7: > * Code style changes > > v6: > * Fixed code style issues > > v5: > * Reinitialization of "i" inconsistent with original intent > > v4: > * Code style fix > > v3: > * Replaced commit message > > v2: > * Code style fix > > v1: > * Initial version > --- > --- > drivers/net/i40e/i40e_fdir.c | 26 ++++++++++++-------------- > 1 file changed, 12 insertions(+), 14 deletions(-) > > diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index > 28cc554f5..f94e1c3b8 100644 > --- a/drivers/net/i40e/i40e_fdir.c > +++ b/drivers/net/i40e/i40e_fdir.c > @@ -73,9 +73,8 @@ > #define I40E_FDIR_IPv6_PAYLOAD_LEN 380 > #define I40E_FDIR_UDP_DEFAULT_LEN 400 > > -/* Wait count and interval for fdir filter programming */ > -#define I40E_FDIR_WAIT_COUNT 10 > -#define I40E_FDIR_WAIT_INTERVAL_US 1000 > +/* Wait time for fdir filter programming */ #define > +I40E_FDIR_MAX_WAIT_US 10000 > > /* Wait count and interval for fdir filter flush */ > #define I40E_FDIR_FLUSH_RETRY 50 > @@ -1295,28 +1294,27 @@ i40e_fdir_filter_programming(struct i40e_pf *pf, > /* Update the tx tail register */ > rte_wmb(); > I40E_PCI_REG_WRITE(txq->qtx_tail, txq->tx_tail); > - > - for (i = 0; i < I40E_FDIR_WAIT_COUNT; i++) { > - rte_delay_us(I40E_FDIR_WAIT_INTERVAL_US); > + for (i = 0; i < I40E_FDIR_MAX_WAIT_US; i++) { > if ((txdp->cmd_type_offset_bsz & > > rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) == > > rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE)) > break; > + rte_delay_us(1); > } > - if (i >= I40E_FDIR_WAIT_COUNT) { > + if (i >= I40E_FDIR_MAX_WAIT_US) { > PMD_DRV_LOG(ERR, "Failed to program FDIR filter:" > " time out to get DD on tx queue."); > return -ETIMEDOUT; > } > /* totally delay 10 ms to check programming status*/ > - rte_delay_us((I40E_FDIR_WAIT_COUNT - i) * > I40E_FDIR_WAIT_INTERVAL_US); > - if (i40e_check_fdir_programming_status(rxq) < 0) { > - PMD_DRV_LOG(ERR, "Failed to program FDIR filter:" > - " programming status reported."); > - return -ENOSYS; > + for (; i < I40E_FDIR_MAX_WAIT_US; i++) { > + if (i40e_check_fdir_programming_status(rxq) >= 0) > + return 0; > + rte_delay_us(1); > } > - > - return 0; > + PMD_DRV_LOG(ERR, "Failed to program FDIR filter:" > + " programming status reported."); > + return -ETIMEDOUT; > } > > /* > -- > 2.12.2
Acked-by: Beilei Xing <beilei.x...@intel.com>
