net/i40e: i40e FDIR update rate optimization
PATCH 1/1 net/i40e: i40e FDIR update rate optimization
From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking the fdir rule will be inserted into guaranteed space or shared space. For the flows that are inserted to the guaranteed space, it returns success directly without retrieving the result for NIC.
This patch changes the global register GLQF_CTL. Therefore, when devarg ``Support multiple driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
--- drivers/net/i40e/i40e_ethdev.c | 96 ++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 57 +++++++--- drivers/net/i40e/i40e_fdir.c | 182 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 181 +++++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 417 insertions(+), 116 deletions(-)
drivers/net/i40e/i40e_ethdev.c +92 -4
@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h"
@@ -1057,8 +1058,14 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +void *mem =NULL ; +uint32_t bmp_size, i =0 ; +struct rte_bitmap *bmp =NULL ; +uint32_t alloc =0 , best =0 , pfqf_fdalloc =0 ; +uint32_t GLQF_ctl_reg =0 ;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1087,12 +1094,84 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR ,"Failed to allocate memory for fdir hash map!" ); ret = -ENOMEM ; - goto err_fdir_hash_map_alloc; + goto err_fdir_mem_alloc; + } + + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + + pfqf_fdalloc =i40e_read_rx_ctl (hw,I40E_PFQF_FDALLOC ); + alloc = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDALLOC_MASK ) >>I40E_PFQF_FDALLOC_FDALLOC_SHIFT ); + best = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDBEST_MASK ) >>I40E_PFQF_FDALLOC_FDBEST_SHIFT ); + + GLQF_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + GLQF_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO set to guaranteed first" ); + }else { +if (GLQF_ctl_reg |I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: guaranteed first" ); + }else { + fdir_info->fdir_invalprio =0 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: shared first" ); + } } + +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , GLQF_ctl_reg); +PMD_DRV_LOG (INFO ,"FDIR guarantee %u, best %u." , + alloc *32 , best *32 ); + + fdir_info->fdir_space_size = (alloc + best) *32 ; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_available_space = alloc *32 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; + + fdir_info->fdir_flow_bitmap.fdir_flow = +rte_zmalloc ("i40e_fdir_flows" , +sizeof (struct i40e_fdir_flows ) * + fdir_info->fdir_space_size, +0 ); + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info->fdir_space_size); + + mem =rte_zmalloc ("gurantee_fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_bitmap.b = bmp; +return 0 ; -err_fdir_hash_map_alloc: +err_fdir_mem_alloc:rte_hash_free (fdir_info->hash_table); +rte_free (fdir_info->fdir_filter_array); +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +rte_bitmap_free (bmp); +rte_free (mem);return ret; }
@@ -1769,8 +1848,15 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) {TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); } + +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); +if (fdir_info->fdir_flow_bitmap.fdir_flow) +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +if (fdir_info->fdir_flow_bitmap.b) +rte_free (fdir_info->fdir_flow_bitmap.b); + }void i40e_flex_payload_reg_set_default (struct i40e_hw *hw)
@@ -2630,7 +2716,9 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows are they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); }/* Remove all Traffic Manager configuration */
drivers/net/i40e/i40e_ethdev.h +44 -13
96 lines not on this page · raw message
drivers/net/i40e/i40e_fdir.c +120 -62
326 lines not on this page · raw message
drivers/net/i40e/i40e_flow.c +148 -33
331 lines not on this page · raw message
drivers/net/i40e/i40e_rxtx.c +12 -3
@@ -2938,16 +2938,17 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define I40E_FDIR_NUM_RX_DESC I40E_MIN_RING_DESC +#define I40E_FDIR_NUM_TX_DESC (256) +#define I40E_FDIR_NUM_RX_DESC (256)enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size; +uint32_t ring_size, i;struct rte_eth_dev *dev; +volatile struct i40e_tx_desc *txdp;if (!pf) {PMD_DRV_LOG (ERR ,"PF is not available" );
@@ -2987,6 +2988,14 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; + +/* Set all the DD flags to 1 */ +for (i =0 ; i <I40E_FDIR_NUM_TX_DESC ; i +=2 ) { + txdp = &txq->tx_ring[i +1 ]; + txdp->cmd_type_offset_bsz |=I40E_TX_DESC_DTYPE_DESC_DONE ; + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[i /2 ]); + } +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured.
drivers/net/i40e/rte_pmd_i40e.c +1 -1
@@ -3060,7 +3060,7 @@ int rte_pmd_i40e_flow_add_del_packet_template( (enum i40e_fdir_status )conf->action.report_status; filter_conf.action.flex_off = conf->action.flex_off; -return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add); +return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add, true); }int
Signature · 1 line
2.17.1
Quoted 10 lines
-----Original Message-----
From: Sun, Chenmin <[email protected]>
Sent: Saturday, June 13, 2020 2:00 AM
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [PATCH] net/i40e: i40e FDIR update rate optimization
Quoted 4 lines
From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking the fdir rule will be inserted into guaranteed space or shared space.
I'm not very clear about " by tracking the fdir rule will be inserted into guaranteed space or shared space ".
Quoted 2 lines
For the flows that are inserted to the guaranteed space, it returns success directly without retrieving the result for NIC.
Without checking the result from NIC?
Quoted 3 lines
This patch changes the global register
GLQF_CTL. Therefore, when devarg ``Support multiple driver`` is set, the patch will not take effect to avoid
Better to use exact devarg name "support-multi-driver".
Quoted 25 lines
affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
Signed-off-by Chenmin Sun <[email protected]>--- drivers/net/i40e/i40e_ethdev.c | 96 ++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 57 +++++++--- drivers/net/i40e/i40e_fdir.c | 182 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 181 +++++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 417 insertions(+), 116 deletions(-)drivers/net/i40e/i40e_ethdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h"
drivers/net/i40e/i40e_ethdev.c static int · line 1065
Quoted 8 lines
drivers/net/i40e/i40e_ethdev.c +3
-0@@ -1057,8 +1058,14 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +void *mem =NULL ; +uint32_t bmp_size, i =0 ;
According to the code style, should be:uint32_t bmp_size;uint32_t i = 0;
drivers/net/i40e/i40e_ethdev.c static int · line 1068
Quoted 3 lines
drivers/net/i40e/i40e_ethdev.c +3
-0+struct rte_bitmap *bmp =NULL ; +uint32_t alloc =0 , best =0 , pfqf_fdalloc =0 ; +uint32_t GLQF_ctl_reg =0 ;
Better to use glpf_ctl_reg.
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev) · line 1097
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.c +2
-1int ret; struct rte_hash_parameters fdir_hash_params = { @@ -1087,12 +1094,84 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR , "Failed to allocate memory for fdir hash map!"); ret = -ENOMEM ; - goto err_fdir_hash_map_alloc; + goto err_fdir_mem_alloc;
Shouldn't only free hash_table here?
Quoted 38 lines
drivers/net/i40e/i40e_ethdev.c +4
-0+ } + + fdir_info->fdir_filter_array = rte_zmalloc("fdir_filter", + sizeof(struct
i40e_fdir_filter) *
+I40E_MAX_FDIR_FILTER_NUM,drivers/net/i40e/i40e_ethdev.c +4
-0+ 0); + + pfqf_fdalloc =i40e_read_rx_ctl (hw,I40E_PFQF_FDALLOC ); + alloc = ((pfqf_fdalloc & I40E_PFQF_FDALLOC_FDALLOC_MASK) >>
I40E_PFQF_FDALLOC_FDALLOC_SHIFT);drivers/net/i40e/i40e_ethdev.c +8
-0+ best = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDBEST_MASK ) >> +I40E_PFQF_FDALLOC_FDBEST_SHIFT ); + + GLQF_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + GLQF_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO set to guaranteedfirst");
drivers/net/i40e/i40e_ethdev.c +4
-0+ }else { +if (GLQF_ctl_reg |I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO is:guaranteed first");
drivers/net/i40e/i40e_ethdev.c +3
-0+ }else { + fdir_info->fdir_invalprio =0 ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO is: sharedfirst");
drivers/net/i40e/i40e_ethdev.c +7
-0+ } } + +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , GLQF_ctl_reg); +PMD_DRV_LOG (INFO ,"FDIR guarantee %u, best %u." , + alloc *32 , best *32 ); + + fdir_info->fdir_space_size = (alloc + best) *32 ;
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev) · line 1138
Quoted 10 lines
drivers/net/i40e/i40e_ethdev.c +10
-0+ fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_available_space = alloc *32 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; + + fdir_info->fdir_flow_bitmap.fdir_flow = +rte_zmalloc ("i40e_fdir_flows" , +sizeof (struct i40e_fdir_flows ) * + fdir_info->fdir_space_size, +0 );
Add goto error if fail to alloc.
Quoted 10 lines
drivers/net/i40e/i40e_ethdev.c +6
-0+ +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; + + bmp_size = + rte_bitmap_get_memory_footprint(fdir_info-Quoted 1 line
fdir_space_size);drivers/net/i40e/i40e_ethdev.c +2
-0+ + mem = rte_zmalloc("gurantee_fdir_bmap", bmp_size,
RTE_CACHE_LINE_SIZE);
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev) · line 1151
Quoted 5 lines
drivers/net/i40e/i40e_ethdev.c +5
-0+if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc;
Should distinguish the errors.
Quoted 40 lines
drivers/net/i40e/i40e_ethdev.c +27
-2+ } + + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_bitmap.b = bmp; +return 0 ; -err_fdir_hash_map_alloc: +err_fdir_mem_alloc:rte_hash_free (fdir_info->hash_table); +rte_free (fdir_info->fdir_filter_array); +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +rte_bitmap_free (bmp); +rte_free (mem);return ret; }@@ -1769,8 +1848,15 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) {TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); } + +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); +if (fdir_info->fdir_flow_bitmap.fdir_flow) +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +if (fdir_info->fdir_flow_bitmap.b) +rte_free (fdir_info->fdir_flow_bitmap.b);
drivers/net/i40e/i40e_ethdev.c i40e_rm_fdir_filter_list(struct i40e_pf *pf)
Quoted 10 lines
drivers/net/i40e/i40e_ethdev.c +3
-1+ } void i40e_flex_payload_reg_set_default(struct i40e_hw *hw) @@ -2630,7 +2716,9 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow = TAILQ_FIRST(&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows are they are static allocated */
/* Do not free FDIR flows since they are static allocated */
Quoted 65 lines
drivers/net/i40e/i40e_ethdev.c +2
-0+if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } /* Remove all Traffic Manager configuration */ diff --git
a/drivers/net/i40e/i40e_ethdev.hb/drivers/net/i40e/i40e_ethdev.hindexe5d0ce53f..bf53dfcc2100644drivers/net/i40e/i40e_ethdev.h +24
-0@@ -264,6 +264,15 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +/* +* Struct to store flow created. +*/ +struct rte_flow { +TAILQ_ENTRY (rte_flow) node; +enum rte_filter_type filter_type; +void *rule; +}; +/** * The overhead from MTU to max frame size. * Considering QinQ packet, the VLAN tag needs to be counted twice. @@ -674,17 +683,33 @@ struct i40e_fdir_filter {struct i40e_fdir_filter_conf fdir; }; +struct i40e_fdir_flows { +uint32_t idx; +struct rte_flow flow; +}; + +struct i40e_fdir_flow_bitmap { +struct rte_bitmap *b; +struct i40e_fdir_flows *fdir_flow; +}; + +#define FLOW_TO_FLOW_BITMAP (f) \ + container_of((f), struct i40e_fdir_flows, flow) +TAILQ_HEAD (i40e_fdir_filter_list, i40e_fdir_filter);/* * A structure used to define fields of a FDIR related info. */ struct i40e_fdir_info { +#define PRG_PKT_CNT (128) +struct i40e_vsi *fdir_vsi;/* pointer to fdir VSI structure */ uint16_t match_counter_index;/* Statistic counter index used for fdir*/
drivers/net/i40e/i40e_ethdev.h +1
-2struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/ +void *prg_pkt[PRG_PKT_CNT ];/* memory for fdir program packet */
drivers/net/i40e/i40e_ethdev.h +1
-0+uint64_t dma_addr[PRG_PKT_CNT ];/* physic address of packet memory*/
drivers/net/i40e/i40e_ethdev.h +1
-0+/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/*
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_info { · line 731
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.h +6
-0@@ -698,6 +723,21 @@ struct i40e_fdir_info {struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table; +struct i40e_fdir_filter *fdir_filter_array; + +/* 0 - At filter invalidation the hardware tries first to +* increment the "best effort" space. +* 1 - At filter invalidation the hardware tries first the +* increment its "guaranteed" space
1. at filter invalidation? Do you mean fail to hit the rule or fail to add the rule?
2. please unify the explanation of 0 and 1.
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_info { · line 734
Quoted 3 lines
drivers/net/i40e/i40e_ethdev.h +3
-0+*/ +uint32_t fdir_invalprio; +
No need blank line.
Quoted 141 lines
drivers/net/i40e/i40e_ethdev.h +6
-9+uint32_t fdir_space_size; +uint32_t fdir_actual_cnt; +uint32_t fdir_guarantee_available_space; +uint32_t fdir_guarantee_free_space; +struct i40e_fdir_flow_bitmap fdir_flow_bitmap; +/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ];@@ -879,15 +919,6 @@ struct i40e_mirror_rule {TAILQ_HEAD (i40e_mirror_rule_list, i40e_mirror_rule); -/* -* Struct to store flow created. -*/ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -enum rte_filter_type filter_type; -void *rule; -}; -TAILQ_HEAD (i40e_flow_list, rte_flow); /* Struct to store Traffic Manager shaper profile. */ @@ -1312,8 +1343,8@@ int i40e_add_del_fdir_filter(struct
rte_eth_dev*dev,drivers/net/i40e/i40e_ethdev.h +2
-2const struct rte_eth_fdir_filter *filter, bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add,bool wait_status);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);drivers/net/i40e/i40e_fdir.c index renamed from drivers/net/i40e/i40e_fdir.c +0
-0
d59399afe..88c71b824100644drivers/net/i40e/i40e_fdir.c +1
-1@@ -99,7 +99,7 @@ static int i40e_flow_fdir_filter_programming(struct i40e_pf *pf, enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add); + bool add, bool wait_status);static int i40e_fdir_rx_queue_init(struct i40e_rx_queue *rxq) @@ -163,6 +163,7 @@
i40e_fdir_setup(struct i40e_pf *pf)drivers/net/i40e/i40e_fdir.c +1
-0char z_name[RTE_MEMZONE_NAMESIZE ];const struct rte_memzone *mz =NULL ;struct rte_eth_dev *eth_dev = pf->adapter->eth_dev; +uint16_t i;if ((pf->flags &I40E_FLAG_FDIR ) ==0 ) { PMD_INIT_LOG(ERR, "HW doesn't support FDIR"); @@ -179,6 +180,7 @@
i40e_fdir_setup(struct i40e_pf *pf)drivers/net/i40e/i40e_fdir.c +8
-3PMD_DRV_LOG (INFO ,"FDIR initialization has been done." );return I40E_SUCCESS ; } +/* make new FDIR VSI */ vsi =i40e_vsi_setup (pf,I40E_VSI_FDIR , pf->main_vsi,0 );if (!vsi) {@@ -233,17 +235,24 @@ i40e_fdir_setup(struct i40e_pf *pf) eth_dev->device->driver->name,I40E_FDIR_MZ_NAME , eth_dev->data->port_id); - mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN , SOCKET_ID_ANY); + mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN *PRG_PKT_CNT , +SOCKET_ID_ANY );if (!mz) {PMD_DRV_LOG (ERR ,"Cannot init memzone for " "flow director program packet." ); err =I40E_ERR_NO_MEMORY ; goto fail_mem; } - pf->fdir.prg_pkt = mz->addr; - pf->fdir.dma_addr = mz->iova; + +for (i =0 ; i <PRG_PKT_CNT ; i++) { + pf->fdir.prg_pkt[i] = (uint8_t *)mz->addr +I40E_FDIR_PKT_LEN * (i %PRG_PKT_CNT ); + pf->fdir.dma_addr[i] = mz->iova +I40E_FDIR_PKT_LEN * (i %PRG_PKT_CNT ); + } pf->fdir.match_counter_index = I40E_COUNTER_INDEX_FDIR(hw-Quoted 1 line
pf_id);drivers/net/i40e/i40e_fdir.c +4
-0+ pf->fdir.fdir_actual_cnt =0 ; + pf->fdir.fdir_guarantee_free_space = + pf->fdir.fdir_guarantee_available_space; + PMD_DRV_LOG(INFO, "FDIR setup successfully, with programmingqueue %u.",
drivers/net/i40e/i40e_fdir.c +1
-0vsi->base_queue);return I40E_SUCCESS ;@@ -327,6 +336,7 @@ i40e_init_flx_pld(struct i40e_pf *pf) pf->fdir.flex_set[index].src_offset =0 ; pf->fdir.flex_set[index].size =I40E_FDIR_MAX_FLEXWORD_NUM ; pf->fdir.flex_set[index].dst_offset =0 ; +I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (index),0x0000C900 );drivers/net/i40e/i40e_fdir.c +0
-0I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (index +1 ),0x0000FC29 );/*non- used*/ @@ -1557,11 +1567,11 @@ i40e_sw_fdir_filter_lookup(struct
i40e_fdir_info*fdir_info,drivers/net/i40e/i40e_fdir.c +0
-1return fdir_info->hash_map[ret]; } -/* Add a flow director filter into the SW list */ static int
i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter){drivers/net/i40e/i40e_fdir.c +8
-2struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_fdir_filter *hash_filter;int ret;if (filter->fdir.input.flow_ext.pkt_template)@@ -1577,9 +1587,14 @@ i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter) ret);return ret; } - fdir_info->hash_map[ret] = filter; -TAILQ_INSERT_TAIL (&fdir_info->fdir_list, filter, rules); +if (fdir_info->hash_map[ret]) +return -1 ; + + hash_filter = &fdir_info->fdir_filter_array[ret]; +rte_memcpy (hash_filter, filter,sizeof (*filter)); + fdir_info->hash_map[ret] = hash_filter; +TAILQ_INSERT_TAIL (&fdir_info->fdir_list, hash_filter, rules);return 0 ;}
drivers/net/i40e/i40e_fdir.c i40e_sw_fdir_filter_del(struct i40e_pf *pf, struct · line 1612
Quoted 5 lines
drivers/net/i40e/i40e_fdir.c +0
-1@@ -1608,7 +1623,6 @@ i40e_sw_fdir_filter_del(struct i40e_pf *pf, struct i40e_fdir_input *input) fdir_info->hash_map[ret] = NULL;TAILQ_REMOVE (&fdir_info->fdir_list, filter, rules); -rte_free (filter);
Why not free filter here?
Quoted 202 lines
drivers/net/i40e/i40e_fdir.c +54
-14return 0 ; }@@ -1675,23 +1689,50 @@ i40e_add_del_fdir_filter(struct rte_eth_dev *dev, return ret; } +static inline unsigned char * +i40e_find_available_buffer (struct rte_eth_dev *dev) { +struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); +struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_tx_queue *txq = pf->fdir.txq; +volatile struct i40e_tx_desc *txdp = &txq->tx_ring[txq->tx_tail +1 ]; +uint32_t i; + +/* wait until the tx descriptor is ready */ +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_MAX_WAIT_US ) { +PMD_DRV_LOG (ERR , + "Failed to program FDIR filter: time out to get DD on tx queue."); +return NULL ; + } + +return (unsigned char *)fdir_info->prg_pkt[txq->tx_tail /2 ]; } +/** * i40e_flow_add_del_fdir_filter - add or remove a flow director filter. * @pf: board private structure * @filter: fdir filter entry * @add: 0 - delete, 1 - add */ +int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev,const struct i40e_fdir_filter_conf *filter, -bool add) +bool add,bool wait_status) {struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data- >dev_private);struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); -unsigned char *pkt = (unsigned char *)pf->fdir.prg_pkt; +unsigned char *pkt =NULL ;enum i40e_filter_pctype pctype;struct i40e_fdir_info *fdir_info = &pf->fdir; -struct i40e_fdir_filter *fdir_filter, *node; +struct i40e_fdir_filter *node;struct i40e_fdir_filter check_filter;/* Check if the filter exists */ int ret =0 ;@@ -1724,25 +1765,40 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,/* Check if there is the filter in SW list */ memset (&check_filter,0 ,sizeof (check_filter));i40e_fdir_filter_convert (filter, &check_filter); - node =i40e_sw_fdir_filter_lookup (fdir_info, &check_filter.fdir.input); -if (add && node) { -PMD_DRV_LOG (ERR , -"Conflict with existing flow director rules!" ); -return -EINVAL ; - } -if (!add && !node) { -PMD_DRV_LOG (ERR , -"There's no corresponding flow firector filter!" ); -return -EINVAL ; +if (add) { + ret =i40e_sw_fdir_filter_insert (pf, &check_filter); +if (ret <0 ) { +PMD_DRV_LOG (ERR , +"Conflict with existing flow director rules!"); +return -EINVAL ; + } + }else { + node =i40e_sw_fdir_filter_lookup (fdir_info, &check_filter.fdir.input); +if (!node) { +PMD_DRV_LOG (ERR , +"There's no corresponding flow firector filter!"); +return -EINVAL ; + } + + ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); +if (ret <0 ) { +PMD_DRV_LOG (ERR , +"Error deleting fdir rule from hash table!"); +return -EINVAL ; + } } -memset (pkt,0 ,I40E_FDIR_PKT_LEN ); +/* find a buffer to store the pkt */ + pkt =i40e_find_available_buffer (dev); +if (pkt ==NULL ) + goto error_op; +memset (pkt,0 ,I40E_FDIR_PKT_LEN ); ret =i40e_flow_fdir_construct_pkt (pf, &filter->input, pkt);if (ret <0 ) {drivers/net/i40e/i40e_fdir.c +13
-19PMD_DRV_LOG (ERR ,"construct packet for fdir fails." ); -return ret; + goto error_op; }if (hw->mac.type ==I40E_MAC_X722 ) {@@ -1751,28 +1807,21 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, hw, I40E_GLQF_FD_PCTYPES((int)pctype)); } - ret =i40e_flow_fdir_filter_programming (pf, pctype, filter, add); + ret =i40e_flow_fdir_filter_programming (pf, pctype, filter, add, +wait_status);if (ret <0 ) { PMD_DRV_LOG(ERR, "fdir programming fails for PCTYPE(%u).", pctype); -return ret; + goto error_op; } -if (add) { - fdir_filter =rte_zmalloc ("fdir_filter" , -sizeof (*fdir_filter),0 ); -if (fdir_filter ==NULL ) { -PMD_DRV_LOG (ERR ,"Failed to alloc memory." ); -return -ENOMEM ; - } +return ret; -rte_memcpy (fdir_filter, &check_filter,sizeof (check_filter)); - ret =i40e_sw_fdir_filter_insert (pf, fdir_filter); -if (ret <0 ) -rte_free (fdir_filter); - }else { - ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); - } +error_op: +/* roll back */ +if (add) +i40e_sw_fdir_filter_del (pf, &check_filter.fdir.input); +else +i40e_sw_fdir_filter_insert (pf, &check_filter);return ret; }@@ -1875,7 +1924,7 @@ i40e_fdir_filter_programming(struct i40e_pf *pf,PMD_DRV_LOG (INFO ,"filling transmit descriptor." ); txdp = &(txq->tx_ring[txq->tx_tail +1 ]); - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[0 ]); td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;@@ -1925,7 +1974,7 @@ static int i40e_flow_fdir_filter_programming(struct i40e_pf *pf, enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add) + bool add, bool wait_status) { struct i40e_tx_queue *txq = pf->fdir.txq; struct i40e_rx_queue *rxq = pf->fdir.rxq; @@ -1933,8 +1982,9 @@i40e_flow_fdir_filter_programming(struct
i40e_pf*pf,drivers/net/i40e/i40e_fdir.c +4
-2volatile struct i40e_tx_desc *txdp;volatile struct i40e_filter_program_desc *fdirdp;uint32_t td_cmd; -uint16_t vsi_id, i; +uint16_t vsi_id;uint8_t dest; +uint32_t i;PMD_DRV_LOG (INFO ,"filling filter programming descriptor." ); fdirdp = (volatile struct i40e_filter_program_desc *) @@ -2009,7 +2059,8 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf, PMD_DRV_LOG(INFO, "filling transmit descriptor."); txdp = &txq->tx_ring[txq->tx_tail +1 ]; - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr = rte_cpu_to_le_64(pf->fdir.dma_addr[txq->tx_tail/
+2]);drivers/net/i40e/i40e_fdir.c +1
-0+ td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;
drivers/net/i40e/i40e_fdir.c i40e_flow_fdir_filter_programming(struct · line 2079
Quoted 7 lines
drivers/net/i40e/i40e_fdir.c +3
-0@@ -2022,25 +2073,32 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf, txq->tx_tail =0 ;/* Update the tx tail register */ rte_wmb (); + +while (i40e_check_fdir_programming_status (rxq) <0 ) +PMD_DRV_LOG (INFO ,"previous error report captured." );
Is it possible it's a dead loop?
Quoted 210 lines
drivers/net/i40e/i40e_fdir.c +1
-17+I40E_PCI_REG_WRITE (txq->qtx_tail, txq->tx_tail); -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_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_MAX_WAIT_US ); -if (i40e_check_fdir_programming_status (rxq) <0 ) { - PMD_DRV_LOG(ERR, - "Failed to program FDIR filter: programming statusreported.");
drivers/net/i40e/i40e_fdir.c +5
-1-return -ETIMEDOUT ; + +if (wait_status) { +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))drivers/net/i40e/i40e_fdir.c +6
-0+break ; +rte_delay_us (1 ); + } +if (i >=I40E_FDIR_MAX_WAIT_US ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: time out to get DDon tx queue.");
drivers/net/i40e/i40e_fdir.c +7
-0+return -ETIMEDOUT ; + } +/* totally delay 10 ms to check programming status*/ +rte_delay_us (I40E_FDIR_MAX_WAIT_US ); +if (i40e_check_fdir_programming_status (rxq) <0 ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: programming statusreported.");
drivers/net/i40e/i40e_fdir.c +3
-1+return -ETIMEDOUT ; + } }return 0 ;@@ -2324,7 +2382,7 @@ i40e_fdir_filter_restore(struct i40e_pf *pf)uint32_t best_cnt;/**< Number of filters in best effort spaces. */ TAILQ_FOREACH(f, fdir_list, rules) -i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE); +i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE, TRUE); fdstat =I40E_READ_REG (hw,I40E_PFQF_FDSTAT ); guarant_cnt =drivers/net/i40e/i40e_flow.c index renamed from drivers/net/i40e/i40e_flow.c +0
-0
8f8df6fae..f5f7d5078100644drivers/net/i40e/i40e_flow.c +5
-4@@ -17,6 +17,7 @@#include <rte_malloc.h> #include <rte_tailq.h> #include <rte_flow_driver.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h" @@ -133,6 +134,8 @@ const struct rte_flow_ops i40e_flow_ops = {static union i40e_filter_t cons_filter;static enum rte_filter_type cons_filter_type =RTE_ETH_FILTER_NONE ; +/* internal pattern w/o VOID items */ +struct rte_flow_item g_items[32 ];/* Pattern matched ethertype filter */ static enum rte_flow_item_type pattern_ethertype[] = { @@ -2026,9 +2029,6 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev, const struct rte_flow_item_eth *eth_spec; const struct rte_flow_item_eth *eth_mask; enum rte_flow_item_type item_type; -uint16_t outer_tpid; - - outer_tpid =i40e_get_outer_vlan (dev); for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {if (item->last) {@@ -2088,7 +2088,7 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev, if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type ==RTE_ETHER_TYPE_IPV6 || filter->ether_type ==RTE_ETHER_TYPE_LLDP || - filter->ether_type == outer_tpid) { + filter->ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +1
-1item,@@ -2331,6 +2331,7 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf, field_idx = layer_idx *I40E_MAX_FLXPLD_FIED + i; flx_pit =MK_FLX_PIT (min_next_off,NONUSE_FLX_PIT_FSIZE ,NONUSE_FLX_PIT_DEST_OFF ); +I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (field_idx), flx_pit); min_next_off++; }@@ -2590,7 +2591,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, uint16_t flex_size;bool cfg_flex_pit = true;bool cfg_flex_msk = true; -uint16_t outer_tpid;uint16_t ether_type;uint32_t vtc_flow_cpu;drivers/net/i40e/i40e_flow.c +0
-1bool outer_ip = true;@@ -2599,7 +2599,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,memset (off_arr,0 ,sizeof (off_arr));memset (len_arr,0 ,sizeof (len_arr));memset (flex_mask,0 ,I40E_FDIR_MAX_FLEX_LEN ); - outer_tpid =i40e_get_outer_vlan (dev); filter->input.flow_ext.customized_pctype = false;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {drivers/net/i40e/i40e_flow.c +0
-0if (item->last) {@@ -2667,7 +2666,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (next_type ==
RTE_FLOW_ITEM_TYPE_VLAN||drivers/net/i40e/i40e_flow.c +1
-1ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +1
-1item,@@ -2711,7 +2710,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +7
-7item,@@ -5028,7 +5027,6 @@ i40e_flow_validate(struct rte_eth_dev *dev, NULL, "NULL attribute.");return -rte_errno; } -memset (&cons_filter,0 ,sizeof (cons_filter));/* Get the non-void item of action */ @@ -5050,12 +5048,16 @@ i40e_flow_validate(struct rte_eth_dev *dev, } item_num++; - items =rte_zmalloc ("i40e_pattern" , - item_num *sizeof (struct rte_flow_item ),0 ); -if (!items) { -rte_flow_error_set (error,ENOMEM ,RTE_FLOW_ERROR_TYPE_ITEM_NUM , - NULL, "No memory for PMD internal items."); -return -ENOMEM ; +if (item_num <=ARRAY_SIZE (g_items)) { + items = g_items; + }else { + items =rte_zmalloc ("i40e_pattern" , + item_num *sizeof (struct rte_flow_item ),0 ); +if (!items) { + rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ITEM_NUM,drivers/net/i40e/i40e_flow.c +1
-0+ NULL, "No memory for PMDinternal items.");
drivers/net/i40e/i40e_flow.c +9
-1+return -ENOMEM ; + } } i40e_pattern_skip_void_item(items, pattern); @@ -5063,24 +5065,62 @@ i40e_flow_validate(struct rte_eth_dev *dev, i =0 ;do { parse_filter =i40e_find_parse_filter_func (items, &i); +if (!parse_filter && !flag) {rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , pattern,"Unsupported pattern" ); -rte_free (items); + +if (items != g_items) +rte_free (items);return -rte_errno; } +if (parse_filter) ret =parse_filter (dev, attr, items, actions, error, &cons_filter); + flag = true; }while ((ret <0 ) && (i <RTE_DIM (i40e_supported_patterns)));
drivers/net/i40e/i40e_flow.c i40e_flow_validate(struct rte_eth_dev *dev, · line 5093
Quoted 10 lines
drivers/net/i40e/i40e_flow.c +4
-1-rte_free (items); +if (items != g_items) +rte_free (items);return ret; } +static +uint32_t bin_search (uint64_t data)
Code style:
static uint32_tbin_search(uint64_t data)
Quoted 87 lines
drivers/net/i40e/i40e_flow.c +42
-9+{ +uint32_t pos =0 ; + +if ((data &0xFFFFFFFF ) ==0 ) { + data >>=32 ; + pos +=32 ; + } + +if ((data &0xFFFF ) ==0 ) { + data >>=16 ; + pos +=16 ; + } +if ((data &0xFF ) ==0 ) { + data >>=8 ; + pos +=8 ; + } +if ((data &0xF ) ==0 ) { + data >>=4 ; + pos +=4 ; + } +if ((data &0x3 ) ==0 ) { + data >>=2 ; + pos +=2 ; + } +if ((data &0x1 ) ==0 ) + pos +=1 ; + +return pos; +} +static struct rte_flow * i40e_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,@@ -5089,21 +5129,54 @@ i40e_flow_create(struct rte_eth_dev *dev, struct rte_flow_error *error) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); -struct rte_flow *flow; +struct rte_flow *flow =NULL ; +struct i40e_fdir_info *fdir_info = &pf->fdir; +uint32_t i =0 , pos =0 ;int ret; - - flow =rte_zmalloc ("i40e_flow" ,sizeof (struct rte_flow ),0 ); -if (!flow) { -rte_flow_error_set (error,ENOMEM , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to allocate memory" ); -return flow; - } +uint64_t slab =0 ; +bool wait_for_status = true; ret =i40e_flow_validate (dev, attr, pattern, actions, error);if (ret <0 )return NULL ; +if (cons_filter_type ==RTE_ETH_FILTER_FDIR ) { +/* scan from gurant fdir flow */ +if (fdir_info->fdir_actual_cnt < fdir_info->fdir_space_size) { +if (rte_bitmap_scan (fdir_info->fdir_flow_bitmap.b, &pos, &slab)) { + i =bin_search (slab); +rte_bitmap_clear (fdir_info- >fdir_flow_bitmap.b, pos + i); + flow = &fdir_info-Quoted 1 line
fdir_flow_bitmap.fdir_flow[pos + i].flow;
drivers/net/i40e/i40e_flow.c +5
-0+ +memset (flow,0 ,sizeof (struct rte_flow )); + +if (fdir_info->fdir_invalprio ==1 ) { + if (fdir_info-Quoted 1 line
fdir_guarantee_free_space> 0) {drivers/net/i40e/i40e_flow.c +1
-0+ fdir_info-Quoted 1 line
fdir_guarantee_free_space--;
drivers/net/i40e/i40e_flow.c +10
-0+ wait_for_status = false; + }else { + wait_for_status = true; + } + } + fdir_info->fdir_actual_cnt++; + } + }else { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_HANDLE,NULL,
drivers/net/i40e/i40e_flow.c i40e_flow_create(struct rte_eth_dev *dev, · line 5168
Quoted 3 lines
drivers/net/i40e/i40e_flow.c +3
-0+ "Fdir space full"); +return flow; + }
Too many indentation here, can it be optimized?
Quoted 142 lines
drivers/net/i40e/i40e_flow.c +6
-0+ + }else { + flow =rte_zmalloc ("i40e_flow" ,sizeof (struct rte_flow ),0 ); +if (!flow) { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_HANDLE,NULL,
drivers/net/i40e/i40e_flow.c +21
-3+ "Failed to allocate memory"); +return flow; + } + } +switch (cons_filter_type) {case RTE_ETH_FILTER_ETHERTYPE : ret = i40e_ethertype_filter_set(pf,@@ -5115,9 +5188,17 @@ i40e_flow_create(struct rte_eth_dev *dev,break ;case RTE_ETH_FILTER_FDIR : ret =i40e_flow_add_del_fdir_filter (dev, - &cons_filter.fdir_filter,1 ); -if (ret) + &cons_filter.fdir_filter,1 , + wait_for_status); +if (ret) { +rte_bitmap_clear (fdir_info->fdir_flow_bitmap.b, i); + fdir_info->fdir_actual_cnt--; +if (fdir_info->fdir_invalprio ==1 ) + fdir_info->fdir_guarantee_free_space++; + goto free_flow; + } + flow->rule =TAILQ_LAST (&pf->fdir.fdir_list, i40e_fdir_filter_list);break ;@@ -5149,7 +5230,10 @@ i40e_flow_create(struct rte_eth_dev *dev,rte_flow_error_set (error, -ret,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failed to create flow." ); -rte_free (flow); + +if (cons_filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (flow); +return NULL ; }@@ -5159,7 +5243,9 @@ i40e_flow_destroy(struct rte_eth_dev *dev, struct rte_flow_error *error) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); +struct i40e_fdir_info *fdir_info = &pf->fdir;enum rte_filter_type filter_type = flow->filter_type; +struct i40e_fdir_flows *f;int ret =0 ;drivers/net/i40e/i40e_flow.c +9
-3switch (filter_type) {@@ -5173,7 +5259,7 @@ i40e_flow_destroy(struct rte_eth_dev *dev,break ;case RTE_ETH_FILTER_FDIR : ret =i40e_flow_add_del_fdir_filter (dev, - &((struct i40e_fdir_filter *)flow->rule)->fdir,0 ); + &((struct i40e_fdir_filter *)flow->rule)->fdir,0 , false);/* If the last flow is destroyed, disable fdir. */ if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { @@ -5193,11 +5279,25 @@ i40e_flow_destroy(struct rte_eth_dev *dev, if (!ret) { TAILQ_REMOVE(&pf->flow_list, flow, node); -rte_free (flow); - }else + if (filter_type == RTE_ETH_FILTER_FDIR) { + f = FLOW_TO_FLOW_BITMAP(flow); + rte_bitmap_set(fdir_info->fdir_flow_bitmap.b, f->idx); + fdir_info->fdir_actual_cnt--; + + if (fdir_info->fdir_invalprio == 1) + /* check if the budget will be gained back toguaranteed space */
drivers/net/i40e/i40e_flow.c +2
-0+if (fdir_info->fdir_guarantee_free_space < + fdir_info-Quoted 1 line
fdir_guarantee_available_space)drivers/net/i40e/i40e_flow.c +1
-0+ fdir_info-Quoted 1 line
fdir_guarantee_free_space++;
drivers/net/i40e/i40e_flow.c +22
-1+ }else { +rte_free (flow); + } + + }else {rte_flow_error_set (error, -ret,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failed to destroy flow." ); + }return ret; }@@ -5347,6 +5447,7 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)struct rte_flow *flow;void *temp;int ret; +uint32_t i =0 ; ret =i40e_fdir_flush (dev);if (!ret) {@@ -5362,10 +5463,24 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) TAILQ_FOREACH_SAFE(flow, &pf->flow_list, node, temp) {if (flow->filter_type ==RTE_ETH_FILTER_FDIR ) {TAILQ_REMOVE (&pf->flow_list, flow, node); -rte_free (flow); } } +/* clear bitmap */ +rte_bitmap_reset (fdir_info->fdir_flow_bitmap.b); +for (i =0 ; i < fdir_info->fdir_space_size; i++) { + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; +rte_bitmap_set (fdir_info->fdir_flow_bitmap.b, i); + } + + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; +memset (fdir_info->fdir_filter_array, +0 , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM ); +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) pf->fdir.inset_flag[pctype] =0 ;drivers/net/i40e/i40e_rxtx.c index renamed from drivers/net/i40e/i40e_rxtx.c +0
-0
840b6f387..febf41fc2100644drivers/net/i40e/i40e_rxtx.c +0
-1@@ -2938,16 +2938,17 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define
I40E_FDIR_NUM_RX_DESCI40E_MIN_RING_DESC
drivers/net/i40e/i40e_rxtx.c i40e_dev_free_queues(struct rte_eth_dev *dev) · line 2942
Quoted 2 lines
drivers/net/i40e/i40e_rxtx.c +2
-0+#define I40E_FDIR_NUM_TX_DESC (256) +#define I40E_FDIR_NUM_RX_DESC (256)
Can the brackets be omitted?
Quoted 45 lines
enum
i40e_status_codei40e_fdir_setup_tx_resources(struct i40e_pf *pf){drivers/net/i40e/i40e_rxtx.c +8
-1struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size; +uint32_t ring_size, i;struct rte_eth_dev *dev; +volatile struct i40e_tx_desc *txdp;if (!pf) { PMD_DRV_LOG(ERR, "PF is not available"); @@ -2987,6 +2988,14 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; + +/* Set all the DD flags to 1 */ +for (i =0 ; i <I40E_FDIR_NUM_TX_DESC ; i +=2 ) { + txdp = &txq->tx_ring[i +1 ]; + txdp->cmd_type_offset_bsz |=
I40E_TX_DESC_DTYPE_DESC_DONE;drivers/net/i40e/i40e_rxtx.c +1
-0+ txdp->buffer_addr = rte_cpu_to_le_64(pf->fdir.dma_addr[i /2]);
drivers/net/i40e/i40e_rxtx.c +2
-0+ } +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured. (quoted diff) +0
-0
b/drivers/net/i40e/rte_pmd_i40e.cindex446e31710..6061bce6e100644drivers/net/i40e/rte_pmd_i40e.c +0
-0@@ -3060,7 +3060,7 @@ intrte_pmd_i40e_flow_add_del_packet_template(
drivers/net/i40e/rte_pmd_i40e.c +1
-2(enum i40e_fdir_status )conf->action.report_status; filter_conf.action.flex_off = conf->action.flex_off; -return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add); +return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add, true); }int --2.17.1
Best Regards,
Sun, Chenmin
Quoted 18 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Wednesday, July 8, 2020 1:38 PM
To: Sun, Chenmin <[email protected]>; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH] net/i40e: i40e FDIR update rate optimizationQuoted 8 lines
-----Original Message-----
From: Sun, Chenmin <[email protected]>
Sent: Saturday, June 13, 2020 2:00 AM
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [PATCH] net/i40e: i40e FDIR update rate optimization
Quoted 7 lines
Quoted 4 lines
From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking the fdir rule will be inserted into guaranteed space or shared space.
I'm not very clear about " by tracking the fdir rule will be inserted into guaranteed space or shared space ".
For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only reports the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. See the fdir programming status descriptor format in the datasheet for more details.
So I need to track which space is the flow being inserted.
Quoted 38 lines
Quoted 2 lines
For the flows that are inserted to the guaranteed space, it returns success directly without retrieving the result for NIC.
Without checking the result from NIC?
Quoted 4 lines
This patch changes the global register
GLQF_CTL. Therefore, when devarg ``Support multiple driver`` is set, the patch will not take effect to avoidBetter to use exact devarg name "support-multi-driver".
Quoted 28 lines
affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
Signed-off-by Chenmin Sun <[email protected]>--- drivers/net/i40e/i40e_ethdev.c | 96 ++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 57 +++++++--- drivers/net/i40e/i40e_fdir.c | 182 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 181 +++++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 417 insertions(+), 116 deletions(-)(quoted diff) +0
-0
b/drivers/net/i40e/i40e_ethdev.cindex970a31cb2..d368c534f100644drivers/net/i40e/i40e_ethdev.c +1
-0@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h" @@ -1057,8 +1058,14 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private);
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.c static int · line 1065
Quoted 5 lines
drivers/net/i40e/i40e_ethdev.c +3
-0+struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +void *mem =NULL ; +uint32_t bmp_size, i =0 ;According to the code style, should be:
uint32_tbmp_size;uint32_ti = 0;
OK
Quoted 59 lines
drivers/net/i40e/i40e_ethdev.c static int · line 1068
Quoted 3 lines
drivers/net/i40e/i40e_ethdev.c +3
-0+struct rte_bitmap *bmp =NULL ; +uint32_t alloc =0 , best =0 , pfqf_fdalloc =0 ; +uint32_t GLQF_ctl_reg =0 ;Better to use
glpf_ctl_reg.drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev) · line 1097
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.c +2
-1int ret; struct rte_hash_parameters fdir_hash_params = { @@ -1087,12 +1094,84 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR , "Failed to allocate memory for fdir hash map!"); ret = -ENOMEM ; - goto err_fdir_hash_map_alloc; + goto err_fdir_mem_alloc;Shouldn't only free
hash_tablehere?Quoted 42 lines
drivers/net/i40e/i40e_ethdev.c +4
-0+ } + + fdir_info->fdir_filter_array = rte_zmalloc("fdir_filter", + sizeof(struct
i40e_fdir_filter) *
+I40E_MAX_FDIR_FILTER_NUM,drivers/net/i40e/i40e_ethdev.c +4
-0+ 0); + + pfqf_fdalloc =i40e_read_rx_ctl (hw,I40E_PFQF_FDALLOC ); + alloc = ((pfqf_fdalloc & I40E_PFQF_FDALLOC_FDALLOC_MASK) >>
I40E_PFQF_FDALLOC_FDALLOC_SHIFT);drivers/net/i40e/i40e_ethdev.c +8
-0+ best = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDBEST_MASK ) >> +I40E_PFQF_FDALLOC_FDBEST_SHIFT ); + + GLQF_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + GLQF_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO set to guaranteedfirst");
drivers/net/i40e/i40e_ethdev.c +4
-0+ }else { +if (GLQF_ctl_reg |I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO is:guaranteed first");
drivers/net/i40e/i40e_ethdev.c +3
-0+ }else { + fdir_info->fdir_invalprio =0 ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO is: sharedfirst");
drivers/net/i40e/i40e_ethdev.c +11
-0+ } } + +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , GLQF_ctl_reg); +PMD_DRV_LOG (INFO ,"FDIR guarantee %u, best %u." , + alloc *32 , best *32 ); + + fdir_info->fdir_space_size = (alloc + best) *32 ; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_available_space = alloc *32 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space;
Quoted 8 lines
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev) · line 1138
Quoted 6 lines
drivers/net/i40e/i40e_ethdev.c +6
-0+ + fdir_info->fdir_flow_bitmap.fdir_flow = +rte_zmalloc ("i40e_fdir_flows" , +sizeof (struct i40e_fdir_flows ) * + fdir_info->fdir_space_size, +0 );Add goto error if fail to alloc.
Done
Quoted 8 lines
Quoted 8 lines
drivers/net/i40e/i40e_ethdev.c +6
-0+ +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; + + bmp_size = + rte_bitmap_get_memory_footprint(fdir_info-Quoted 1 line
fdir_space_size);
Quoted 11 lines
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev) · line 1151
Quoted 8 lines
drivers/net/i40e/i40e_ethdev.c +2
-0+ + mem = rte_zmalloc("gurantee_fdir_bmap", bmp_size,
RTE_CACHE_LINE_SIZE);drivers/net/i40e/i40e_ethdev.c +5
-0+if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc;Should distinguish the errors.
OK
Quoted 44 lines
Quoted 44 lines
drivers/net/i40e/i40e_ethdev.c +28
-2+ } + + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_bitmap.b = bmp; +return 0 ; -err_fdir_hash_map_alloc: +err_fdir_mem_alloc:rte_hash_free (fdir_info->hash_table); +rte_free (fdir_info->fdir_filter_array); +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +rte_bitmap_free (bmp); +rte_free (mem);return ret; }@@ -1769,8 +1848,15 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) {TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); } + +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); +if (fdir_info->fdir_flow_bitmap.fdir_flow) +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +if (fdir_info->fdir_flow_bitmap.b) +rte_free (fdir_info->fdir_flow_bitmap.b); + }
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.c i40e_dev_close(struct rte_eth_dev *dev) · line 2719
Quoted 7 lines
drivers/net/i40e/i40e_ethdev.c +2
-1void i40e_flex_payload_reg_set_default(struct i40e_hw *hw) @@ -2630,7 +2716,9 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow = TAILQ_FIRST(&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows are they are static allocated */ /* Do not free FDIR flows since they are static allocated */
OK
Quoted 69 lines
Quoted 69 lines
drivers/net/i40e/i40e_ethdev.c +2
-0+if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } /* Remove all Traffic Manager configuration */ diff --git
a/drivers/net/i40e/i40e_ethdev.hb/drivers/net/i40e/i40e_ethdev.hindexe5d0ce53f..bf53dfcc2100644drivers/net/i40e/i40e_ethdev.h +24
-0@@ -264,6 +264,15 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +/* +* Struct to store flow created. +*/ +struct rte_flow { +TAILQ_ENTRY (rte_flow) node; +enum rte_filter_type filter_type; +void *rule; +}; +/** * The overhead from MTU to max frame size. * Considering QinQ packet, the VLAN tag needs to be counted twice. @@ -674,17 +683,33 @@ struct i40e_fdir_filter {struct i40e_fdir_filter_conf fdir; }; +struct i40e_fdir_flows { +uint32_t idx; +struct rte_flow flow; +}; + +struct i40e_fdir_flow_bitmap { +struct rte_bitmap *b; +struct i40e_fdir_flows *fdir_flow; +}; + +#define FLOW_TO_FLOW_BITMAP (f) \ + container_of((f), struct i40e_fdir_flows, flow) +TAILQ_HEAD (i40e_fdir_filter_list, i40e_fdir_filter);/* * A structure used to define fields of a FDIR related info. */ struct i40e_fdir_info { +#define PRG_PKT_CNT (128) +struct i40e_vsi *fdir_vsi;/* pointer to fdir VSI structure */ uint16_t match_counter_index;/* Statistic counter index used for fdir*/
drivers/net/i40e/i40e_ethdev.h +1
-2struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/ +void *prg_pkt[PRG_PKT_CNT ];/* memory for fdir program packet */
drivers/net/i40e/i40e_ethdev.h +1
-0+uint64_t dma_addr[PRG_PKT_CNT ];/* physic address of packet memory*/
drivers/net/i40e/i40e_ethdev.h +1
-0+/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/* @@ -698,6 +723,21 @@ struct i40e_fdir_info {struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table;
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_info { · line 731
Quoted 6 lines
drivers/net/i40e/i40e_ethdev.h +6
-0+struct i40e_fdir_filter *fdir_filter_array; + +/* 0 - At filter invalidation the hardware tries first to +* increment the "best effort" space. +* 1 - At filter invalidation the hardware tries first the +* increment its "guaranteed" space 1. at filter invalidation? Do you mean fail to hit the rule or fail to add the rule?
2. please unify the explanation of 0 and 1.
Means destroy a flow.
I have added more comments for it, please check it in v2
Quoted 153 lines
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_info { · line 734
Quoted 4 lines
drivers/net/i40e/i40e_ethdev.h +3
-0+*/ +uint32_t fdir_invalprio; +No need blank line.
Quoted 93 lines
drivers/net/i40e/i40e_ethdev.h +9
-11+uint32_t fdir_space_size; +uint32_t fdir_actual_cnt; +uint32_t fdir_guarantee_available_space; +uint32_t fdir_guarantee_free_space; +struct i40e_fdir_flow_bitmap fdir_flow_bitmap; +/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ];@@ -879,15 +919,6 @@ struct i40e_mirror_rule {TAILQ_HEAD (i40e_mirror_rule_list, i40e_mirror_rule); -/* -* Struct to store flow created. -*/ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -enum rte_filter_type filter_type; -void *rule; -}; -TAILQ_HEAD (i40e_flow_list, rte_flow); /* Struct to store Traffic Manager shaper profile. */ @@ -1312,8 +1343,8 @@ int i40e_add_del_fdir_filter(struct rte_eth_dev *dev,const struct rte_eth_fdir_filter *filter,bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add,bool wait_status);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);(quoted diff) +0
-0
b/drivers/net/i40e/i40e_fdir.cindexd59399afe..88c71b824100644drivers/net/i40e/i40e_fdir.c +1
-1@@ -99,7 +99,7 @@ static int i40e_flow_fdir_filter_programming(struct i40e_pf *pf, enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add); + bool add, bool wait_status);static int i40e_fdir_rx_queue_init(struct i40e_rx_queue *rxq) @@ -163,6 +163,7@@
i40e_fdir_setup(struct i40e_pf *pf)drivers/net/i40e/i40e_fdir.c +1
-0char z_name[RTE_MEMZONE_NAMESIZE ];const struct rte_memzone *mz =NULL ;struct rte_eth_dev *eth_dev = pf->adapter->eth_dev; +uint16_t i;if ((pf->flags &I40E_FLAG_FDIR ) ==0 ) { PMD_INIT_LOG(ERR, "HW doesn't support FDIR"); @@ -179,6 +180,7 @@
i40e_fdir_setup(struct i40e_pf *pf)drivers/net/i40e/i40e_fdir.c +8
-3PMD_DRV_LOG (INFO ,"FDIR initialization has been done." );return I40E_SUCCESS ; } +/* make new FDIR VSI */ vsi =i40e_vsi_setup (pf,I40E_VSI_FDIR , pf->main_vsi,0 );if (!vsi) {@@ -233,17 +235,24 @@ i40e_fdir_setup(struct i40e_pf *pf) eth_dev->device->driver->name,I40E_FDIR_MZ_NAME , eth_dev->data->port_id); - mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN , SOCKET_ID_ANY); + mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN *PRG_PKT_CNT , +SOCKET_ID_ANY );if (!mz) {PMD_DRV_LOG (ERR ,"Cannot init memzone for " "flow director program packet." ); err =I40E_ERR_NO_MEMORY ; goto fail_mem; } - pf->fdir.prg_pkt = mz->addr; - pf->fdir.dma_addr = mz->iova; + +for (i =0 ; i <PRG_PKT_CNT ; i++) { + pf->fdir.prg_pkt[i] = (uint8_t *)mz->addr +I40E_FDIR_PKT_LEN * (i %PRG_PKT_CNT ); + pf->fdir.dma_addr[i] = mz->iova +I40E_FDIR_PKT_LEN * (i %PRG_PKT_CNT ); + } pf->fdir.match_counter_index = I40E_COUNTER_INDEX_FDIR(hw-Quoted 1 line
pf_id);drivers/net/i40e/i40e_fdir.c i40e_fdir_setup(struct i40e_pf *pf)
Quoted 5 lines
drivers/net/i40e/i40e_fdir.c +4
-0+ pf->fdir.fdir_actual_cnt =0 ; + pf->fdir.fdir_guarantee_free_space = + pf->fdir.fdir_guarantee_available_space; + PMD_DRV_LOG(INFO, "FDIR setup successfully, with programmingqueue
drivers/net/i40e/i40e_fdir.c i40e_init_flx_pld(struct i40e_pf *pf) · line 341
Quoted 10 lines
%u.",
drivers/net/i40e/i40e_fdir.c +1
-0vsi->base_queue);return I40E_SUCCESS ;@@ -327,6 +336,7 @@ i40e_init_flx_pld(struct i40e_pf *pf) pf->fdir.flex_set[index].src_offset =0 ; pf->fdir.flex_set[index].size =I40E_FDIR_MAX_FLEXWORD_NUM ; pf->fdir.flex_set[index].dst_offset =0 ; + I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(index),
0x0000C900);Quoted 2 lines
drivers/net/i40e/i40e_fdir.c +0
-0I40E_WRITE_REG(hw,
I40E_PRTQF_FLX_PIT(index + 1), 0x0000FC29);/*non-used*/ @@
Quoted 34 lines
-1557,11 +1567,11 @@ i40e_sw_fdir_filter_lookup(struct
i40e_fdir_info*fdir_info,drivers/net/i40e/i40e_fdir.c +0
-1return fdir_info->hash_map[ret]; } -/* Add a flow director filter into the SW list */ static int
i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter){drivers/net/i40e/i40e_fdir.c +8
-2struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_fdir_filter *hash_filter;int ret;if (filter->fdir.input.flow_ext.pkt_template)@@ -1577,9 +1587,14 @@ i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter) ret);return ret; } - fdir_info->hash_map[ret] = filter; -TAILQ_INSERT_TAIL (&fdir_info->fdir_list, filter, rules); +if (fdir_info->hash_map[ret]) +return -1 ; + + hash_filter = &fdir_info->fdir_filter_array[ret]; +rte_memcpy (hash_filter, filter,sizeof (*filter)); + fdir_info->hash_map[ret] = hash_filter; +TAILQ_INSERT_TAIL (&fdir_info->fdir_list, hash_filter, rules);return 0 ;}
drivers/net/i40e/i40e_fdir.c +0
-0@@ -1608,7 +1623,6 @@ i40e_sw_fdir_filter_del(struct i40e_pf *pf, struct i40e_fdir_input *input) fdir_info->hash_map[ret] = NULL;
Quoted 4 lines
drivers/net/i40e/i40e_fdir.c i40e_sw_fdir_filter_del(struct i40e_pf *pf, struct i40e_fdir_input *input) · line 1611
Quoted 2 lines
drivers/net/i40e/i40e_fdir.c +0
-1TAILQ_REMOVE (&fdir_info->fdir_list, filter, rules); -rte_free (filter);Why not free filter here?
Because it's statically allocated
Quoted 427 lines
Quoted 201 lines
drivers/net/i40e/i40e_fdir.c +54
-14return 0 ; }@@ -1675,23 +1689,50 @@ i40e_add_del_fdir_filter(struct rte_eth_dev *dev, return ret; } +static inline unsigned char * +i40e_find_available_buffer (struct rte_eth_dev *dev) { +struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); +struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_tx_queue *txq = pf->fdir.txq; +volatile struct i40e_tx_desc *txdp = &txq->tx_ring[txq->tx_tail +1 ]; +uint32_t i; + +/* wait until the tx descriptor is ready */ +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_MAX_WAIT_US ) { +PMD_DRV_LOG (ERR , + "Failed to program FDIR filter: time out to get DD on tx queue."); +return NULL ; + } + +return (unsigned char *)fdir_info->prg_pkt[txq->tx_tail /2 ]; } +/** * i40e_flow_add_del_fdir_filter - add or remove a flow director filter. * @pf: board private structure * @filter: fdir filter entry * @add: 0 - delete, 1 - add */ +int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev,const struct i40e_fdir_filter_conf *filter, -bool add) +bool add,bool wait_status) {struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data- >dev_private);struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); -unsigned char *pkt = (unsigned char *)pf->fdir.prg_pkt; +unsigned char *pkt =NULL ;enum i40e_filter_pctype pctype;struct i40e_fdir_info *fdir_info = &pf->fdir; -struct i40e_fdir_filter *fdir_filter, *node; +struct i40e_fdir_filter *node;struct i40e_fdir_filter check_filter;/* Check if the filter exists */ int ret =0 ;@@ -1724,25 +1765,40 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,/* Check if there is the filter in SW list */ memset (&check_filter,0 ,sizeof (check_filter));i40e_fdir_filter_convert (filter, &check_filter); - node =i40e_sw_fdir_filter_lookup (fdir_info, &check_filter.fdir.input); -if (add && node) { -PMD_DRV_LOG (ERR , -"Conflict with existing flow director rules!" ); -return -EINVAL ; - } -if (!add && !node) { -PMD_DRV_LOG (ERR , -"There's no corresponding flow firector filter!" ); -return -EINVAL ; +if (add) { + ret =i40e_sw_fdir_filter_insert (pf, &check_filter); +if (ret <0 ) { +PMD_DRV_LOG (ERR , +"Conflict with existing flow director rules!"); +return -EINVAL ; + } + }else { + node =i40e_sw_fdir_filter_lookup (fdir_info, &check_filter.fdir.input); +if (!node) { +PMD_DRV_LOG (ERR , +"There's no corresponding flow firector filter!"); +return -EINVAL ; + } + + ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); +if (ret <0 ) { +PMD_DRV_LOG (ERR , +"Error deleting fdir rule from hash table!"); +return -EINVAL ; + } } -memset (pkt,0 ,I40E_FDIR_PKT_LEN ); +/* find a buffer to store the pkt */ + pkt =i40e_find_available_buffer (dev); +if (pkt ==NULL ) + goto error_op; +memset (pkt,0 ,I40E_FDIR_PKT_LEN ); ret =i40e_flow_fdir_construct_pkt (pf, &filter->input, pkt);if (ret <0 ) {drivers/net/i40e/i40e_fdir.c +1
-1PMD_DRV_LOG (ERR ,"construct packet for fdir fails." ); -return ret; + goto error_op; } if (hw->mac.type == I40E_MAC_X722) { @@ -1751,28 +1807,21 @@i40e_flow_add_del_fdir_filter(struct
rte_eth_dev*dev,drivers/net/i40e/i40e_fdir.c +12
-18hw, I40E_GLQF_FD_PCTYPES((int)pctype)); } - ret =i40e_flow_fdir_filter_programming (pf, pctype, filter, add); + ret =i40e_flow_fdir_filter_programming (pf, pctype, filter, add, +wait_status);if (ret <0 ) {PMD_DRV_LOG (ERR ,"fdir programming fails for PCTYPE(%u)." , pctype); -return ret; + goto error_op; } -if (add) { - fdir_filter =rte_zmalloc ("fdir_filter" , -sizeof (*fdir_filter),0 ); -if (fdir_filter ==NULL ) { -PMD_DRV_LOG (ERR ,"Failed to alloc memory." ); -return -ENOMEM ; - } +return ret; -rte_memcpy (fdir_filter, &check_filter,sizeof (check_filter)); - ret =i40e_sw_fdir_filter_insert (pf, fdir_filter); -if (ret <0 ) -rte_free (fdir_filter); - }else { - ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); - } +error_op: +/* roll back */ +if (add) +i40e_sw_fdir_filter_del (pf, &check_filter.fdir.input); +else +i40e_sw_fdir_filter_insert (pf, &check_filter);return ret; }@@ -1875,7 +1924,7 @@ i40e_fdir_filter_programming(struct i40e_pf *pf,PMD_DRV_LOG (INFO ,"filling transmit descriptor." ); txdp = &(txq->tx_ring[txq->tx_tail +1 ]); - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[0 ]); td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;@@ -1925,7 +1974,7 @@ static int i40e_flow_fdir_filter_programming(struct i40e_pf *pf, enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add) + bool add, bool wait_status) { struct i40e_tx_queue *txq = pf->fdir.txq; struct i40e_rx_queue *rxq = pf->fdir.rxq; @@ -1933,8 +1982,9 @@i40e_flow_fdir_filter_programming(struct
i40e_pf*pf,drivers/net/i40e/i40e_fdir.c +4
-2volatile struct i40e_tx_desc *txdp;volatile struct i40e_filter_program_desc *fdirdp;uint32_t td_cmd; -uint16_t vsi_id, i; +uint16_t vsi_id;uint8_t dest; +uint32_t i;PMD_DRV_LOG (INFO ,"filling filter programming descriptor." ); fdirdp = (volatile struct i40e_filter_program_desc *) @@ -2009,7 +2059,8 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf, PMD_DRV_LOG(INFO, "filling transmit descriptor."); txdp = &txq->tx_ring[txq->tx_tail +1 ]; - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr = rte_cpu_to_le_64(pf->fdir.dma_addr[txq->tx_tail/
+2]);drivers/net/i40e/i40e_fdir.c +1
-0+ td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;drivers/net/i40e/i40e_fdir.c i40e_flow_fdir_filter_programming(struct · line 2079
Quoted 7 lines
drivers/net/i40e/i40e_fdir.c +3
-0@@ -2022,25 +2073,32 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf, txq->tx_tail =0 ;/* Update the tx tail register */ rte_wmb (); + +while (i40e_check_fdir_programming_status (rxq) <0 ) +PMD_DRV_LOG (INFO ,"previous error report captured." );Is it possible it's a dead loop?
Quoted 216 lines
drivers/net/i40e/i40e_fdir.c +1
-17+I40E_PCI_REG_WRITE (txq->qtx_tail, txq->tx_tail); -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_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_MAX_WAIT_US ); -if (i40e_check_fdir_programming_status (rxq) <0 ) { - PMD_DRV_LOG(ERR, - "Failed to program FDIR filter: programming statusreported.");
drivers/net/i40e/i40e_fdir.c +5
-1-return -ETIMEDOUT ; + +if (wait_status) { +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))drivers/net/i40e/i40e_fdir.c +6
-0+break ; +rte_delay_us (1 ); + } +if (i >=I40E_FDIR_MAX_WAIT_US ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: time out to get DDon tx queue.");
drivers/net/i40e/i40e_fdir.c +7
-0+return -ETIMEDOUT ; + } +/* totally delay 10 ms to check programming status*/ +rte_delay_us (I40E_FDIR_MAX_WAIT_US ); +if (i40e_check_fdir_programming_status (rxq) <0 ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: programming statusreported.");
drivers/net/i40e/i40e_fdir.c +3
-1+return -ETIMEDOUT ; + } }return 0 ;@@ -2324,7 +2382,7 @@ i40e_fdir_filter_restore(struct i40e_pf *pf)uint32_t best_cnt;/**< Number of filters in best effort spaces. */ TAILQ_FOREACH(f, fdir_list, rules) -i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE); +i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE, TRUE); fdstat =I40E_READ_REG (hw,I40E_PFQF_FDSTAT ); guarant_cnt =(quoted diff) +0
-0
b/drivers/net/i40e/i40e_flow.cindex8f8df6fae..f5f7d5078100644drivers/net/i40e/i40e_flow.c +3
-0@@ -17,6 +17,7 @@#include <rte_malloc.h> #include <rte_tailq.h> #include <rte_flow_driver.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h" @@ -133,6 +134,8 @@ const struct rte_flow_ops i40e_flow_ops = {static union i40e_filter_t cons_filter;static enum rte_filter_type cons_filter_type =RTE_ETH_FILTER_NONE ; +/* internal pattern w/o VOID items */ struct rte_flow_item +g_items[32 ]; /* Pattern matched ethertype filter */ static enum
rte_flow_item_typepattern_ethertype[] = { @@ -2026,9 +2029,6 @@ i40e_flow_parse_ethertype_pattern(structrte_eth_dev*dev,drivers/net/i40e/i40e_flow.c +1
-4const struct rte_flow_item_eth *eth_spec;const struct rte_flow_item_eth *eth_mask;enum rte_flow_item_type item_type; -uint16_t outer_tpid; - - outer_tpid =i40e_get_outer_vlan (dev);for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {@@ -2088,7 +2088,7 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev, if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type ==RTE_ETHER_TYPE_IPV6 || filter->ether_type ==RTE_ETHER_TYPE_LLDP || - filter->ether_type == outer_tpid) { + filter->ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +1
-1item,@@ -2331,6 +2331,7 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf, field_idx = layer_idx *I40E_MAX_FLXPLD_FIED + i; flx_pit =MK_FLX_PIT (min_next_off,NONUSE_FLX_PIT_FSIZE ,NONUSE_FLX_PIT_DEST_OFF ); +I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (field_idx), flx_pit); min_next_off++; }@@ -2590,7 +2591,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, uint16_t flex_size;bool cfg_flex_pit = true;bool cfg_flex_msk = true; -uint16_t outer_tpid;uint16_t ether_type;uint32_t vtc_flow_cpu;drivers/net/i40e/i40e_flow.c +0
-1bool outer_ip = true;@@ -2599,7 +2599,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,memset (off_arr,0 ,sizeof (off_arr));memset (len_arr,0 ,sizeof (len_arr));memset (flex_mask,0 ,I40E_FDIR_MAX_FLEX_LEN ); - outer_tpid =i40e_get_outer_vlan (dev); filter->input.flow_ext.customized_pctype = false;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {drivers/net/i40e/i40e_flow.c +0
-0if (item->last) {@@ -2667,7 +2666,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (next_type ==
RTE_FLOW_ITEM_TYPE_VLAN||drivers/net/i40e/i40e_flow.c +1
-1ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +1
-1item,@@ -2711,7 +2710,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +0
-1item,@@ -5028,7 +5027,6 @@ i40e_flow_validate(struct rte_eth_dev *dev, NULL, "NULL attribute.");return -rte_errno; } -memset (&cons_filter,0 ,sizeof (cons_filter)); /* Get the non-void item of action */ @@ -5050,12 +5048,16 @@i40e_flow_validate(struct
rte_eth_dev*dev,drivers/net/i40e/i40e_flow.c +0
-4} item_num++; - items =rte_zmalloc ("i40e_pattern" , - item_num *sizeof (struct rte_flow_item ),0 ); -if (!items) { - rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ITEM_NUM,drivers/net/i40e/i40e_flow.c +0
-1- NULL, "No memory for PMD internalitems.");
drivers/net/i40e/i40e_flow.c +5
-1-return -ENOMEM ; +if (item_num <=ARRAY_SIZE (g_items)) { + items = g_items; + }else { + items = rte_zmalloc("i40e_pattern", + item_num * sizeof(struct rte_flow_item),0);
drivers/net/i40e/i40e_flow.c +2
-0+if (!items) { + rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ITEM_NUM,drivers/net/i40e/i40e_flow.c +1
-0+ NULL, "No memory for PMDinternal items.");
drivers/net/i40e/i40e_flow.c +11
-2+return -ENOMEM ; + } } i40e_pattern_skip_void_item(items, pattern); @@ -5063,24 +5065,62 @@ i40e_flow_validate(struct rte_eth_dev *dev, i =0 ;do { parse_filter =i40e_find_parse_filter_func (items, &i); +if (!parse_filter && !flag) {rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , pattern,"Unsupported pattern" ); -rte_free (items); + +if (items != g_items) +rte_free (items);return -rte_errno; } +if (parse_filter) ret =parse_filter (dev, attr, items, actions, error, &cons_filter); + flag = true; }while ((ret <0 ) && (i <RTE_DIM (i40e_supported_patterns))); -rte_free (items); +if (items != g_items) +rte_free (items);
Quoted 6 lines
drivers/net/i40e/i40e_flow.c i40e_flow_validate(struct rte_eth_dev *dev, · line 5093
Quoted 5 lines
drivers/net/i40e/i40e_flow.c +2
-0return ret; } +static +uint32_t bin_search (uint64_t data)Code style:
Have replaced this function with rte_bsf64()
Quoted 79 lines
static
uint32_tbin_search(uint64_t data)Quoted 76 lines
drivers/net/i40e/i40e_flow.c +42
-9+{ +uint32_t pos =0 ; + +if ((data &0xFFFFFFFF ) ==0 ) { + data >>=32 ; + pos +=32 ; + } + +if ((data &0xFFFF ) ==0 ) { + data >>=16 ; + pos +=16 ; + } +if ((data &0xFF ) ==0 ) { + data >>=8 ; + pos +=8 ; + } +if ((data &0xF ) ==0 ) { + data >>=4 ; + pos +=4 ; + } +if ((data &0x3 ) ==0 ) { + data >>=2 ; + pos +=2 ; + } +if ((data &0x1 ) ==0 ) + pos +=1 ; + +return pos; +} +static struct rte_flow * i40e_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,@@ -5089,21 +5129,54 @@ i40e_flow_create(struct rte_eth_dev *dev, struct rte_flow_error *error) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); -struct rte_flow *flow; +struct rte_flow *flow =NULL ; +struct i40e_fdir_info *fdir_info = &pf->fdir; +uint32_t i =0 , pos =0 ;int ret; - - flow =rte_zmalloc ("i40e_flow" ,sizeof (struct rte_flow ),0 ); -if (!flow) { -rte_flow_error_set (error,ENOMEM , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to allocate memory" ); -return flow; - } +uint64_t slab =0 ; +bool wait_for_status = true; ret =i40e_flow_validate (dev, attr, pattern, actions, error);if (ret <0 )return NULL ; +if (cons_filter_type ==RTE_ETH_FILTER_FDIR ) { +/* scan from gurant fdir flow */ +if (fdir_info->fdir_actual_cnt < fdir_info->fdir_space_size) { +if (rte_bitmap_scan (fdir_info->fdir_flow_bitmap.b, &pos, &slab)) { + i =bin_search (slab); +rte_bitmap_clear (fdir_info- >fdir_flow_bitmap.b, pos + i); + flow = &fdir_info-Quoted 1 line
fdir_flow_bitmap.fdir_flow[pos + i].flow;
drivers/net/i40e/i40e_flow.c +5
-0+ +memset (flow,0 ,sizeof (struct rte_flow )); + +if (fdir_info->fdir_invalprio ==1 ) { + if (fdir_info-Quoted 1 line
fdir_guarantee_free_space> 0) {drivers/net/i40e/i40e_flow.c +1
-0+ fdir_info-Quoted 1 line
fdir_guarantee_free_space--;
Quoted 17 lines
Quoted 11 lines
drivers/net/i40e/i40e_flow.c +10
-0+ wait_for_status = false; + }else { + wait_for_status = true; + } + } + fdir_info->fdir_actual_cnt++; + } + }else { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_HANDLE,NULL,
drivers/net/i40e/i40e_flow.c i40e_flow_create(struct rte_eth_dev *dev, · line 5168
Quoted 3 lines
drivers/net/i40e/i40e_flow.c +3
-0+ "Fdir space full"); +return flow; + }Too many indentation here, can it be optimized?
OK
Quoted 141 lines
Quoted 141 lines
drivers/net/i40e/i40e_flow.c +6
-0+ + }else { + flow =rte_zmalloc ("i40e_flow" ,sizeof (struct rte_flow ),0 ); +if (!flow) { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_HANDLE,NULL,
drivers/net/i40e/i40e_flow.c +5
-0+ "Failed to allocate memory"); +return flow; + } + } +switch (cons_filter_type) {case RTE_ETH_FILTER_ETHERTYPE : ret = i40e_ethertype_filter_set(pf, @@ -5115,9 +5188,17 @@i40e_flow_create(struct
rte_eth_dev*dev,drivers/net/i40e/i40e_flow.c +16
-3break ;case RTE_ETH_FILTER_FDIR : ret =i40e_flow_add_del_fdir_filter (dev, - &cons_filter.fdir_filter,1 ); -if (ret) + &cons_filter.fdir_filter,1 , + wait_for_status); +if (ret) { +rte_bitmap_clear (fdir_info->fdir_flow_bitmap.b, i); + fdir_info->fdir_actual_cnt--; +if (fdir_info->fdir_invalprio ==1 ) + fdir_info->fdir_guarantee_free_space++; + goto free_flow; + } + flow->rule =TAILQ_LAST (&pf->fdir.fdir_list, i40e_fdir_filter_list);break ;@@ -5149,7 +5230,10 @@ i40e_flow_create(struct rte_eth_dev *dev,rte_flow_error_set (error, -ret,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failed to create flow." ); -rte_free (flow); + +if (cons_filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (flow); +return NULL ; }@@ -5159,7 +5243,9 @@ i40e_flow_destroy(struct rte_eth_dev *dev, struct rte_flow_error *error) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data- >dev_private); +struct i40e_fdir_info *fdir_info = &pf->fdir;enum rte_filter_type filter_type = flow->filter_type; +struct i40e_fdir_flows *f;int ret =0 ;drivers/net/i40e/i40e_flow.c +9
-3switch (filter_type) {@@ -5173,7 +5259,7 @@ i40e_flow_destroy(struct rte_eth_dev *dev,break ;case RTE_ETH_FILTER_FDIR : ret =i40e_flow_add_del_fdir_filter (dev, - &((struct i40e_fdir_filter *)flow->rule)->fdir,0 ); + &((struct i40e_fdir_filter *)flow->rule)->fdir,0 , false);/* If the last flow is destroyed, disable fdir. */ if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { @@ -5193,11 +5279,25 @@ i40e_flow_destroy(struct rte_eth_dev *dev, if (!ret) { TAILQ_REMOVE(&pf->flow_list, flow, node); -rte_free (flow); - }else + if (filter_type == RTE_ETH_FILTER_FDIR) { + f = FLOW_TO_FLOW_BITMAP(flow); + rte_bitmap_set(fdir_info->fdir_flow_bitmap.b, f->idx); + fdir_info->fdir_actual_cnt--; + + if (fdir_info->fdir_invalprio == 1) + /* check if the budget will be gained back toguaranteed space */
drivers/net/i40e/i40e_flow.c +2
-0+if (fdir_info->fdir_guarantee_free_space < + fdir_info-Quoted 1 line
fdir_guarantee_available_space)drivers/net/i40e/i40e_flow.c +1
-0+ fdir_info-Quoted 1 line
fdir_guarantee_free_space++;
drivers/net/i40e/i40e_flow.c +22
-1+ }else { +rte_free (flow); + } + + }else {rte_flow_error_set (error, -ret,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failed to destroy flow." ); + }return ret; }@@ -5347,6 +5447,7 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)struct rte_flow *flow;void *temp;int ret; +uint32_t i =0 ; ret =i40e_fdir_flush (dev);if (!ret) {@@ -5362,10 +5463,24 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) TAILQ_FOREACH_SAFE(flow, &pf->flow_list, node, temp) {if (flow->filter_type ==RTE_ETH_FILTER_FDIR ) {TAILQ_REMOVE (&pf->flow_list, flow, node); -rte_free (flow); } } +/* clear bitmap */ +rte_bitmap_reset (fdir_info->fdir_flow_bitmap.b); +for (i =0 ; i < fdir_info->fdir_space_size; i++) { + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; +rte_bitmap_set (fdir_info->fdir_flow_bitmap.b, i); + } + + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; +memset (fdir_info->fdir_filter_array, +0 , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM ); +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) pf->fdir.inset_flag[pctype] =0 ;(quoted diff) +0
-0
b/drivers/net/i40e/i40e_rxtx.cindex840b6f387..febf41fc2100644drivers/net/i40e/i40e_rxtx.c +0
-0@@ -2938,16 +2938,17 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } }
Quoted 6 lines
drivers/net/i40e/i40e_rxtx.c i40e_dev_free_queues(struct rte_eth_dev *dev) · line 2942
Quoted 4 lines
drivers/net/i40e/i40e_rxtx.c +0
-1-#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define
I40E_FDIR_NUM_RX_DESCI40E_MIN_RING_DESCdrivers/net/i40e/i40e_rxtx.c +2
-0+#define I40E_FDIR_NUM_TX_DESC (256) +#define I40E_FDIR_NUM_RX_DESC (256)Can the brackets be omitted?
OK
Quoted 46 lines
Quoted 46 lines
enum
i40e_status_codei40e_fdir_setup_tx_resources(struct i40e_pf *pf){drivers/net/i40e/i40e_rxtx.c +8
-1struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size; +uint32_t ring_size, i;struct rte_eth_dev *dev; +volatile struct i40e_tx_desc *txdp;if (!pf) { PMD_DRV_LOG(ERR, "PF is not available"); @@ -2987,6 +2988,14 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; + +/* Set all the DD flags to 1 */ +for (i =0 ; i <I40E_FDIR_NUM_TX_DESC ; i +=2 ) { + txdp = &txq->tx_ring[i +1 ]; + txdp->cmd_type_offset_bsz |=
I40E_TX_DESC_DTYPE_DESC_DONE;drivers/net/i40e/i40e_rxtx.c +1
-0+ txdp->buffer_addr = rte_cpu_to_le_64(pf->fdir.dma_addr[i /2]);
drivers/net/i40e/i40e_rxtx.c +2
-0+ } +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured. (quoted diff) +0
-0
b/drivers/net/i40e/rte_pmd_i40e.cindex446e31710..6061bce6e100644drivers/net/i40e/rte_pmd_i40e.c +0
-0@@ -3060,7 +3060,7 @@ intrte_pmd_i40e_flow_add_del_packet_template(
drivers/net/i40e/rte_pmd_i40e.c +1
-2(enum i40e_fdir_status )conf->action.report_status; filter_conf.action.flex_off = conf->action.flex_off; -return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add); +return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add, true); }int --2.17.1
Quoted 55 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of [email protected]
Sent: Saturday, June 13, 2020 02:00
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [dpdk-dev] [PATCH] net/i40e: i40e FDIR update rate optimizationFrom: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking the fdir rule will be inserted into guaranteed space or shared space. For the flows that are inserted to the guaranteed space, it returns success directly without retrieving the result for NIC.
This patch changes the global register
GLQF_CTL. Therefore, when devarg ``Support multiple driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.Signed-off-by Chenmin Sun <[email protected]>--- drivers/net/i40e/i40e_ethdev.c | 96 ++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 57 +++++++--- drivers/net/i40e/i40e_fdir.c | 182 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 181 +++++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 417 insertions(+), 116 deletions(-)drivers/net/i40e/i40e_flow.c +22
-0+static +uint32_t bin_search (uint64_t data) +{ +uint32_t pos =0 ; + +if ((data &0xFFFFFFFF ) ==0 ) { + data >>=32 ; + pos +=32 ; + } + +if ((data &0xFFFF ) ==0 ) { + data >>=16 ; + pos +=16 ; + } +if ((data &0xFF ) ==0 ) { + data >>=8 ; + pos +=8 ; + } +if ((data &0xF ) ==0 ) { + data >>=4 ; + pos +=4 ; + }
drivers/net/i40e/i40e_flow.c i40e_flow_validate(struct rte_eth_dev *dev, · line 5123
Quoted 10 lines
drivers/net/i40e/i40e_flow.c +10
-0+if ((data &0x3 ) ==0 ) { + data >>=2 ; + pos +=2 ; + } +if ((data &0x1 ) ==0 ) + pos +=1 ; + +return pos; +} +
Try " __builtin_ctzll ", DPDK has many examples to use it. ;-)
Quoted 2 lines
--
2.17.1
Best Regards,
Sun, Chenmin
Quoted 69 lines
-----Original Message-----
From: Wang, Haiyue <[email protected]>
Sent: Wednesday, July 8, 2020 4:41 PM
To: Sun, Chenmin <[email protected]>; Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: RE: [dpdk-dev] [PATCH] net/i40e: i40e FDIR update rate optimizationQuoted 60 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of [email protected]
Sent: Saturday, June 13, 2020 02:00
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [dpdk-dev] [PATCH] net/i40e: i40e FDIR update rate optimizationFrom: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking the fdir rule will be inserted into guaranteed space or shared space. For the flows that are inserted to the guaranteed space, it returns success directly without retrieving the result for NIC.
This patch changes the global register
GLQF_CTL. Therefore, when devarg ``Support multiple driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.Signed-off-by Chenmin Sun <[email protected]>--- drivers/net/i40e/i40e_ethdev.c | 96 ++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 57 +++++++--- drivers/net/i40e/i40e_fdir.c | 182 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 181 +++++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 417 insertions(+), 116 deletions(-)drivers/net/i40e/i40e_flow.c +26
-0+static +uint32_t bin_search (uint64_t data) +{ +uint32_t pos =0 ; + +if ((data &0xFFFFFFFF ) ==0 ) { + data >>=32 ; + pos +=32 ; + } + +if ((data &0xFFFF ) ==0 ) { + data >>=16 ; + pos +=16 ; + } +if ((data &0xFF ) ==0 ) { + data >>=8 ; + pos +=8 ; + } +if ((data &0xF ) ==0 ) { + data >>=4 ; + pos +=4 ; + } +if ((data &0x3 ) ==0 ) { + data >>=2 ; + pos +=2 ; + }
Quoted 9 lines
drivers/net/i40e/i40e_flow.c i40e_flow_validate(struct rte_eth_dev *dev, · line 5123
Quoted 6 lines
drivers/net/i40e/i40e_flow.c +6
-0+if ((data &0x1 ) ==0 ) + pos +=1 ; + +return pos; +} +Try "
__builtin_ctzll", DPDK has many examples to use it. ;-)
Thanks, I have replaced it with rte_bsf64()
Quoted 2 lines
Quoted 2 lines
--
2.17.1
PATCH v2 1/1 net/i40e: i40e FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking whether the fdir rule being inserted into the guaranteed space or shared space.
For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only reports the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. See the fdir programming status descriptor format in the datasheet for more details.
This patch changes the global register GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
---
v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace the bin_serch() with rte_bsf64()
--- drivers/net/i40e/i40e_ethdev.c | 136 ++++++++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 63 ++++++++--- drivers/net/i40e/i40e_fdir.c | 190 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 167 ++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 455 insertions(+), 118 deletions(-)
drivers/net/i40e/i40e_ethdev.c +130 -6
@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h"
@@ -1045,8 +1046,17 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +void *mem =NULL ; +uint32_t i =0 ; +uint32_t bmp_size; +uint32_t alloc =0 ; +uint32_t best =0 ; +uint32_t pfqf_fdalloc =0 ; +uint32_t glqf_ctl_reg =0 ; +struct rte_bitmap *bmp =NULL ;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1067,6 +1077,7 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR ,"Failed to create fdir hash table!" );return -EINVAL ; } + fdir_info->hash_map = rte_zmalloc("i40e_fdir_hash_map", sizeof(struct i40e_fdir_filter *) * I40E_MAX_FDIR_FILTER_NUM,
@@ -1077,8 +1088,100 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) ret = -ENOMEM ; goto err_fdir_hash_map_alloc; } + + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + +if (!fdir_info->fdir_filter_array) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir filter array!" ); + ret = -ENOMEM ; + goto err_fdir_filter_array_alloc; + } + + pfqf_fdalloc =i40e_read_rx_ctl (hw,I40E_PFQF_FDALLOC ); + alloc = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDALLOC_MASK ) >> +I40E_PFQF_FDALLOC_FDALLOC_SHIFT ); + best = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDBEST_MASK ) >> +I40E_PFQF_FDALLOC_FDBEST_SHIFT ); + + glqf_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + glqf_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO set to guaranteed first" ); + }else { +if (glqf_ctl_reg |I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: guaranteed first" ); + }else { + fdir_info->fdir_invalprio =0 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: shared first" ); + } + } + +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , glqf_ctl_reg); +PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , + alloc *32 , best *32 ); + + fdir_info->fdir_space_size = (alloc + best) *32 ; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_available_space = alloc *32 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; + + fdir_info->fdir_flow_bitmap.fdir_flow = +rte_zmalloc ("i40e_fdir_flows" , +sizeof (struct i40e_fdir_flows ) * + fdir_info->fdir_space_size, +0 ); + +if (!fdir_info->fdir_flow_bitmap.fdir_flow) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for bitmap flow!" ); + ret = -ENOMEM ; + goto err_fdir_bitmap_flow_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info->fdir_space_size); + + mem =rte_zmalloc ("fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to initialization fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_bmp_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_bitmap.b = bmp; +return 0 ; +err_fdir_bmp_alloc: +rte_free (mem); +err_fdir_mem_alloc: +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +err_fdir_bitmap_flow_alloc: +rte_free (fdir_info->fdir_filter_array); +err_fdir_filter_array_alloc: +rte_free (fdir_info->hash_map); err_fdir_hash_map_alloc:rte_hash_free (fdir_info->hash_table);
@@ -1749,18 +1852,34 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)struct i40e_fdir_info *fdir_info; fdir_info = &pf->fdir; -/* Remove all flow director rules and hash */ + +/* Remove all flow director rules */ +while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) +TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); +} + +static void +i40e_fdir_memory_cleanup (struct i40e_pf *pf) +{ +struct i40e_fdir_info *fdir_info; + + fdir_info = &pf->fdir; + +/* flow director memory cleanup */ if (fdir_info->hash_map)rte_free (fdir_info->hash_map);if (fdir_info->hash_table)rte_hash_free (fdir_info->hash_table); +if (fdir_info->fdir_flow_bitmap.b) +rte_bitmap_free (fdir_info->fdir_flow_bitmap.b); +if (fdir_info->fdir_flow_bitmap.fdir_flow) +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); -while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) { -TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); - } } +void i40e_flex_payload_reg_set_default (struct i40e_hw *hw) {/*
@@ -2618,9 +2737,14 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows since they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } +/* release the fdir static allocated memory */ +i40e_fdir_memory_cleanup (pf); +/* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit (dev);
drivers/net/i40e/i40e_ethdev.h +50 -13
102 lines not on this page · raw message
drivers/net/i40e/i40e_fdir.c +128 -62
334 lines not on this page · raw message
drivers/net/i40e/i40e_flow.c +134 -33
313 lines not on this page · raw message
drivers/net/i40e/i40e_rxtx.c +12 -3
@@ -2938,16 +2938,17 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define I40E_FDIR_NUM_RX_DESC I40E_MIN_RING_DESC +#define I40E_FDIR_NUM_TX_DESC 256 +#define I40E_FDIR_NUM_RX_DESC 256enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size; +uint32_t ring_size, i;struct rte_eth_dev *dev; +volatile struct i40e_tx_desc *txdp;if (!pf) {PMD_DRV_LOG (ERR ,"PF is not available" );
@@ -2987,6 +2988,14 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; + +/* Set all the DD flags to 1 */ +for (i =0 ; i <I40E_FDIR_NUM_TX_DESC ; i +=2 ) { + txdp = &txq->tx_ring[i +1 ]; + txdp->cmd_type_offset_bsz |=I40E_TX_DESC_DTYPE_DESC_DONE ; + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[i /2 ]); + } +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured.
drivers/net/i40e/rte_pmd_i40e.c +1 -1
@@ -3060,7 +3060,7 @@ int rte_pmd_i40e_flow_add_del_packet_template( (enum i40e_fdir_status )conf->action.report_status; filter_conf.action.flex_off = conf->action.flex_off; -return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add); +return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add, true); }int
Signature · 1 line
2.17.1
Quoted 21 lines
-----Original Message-----
From: Sun, Chenmin <[email protected]>
Sent: Thursday, July 9, 2020 10:40 PM
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Wang, Haiyue <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [PATCH V2] net/i40e: i40e FDIR update rate optimizationFrom: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking whether the fdir rule being inserted into the guaranteed space or shared space. For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only reports the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. See the fdir programming status descriptor format in the datasheet for more details.
Quoted 3 lines
This patch changes the global register
GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
Overall I think the patch is too big, is that possible to separate into 2 or more patches?
For example:
1.) you introduce some new data structure to tack the flow
2) the optimization for flow programming.
More comments inline.
Quoted 36 lines
Signed-off-by Chenmin Sun <[email protected]>---
v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace thebin_serch()withrte_bsf64()--- drivers/net/i40e/i40e_ethdev.c | 136 ++++++++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 63 ++++++++--- drivers/net/i40e/i40e_fdir.c | 190 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 167 ++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 455 insertions(+), 118 deletions(-)drivers/net/i40e/i40e_ethdev.c +2
-0@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h" @@ -1045,8 +1046,17 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;
drivers/net/i40e/i40e_ethdev.c static int · line 1060
Quoted 10 lines
drivers/net/i40e/i40e_ethdev.c +8
-0char fdir_hash_name[RTE_HASH_NAMESIZE ]; +void *mem =NULL ; +uint32_t i =0 ; +uint32_t bmp_size; +uint32_t alloc =0 ; +uint32_t best =0 ; +uint32_t pfqf_fdalloc =0 ; +uint32_t glqf_ctl_reg =0 ; +struct rte_bitmap *bmp =NULL ;int ret;
Its better to follow RCT, and please apply on other functions.
Quoted 43 lines
drivers/net/i40e/i40e_ethdev.c +0
-0struct rte_hash_parameters fdir_hash_params = { @@ -1067,6 +1077,7 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)drivers/net/i40e/i40e_ethdev.c +29
-0PMD_INIT_LOG (ERR ,"Failed to create fdir hash table!" );return -EINVAL ; } + fdir_info->hash_map = rte_zmalloc("i40e_fdir_hash_map", sizeof(struct i40e_fdir_filter *) * I40E_MAX_FDIR_FILTER_NUM,@@ -1077,8 +1088,100 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) ret = -ENOMEM ; goto err_fdir_hash_map_alloc; } + + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + +if (!fdir_info->fdir_filter_array) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir filter array!" ); + ret = -ENOMEM ; + goto err_fdir_filter_array_alloc; + } + + pfqf_fdalloc =i40e_read_rx_ctl (hw,I40E_PFQF_FDALLOC ); + alloc = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDALLOC_MASK ) >> +I40E_PFQF_FDALLOC_FDALLOC_SHIFT ); + best = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDBEST_MASK ) >> +I40E_PFQF_FDALLOC_FDBEST_SHIFT ); + + glqf_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + glqf_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO set to guaranteed first" ); + }else { +if (glqf_ctl_reg |I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: guaranteed first" );
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev · line 1129
Quoted 10 lines
drivers/net/i40e/i40e_ethdev.c +9
-0+ }else { + fdir_info->fdir_invalprio =0 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: shared first" ); + } + } + +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , glqf_ctl_reg); + PMD_DRV_LOG(INFO, "FDIR guarantee space: %u, best_effort space %u.", + alloc *32 , best *32 );
I think *32 can be applied when you assign alloc and best.
Also its better to replace by macro with meaningful name and use bit shift << but not *.
Quoted 134 lines
drivers/net/i40e/i40e_ethdev.c +55
-0+ + fdir_info->fdir_space_size = (alloc + best) *32 ; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_available_space = alloc *32 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; + + fdir_info->fdir_flow_bitmap.fdir_flow = +rte_zmalloc ("i40e_fdir_flows" , +sizeof (struct i40e_fdir_flows ) * + fdir_info->fdir_space_size, +0 ); + +if (!fdir_info->fdir_flow_bitmap.fdir_flow) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for bitmap flow!" ); + ret = -ENOMEM ; + goto err_fdir_bitmap_flow_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info->fdir_space_size); + + mem =rte_zmalloc ("fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to initialization fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_bmp_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_bitmap.b = bmp; +return 0 ; +err_fdir_bmp_alloc: +rte_free (mem); +err_fdir_mem_alloc: +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +err_fdir_bitmap_flow_alloc: +rte_free (fdir_info->fdir_filter_array); +err_fdir_filter_array_alloc: +rte_free (fdir_info->hash_map); err_fdir_hash_map_alloc:drivers/net/i40e/i40e_ethdev.c +25
-6rte_hash_free (fdir_info->hash_table);@@ -1749,18 +1852,34 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)struct i40e_fdir_info *fdir_info; fdir_info = &pf->fdir; -/* Remove all flow director rules and hash */ + +/* Remove all flow director rules */ +while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) +TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); } + +static void +i40e_fdir_memory_cleanup (struct i40e_pf *pf) { +struct i40e_fdir_info *fdir_info; + + fdir_info = &pf->fdir; + +/* flow director memory cleanup */ if (fdir_info->hash_map)rte_free (fdir_info->hash_map);if (fdir_info->hash_table)rte_hash_free (fdir_info->hash_table); +if (fdir_info->fdir_flow_bitmap.b) +rte_bitmap_free (fdir_info->fdir_flow_bitmap.b); +if (fdir_info->fdir_flow_bitmap.fdir_flow) +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); -while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) { -TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); - } } +void i40e_flex_payload_reg_set_default (struct i40e_hw *hw) {/* @@ -2618,9 +2737,14 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows since they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } +/* release the fdir static allocated memory */ +i40e_fdir_memory_cleanup (pf); +/* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit (dev);drivers/net/i40e/i40e_ethdev.h +9
-0@@ -264,6 +264,15 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +/* +* Struct to store flow created. +*/ +struct rte_flow { +TAILQ_ENTRY (rte_flow) node; +enum rte_filter_type filter_type; +void *rule; +}; +/** * The overhead from MTU to max frame size. * Considering QinQ packet, the VLAN tag needs to be counted twice.
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_filter { · line 686
Quoted 4 lines
drivers/net/i40e/i40e_ethdev.h +1
-0@@ -674,17 +683,33 @@ struct i40e_fdir_filter {struct i40e_fdir_filter_conf fdir; }; +struct i40e_fdir_flows {
Why it be named as "flows"
Could you add more comment here, what's purpose of the data structure and each field?
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_filter { · line 688
Quoted 2 lines
drivers/net/i40e/i40e_ethdev.h +2
-0+uint32_t idx; +struct rte_flow flow;
Not sure if its better to move flow to the first field, so we cover between a rte_flow point and a i40e_fdir_flow point directly.
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_filter { · line 694
Quoted 6 lines
drivers/net/i40e/i40e_ethdev.h +6
-0+}; + +struct i40e_fdir_flow_bitmap { +struct rte_bitmap *b; +struct i40e_fdir_flows *fdir_flow; +};
Can we just add rte_bitmap into i40e_fdir_flow?
Quoted 45 lines
drivers/net/i40e/i40e_ethdev.h +6
-0+ +#define FLOW_TO_FLOW_BITMAP (f) \ + container_of((f), struct i40e_fdir_flows, flow) +TAILQ_HEAD (i40e_fdir_filter_list, i40e_fdir_filter);/* * A structure used to define fields of a FDIR related info. */ struct i40e_fdir_info { +#define PRG_PKT_CNT 128 +struct i40e_vsi *fdir_vsi;/* pointer to fdir VSI structure */ uint16_t match_counter_index;/* Statistic counter index used for fdir*/
drivers/net/i40e/i40e_ethdev.h +0
-2struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/
drivers/net/i40e/i40e_ethdev.h +1
-0+void *prg_pkt[PRG_PKT_CNT ];/* memory for fdir program packet */
drivers/net/i40e/i40e_ethdev.h +1
-0+uint64_t dma_addr[PRG_PKT_CNT ];/* physic address of packet memory*/
drivers/net/i40e/i40e_ethdev.h +9
-0+/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/* @@ -698,6 +723,27 @@ struct i40e_fdir_info {struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table; +struct i40e_fdir_filter *fdir_filter_array; + +/* +* Priority ordering at filter invalidation(destroying a flow) between +* "best effort" space and "guaranteed" space. +* +* 0 = At filter invalidation, the hardware first tries to increment the +* "best effort" space. The "guaranteed" space is incremented only when
drivers/net/i40e/i40e_ethdev.h +4
-0+* the global "best effort" space is at it max value or the "best effort" +* space of the PF is at its max value. +* 1 = At filter invalidation, the hardware first tries to increment its +* "guaranteed" space. The "best effort" space is incremented only when
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_info { · line 745
Quoted 8 lines
drivers/net/i40e/i40e_ethdev.h +8
-0+* it is already at its max value. +*/ +uint32_t fdir_invalprio; +uint32_t fdir_space_size; +uint32_t fdir_actual_cnt; +uint32_t fdir_guarantee_available_space; +uint32_t fdir_guarantee_free_space; +struct i40e_fdir_flow_bitmap fdir_flow_bitmap;
What is the flow_bitmap usage? its free bitmap or alloc bitmap? Better add more description here, or rename it with more clean purpose.
Quoted 71 lines
drivers/net/i40e/i40e_ethdev.h +1
-9+/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ];@@ -894,15 +940,6 @@ struct i40e_mirror_rule {TAILQ_HEAD (i40e_mirror_rule_list, i40e_mirror_rule); -/* -* Struct to store flow created. -*/ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -enum rte_filter_type filter_type; -void *rule; -}; -TAILQ_HEAD (i40e_flow_list, rte_flow); /* Struct to store Traffic Manager shaper profile. */ @@ -1335,8 +1372,8@@ int i40e_add_del_fdir_filter(struct
rte_eth_dev*dev,drivers/net/i40e/i40e_ethdev.h +2
-2const struct rte_eth_fdir_filter *filter, bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add,bool wait_status);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);drivers/net/i40e/i40e_fdir.c index renamed from drivers/net/i40e/i40e_fdir.c +0
-0
4a778db4c..d7ba841d6100644drivers/net/i40e/i40e_fdir.c +1
-1@@ -99,7 +99,7 @@ static int i40e_flow_fdir_filter_programming(struct i40e_pf *pf, enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add); + bool add, bool wait_status);static int i40e_fdir_rx_queue_init(struct i40e_rx_queue *rxq) @@ -163,6 +163,7@@
i40e_fdir_setup(struct i40e_pf *pf)drivers/net/i40e/i40e_fdir.c +5
-1char z_name[RTE_MEMZONE_NAMESIZE ];const struct rte_memzone *mz =NULL ;struct rte_eth_dev *eth_dev = pf->adapter->eth_dev; +uint16_t i;if ((pf->flags &I40E_FLAG_FDIR ) ==0 ) { PMD_INIT_LOG(ERR, "HW doesn't support FDIR"); @@ -179,6 +180,7 @@ i40e_fdir_setup(struct i40e_pf *pf)PMD_DRV_LOG (INFO ,"FDIR initialization has been done." );return I40E_SUCCESS ; } +/* make new FDIR VSI */ vsi =i40e_vsi_setup (pf,I40E_VSI_FDIR , pf->main_vsi,0 );if (!vsi) {@@ -233,17 +235,27 @@ i40e_fdir_setup(struct i40e_pf *pf) eth_dev->device->driver->name,I40E_FDIR_MZ_NAME , eth_dev->data->port_id); - mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN , SOCKET_ID_ANY); + mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN *PRG_PKT_CNT , +SOCKET_ID_ANY );if (!mz) { PMD_DRV_LOG(ERR, "Cannot init memzone for "
drivers/net/i40e/i40e_fdir.c i40e_fdir_setup(struct i40e_pf *pf) · line 251
Quoted 10 lines
drivers/net/i40e/i40e_fdir.c +4
-2"flow director program packet."); err =I40E_ERR_NO_MEMORY ; goto fail_mem; } - pf->fdir.prg_pkt = mz->addr; - pf->fdir.dma_addr = mz->iova; + +for (i =0 ; i <PRG_PKT_CNT ; i++) { + pf->fdir.prg_pkt[i] = (uint8_t *)mz->addr +I40E_FDIR_PKT_LEN * + (i %PRG_PKT_CNT );
The loop is from 0 to PRG_PKT_CNT, why "i % PKG_PTK_CNT"?
Quoted 15 lines
drivers/net/i40e/i40e_fdir.c +7
-0+ pf->fdir.dma_addr[i] = mz->iova +I40E_FDIR_PKT_LEN * + (i %PRG_PKT_CNT ); + } pf->fdir.match_counter_index =I40E_COUNTER_INDEX_FDIR (hw->pf_id); + pf->fdir.fdir_actual_cnt =0 ; + pf->fdir.fdir_guarantee_free_space = + pf->fdir.fdir_guarantee_available_space; +PMD_DRV_LOG(INFO, "FDIR setup successfully, with programming
queue %u.",drivers/net/i40e/i40e_fdir.c +0
-0vsi->base_queue);return I40E_SUCCESS ;
drivers/net/i40e/i40e_fdir.c i40e_init_flx_pld(struct i40e_pf *pf) · line 342
Quoted 4 lines
drivers/net/i40e/i40e_fdir.c +1
-0@@ -327,6 +339,7 @@ i40e_init_flx_pld(struct i40e_pf *pf) pf->fdir.flex_set[index].src_offset =0 ; pf->fdir.flex_set[index].size =I40E_FDIR_MAX_FLEXWORD_NUM ; pf->fdir.flex_set[index].dst_offset =0 ; +
Dummy empty line.
Quoted 63 lines
drivers/net/i40e/i40e_fdir.c +8
-3I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (index),0x0000C900 );I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (index +1 ),0x0000FC29 );/*non-used*/ @@ -1557,11 +1570,11 @@ i40e_sw_fdir_filter_lookup(structi40e_fdir_info *fdir_info, return fdir_info->hash_map[ret]; } -/* Add a flow director filter into the SW list */ static int i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter) { struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_fdir_filter *hash_filter;int ret;if (filter->fdir.input.flow_ext.pkt_template)@@ -1577,9 +1590,14 @@ i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter) ret);return ret; } - fdir_info->hash_map[ret] = filter; -TAILQ_INSERT_TAIL (&fdir_info->fdir_list, filter, rules); +if (fdir_info->hash_map[ret]) +return -1 ; + + hash_filter = &fdir_info->fdir_filter_array[ret]; +rte_memcpy (hash_filter, filter,sizeof (*filter)); + fdir_info->hash_map[ret] = hash_filter; +TAILQ_INSERT_TAIL (&fdir_info->fdir_list, hash_filter, rules);return 0 ;}
drivers/net/i40e/i40e_fdir.c +0
-1@@ -1608,7 +1626,6 @@ i40e_sw_fdir_filter_del(struct i40e_pf *pf, struct i40e_fdir_input *input) fdir_info->hash_map[ret] = NULL;TAILQ_REMOVE (&fdir_info->fdir_list, filter, rules); -rte_free (filter);return 0 ;}
drivers/net/i40e/i40e_fdir.c +14
-0@@ -1675,23 +1692,50 @@ i40e_add_del_fdir_filter(struct rte_eth_dev *dev, return ret; } +static inline unsigned char * +i40e_find_available_buffer (struct rte_eth_dev *dev) { +struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_tx_queue *txq = pf->fdir.txq; +volatile struct i40e_tx_desc *txdp = &txq->tx_ring[txq->tx_tail +1 ]; +uint32_t i; + +/* wait until the tx descriptor is ready */ +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 ;
drivers/net/i40e/i40e_fdir.c i40e_add_del_fdir_filter(struct rte_eth_dev · line 1720
Quoted 10 lines
drivers/net/i40e/i40e_fdir.c +9
-0+rte_delay_us (1 ); + } +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 NULL ; + } + +return (unsigned char *)fdir_info->prg_pkt[txq->tx_tail /2 ]; }
why tx_tail / 2, better some add some description here, and use " >> 1" if its word / byte conversion.
Quoted 612 lines
drivers/net/i40e/i40e_fdir.c +33
-15+/** * i40e_flow_add_del_fdir_filter - add or remove a flow director filter. * @pf: board private structure * @filter: fdir filter entry * @add: 0 - delete, 1 - add */ +int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev,const struct i40e_fdir_filter_conf *filter, -bool add) +bool add,bool wait_status) {struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); -unsigned char *pkt = (unsigned char *)pf->fdir.prg_pkt; +unsigned char *pkt =NULL ;enum i40e_filter_pctype pctype;struct i40e_fdir_info *fdir_info = &pf->fdir; -struct i40e_fdir_filter *fdir_filter, *node; +struct i40e_fdir_filter *node;struct i40e_fdir_filter check_filter;/* Check if the filter exists */ int ret =0 ;@@ -1724,25 +1768,41 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,/* Check if there is the filter in SW list */ memset (&check_filter,0 ,sizeof (check_filter));i40e_fdir_filter_convert (filter, &check_filter); - node =i40e_sw_fdir_filter_lookup (fdir_info, &check_filter.fdir.input); -if (add && node) { -PMD_DRV_LOG (ERR , -"Conflict with existing flow director rules!" ); -return -EINVAL ; - } -if (!add && !node) { -PMD_DRV_LOG (ERR , -"There's no corresponding flow firector filter!" ); -return -EINVAL ; +if (add) { + ret =i40e_sw_fdir_filter_insert (pf, &check_filter); +if (ret <0 ) { +PMD_DRV_LOG (ERR , +"Conflict with existing flow director rules!" ); +return -EINVAL ; + } + }else { + node =i40e_sw_fdir_filter_lookup (fdir_info, + &check_filter.fdir.input); +if (!node) { +PMD_DRV_LOG (ERR , +"There's no corresponding flow firector filter!" ); +return -EINVAL ; + } + + ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); +if (ret <0 ) { +PMD_DRV_LOG (ERR , +"Error deleting fdir rule from hash table!" ); +return -EINVAL ; + } } -memset (pkt,0 ,I40E_FDIR_PKT_LEN ); +/* find a buffer to store the pkt */ + pkt =i40e_find_available_buffer (dev); +if (pkt ==NULL ) + goto error_op; +memset (pkt,0 ,I40E_FDIR_PKT_LEN ); ret =i40e_flow_fdir_construct_pkt (pf, &filter->input, pkt);if (ret <0 ) {PMD_DRV_LOG (ERR ,"construct packet for fdir fails." ); -return ret; + goto error_op; }drivers/net/i40e/i40e_fdir.c +10
-16if (hw->mac.type ==I40E_MAC_X722 ) {@@ -1751,28 +1811,22 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, hw, I40E_GLQF_FD_PCTYPES((int)pctype)); } - ret =i40e_flow_fdir_filter_programming (pf, pctype, filter, add); + ret =i40e_flow_fdir_filter_programming (pf, pctype, filter, add, + wait_status);if (ret <0 ) {PMD_DRV_LOG (ERR ,"fdir programming fails for PCTYPE(%u)." , pctype); -return ret; + goto error_op; } -if (add) { - fdir_filter =rte_zmalloc ("fdir_filter" , -sizeof (*fdir_filter),0 ); -if (fdir_filter ==NULL ) { -PMD_DRV_LOG (ERR ,"Failed to alloc memory." ); -return -ENOMEM ; - } +return ret; -rte_memcpy (fdir_filter, &check_filter,sizeof (check_filter)); - ret =i40e_sw_fdir_filter_insert (pf, fdir_filter); -if (ret <0 ) -rte_free (fdir_filter); - }else { - ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); - } +error_op: +/* roll back */ +if (add) +i40e_sw_fdir_filter_del (pf, &check_filter.fdir.input); +else +i40e_sw_fdir_filter_insert (pf, &check_filter);return ret;}
drivers/net/i40e/i40e_fdir.c +2
-2@@ -1875,7 +1929,7 @@ i40e_fdir_filter_programming(struct i40e_pf *pf,PMD_DRV_LOG (INFO ,"filling transmit descriptor." ); txdp = &(txq->tx_ring[txq->tx_tail +1 ]); - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[0 ]); td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;@@ -1925,7 +1979,7 @@ static int i40e_flow_fdir_filter_programming(struct i40e_pf *pf, enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add) + bool add, bool wait_status) { struct i40e_tx_queue *txq = pf->fdir.txq; struct i40e_rx_queue *rxq = pf->fdir.rxq; @@ -1933,8 +1987,10 @@i40e_flow_fdir_filter_programming(struct
i40e_pf*pf,drivers/net/i40e/i40e_fdir.c +18
-20volatile struct i40e_tx_desc *txdp;volatile struct i40e_filter_program_desc *fdirdp;uint32_t td_cmd; -uint16_t vsi_id, i; +uint16_t vsi_id;uint8_t dest; +uint32_t i; +uint8_t retry_count =0 ;PMD_DRV_LOG (INFO ,"filling filter programming descriptor." ); fdirdp = (volatile struct i40e_filter_program_desc *) @@ -2009,7 +2065,8 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf, PMD_DRV_LOG(INFO, "filling transmit descriptor."); txdp = &txq->tx_ring[txq->tx_tail +1 ]; - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[txq->tx_tail / +2 ]); + td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;@@ -2022,25 +2079,34 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf, txq->tx_tail =0 ;/* Update the tx tail register */ rte_wmb (); + +/* capture the previous error report(if any) from rx ring */ +while ((i40e_check_fdir_programming_status (rxq) <0 ) && + (++retry_count <100 )) +PMD_DRV_LOG (INFO ,"previous error report captured." ); +I40E_PCI_REG_WRITE (txq->qtx_tail, txq->tx_tail); -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_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_MAX_WAIT_US ); -if (i40e_check_fdir_programming_status (rxq) <0 ) { -PMD_DRV_LOG (ERR , - "Failed to program FDIR filter: programming status reported."); -return -ETIMEDOUT ; + +if (wait_status) { +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))drivers/net/i40e/i40e_fdir.c +6
-0+break ; +rte_delay_us (1 ); + } +if (i >=I40E_FDIR_MAX_WAIT_US ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: time out to get DD on txqueue.");
drivers/net/i40e/i40e_fdir.c +7
-0+return -ETIMEDOUT ; + } +/* totally delay 10 ms to check programming status*/ +rte_delay_us (I40E_FDIR_MAX_WAIT_US ); +if (i40e_check_fdir_programming_status (rxq) <0 ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: programming statusreported.");
drivers/net/i40e/i40e_fdir.c +3
-1+return -ETIMEDOUT ; + } }return 0 ;@@ -2324,7 +2390,7 @@ i40e_fdir_filter_restore(struct i40e_pf *pf)uint32_t best_cnt;/**< Number of filters in best effort spaces. */ TAILQ_FOREACH(f, fdir_list, rules) -i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE); +i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE, TRUE); fdstat =I40E_READ_REG (hw,I40E_PFQF_FDSTAT ); guarant_cnt =drivers/net/i40e/i40e_flow.c +5
-4@@ -17,6 +17,7 @@#include <rte_malloc.h> #include <rte_tailq.h> #include <rte_flow_driver.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h" @@ -144,6 +145,8 @@ const struct rte_flow_ops i40e_flow_ops = {static union i40e_filter_t cons_filter;static enum rte_filter_type cons_filter_type =RTE_ETH_FILTER_NONE ; +/* internal pattern w/o VOID items */ +struct rte_flow_item g_items[32 ];/* Pattern matched ethertype filter */ static enum rte_flow_item_type pattern_ethertype[] = { @@ -2044,9 +2047,6 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev, const struct rte_flow_item_eth *eth_spec; const struct rte_flow_item_eth *eth_mask; enum rte_flow_item_type item_type; -uint16_t outer_tpid; - - outer_tpid =i40e_get_outer_vlan (dev); for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {if (item->last) {@@ -2106,7 +2106,7 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev, if (filter->ether_type == RTE_ETHER_TYPE_IPV4 || filter->ether_type ==RTE_ETHER_TYPE_IPV6 || filter->ether_type ==RTE_ETHER_TYPE_LLDP || - filter->ether_type == outer_tpid) { + filter->ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +1
-1item,@@ -2349,6 +2349,7 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf, field_idx = layer_idx *I40E_MAX_FLXPLD_FIED + i; flx_pit =MK_FLX_PIT (min_next_off,NONUSE_FLX_PIT_FSIZE ,NONUSE_FLX_PIT_DEST_OFF ); +I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (field_idx), flx_pit); min_next_off++; }@@ -2608,7 +2609,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, uint16_t flex_size;bool cfg_flex_pit = true;bool cfg_flex_msk = true; -uint16_t outer_tpid;uint16_t ether_type;uint32_t vtc_flow_cpu;drivers/net/i40e/i40e_flow.c +0
-1bool outer_ip = true;@@ -2617,7 +2617,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,memset (off_arr,0 ,sizeof (off_arr));memset (len_arr,0 ,sizeof (len_arr));memset (flex_mask,0 ,I40E_FDIR_MAX_FLEX_LEN ); - outer_tpid =i40e_get_outer_vlan (dev); filter->input.flow_ext.customized_pctype = false;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {drivers/net/i40e/i40e_flow.c +1
-1if (item->last) {@@ -2685,7 +2684,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || ether_type ==RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +1
-1item,@@ -2729,7 +2728,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/i40e/i40e_flow.c +12
-7item,@@ -5263,7 +5262,6 @@ i40e_flow_validate(struct rte_eth_dev *dev, NULL, "NULL attribute.");return -rte_errno; } -memset (&cons_filter,0 ,sizeof (cons_filter));/* Get the non-void item of action */ @@ -5285,12 +5283,18 @@ i40e_flow_validate(struct rte_eth_dev *dev, } item_num++; - items =rte_zmalloc ("i40e_pattern" , - item_num *sizeof (struct rte_flow_item ),0 ); -if (!items) { -rte_flow_error_set (error,ENOMEM , RTE_FLOW_ERROR_TYPE_ITEM_NUM, -NULL ,"No memory for PMD internal items." ); -return -ENOMEM ; +if (item_num <=ARRAY_SIZE (g_items)) { + items = g_items; + }else { + items =rte_zmalloc ("i40e_pattern" , + item_num *sizeof (struct rte_flow_item ),0 ); +if (!items) { +rte_flow_error_set (error,ENOMEM , +RTE_FLOW_ERROR_TYPE_ITEM_NUM , +NULL , +"No memory for PMD internal items." ); +return -ENOMEM ; + } }
i40e_pattern_skip_void_item(items, pattern); @@ -5298,20 +5302,26
@@ i40e_flow_validate(structrte_eth_dev*dev,drivers/net/i40e/i40e_flow.c +63
-11i =0 ;do { parse_filter =i40e_find_parse_filter_func (items, &i); +if (!parse_filter && !flag) {rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , pattern,"Unsupported pattern" ); -rte_free (items); + +if (items != g_items) +rte_free (items);return -rte_errno; } +if (parse_filter) ret =parse_filter (dev, attr, items, actions, error, &cons_filter); + flag = true; }while ((ret <0 ) && (i <RTE_DIM (i40e_supported_patterns))); -rte_free (items); +if (items != g_items) +rte_free (items);return ret; }@@ -5324,21 +5334,67 @@ i40e_flow_create(struct rte_eth_dev *dev, struct rte_flow_error *error) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); -struct rte_flow *flow; +struct rte_flow *flow =NULL ; +struct i40e_fdir_info *fdir_info = &pf->fdir; +uint32_t i =0 ; +uint32_t pos =0 ; +uint64_t slab =0 ; +bool wait_for_status = true;int ret; - flow =rte_zmalloc ("i40e_flow" ,sizeof (struct rte_flow ),0 ); -if (!flow) { -rte_flow_error_set (error,ENOMEM , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to allocate memory" ); -return flow; - } - ret =i40e_flow_validate (dev, attr, pattern, actions, error);if (ret <0 )return NULL ; +if (cons_filter_type ==RTE_ETH_FILTER_FDIR ) { +if (fdir_info->fdir_actual_cnt >= + fdir_info->fdir_space_size) { +rte_flow_error_set (error,ENOMEM , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"Fdir space full" ); +return NULL ; + } + + ret =rte_bitmap_scan (fdir_info->fdir_flow_bitmap.b, &pos, + &slab); + +/* normally this won't happen as the fdir_actual_cnt should be +* same with the number of the set bits in fdir_flow_bitmap, +* but anyway handle this error condition here for safe +*/ +if (ret ==0 ) { +PMD_DRV_LOG (ERR ,"fdir_actual_cnt out of sync" ); +rte_flow_error_set (error,ENOMEM , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"Fdir space full" ); +return NULL ; + } + + i =rte_bsf64 (slab); + pos += i; +rte_bitmap_clear (fdir_info->fdir_flow_bitmap.b, pos); + flow = &fdir_info->fdir_flow_bitmap.fdir_flow[pos].flow; +memset (flow,0 ,sizeof (struct rte_flow )); + +if (fdir_info->fdir_invalprio ==1 ) { +if (fdir_info->fdir_guarantee_free_space >0 ) { + fdir_info->fdir_guarantee_free_space--; + wait_for_status = false; + } + } + + fdir_info->fdir_actual_cnt++; + + }else { + flow =rte_zmalloc ("i40e_flow" ,sizeof (struct rte_flow ),0 ); +if (!flow) { +rte_flow_error_set (error,ENOMEM , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"Failed to allocate memory" ); +return flow; + } + } +switch (cons_filter_type) {case RTE_ETH_FILTER_ETHERTYPE :drivers/net/i40e/i40e_flow.c +16
-3ret = i40e_ethertype_filter_set(pf,@@ -5350,9 +5406,17 @@ i40e_flow_create(struct rte_eth_dev *dev,break ;case RTE_ETH_FILTER_FDIR : ret =i40e_flow_add_del_fdir_filter (dev, - &cons_filter.fdir_filter,1 ); -if (ret) + &cons_filter.fdir_filter,1 , + wait_for_status); +if (ret) { +rte_bitmap_set (fdir_info->fdir_flow_bitmap.b, pos); + fdir_info->fdir_actual_cnt--; +if (fdir_info->fdir_invalprio ==1 ) + fdir_info->fdir_guarantee_free_space++; + goto free_flow; + } + flow->rule =TAILQ_LAST (&pf->fdir.fdir_list, i40e_fdir_filter_list);break ;@@ -5384,7 +5448,10 @@ i40e_flow_create(struct rte_eth_dev *dev,rte_flow_error_set (error, -ret,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failed to create flow." ); -rte_free (flow); + +if (cons_filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (flow); +return NULL ; }@@ -5394,7 +5461,9 @@ i40e_flow_destroy(struct rte_eth_dev *dev, struct rte_flow_error *error) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_fdir_info *fdir_info = &pf->fdir;enum rte_filter_type filter_type = flow->filter_type; +struct i40e_fdir_flows *f;int ret =0 ;drivers/net/i40e/i40e_flow.c +37
-4switch (filter_type) {@@ -5408,7 +5477,8 @@ i40e_flow_destroy(struct rte_eth_dev *dev,break ;case RTE_ETH_FILTER_FDIR : ret =i40e_flow_add_del_fdir_filter (dev, - &((struct i40e_fdir_filter *)flow->rule)->fdir,0 ); + &((struct i40e_fdir_filter *)flow->rule)->fdir, +0 , false);/* If the last flow is destroyed, disable fdir. */ if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { @@ -5428,11 +5498,27 @@ i40e_flow_destroy(struct rte_eth_dev *dev, if (!ret) {TAILQ_REMOVE (&pf->flow_list, flow, node); -rte_free (flow); - }else +if (filter_type ==RTE_ETH_FILTER_FDIR ) { + f =FLOW_TO_FLOW_BITMAP (flow); +rte_bitmap_set (fdir_info->fdir_flow_bitmap.b, f->idx); + fdir_info->fdir_actual_cnt--; + +if (fdir_info->fdir_invalprio ==1 ) +/* check if the budget will be gained back to +* guaranteed space +*/ +if (fdir_info->fdir_guarantee_free_space < + fdir_info->fdir_guarantee_available_space) + fdir_info->fdir_guarantee_free_space++; + }else { +rte_free (flow); + } + + } else { rte_flow_error_set(error, -ret,RTE_FLOW_ERROR_TYPE_HANDLE ,NULL ,"Failed to destroy flow." ); + }return ret; }@@ -5582,6 +5668,7 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)struct rte_flow *flow;void *temp;int ret; +uint32_t i =0 ; ret =i40e_fdir_flush (dev);if (!ret) {@@ -5597,10 +5684,24 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) TAILQ_FOREACH_SAFE(flow, &pf->flow_list, node, temp) {if (flow->filter_type ==RTE_ETH_FILTER_FDIR ) {TAILQ_REMOVE (&pf->flow_list, flow, node); -rte_free (flow); } } +/* clear bitmap */ +rte_bitmap_reset (fdir_info->fdir_flow_bitmap.b); +for (i =0 ; i < fdir_info->fdir_space_size; i++) { + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; +rte_bitmap_set (fdir_info->fdir_flow_bitmap.b, i); + } + + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; +memset (fdir_info->fdir_filter_array, +0 , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM ); +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) pf->fdir.inset_flag[pctype] =0 ;drivers/net/i40e/i40e_rxtx.c index renamed from drivers/net/i40e/i40e_rxtx.c +0
-0
840b6f387..f5235864d100644drivers/net/i40e/i40e_rxtx.c +0
-1@@ -2938,16 +2938,17 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define
I40E_FDIR_NUM_RX_DESCI40E_MIN_RING_DESCdrivers/net/i40e/i40e_rxtx.c +4
-1+#define I40E_FDIR_NUM_TX_DESC 256 +#define I40E_FDIR_NUM_RX_DESC 256enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size; +uint32_t ring_size, i;struct rte_eth_dev *dev; +volatile struct i40e_tx_desc *txdp;if (!pf) { PMD_DRV_LOG(ERR, "PF is not available"); @@ -2987,6 +2988,14@@
i40e_fdir_setup_tx_resources(struct i40e_pf *pf)drivers/net/i40e/i40e_rxtx.c +5
-0txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; + +/* Set all the DD flags to 1 */ +for (i =0 ; i <I40E_FDIR_NUM_TX_DESC ; i +=2 ) { + txdp = &txq->tx_ring[i +1 ]; + txdp->cmd_type_offset_bsz |=
I40E_TX_DESC_DTYPE_DESC_DONE;
drivers/net/i40e/i40e_rxtx.c i40e_fdir_setup_tx_resources(struct i40e_pf *pf) · line 2997
Quoted 2 lines
drivers/net/i40e/i40e_rxtx.c +2
-0+ txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[i /2 ]); + }
DD bits are assume to be reported by hardware, why we initialize them to 1 ?
Quoted 20 lines
drivers/net/i40e/i40e_rxtx.c +1
-0+/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured. (quoted diff) +0
-0
b/drivers/net/i40e/rte_pmd_i40e.cindexe216e6783..c52a5af2e100644drivers/net/i40e/rte_pmd_i40e.c +0
-0@@ -3060,7 +3060,7 @@ intrte_pmd_i40e_flow_add_del_packet_template(
drivers/net/i40e/rte_pmd_i40e.c +1
-2(enum i40e_fdir_status )conf->action.report_status; filter_conf.action.flex_off = conf->action.flex_off; -return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add); +return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add, true); }int --2.17.1
Best Regards,
Sun, Chenmin
Quoted 32 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Friday, July 10, 2020 10:51 AM
To: Sun, Chenmin <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Wang, Haiyue <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH V2] net/i40e: i40e FDIR update rate optimizationQuoted 9 lines
-----Original Message-----
From: Sun, Chenmin <[email protected]>
Sent: Thursday, July 9, 2020 10:40 PM
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Wang, Haiyue <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [PATCH V2] net/i40e: i40e FDIR update rate optimizationQuoted 4 lines
From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking whether the fdir rule being inserted into the guaranteed space or shared
space.
Quoted 5 lines
For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only reports the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. See the fdir programming status descriptor format in the
datasheet for more details.
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
This patch changes the global register
GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linuxkernel driver.
Overall I think the patch is too big, is that possible to separate into 2 or more patches?
OK
Quoted 45 lines
For example:
1.) you introduce some new data structure to tack the flow
2) the optimization for flow programming.More comments inline.
Quoted 40 lines
Signed-off-by Chenmin Sun <[email protected]>---
v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace thebin_serch()withrte_bsf64()--- drivers/net/i40e/i40e_ethdev.c | 136 ++++++++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 63 ++++++++--- drivers/net/i40e/i40e_fdir.c | 190 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 167 ++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 455 insertions(+), 118 deletions(-)(quoted diff) +0
-0
b/drivers/net/i40e/i40e_ethdev.cindex3bc312c11..099f4c5e3100644drivers/net/i40e/i40e_ethdev.c +5
-0@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h" @@ -1045,8 +1046,17 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +void *mem =NULL ; +uint32_t i =0 ; +uint32_t bmp_size;
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.c static int · line 1060
Quoted 6 lines
drivers/net/i40e/i40e_ethdev.c +5
-0+uint32_t alloc =0 ; +uint32_t best =0 ; +uint32_t pfqf_fdalloc =0 ; +uint32_t glqf_ctl_reg =0 ; +struct rte_bitmap *bmp =NULL ;int ret;Its better to follow RCT, and please apply on other functions.
OK
Quoted 50 lines
drivers/net/i40e/i40e_ethdev.c static int · line 1061
Quoted 2 lines
drivers/net/i40e/i40e_ethdev.c +0
-0struct rte_hash_parameters fdir_hash_params = { @@ -1067,6+1077,7
Quoted 27 lines
drivers/net/i40e/i40e_ethdev.c +0
-0@@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)drivers/net/i40e/i40e_ethdev.c +15
-0PMD_INIT_LOG (ERR ,"Failed to create fdir hash table!" );return -EINVAL ; } + fdir_info->hash_map = rte_zmalloc("i40e_fdir_hash_map", sizeof(struct i40e_fdir_filter *) * I40E_MAX_FDIR_FILTER_NUM,@@ -1077,8 +1088,100 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) ret = -ENOMEM ; goto err_fdir_hash_map_alloc; } + + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + +if (!fdir_info->fdir_filter_array) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir filter array!" ); + ret = -ENOMEM ; + goto err_fdir_filter_array_alloc; + } + + pfqf_fdalloc =i40e_read_rx_ctl (hw,I40E_PFQF_FDALLOC );drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev · line 1115
Quoted 10 lines
drivers/net/i40e/i40e_ethdev.c +10
-0+ alloc = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDALLOC_MASK ) >> +I40E_PFQF_FDALLOC_FDALLOC_SHIFT ); + best = ((pfqf_fdalloc &I40E_PFQF_FDALLOC_FDBEST_MASK ) >> +I40E_PFQF_FDALLOC_FDBEST_SHIFT ); + + glqf_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + glqf_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO set to guaranteedfirst");
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev)
Quoted 4 lines
drivers/net/i40e/i40e_ethdev.c +4
-0+ }else { +if (glqf_ctl_reg |I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO is:guaranteed first");
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev)
Quoted 3 lines
drivers/net/i40e/i40e_ethdev.c +3
-0+ }else { + fdir_info->fdir_invalprio =0 ; + PMD_DRV_LOG(INFO, "FDIR INVALPRIO is: sharedfirst");
Quoted 11 lines
drivers/net/i40e/i40e_ethdev.c i40e_init_fdir_filter_list(struct rte_eth_dev *dev) · line 1127
Quoted 7 lines
drivers/net/i40e/i40e_ethdev.c +6
-0+ } + } + +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , glqf_ctl_reg); + PMD_DRV_LOG(INFO, "FDIR guarantee space: %u, best_effort space %u.", + alloc *32 , best *32 );I think *32 can be applied when you assign alloc and best.
Also its better to replace by macro with meaningful name and use bit shift << but not *.
I will get the alloc/best number from hw->func_caps instead
Quoted 138 lines
Quoted 138 lines
drivers/net/i40e/i40e_ethdev.c +55
-0+ + fdir_info->fdir_space_size = (alloc + best) *32 ; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_available_space = alloc *32 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; + + fdir_info->fdir_flow_bitmap.fdir_flow = +rte_zmalloc ("i40e_fdir_flows" , +sizeof (struct i40e_fdir_flows ) * + fdir_info->fdir_space_size, +0 ); + +if (!fdir_info->fdir_flow_bitmap.fdir_flow) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for bitmap flow!" ); + ret = -ENOMEM ; + goto err_fdir_bitmap_flow_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_bitmap.fdir_flow[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info- fdir_space_size); + + mem =rte_zmalloc ("fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to initialization fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_bmp_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_bitmap.b = bmp; +return 0 ; +err_fdir_bmp_alloc: +rte_free (mem); +err_fdir_mem_alloc: +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +err_fdir_bitmap_flow_alloc: +rte_free (fdir_info->fdir_filter_array); +err_fdir_filter_array_alloc: +rte_free (fdir_info->hash_map);
err_fdir_hash_map_alloc:drivers/net/i40e/i40e_ethdev.c +25
-6rte_hash_free (fdir_info->hash_table);@@ -1749,18 +1852,34 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)struct i40e_fdir_info *fdir_info; fdir_info = &pf->fdir; -/* Remove all flow director rules and hash */ + +/* Remove all flow director rules */ +while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) +TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); } + +static void +i40e_fdir_memory_cleanup (struct i40e_pf *pf) { +struct i40e_fdir_info *fdir_info; + + fdir_info = &pf->fdir; + +/* flow director memory cleanup */ if (fdir_info->hash_map)rte_free (fdir_info->hash_map);if (fdir_info->hash_table)rte_hash_free (fdir_info->hash_table); +if (fdir_info->fdir_flow_bitmap.b) +rte_bitmap_free (fdir_info->fdir_flow_bitmap.b); +if (fdir_info->fdir_flow_bitmap.fdir_flow) +rte_free (fdir_info->fdir_flow_bitmap.fdir_flow); +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); -while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) { -TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); - } } +void i40e_flex_payload_reg_set_default (struct i40e_hw *hw) {/* @@ -2618,9 +2737,14 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows since they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } +/* release the fdir static allocated memory */ +i40e_fdir_memory_cleanup (pf); +/* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit (dev);(quoted diff) +0
-0
b/drivers/net/i40e/i40e_ethdev.hindex31ca05de9..5861c358b100644drivers/net/i40e/i40e_ethdev.h +9
-0@@ -264,6 +264,15 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +/* +* Struct to store flow created. +*/ +struct rte_flow { +TAILQ_ENTRY (rte_flow) node; +enum rte_filter_type filter_type; +void *rule; +}; +/** * The overhead from MTU to max frame size. * Considering QinQ packet, the VLAN tag needs to be counted twice. @@ -674,17 +683,33 @@ struct i40e_fdir_filter {struct i40e_fdir_filter_conf fdir; };
Quoted 6 lines
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_filter { · line 686
Quoted 1 line
drivers/net/i40e/i40e_ethdev.h +1
-0+struct i40e_fdir_flows {Why it be named as "flows"
Could you add more comment here, what's purpose of the data structure and each field?
Ok, I've added more comment for the new data structures, please check them in v3
Quoted 5 lines
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_filter { · line 688
Quoted 2 lines
drivers/net/i40e/i40e_ethdev.h +2
-0+uint32_t idx; +struct rte_flow flow;Not sure if its better to move flow to the first field, so we cover between a
rte_flowpoint and ai40e_fdir_flowpoint directly.
I'm not sure either... Could you explain a bit more? I'll move it to the first
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_filter { · line 694
Quoted 6 lines
drivers/net/i40e/i40e_ethdev.h +6
-0+}; + +struct i40e_fdir_flow_bitmap { +struct rte_bitmap *b; +struct i40e_fdir_flows *fdir_flow; +};Can we just add
rte_bitmapintoi40e_fdir_flow?
I think the i40e_fdir_flow is a typo here, shoul be i40e_fdir_flows. Please check my feedback in the next comment
Quoted 48 lines
Quoted 48 lines
drivers/net/i40e/i40e_ethdev.h +6
-0+ +#define FLOW_TO_FLOW_BITMAP (f) \ + container_of((f), struct i40e_fdir_flows, flow) +TAILQ_HEAD (i40e_fdir_filter_list, i40e_fdir_filter);/* * A structure used to define fields of a FDIR related info. */ struct i40e_fdir_info { +#define PRG_PKT_CNT 128 +struct i40e_vsi *fdir_vsi;/* pointer to fdir VSI structure */ uint16_t match_counter_index;/* Statistic counter index used for fdir*/
drivers/net/i40e/i40e_ethdev.h +0
-2struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/
drivers/net/i40e/i40e_ethdev.h +1
-0+void *prg_pkt[PRG_PKT_CNT ];/* memory for fdir program packet */
drivers/net/i40e/i40e_ethdev.h +1
-0+uint64_t dma_addr[PRG_PKT_CNT ];/* physic address of packet memory*/
drivers/net/i40e/i40e_ethdev.h +9
-0+/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/* @@ -698,6 +723,27 @@ struct i40e_fdir_info {struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table; +struct i40e_fdir_filter *fdir_filter_array; + +/* +* Priority ordering at filter invalidation(destroying a flow) between +* "best effort" space and "guaranteed" space. +* +* 0 = At filter invalidation, the hardware first tries to increment the +* "best effort" space. The "guaranteed" space is incremented only when
drivers/net/i40e/i40e_ethdev.h +4
-0+* the global "best effort" space is at it max value or the "best effort" +* space of the PF is at its max value. +* 1 = At filter invalidation, the hardware first tries to increment its +* "guaranteed" space. The "best effort" space is incremented only when
drivers/net/i40e/i40e_ethdev.h +3
-0+* it is already at its max value. +*/ +uint32_t fdir_invalprio;
Quoted 9 lines
drivers/net/i40e/i40e_ethdev.h struct i40e_fdir_info { · line 745
Quoted 5 lines
drivers/net/i40e/i40e_ethdev.h +5
-0+uint32_t fdir_space_size; +uint32_t fdir_actual_cnt; +uint32_t fdir_guarantee_available_space; +uint32_t fdir_guarantee_free_space; +struct i40e_fdir_flow_bitmap fdir_flow_bitmap;What is the
flow_bitmapusage? its free bitmap or alloc bitmap? Better add more description here, or rename it with more clean purpose.
This is neither a free bitmap nor an alloc bitmap. This bitmap manages all pre-allocated rte_flow memory pools. so for the above one comment, I can't move the bitmap into i40e_fdir_flows
I have add more description in v3
Quoted 83 lines
Quoted 46 lines
drivers/net/i40e/i40e_ethdev.h +4
-11+/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ];@@ -894,15 +940,6 @@ struct i40e_mirror_rule {TAILQ_HEAD (i40e_mirror_rule_list, i40e_mirror_rule); -/* -* Struct to store flow created. -*/ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -enum rte_filter_type filter_type; -void *rule; -}; -TAILQ_HEAD (i40e_flow_list, rte_flow); /* Struct to store Traffic Manager shaper profile. */ @@ -1335,8 +1372,8 @@ int i40e_add_del_fdir_filter(struct rte_eth_dev *dev,const struct rte_eth_fdir_filter *filter,bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add,bool wait_status);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);(quoted diff) +0
-0
b/drivers/net/i40e/i40e_fdir.cindex4a778db4c..d7ba841d6100644drivers/net/i40e/i40e_fdir.c +1
-1@@ -99,7 +99,7 @@ static int i40e_flow_fdir_filter_programming(struct i40e_pf *pf, enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add); + bool add, bool wait_status);static int i40e_fdir_rx_queue_init(struct i40e_rx_queue *rxq) @@ -163,6 +163,7@@
i40e_fdir_setup(struct i40e_pf *pf)drivers/net/i40e/i40e_fdir.c i40e_fdir_setup(struct i40e_pf *pf)
Quoted 7 lines
drivers/net/i40e/i40e_fdir.c +1
-0char z_name[RTE_MEMZONE_NAMESIZE ];const struct rte_memzone *mz =NULL ;struct rte_eth_dev *eth_dev = pf->adapter->eth_dev; +uint16_t i;if ((pf->flags &I40E_FLAG_FDIR ) ==0 ) { PMD_INIT_LOG(ERR, "HW doesn't support FDIR"); @@ -179,6
Quoted 18 lines
+180,7 @@
i40e_fdir_setup(struct i40e_pf *pf)drivers/net/i40e/i40e_fdir.c +3
-1PMD_DRV_LOG (INFO ,"FDIR initialization has been done." );return I40E_SUCCESS ; } +/* make new FDIR VSI */ vsi =i40e_vsi_setup (pf,I40E_VSI_FDIR , pf->main_vsi,0 );if (!vsi) {@@ -233,17 +235,27 @@ i40e_fdir_setup(struct i40e_pf *pf) eth_dev->device->driver->name,I40E_FDIR_MZ_NAME , eth_dev->data->port_id); - mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN , SOCKET_ID_ANY); + mz =i40e_memzone_reserve (z_name,I40E_FDIR_PKT_LEN *PRG_PKT_CNT , +SOCKET_ID_ANY );if (!mz) {drivers/net/i40e/i40e_fdir.c i40e_fdir_setup(struct i40e_pf *pf) · line 250
Quoted 10 lines
drivers/net/i40e/i40e_fdir.c +3
-2PMD_DRV_LOG (ERR ,"Cannot init memzone for " "flow director program packet." ); err =I40E_ERR_NO_MEMORY ; goto fail_mem; } - pf->fdir.prg_pkt = mz->addr; - pf->fdir.dma_addr = mz->iova; + +for (i =0 ; i <PRG_PKT_CNT ; i++) { + pf->fdir.prg_pkt[i] = (uint8_t *)mz->addr +
I40E_FDIR_PKT_LEN*
Quoted 4 lines
drivers/net/i40e/i40e_fdir.c i40e_fdir_setup(struct i40e_pf *pf) · line 251
Quoted 1 line
drivers/net/i40e/i40e_fdir.c +1
-0+ (i %PRG_PKT_CNT );The loop is from 0 to
PRG_PKT_CNT, why "i %PKG_PTK_CNT"?
op "%" is useless, will remove it
Quoted 19 lines
Quoted 11 lines
drivers/net/i40e/i40e_fdir.c +7
-0+ pf->fdir.dma_addr[i] = mz->iova +I40E_FDIR_PKT_LEN * + (i %PRG_PKT_CNT ); + } pf->fdir.match_counter_index =I40E_COUNTER_INDEX_FDIR (hw->pf_id); + pf->fdir.fdir_actual_cnt =0 ; + pf->fdir.fdir_guarantee_free_space = + pf->fdir.fdir_guarantee_available_space; +PMD_DRV_LOG(INFO, "FDIR setup successfully, with programming
queue
drivers/net/i40e/i40e_fdir.c i40e_init_flx_pld(struct i40e_pf *pf) · line 340
Quoted 6 lines
%u.",
drivers/net/i40e/i40e_fdir.c +0
-0vsi->base_queue);return I40E_SUCCESS ;@@ -327,6 +339,7 @@ i40e_init_flx_pld(struct i40e_pf *pf) pf->fdir.flex_set[index].src_offset =0 ; pf->fdir.flex_set[index].size =
I40E_FDIR_MAX_FLEXWORD_NUM;
Quoted 4 lines
drivers/net/i40e/i40e_fdir.c i40e_init_flx_pld(struct i40e_pf *pf) · line 342
Quoted 2 lines
drivers/net/i40e/i40e_fdir.c +1
-0pf->fdir.flex_set[index].dst_offset =0 ; +Dummy empty line.
ok
Quoted 66 lines
drivers/net/i40e/i40e_fdir.c i40e_init_flx_pld(struct i40e_pf *pf) · line 343
Quoted 1 line
drivers/net/i40e/i40e_fdir.c +0
-0I40E_WRITE_REG(hw, I40E_PRTQF_FLX_PIT(index),
0x0000C900);drivers/net/i40e/i40e_fdir.c i40e_init_flx_pld(struct i40e_pf *pf) · line 345
Quoted 2 lines
drivers/net/i40e/i40e_fdir.c +0
-0I40E_WRITE_REG (hw,I40E_PRTQF_FLX_PIT (index +1 ),0x0000FC29 );/*non- used*/ @@
Quoted 48 lines
-1557,11 +1570,11 @@ i40e_sw_fdir_filter_lookup(struct
i40e_fdir_info*fdir_info,drivers/net/i40e/i40e_fdir.c +0
-1return fdir_info->hash_map[ret]; } -/* Add a flow director filter into the SW list */ static int
i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter){drivers/net/i40e/i40e_fdir.c +8
-2struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_fdir_filter *hash_filter;int ret;if (filter->fdir.input.flow_ext.pkt_template)@@ -1577,9 +1590,14 @@ i40e_sw_fdir_filter_insert(struct i40e_pf *pf, struct i40e_fdir_filter *filter) ret);return ret; } - fdir_info->hash_map[ret] = filter; -TAILQ_INSERT_TAIL (&fdir_info->fdir_list, filter, rules); +if (fdir_info->hash_map[ret]) +return -1 ; + + hash_filter = &fdir_info->fdir_filter_array[ret]; +rte_memcpy (hash_filter, filter,sizeof (*filter)); + fdir_info->hash_map[ret] = hash_filter; +TAILQ_INSERT_TAIL (&fdir_info->fdir_list, hash_filter, rules);return 0 ;}
drivers/net/i40e/i40e_fdir.c +0
-1@@ -1608,7 +1626,6 @@ i40e_sw_fdir_filter_del(struct i40e_pf *pf, struct i40e_fdir_input *input) fdir_info->hash_map[ret] = NULL;TAILQ_REMOVE (&fdir_info->fdir_list, filter, rules); -rte_free (filter);return 0 ;}
drivers/net/i40e/i40e_fdir.c +3
-0@@ -1675,23 +1692,50 @@ i40e_add_del_fdir_filter(struct rte_eth_dev *dev, return ret; } +static inline unsigned char * +i40e_find_available_buffer (struct rte_eth_dev *dev) { + struct i40e_pf *pf =drivers/net/i40e/i40e_fdir.c i40e_add_del_fdir_filter(struct rte_eth_dev · line 1708
Quoted 10 lines
drivers/net/i40e/i40e_fdir.c +9
-0I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_tx_queue *txq = pf->fdir.txq; +volatile struct i40e_tx_desc *txdp = &txq->tx_ring[txq->tx_tail +1 ]; +uint32_t i; + +/* wait until the tx descriptor is ready */ +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))==
drivers/net/i40e/i40e_fdir.c i40e_add_del_fdir_filter(struct rte_eth_dev · line 1709
Quoted 1 line
drivers/net/i40e/i40e_fdir.c +1
-0+rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE))
Quoted 15 lines
drivers/net/i40e/i40e_fdir.c i40e_add_del_fdir_filter(struct rte_eth_dev *dev,
Quoted 11 lines
drivers/net/i40e/i40e_fdir.c +10
-0+break ; +rte_delay_us (1 ); + } +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 NULL ; + } + +return (unsigned char *)fdir_info->prg_pkt[txq->tx_tail /2 ]; }why
tx_tail/ 2, better some add some description here, and use " >> 1" if its word / byte conversion.
Because each fdir programming requires two tx descriptors, the number of tx descriptors is twice of fdir buffer will use >> 1
Quoted 70 lines
Quoted 48 lines
drivers/net/i40e/i40e_fdir.c +6
-4+/** * i40e_flow_add_del_fdir_filter - add or remove a flow director filter. * @pf: board private structure * @filter: fdir filter entry * @add: 0 - delete, 1 - add */ +int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev,const struct i40e_fdir_filter_conf *filter, -bool add) +bool add,bool wait_status) {struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); -unsigned char *pkt = (unsigned char *)pf->fdir.prg_pkt; +unsigned char *pkt =NULL ;enum i40e_filter_pctype pctype;struct i40e_fdir_info *fdir_info = &pf->fdir; -struct i40e_fdir_filter *fdir_filter, *node; +struct i40e_fdir_filter *node;struct i40e_fdir_filter check_filter;/* Check if the filter exists */ int ret =0 ;return 0 ;@@ -2324,7 +2390,7 @@ i40e_fdir_filter_restore(struct i40e_pf *pf)uint32_t best_cnt;/**< Number of filters in best effort spaces. */ TAILQ_FOREACH(f, fdir_list, rules) -i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE); +i40e_flow_add_del_fdir_filter (dev, &f->fdir, TRUE, TRUE); fdstat =I40E_READ_REG (hw,I40E_PFQF_FDSTAT ); guarant_cnt =(quoted diff) +0
-0
b/drivers/net/i40e/i40e_flow.cindex7cd537340..260e58dc1100644drivers/net/i40e/i40e_flow.c +1
-0@@ -17,6 +17,7 @@#include <rte_malloc.h> #include <rte_tailq.h> #include <rte_flow_driver.h> +#include <rte_bitmap.h> enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {drivers/net/i40e/i40e_flow.c
Quoted 9 lines
drivers/net/i40e/i40e_flow.c +2
-1struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size; +uint32_t ring_size, i;struct rte_eth_dev *dev; +volatile struct i40e_tx_desc *txdp;if (!pf) { PMD_DRV_LOG(ERR, "PF is not available"); @@ -2987,6+2988,14 @@
drivers/net/i40e/i40e_flow.c
Quoted 11 lines
i40e_fdir_setup_tx_resources(struct i40e_pf *pf)drivers/net/i40e/i40e_flow.c +5
-0txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; + +/* Set all the DD flags to 1 */ +for (i =0 ; i <I40E_FDIR_NUM_TX_DESC ; i +=2 ) { + txdp = &txq->tx_ring[i +1 ]; + txdp->cmd_type_offset_bsz |=
I40E_TX_DESC_DTYPE_DESC_DONE;drivers/net/i40e/i40e_flow.c +1
-0+ txdp->buffer_addr = rte_cpu_to_le_64(pf->fdir.dma_addr[i/ 2]);
Quoted 4 lines
drivers/net/i40e/i40e_flow.c
Quoted 1 line
drivers/net/i40e/i40e_flow.c +1
-0+ }DD bits are assume to be reported by hardware, why we initialize them to 1 ?
Yes, it may easy to confuse people here. I do this because the i40e_find_available_buffer() checks the tx descriptor.DD field to determine whether the descriptor can be used. After the NIC has taken the data of the tx descriptor, it infoms the software by setting the DD bit. The software can then safely reuse the descriptor. Therefore, I set DD to 1 during initialization so that the software knows that all descriptors are available.
Quoted 5 lines
Quoted 4 lines
int
--
2.17.1
v3 cover i40e FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
i40e FDIR update rate optimization
[PATCH v3 1/2] net/i40e: introduce new data structures [PATCH v3 2/2] net/i40e: i40e FDIR update rate optimization
v3:
* Split the patch into two
* Renamed some data structures and added some descriptions
---
v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace the bin_serch() with rte_bsf64()
Chenmin Sun (2):
net/i40e: i40e FDIR update rate optimization data structures net/i40e: i40e FDIR update rate optimization
drivers/net/i40e/i40e_ethdev.c | 128 ++++++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 76 ++++++++++--- drivers/net/i40e/i40e_fdir.c | 191 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 167 ++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 460 insertions(+), 119 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 net/i40e: i40e FDIR update rate optimization data structures
From: Chenmin Sun <[email protected]>
This patch introduces the new data structures for i40e fdir update rate optimization.
--- drivers/net/i40e/i40e_ethdev.h | 72 ++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 11 deletions(-)
drivers/net/i40e/i40e_ethdev.h +61 -11
@@ -264,6 +264,15 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +/* +* Struct to store flow created. +*/ +struct rte_flow { +TAILQ_ENTRY (rte_flow) node; +enum rte_filter_type filter_type; +void *rule; +}; +/** * The overhead from MTU to max frame size. * Considering QinQ packet, the VLAN tag needs to be counted twice.
@@ -674,17 +683,37 @@ struct i40e_fdir_filter {struct i40e_fdir_filter_conf fdir; }; +/* fdir memory pool entry */ +struct i40e_fdir_entry { +struct rte_flow flow; +uint32_t idx; +}; + +/* pre-allocated fdir memory pool */ +struct i40e_fdir_flow_pool { +/* a bitmap to manage the fdir pool */ +struct rte_bitmap *b; +/* the size the pool is pf->fdir->fdir_space_size */ +struct i40e_fdir_entry *pool; +}; + +#define FLOW_TO_FLOW_BITMAP (f) \ + container_of((f), struct i40e_fdir_entry, flow) +TAILQ_HEAD (i40e_fdir_filter_list, i40e_fdir_filter);/* * A structure used to define fields of a FDIR related info. */ struct i40e_fdir_info { +#define PRG_PKT_CNT 128 +struct i40e_vsi *fdir_vsi;/* pointer to fdir VSI structure */ uint16_t match_counter_index;/* Statistic counter index used for fdir*/ struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq;void *prg_pkt;/* memory for fdir program packet */ uint64_t dma_addr;/* physic address of packet memory*/ +/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/*
@@ -697,6 +726,36 @@ struct i40e_fdir_info {struct i40e_fdir_filter_list fdir_list;struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table; +/* An array to store the inserted rules input */ +struct i40e_fdir_filter *fdir_filter_array; + +/* +* Priority ordering at filter invalidation(destroying a flow) between +* "best effort" space and "guaranteed" space. +* +* 0 = At filter invalidation, the hardware first tries to increment the +* "best effort" space. The "guaranteed" space is incremented only when +* the global "best effort" space is at it max value or the "best effort" +* space of the PF is at its max value. +* 1 = At filter invalidation, the hardware first tries to increment its +* "guaranteed" space. The "best effort" space is incremented only when +* it is already at its max value. +*/ +uint32_t fdir_invalprio; +/* the total size of the fdir, this number is the sum of the guaranteed + +* shared space +*/ +uint32_t fdir_space_size; +/* the actual number of the fdir rules in hardware, initialized as 0 */ +uint32_t fdir_actual_cnt; +/* the guaranteed space of the fdir */ +uint32_t fdir_guarantee_free_space; +/* the available guaranteed space, initialized as the +* fdir_guarantee_free_space and dynamically maintained +*/ +uint32_t fdir_guarantee_available_space; +/* the pre-allocated pool of the rte_flow */ +struct i40e_fdir_flow_pool fdir_flow_pool;/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];
@@ -894,15 +953,6 @@ struct i40e_mirror_rule {TAILQ_HEAD (i40e_mirror_rule_list, i40e_mirror_rule); -/* -* Struct to store flow created. -*/ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -enum rte_filter_type filter_type; -void *rule; -}; -TAILQ_HEAD (i40e_flow_list, rte_flow);/* Struct to store Traffic Manager shaper profile. */
@@ -1335,8 +1385,8 @@ int i40e_add_del_fdir_filter(struct rte_eth_dev *dev,const struct rte_eth_fdir_filter *filter, bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);
Signature · 1 line
2.17.1
PATCH v3 2/2 net/i40e: i40e FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking whether the fdir rule being inserted into the guaranteed space or shared space.
For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only reports the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. See the fdir programming status descriptor format in the datasheet for more details.
This patch changes the global register GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
--- drivers/net/i40e/i40e_ethdev.c | 128 ++++++++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 6 +- drivers/net/i40e/i40e_fdir.c | 191 +++++++++++++++++++++----------- drivers/net/i40e/i40e_flow.c | 167 ++++++++++++++++++++++------ drivers/net/i40e/i40e_rxtx.c | 15 ++- drivers/net/i40e/rte_pmd_i40e.c | 2 +- 6 files changed, 400 insertions(+), 109 deletions(-)
drivers/net/i40e/i40e_ethdev.c +122 -6
@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h"
@@ -1045,8 +1046,16 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +uint32_t alloc = hw->func_caps.fd_filters_guaranteed; +uint32_t best = hw->func_caps.fd_filters_best_effort; +uint32_t glqf_ctl_reg =0 ; +struct rte_bitmap *bmp =NULL ; +uint32_t bmp_size; +void *mem =NULL ; +uint32_t i =0 ;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1067,6 +1076,7 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR ,"Failed to create fdir hash table!" );return -EINVAL ; } + fdir_info->hash_map = rte_zmalloc("i40e_fdir_hash_map", sizeof(struct i40e_fdir_filter *) * I40E_MAX_FDIR_FILTER_NUM,
@@ -1077,8 +1087,93 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) ret = -ENOMEM ; goto err_fdir_hash_map_alloc; } + + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + +if (!fdir_info->fdir_filter_array) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir filter array!" ); + ret = -ENOMEM ; + goto err_fdir_filter_array_alloc; + } + + glqf_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + glqf_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO set to guaranteed first" ); + }else { +if (glqf_ctl_reg |I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: guaranteed first" ); + }else { + fdir_info->fdir_invalprio =0 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: shared first" ); + } + } + +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , glqf_ctl_reg); +PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , alloc, best); + + fdir_info->fdir_space_size = alloc + best; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_available_space = alloc; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_available_space; + + fdir_info->fdir_flow_pool.pool = +rte_zmalloc ("i40e_fdir_entry" , +sizeof (struct i40e_fdir_entry ) * + fdir_info->fdir_space_size, +0 ); + +if (!fdir_info->fdir_flow_pool.pool) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for bitmap flow!" ); + ret = -ENOMEM ; + goto err_fdir_bitmap_flow_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_pool.pool[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info->fdir_space_size); + + mem =rte_zmalloc ("fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to initialization fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_bmp_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_pool.b = bmp; +return 0 ; +err_fdir_bmp_alloc: +rte_free (mem); +err_fdir_mem_alloc: +rte_free (fdir_info->fdir_flow_pool.pool); +err_fdir_bitmap_flow_alloc: +rte_free (fdir_info->fdir_filter_array); +err_fdir_filter_array_alloc: +rte_free (fdir_info->hash_map); err_fdir_hash_map_alloc:rte_hash_free (fdir_info->hash_table);
@@ -1749,18 +1844,34 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)struct i40e_fdir_info *fdir_info; fdir_info = &pf->fdir; -/* Remove all flow director rules and hash */ + +/* Remove all flow director rules */ +while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) +TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); +} + +static void +i40e_fdir_memory_cleanup (struct i40e_pf *pf) +{ +struct i40e_fdir_info *fdir_info; + + fdir_info = &pf->fdir; + +/* flow director memory cleanup */ if (fdir_info->hash_map)rte_free (fdir_info->hash_map);if (fdir_info->hash_table)rte_hash_free (fdir_info->hash_table); +if (fdir_info->fdir_flow_pool.b) +rte_bitmap_free (fdir_info->fdir_flow_pool.b); +if (fdir_info->fdir_flow_pool.pool) +rte_free (fdir_info->fdir_flow_pool.pool); +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); -while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) { -TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); - } } +void i40e_flex_payload_reg_set_default (struct i40e_hw *hw) {/*
@@ -2618,9 +2729,14 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows since they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } +/* release the fdir static allocated memory */ +i40e_fdir_memory_cleanup (pf); +/* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit (dev);
drivers/net/i40e/i40e_ethdev.h +3 -3
@@ -711,8 +711,8 @@ struct i40e_fdir_info {uint16_t match_counter_index;/* Statistic counter index used for fdir*/ struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/ +void *prg_pkt[PRG_PKT_CNT ];/* memory for fdir program packet */ +uint64_t dma_addr[PRG_PKT_CNT ];/* physic address of packet memory*/ /* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];
@@ -1386,7 +1386,7 @@ int i40e_add_del_fdir_filter(struct rte_eth_dev *dev, bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev,const struct i40e_fdir_filter_conf *filter, -bool add); +bool add,bool wait_status);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);
drivers/net/i40e/i40e_fdir.c +128 -63
335 lines not on this page · raw message
drivers/net/i40e/i40e_flow.c +134 -33
312 lines not on this page · raw message
drivers/net/i40e/i40e_rxtx.c +12 -3
@@ -2940,16 +2940,17 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define I40E_FDIR_NUM_RX_DESC I40E_MIN_RING_DESC +#define I40E_FDIR_NUM_TX_DESC 256 +#define I40E_FDIR_NUM_RX_DESC 256enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size; +volatile struct i40e_tx_desc *txdp;struct rte_eth_dev *dev; +uint32_t ring_size, i;if (!pf) {PMD_DRV_LOG (ERR ,"PF is not available" );
@@ -2989,6 +2990,14 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; + +/* Set all the DD flags to 1 */ +for (i =0 ; i <I40E_FDIR_NUM_TX_DESC ; i +=2 ) { + txdp = &txq->tx_ring[i +1 ]; + txdp->cmd_type_offset_bsz |=I40E_TX_DESC_DTYPE_DESC_DONE ; + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[i /2 ]); + } +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured.
drivers/net/i40e/rte_pmd_i40e.c +1 -1
@@ -3060,7 +3060,7 @@ int rte_pmd_i40e_flow_add_del_packet_template( (enum i40e_fdir_status )conf->action.report_status; filter_conf.action.flex_off = conf->action.flex_off; -return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add); +return i40e_flow_add_del_fdir_filter (dev, &filter_conf, add, true); }int
Signature · 1 line
2.17.1
v4 cover i40e FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
[PATCH v4 1/4] net/i40e: introducing the fdir guaranteed/shared space tracking [PATCH v4 2/4] net/i40e: FDIR flow memory management optimization [PATCH v4 2/4] net/i40e: move the i40e_get_outer_vlan to where it real needed [PATCH v4 2/4] net/i40e: FDIR update rate optimization
v4:
* Split the patch to 4
* New two functions for fdir mempool get/put.
* Rewrite function i40e_find_available_buffer().
* Move the fdir space tracking logic to i40e_flow_add_del_fdir_filter(). v3:
* Split the patch into two.
* Renamed some data structures and added some descriptions. v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace the bin_serch() with rte_bsf64()
Chenmin Sun (4):
net/i40e: introducing the fdir space tracking net/i40e: FDIR flow memory management optimization net/i40e: move the i40e_get_outer_vlan to where it real needed net/i40e: FDIR update rate optimization
drivers/net/i40e/i40e_ethdev.c | 135 +++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 85 ++++++++-- drivers/net/i40e/i40e_fdir.c | 284 ++++++++++++++++++++++++++------- drivers/net/i40e/i40e_flow.c | 108 +++++++++---- drivers/net/i40e/i40e_rxtx.c | 7 +- drivers/net/i40e/i40e_rxtx.h | 3 + 6 files changed, 509 insertions(+), 113 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/4 net/i40e: introducing the fdir space tracking
From: Chenmin Sun <[email protected]>
This patch introduces a fdir flow management for guaranteed/shared space tracking.
The fdir space is reported by the i40e_hw_capabilities.fd_filters_guaranteed and fd_filters_best_effort. The fdir space is managed by hardware and now is tracking in software. The management algorithm is controlled by the GLQF_CTL.INVALPRIO. Detailed implementation please check in the datasheet and the description of struct i40e_fdir_info.fdir_invalprio.
This patch changes the global register GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
--- drivers/net/i40e/i40e_ethdev.c | 41 ++++++++++++++++++++++++++++++++++ drivers/net/i40e/i40e_ethdev.h | 28 +++++++++++++++++++++-- drivers/net/i40e/i40e_fdir.c | 16 +++++++++++++ drivers/net/i40e/i40e_flow.c | 5 +++++ drivers/net/i40e/i40e_rxtx.c | 1 + 5 files changed, 89 insertions(+), 2 deletions(-)
drivers/net/i40e/i40e_ethdev.c +41 -0
@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h"
@@ -1045,8 +1046,11 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +uint32_t alloc = hw->func_caps.fd_filters_guaranteed; +uint32_t best = hw->func_caps.fd_filters_best_effort;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1067,6 +1071,7 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR ,"Failed to create fdir hash table!" );return -EINVAL ; } + fdir_info->hash_map = rte_zmalloc("i40e_fdir_hash_map", sizeof(struct i40e_fdir_filter *) * I40E_MAX_FDIR_FILTER_NUM,
@@ -1077,6 +1082,15 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) ret = -ENOMEM ; goto err_fdir_hash_map_alloc; } + + fdir_info->fdir_space_size = alloc + best; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_total_space = alloc; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_total_space; + +PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , alloc, best); +return 0 ; err_fdir_hash_map_alloc:
@@ -1101,6 +1115,30 @@ i40e_init_customized_info(struct i40e_pf *pf) pf->esp_support = false; } +static void +i40e_init_filter_invalidation (struct i40e_pf *pf) +{ +struct i40e_hw *hw =I40E_PF_TO_HW (pf); +struct i40e_fdir_info *fdir_info = &pf->fdir; +uint32_t glqf_ctl_reg =0 ; + + glqf_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + glqf_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO set to guaranteed first" ); +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , glqf_ctl_reg); + }else { +if (glqf_ctl_reg &I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: guaranteed first" ); + }else { + fdir_info->fdir_invalprio =0 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: shared first" ); + } + } +} +void i40e_init_queue_region_conf (struct rte_eth_dev *dev) {
@@ -1654,6 +1692,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)/* Initialize customized information */ i40e_init_customized_info (pf); +/* Initialize the filter invalidation configuration */ +i40e_init_filter_invalidation (pf); + ret =i40e_init_ethtype_filter_list (dev);if (ret <0 ) goto err_init_ethtype_filter_list;
drivers/net/i40e/i40e_ethdev.h +26 -2
@@ -698,6 +698,30 @@ struct i40e_fdir_info {struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table; +/* +* Priority ordering at filter invalidation(destroying a flow) between +* "best effort" space and "guaranteed" space. +* +* 0 = At filter invalidation, the hardware first tries to increment the +* "best effort" space. The "guaranteed" space is incremented only when +* the global "best effort" space is at it max value or the "best effort" +* space of the PF is at its max value. +* 1 = At filter invalidation, the hardware first tries to increment its +* "guaranteed" space. The "best effort" space is incremented only when +* it is already at its max value. +*/ +uint32_t fdir_invalprio; +/* the total size of the fdir, this number is the sum of the guaranteed + +* shared space +*/ +uint32_t fdir_space_size; +/* the actual number of the fdir rules in hardware, initialized as 0 */ +uint32_t fdir_actual_cnt; +/* the free guaranteed space of the fdir */ +uint32_t fdir_guarantee_free_space; +/* the fdir total guaranteed space */ +uint32_t fdir_guarantee_total_space; +/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ];
@@ -1335,8 +1359,8 @@ int i40e_add_del_fdir_filter(struct rte_eth_dev *dev,const struct rte_eth_fdir_filter *filter, bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);
drivers/net/i40e/i40e_fdir.c +16 -0
@@ -21,6 +21,7 @@#include <rte_tcp.h> #include <rte_sctp.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h"
@@ -244,6 +245,10 @@ i40e_fdir_setup(struct i40e_pf *pf) pf->fdir.dma_addr = mz->iova; pf->fdir.match_counter_index =I40E_COUNTER_INDEX_FDIR (hw->pf_id); + pf->fdir.fdir_actual_cnt =0 ; + pf->fdir.fdir_guarantee_free_space = + pf->fdir.fdir_guarantee_total_space; +PMD_DRV_LOG (INFO ,"FDIR setup successfully, with programming queue %u." , vsi->base_queue);return I40E_SUCCESS ;
@@ -1762,6 +1767,11 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, }if (add) { + fdir_info->fdir_actual_cnt++; +if (fdir_info->fdir_invalprio ==1 && + fdir_info->fdir_guarantee_free_space >0 ) + fdir_info->fdir_guarantee_free_space--; + fdir_filter =rte_zmalloc ("fdir_filter" ,sizeof (*fdir_filter),0 );if (fdir_filter ==NULL ) {
@@ -1774,6 +1784,12 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,if (ret <0 )rte_free (fdir_filter); }else { + fdir_info->fdir_actual_cnt--; +if (fdir_info->fdir_invalprio ==1 && + fdir_info->fdir_guarantee_free_space < + fdir_info->fdir_guarantee_total_space) + fdir_info->fdir_guarantee_free_space++; + ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); }
drivers/net/i40e/i40e_flow.c +5 -0
@@ -17,6 +17,7 @@#include <rte_malloc.h> #include <rte_tailq.h> #include <rte_flow_driver.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h"
@@ -5601,6 +5602,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) } } + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_total_space; +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) pf->fdir.inset_flag[pctype] =0 ;
drivers/net/i40e/i40e_rxtx.c +1 -0
@@ -2989,6 +2989,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured.
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH V4 1/4] net/i40e: introducing the fdir space tracking
Quoted 21 lines
-----Original Message-----
From: Sun, Chenmin <[email protected]>
Sent: Thursday, July 16, 2020 3:53 AM
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Wang, Haiyue <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [PATCH V4 1/4] net/i40e: introducing the fdir space trackingFrom: Chenmin Sun <[email protected]>
This patch introduces a fdir flow management for guaranteed/shared space tracking.
The fdir space is reported by the i40e_hw_capabilities.fd_filters_guaranteed andfd_filters_best_effort. The fdir space is managed by hardware and now is tracking in software. The management algorithm is controlled by the GLQF_CTL.INVALPRIO. Detailed implementation please check in the datasheet and the description of struct i40e_fdir_info.fdir_invalprio.
Quoted 6 lines
This patch changes the global register
GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.Signed-off-by Chenmin Sun <[email protected]>
PATCH v4 2/4 net/i40e: FDIR flow memory management optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch allocated some memory pool for flow management to avoid calling rte_zmalloc/rte_free every time.
This patch also improves the hash table operation. When adding/removing a flow, the software will directly add/delete it from the hash table. If any error occurs, it then roll back the operation it just done.
--- drivers/net/i40e/i40e_ethdev.c | 94 +++++++++++++++++++++++-- drivers/net/i40e/i40e_ethdev.h | 43 +++++++++--- drivers/net/i40e/i40e_fdir.c | 121 ++++++++++++++++++++++++--------- drivers/net/i40e/i40e_flow.c | 92 ++++++++++++++++++------- 4 files changed, 280 insertions(+), 70 deletions(-)
drivers/net/i40e/i40e_ethdev.c +87 -7
@@ -1051,6 +1051,10 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)char fdir_hash_name[RTE_HASH_NAMESIZE ];uint32_t alloc = hw->func_caps.fd_filters_guaranteed;uint32_t best = hw->func_caps.fd_filters_best_effort; +struct rte_bitmap *bmp =NULL ; +uint32_t bmp_size; +void *mem =NULL ; +uint32_t i =0 ;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1083,6 +1087,18 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) goto err_fdir_hash_map_alloc; } + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + +if (!fdir_info->fdir_filter_array) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir filter array!" ); + ret = -ENOMEM ; + goto err_fdir_filter_array_alloc; + } + fdir_info->fdir_space_size = alloc + best; fdir_info->fdir_actual_cnt =0 ; fdir_info->fdir_guarantee_total_space = alloc;
@@ -1091,8 +1107,53 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , alloc, best); + fdir_info->fdir_flow_pool.pool = +rte_zmalloc ("i40e_fdir_entry" , +sizeof (struct i40e_fdir_entry ) * + fdir_info->fdir_space_size, +0 ); + +if (!fdir_info->fdir_flow_pool.pool) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for bitmap flow!" ); + ret = -ENOMEM ; + goto err_fdir_bitmap_flow_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_pool.pool[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info->fdir_space_size); + mem =rte_zmalloc ("fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to initialization fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_bmp_alloc; + } +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_pool.bitmap = bmp; +return 0 ; +err_fdir_bmp_alloc: +rte_free (mem); +err_fdir_mem_alloc: +rte_free (fdir_info->fdir_flow_pool.pool); +err_fdir_bitmap_flow_alloc: +rte_free (fdir_info->fdir_filter_array); +err_fdir_filter_array_alloc: +rte_free (fdir_info->hash_map); err_fdir_hash_map_alloc:rte_hash_free (fdir_info->hash_table);
@@ -1790,16 +1851,30 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)struct i40e_fdir_info *fdir_info; fdir_info = &pf->fdir; -/* Remove all flow director rules and hash */ + +/* Remove all flow director rules */ +while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) +TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); +} + +static void +i40e_fdir_memory_cleanup (struct i40e_pf *pf) +{ +struct i40e_fdir_info *fdir_info; + + fdir_info = &pf->fdir; + +/* flow director memory cleanup */ if (fdir_info->hash_map)rte_free (fdir_info->hash_map);if (fdir_info->hash_table)rte_hash_free (fdir_info->hash_table); - -while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) { -TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); - } +if (fdir_info->fdir_flow_pool.bitmap) +rte_bitmap_free (fdir_info->fdir_flow_pool.bitmap); +if (fdir_info->fdir_flow_pool.pool) +rte_free (fdir_info->fdir_flow_pool.pool); +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); }void i40e_flex_payload_reg_set_default (struct i40e_hw *hw)
@@ -2659,9 +2734,14 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows since they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } +/* release the fdir static allocated memory */ +i40e_fdir_memory_cleanup (pf); +/* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit (dev);
drivers/net/i40e/i40e_ethdev.h +34 -9
79 lines not on this page · raw message
drivers/net/i40e/i40e_fdir.c +90 -31
190 lines not on this page · raw message
drivers/net/i40e/i40e_flow.c +69 -23
184 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH V4 2/4] net/i40e: FDIR flow memory management optimization
Quoted 12 lines
-----Original Message-----
From: Sun, Chenmin <[email protected]>
Sent: Thursday, July 16, 2020 3:53 AM
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Wang, Haiyue <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [PATCH V4 2/4] net/i40e: FDIR flow memory management optimizationFrom: Chenmin Sun <[email protected]>
Quoted 7 lines
This patch allocated some memory pool for flow management to avoid calling rte_zmalloc/rte_free every time.
This patch also improves the hash table operation. When adding/removing a flow, the software will directly add/delete it from the hash table. If any error occurs, it then roll back the operation it just done.Signed-off-by Chenmin Sun <[email protected]>
PATCH v4 3/4 net/i40e: move the i40e_get_outer_vlan to where it real needed
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch moves the fetching the device tpid to where it really needs, rather than fetching it every time when entered the functions. This is because this operation costs too many cycles and it is used only when matching the ethernet header.
--- drivers/net/i40e/i40e_flow.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_flow.c +3 -8
@@ -2047,9 +2047,6 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,const struct rte_flow_item_eth *eth_spec;const struct rte_flow_item_eth *eth_mask;enum rte_flow_item_type item_type; -uint16_t outer_tpid; - - outer_tpid =i40e_get_outer_vlan (dev);for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -2109,7 +2106,7 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,if (filter->ether_type ==RTE_ETHER_TYPE_IPV4 || filter->ether_type ==RTE_ETHER_TYPE_IPV6 || filter->ether_type ==RTE_ETHER_TYPE_LLDP || - filter->ether_type == outer_tpid) { + filter->ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
@@ -2611,7 +2608,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,uint16_t flex_size;bool cfg_flex_pit = true;bool cfg_flex_msk = true; -uint16_t outer_tpid;uint16_t ether_type;uint32_t vtc_flow_cpu;bool outer_ip = true;
@@ -2620,7 +2616,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,memset (off_arr,0 ,sizeof (off_arr));memset (len_arr,0 ,sizeof (len_arr));memset (flex_mask,0 ,I40E_FDIR_MAX_FLEX_LEN ); - outer_tpid =i40e_get_outer_vlan (dev); filter->input.flow_ext.customized_pctype = false;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -2688,7 +2683,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,if (next_type ==RTE_FLOW_ITEM_TYPE_VLAN || ether_type ==RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
@@ -2732,7 +2727,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,if (ether_type ==RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
Signature · 1 line
2.17.1
PATCH v4 4/4 net/i40e: FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking whether the fdir rule being inserted into the guaranteed space or shared space.
For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only report the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. When destroying a flow, we also assume the operation will succeed as the software has checked the flow is indeed in the hardware.
See the fdir programming status descriptor format in the datasheet for more details.
--- drivers/net/i40e/i40e_ethdev.h | 14 ++- drivers/net/i40e/i40e_fdir.c | 151 ++++++++++++++++++++++++++------- drivers/net/i40e/i40e_rxtx.c | 6 +- drivers/net/i40e/i40e_rxtx.h | 3 + 4 files changed, 139 insertions(+), 35 deletions(-)
drivers/net/i40e/i40e_ethdev.h +12 -2
@@ -264,6 +264,8 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +#define I40E_FDIR_PRG_PKT_CNT 128 +/* * Struct to store flow created. */
@@ -705,12 +707,20 @@ TAILQ_HEAD(i40e_fdir_filter_list, i40e_fdir_filter);* A structure used to define fields of a FDIR related info. */ struct i40e_fdir_info { +#define I40E_FDIR_PRG_PKT_CNT 128 +struct i40e_vsi *fdir_vsi;/* pointer to fdir VSI structure */ uint16_t match_counter_index;/* Statistic counter index used for fdir*/ struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/ +void *prg_pkt[I40E_FDIR_PRG_PKT_CNT ];/* memory for fdir program packet */ +uint64_t dma_addr[I40E_FDIR_PRG_PKT_CNT ];/* physic address of packet memory*/ +/* +* txq available buffer counter, indicates how many available buffers +* for fdir programming, initialized as I40E_FDIR_PRG_PKT_CNT +*/ +int txq_available_buf_count; +/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/*
drivers/net/i40e/i40e_fdir.c +122 -29
249 lines not on this page · raw message
drivers/net/i40e/i40e_rxtx.c +2 -4
@@ -2940,16 +2940,13 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define I40E_FDIR_NUM_RX_DESC I40E_MIN_RING_DESC -enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size;struct rte_eth_dev *dev; +uint32_t ring_size;if (!pf) {PMD_DRV_LOG (ERR ,"PF is not available" );
@@ -2996,6 +2993,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)*/ txq->q_set = TRUE; pf->fdir.txq = txq; + pf->fdir.txq_available_buf_count =I40E_FDIR_PRG_PKT_CNT ;return I40E_SUCCESS ; }
drivers/net/i40e/i40e_rxtx.h +3 -0
@@ -24,6 +24,9 @@#define I40E_MIN_RING_DESC 64#define I40E_MAX_RING_DESC 4096 +#define I40E_FDIR_NUM_TX_DESC (I40E_FDIR_PRG_PKT_CNT * 2) +#define I40E_FDIR_NUM_RX_DESC (I40E_FDIR_PRG_PKT_CNT * 2) +#define I40E_MIN_TSO_MSS 256#define I40E_MAX_TSO_MSS 9674
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH V4 4/4] net/i40e: FDIR update rate optimization
[...]
Quoted 58 lines
drivers/net/i40e/i40e_fdir.c +23
-0+static inline unsigned char * +i40e_find_available_buffer(struct rte_eth_dev *dev) +{ + struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); + struct i40e_fdir_info *fdir_info = &pf->fdir; + struct i40e_tx_queue *txq = pf->fdir.txq; + volatile struct i40e_tx_desc *txdp = &txq->tx_ring[txq->tx_tail + 1]; + uint32_t i; + + /* no available buffer + * search for more available buffers from the current + * descriptor, until an unavailable one + */ + if (fdir_info->txq_available_buf_count <= 0) { + uint16_t tmp_tail; + volatile struct i40e_tx_desc *tmp_txdp; + + tmp_tail = txq->tx_tail; + tmp_txdp = &txq->tx_ring[tmp_tail + 1]; + + do { + if ((tmp_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))drivers/net/i40e/i40e_fdir.c +22
-0+ fdir_info->txq_available_buf_count++; + else + break; + + tmp_tail +=2 ; +if (tmp_tail >= txq->nb_tx_desc) + tmp_tail =0 ; + }while (tmp_tail != txq->tx_tail); + } + +/* +* if txq_available_buf_count > 0, just use the next one is ok, +* else wait for the next DD until it's set to make sure the data +* had been fetched by hardware +*/ +if (fdir_info->txq_available_buf_count >0 ) { + fdir_info->txq_available_buf_count--; + }else { +/* wait until the tx descriptor is ready */ +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))drivers/net/i40e/i40e_fdir.c +6
-0+break ; +rte_delay_us (1 ); + } +if (i >=I40E_FDIR_MAX_WAIT_US ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: time out to get DD on txqueue.");
drivers/net/i40e/i40e_fdir.c i40e_add_del_fdir_filter(struct rte_eth_dev *dev, · line 1801
Quoted 3 lines
drivers/net/i40e/i40e_fdir.c +3
-0+return NULL ; + } + }
Why wait for I40E_FDIR_MAX_WAIT_US but not return NULL immediately?
[...]
Quoted 21 lines
i40e_flow_fdir_filter_programming(struct
i40e_pf*pf,drivers/net/i40e/i40e_fdir.c +4
-2enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add) + bool add, bool wait_status) { struct i40e_tx_queue *txq = pf->fdir.txq;struct i40e_rx_queue *rxq = pf->fdir.rxq;@@ -2011,8 +2092,10 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,volatile struct i40e_tx_desc *txdp;volatile struct i40e_filter_program_desc *fdirdp;uint32_t td_cmd; -uint16_t vsi_id, i; +uint16_t vsi_id;uint8_t dest; +uint32_t i; +uint8_t retry_count =0 ;PMD_DRV_LOG (INFO ,"filling filter programming descriptor." ); fdirdp = (volatile struct i40e_filter_program_desc *)
drivers/net/i40e/i40e_fdir.c i40e_flow_fdir_filter_programming(struct i40e_pf *pf, · line 2174
Quoted 6 lines
drivers/net/i40e/i40e_fdir.c +2
-1@@ -2087,7 +2170,8 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,PMD_DRV_LOG (INFO ,"filling transmit descriptor." ); txdp = &txq->tx_ring[txq->tx_tail +1 ]; - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[txq->tx_tail /2 ]); +
[txq->tx_tail / 2] is not readable, how about use the avail pkt you get directly? Or another index to identify it?
drivers/net/i40e/i40e_fdir.c i40e_flow_fdir_filter_programming(struct i40e_pf *pf, · line 2192
Quoted 13 lines
drivers/net/i40e/i40e_fdir.c +6
-0td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;@@ -2100,25 +2184,34 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf, txq->tx_tail =0 ;/* Update the tx tail register */ rte_wmb (); + +/* capture the previous error report(if any) from rx ring */ +while ((i40e_check_fdir_programming_status (rxq) <0 ) && + (++retry_count <100 )) +PMD_DRV_LOG (INFO ,"previous error report captured." ); +
Why check FDIR ring for 100 times? And "&&" is used here, the log is only print if the 100th check fails?
Quoted 3 lines
(quoted diff) +0
-1--2.17.1
Re: [dpdk-dev] [PATCH V4 4/4] net/i40e: FDIR update rate optimization
Best Regards,
Sun, Chenmin
Quoted 70 lines
-----Original Message-----
From: Wu, Jingjing <[email protected]>
Sent: Thursday, July 16, 2020 9:57 PM
To: Sun, Chenmin <[email protected]>; Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wang, Haiyue <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH V4 4/4] net/i40e: FDIR update rate optimization[...]
Quoted 51 lines
(quoted diff) +3
-0+static inline unsigned char * +i40e_find_available_buffer(struct rte_eth_dev *dev) { + struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data-
dev_private);drivers/net/i40e/i40e_fdir.c +19
-0+struct i40e_fdir_info *fdir_info = &pf->fdir; +struct i40e_tx_queue *txq = pf->fdir.txq; +volatile struct i40e_tx_desc *txdp = &txq->tx_ring[txq->tx_tail +1 ]; +uint32_t i; + +/* no available buffer +* search for more available buffers from the current +* descriptor, until an unavailable one +*/ + if (fdir_info->txq_available_buf_count <= 0) { + uint16_t tmp_tail; + volatile struct i40e_tx_desc *tmp_txdp; + + tmp_tail = txq->tx_tail; + tmp_txdp = &txq->tx_ring[tmp_tail + 1]; + + do { + if ((tmp_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))drivers/net/i40e/i40e_fdir.c +22
-0+ fdir_info->txq_available_buf_count++; + else + break; + + tmp_tail +=2 ; +if (tmp_tail >= txq->nb_tx_desc) + tmp_tail =0 ; + }while (tmp_tail != txq->tx_tail); + } + +/* +* if txq_available_buf_count > 0, just use the next one is ok, +* else wait for the next DD until it's set to make sure the data +* had been fetched by hardware +*/ +if (fdir_info->txq_available_buf_count >0 ) { + fdir_info->txq_available_buf_count--; + }else { +/* wait until the tx descriptor is ready */ +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))drivers/net/i40e/i40e_fdir.c i40e_add_del_fdir_filter(struct rte_eth_dev *dev,
Quoted 6 lines
drivers/net/i40e/i40e_fdir.c +6
-0+break ; +rte_delay_us (1 ); + } +if (i >=I40E_FDIR_MAX_WAIT_US ) { + PMD_DRV_LOG(ERR, + "Failed to program FDIR filter: time out to get DD ontx
Quoted 5 lines
drivers/net/i40e/i40e_fdir.c i40e_add_del_fdir_filter(struct rte_eth_dev *dev, · line 1801
Quoted 4 lines
queue.");
drivers/net/i40e/i40e_fdir.c +3
-0+return NULL ; + } + }Why wait for
I40E_FDIR_MAX_WAIT_USbut not return NULL immediately?
Done
Quoted 25 lines
[...]
Quoted 22 lines
i40e_flow_fdir_filter_programming(struct
i40e_pf*pf,drivers/net/i40e/i40e_fdir.c +1
-1enum i40e_filter_pctype pctype, const struct i40e_fdir_filter_conf *filter, - bool add) + bool add, bool wait_status) { struct i40e_tx_queue *txq = pf->fdir.txq; struct i40e_rx_queue *rxq = pf->fdir.rxq; @@ -2011,8 +2092,10 @@i40e_flow_fdir_filter_programming(struct
i40e_pf*pf,drivers/net/i40e/i40e_fdir.c +4
-1volatile struct i40e_tx_desc *txdp;volatile struct i40e_filter_program_desc *fdirdp;uint32_t td_cmd; -uint16_t vsi_id, i; +uint16_t vsi_id;uint8_t dest; +uint32_t i; +uint8_t retry_count =0 ;PMD_DRV_LOG (INFO ,"filling filter programming descriptor." ); fdirdp = (volatile struct i40e_filter_program_desc *) @@ -2087,7 +2170,8 @@ i40e_flow_fdir_filter_programming(struct i40e_pf *pf,
Quoted 8 lines
drivers/net/i40e/i40e_fdir.c i40e_flow_fdir_filter_programming(struct i40e_pf *pf, · line 2174
Quoted 6 lines
drivers/net/i40e/i40e_fdir.c +3
-1PMD_DRV_LOG (INFO ,"filling transmit descriptor." ); txdp = &txq->tx_ring[txq->tx_tail +1 ]; - txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr); + txdp->buffer_addr =rte_cpu_to_le_64 (pf->fdir.dma_addr[txq->tx_tail +/2 ]); +[
txq->tx_tail/ 2] is not readable, how about use the avail pkt you get directly? Or another index to identify it?
Have replaced with >> 1
Quoted 5 lines
drivers/net/i40e/i40e_fdir.c i40e_flow_fdir_filter_programming(struct
Quoted 4 lines
drivers/net/i40e/i40e_fdir.c +0
-0td_cmd =I40E_TX_DESC_CMD_EOP |I40E_TX_DESC_CMD_RS |I40E_TX_DESC_CMD_DUMMY ;@@ -2100,25 +2184,34 @@ i40e_flow_fdir_filter_programming(struct
i40e_pf*pf,
Quoted 11 lines
drivers/net/i40e/i40e_fdir.c i40e_flow_fdir_filter_programming(struct i40e_pf *pf, · line 2192
Quoted 9 lines
drivers/net/i40e/i40e_fdir.c +6
-0txq->tx_tail =0 ;/* Update the tx tail register */ rte_wmb (); + +/* capture the previous error report(if any) from rx ring */ +while ((i40e_check_fdir_programming_status (rxq) <0 ) && + (++retry_count <100 )) +PMD_DRV_LOG (INFO ,"previous error report captured." ); +Why check FDIR ring for 100 times? And "&&" is used here, the log is only print if the 100th check fails?
No, it will print 100 times.
The purpose of this code is to clean up the fdir rx queue. Have new an independent function for this
Quoted 3 lines
Quoted 3 lines
(quoted diff) +0
-1--2.17.1
v5 cover i40e FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
[PATCH v5 1/4] net/i40e: introducing the fdir guaranteed/shared space tracking [PATCH v5 2/4] net/i40e: FDIR flow memory management optimization [PATCH v5 2/4] net/i40e: move the i40e_get_outer_vlan to where it real needed [PATCH v5 2/4] net/i40e: FDIR update rate optimization
v5:
* Remove duplicated macro definition
* Replace multiplication and division with bitwise operators v4:
* Split the patch to 4
* New two functions for fdir mempool get/put.
* Rewrite function i40e_find_available_buffer().
* Move the fdir space tracking logic to i40e_flow_add_del_fdir_filter(). v3:
* Split the patch into two.
* Renamed some data structures and added some descriptions. v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace the bin_serch() with rte_bsf64()
Chenmin Sun (4):
net/i40e: introducing the fdir space tracking net/i40e: FDIR flow memory management optimization net/i40e: move the i40e_get_outer_vlan to where it real needed net/i40e: FDIR update rate optimization
drivers/net/i40e/i40e_ethdev.c | 135 +++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 83 ++++++++-- drivers/net/i40e/i40e_fdir.c | 271 ++++++++++++++++++++++++++------- drivers/net/i40e/i40e_flow.c | 108 +++++++++---- drivers/net/i40e/i40e_rxtx.c | 7 +- drivers/net/i40e/i40e_rxtx.h | 3 + 6 files changed, 494 insertions(+), 113 deletions(-)
Signature · 1 line
2.17.1
PATCH v5 1/4 net/i40e: introducing the fdir space tracking
From: Chenmin Sun <[email protected]>
This patch introduces a fdir flow management for guaranteed/shared space tracking.
The fdir space is reported by the i40e_hw_capabilities.fd_filters_guaranteed and fd_filters_best_effort. The fdir space is managed by hardware and now is tracking in software. The management algorithm is controlled by the GLQF_CTL.INVALPRIO. Detailed implementation please check in the datasheet and the description of struct i40e_fdir_info.fdir_invalprio.
This patch changes the global register GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
--- drivers/net/i40e/i40e_ethdev.c | 41 ++++++++++++++++++++++++++++++++++ drivers/net/i40e/i40e_ethdev.h | 28 +++++++++++++++++++++-- drivers/net/i40e/i40e_fdir.c | 16 +++++++++++++ drivers/net/i40e/i40e_flow.c | 5 +++++ drivers/net/i40e/i40e_rxtx.c | 1 + 5 files changed, 89 insertions(+), 2 deletions(-)
drivers/net/i40e/i40e_ethdev.c +41 -0
@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h"
@@ -1045,8 +1046,11 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +uint32_t alloc = hw->func_caps.fd_filters_guaranteed; +uint32_t best = hw->func_caps.fd_filters_best_effort;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1067,6 +1071,7 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR ,"Failed to create fdir hash table!" );return -EINVAL ; } + fdir_info->hash_map = rte_zmalloc("i40e_fdir_hash_map", sizeof(struct i40e_fdir_filter *) * I40E_MAX_FDIR_FILTER_NUM,
@@ -1077,6 +1082,15 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) ret = -ENOMEM ; goto err_fdir_hash_map_alloc; } + + fdir_info->fdir_space_size = alloc + best; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_total_space = alloc; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_total_space; + +PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , alloc, best); +return 0 ; err_fdir_hash_map_alloc:
@@ -1101,6 +1115,30 @@ i40e_init_customized_info(struct i40e_pf *pf) pf->esp_support = false; } +static void +i40e_init_filter_invalidation (struct i40e_pf *pf) +{ +struct i40e_hw *hw =I40E_PF_TO_HW (pf); +struct i40e_fdir_info *fdir_info = &pf->fdir; +uint32_t glqf_ctl_reg =0 ; + + glqf_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + glqf_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO set to guaranteed first" ); +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , glqf_ctl_reg); + }else { +if (glqf_ctl_reg &I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: guaranteed first" ); + }else { + fdir_info->fdir_invalprio =0 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: shared first" ); + } + } +} +void i40e_init_queue_region_conf (struct rte_eth_dev *dev) {
@@ -1654,6 +1692,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)/* Initialize customized information */ i40e_init_customized_info (pf); +/* Initialize the filter invalidation configuration */ +i40e_init_filter_invalidation (pf); + ret =i40e_init_ethtype_filter_list (dev);if (ret <0 ) goto err_init_ethtype_filter_list;
drivers/net/i40e/i40e_ethdev.h +26 -2
@@ -698,6 +698,30 @@ struct i40e_fdir_info {struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table; +/* +* Priority ordering at filter invalidation(destroying a flow) between +* "best effort" space and "guaranteed" space. +* +* 0 = At filter invalidation, the hardware first tries to increment the +* "best effort" space. The "guaranteed" space is incremented only when +* the global "best effort" space is at it max value or the "best effort" +* space of the PF is at its max value. +* 1 = At filter invalidation, the hardware first tries to increment its +* "guaranteed" space. The "best effort" space is incremented only when +* it is already at its max value. +*/ +uint32_t fdir_invalprio; +/* the total size of the fdir, this number is the sum of the guaranteed + +* shared space +*/ +uint32_t fdir_space_size; +/* the actual number of the fdir rules in hardware, initialized as 0 */ +uint32_t fdir_actual_cnt; +/* the free guaranteed space of the fdir */ +uint32_t fdir_guarantee_free_space; +/* the fdir total guaranteed space */ +uint32_t fdir_guarantee_total_space; +/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ];
@@ -1335,8 +1359,8 @@ int i40e_add_del_fdir_filter(struct rte_eth_dev *dev,const struct rte_eth_fdir_filter *filter, bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);
drivers/net/i40e/i40e_fdir.c +16 -0
@@ -21,6 +21,7 @@#include <rte_tcp.h> #include <rte_sctp.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h"
@@ -244,6 +245,10 @@ i40e_fdir_setup(struct i40e_pf *pf) pf->fdir.dma_addr = mz->iova; pf->fdir.match_counter_index =I40E_COUNTER_INDEX_FDIR (hw->pf_id); + pf->fdir.fdir_actual_cnt =0 ; + pf->fdir.fdir_guarantee_free_space = + pf->fdir.fdir_guarantee_total_space; +PMD_DRV_LOG (INFO ,"FDIR setup successfully, with programming queue %u." , vsi->base_queue);return I40E_SUCCESS ;
@@ -1762,6 +1767,11 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, }if (add) { + fdir_info->fdir_actual_cnt++; +if (fdir_info->fdir_invalprio ==1 && + fdir_info->fdir_guarantee_free_space >0 ) + fdir_info->fdir_guarantee_free_space--; + fdir_filter =rte_zmalloc ("fdir_filter" ,sizeof (*fdir_filter),0 );if (fdir_filter ==NULL ) {
@@ -1774,6 +1784,12 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,if (ret <0 )rte_free (fdir_filter); }else { + fdir_info->fdir_actual_cnt--; +if (fdir_info->fdir_invalprio ==1 && + fdir_info->fdir_guarantee_free_space < + fdir_info->fdir_guarantee_total_space) + fdir_info->fdir_guarantee_free_space++; + ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); }
drivers/net/i40e/i40e_flow.c +5 -0
@@ -17,6 +17,7 @@#include <rte_malloc.h> #include <rte_tailq.h> #include <rte_flow_driver.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h"
@@ -5601,6 +5602,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) } } + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_total_space; +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) pf->fdir.inset_flag[pctype] =0 ;
drivers/net/i40e/i40e_rxtx.c +1 -0
@@ -2989,6 +2989,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured.
Signature · 1 line
2.17.1
PATCH v5 2/4 net/i40e: FDIR flow memory management optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch allocated some memory pool for flow management to avoid calling rte_zmalloc/rte_free every time.
This patch also improves the hash table operation. When adding/removing a flow, the software will directly add/delete it from the hash table. If any error occurs, it then roll back the operation it just done.
--- drivers/net/i40e/i40e_ethdev.c | 94 +++++++++++++++++++++++-- drivers/net/i40e/i40e_ethdev.h | 43 +++++++++--- drivers/net/i40e/i40e_fdir.c | 121 ++++++++++++++++++++++++--------- drivers/net/i40e/i40e_flow.c | 92 ++++++++++++++++++------- 4 files changed, 280 insertions(+), 70 deletions(-)
drivers/net/i40e/i40e_ethdev.c +87 -7
@@ -1051,6 +1051,10 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)char fdir_hash_name[RTE_HASH_NAMESIZE ];uint32_t alloc = hw->func_caps.fd_filters_guaranteed;uint32_t best = hw->func_caps.fd_filters_best_effort; +struct rte_bitmap *bmp =NULL ; +uint32_t bmp_size; +void *mem =NULL ; +uint32_t i =0 ;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1083,6 +1087,18 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) goto err_fdir_hash_map_alloc; } + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + +if (!fdir_info->fdir_filter_array) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir filter array!" ); + ret = -ENOMEM ; + goto err_fdir_filter_array_alloc; + } + fdir_info->fdir_space_size = alloc + best; fdir_info->fdir_actual_cnt =0 ; fdir_info->fdir_guarantee_total_space = alloc;
@@ -1091,8 +1107,53 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , alloc, best); + fdir_info->fdir_flow_pool.pool = +rte_zmalloc ("i40e_fdir_entry" , +sizeof (struct i40e_fdir_entry ) * + fdir_info->fdir_space_size, +0 ); + +if (!fdir_info->fdir_flow_pool.pool) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for bitmap flow!" ); + ret = -ENOMEM ; + goto err_fdir_bitmap_flow_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_pool.pool[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info->fdir_space_size); + mem =rte_zmalloc ("fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to initialization fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_bmp_alloc; + } +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_pool.bitmap = bmp; +return 0 ; +err_fdir_bmp_alloc: +rte_free (mem); +err_fdir_mem_alloc: +rte_free (fdir_info->fdir_flow_pool.pool); +err_fdir_bitmap_flow_alloc: +rte_free (fdir_info->fdir_filter_array); +err_fdir_filter_array_alloc: +rte_free (fdir_info->hash_map); err_fdir_hash_map_alloc:rte_hash_free (fdir_info->hash_table);
@@ -1790,16 +1851,30 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)struct i40e_fdir_info *fdir_info; fdir_info = &pf->fdir; -/* Remove all flow director rules and hash */ + +/* Remove all flow director rules */ +while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) +TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); +} + +static void +i40e_fdir_memory_cleanup (struct i40e_pf *pf) +{ +struct i40e_fdir_info *fdir_info; + + fdir_info = &pf->fdir; + +/* flow director memory cleanup */ if (fdir_info->hash_map)rte_free (fdir_info->hash_map);if (fdir_info->hash_table)rte_hash_free (fdir_info->hash_table); - -while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) { -TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); - } +if (fdir_info->fdir_flow_pool.bitmap) +rte_bitmap_free (fdir_info->fdir_flow_pool.bitmap); +if (fdir_info->fdir_flow_pool.pool) +rte_free (fdir_info->fdir_flow_pool.pool); +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); }void i40e_flex_payload_reg_set_default (struct i40e_hw *hw)
@@ -2659,9 +2734,14 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows since they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } +/* release the fdir static allocated memory */ +i40e_fdir_memory_cleanup (pf); +/* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit (dev);
drivers/net/i40e/i40e_ethdev.h +34 -9
79 lines not on this page · raw message
drivers/net/i40e/i40e_fdir.c +90 -31
190 lines not on this page · raw message
drivers/net/i40e/i40e_flow.c +69 -23
184 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v5 3/4 net/i40e: move the i40e_get_outer_vlan to where it real needed
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch moves the fetching the device tpid to where it really needs, rather than fetching it every time when entered the functions. This is because this operation costs too many cycles and it is used only when matching the ethernet header.
--- drivers/net/i40e/i40e_flow.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_flow.c +3 -8
@@ -2047,9 +2047,6 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,const struct rte_flow_item_eth *eth_spec;const struct rte_flow_item_eth *eth_mask;enum rte_flow_item_type item_type; -uint16_t outer_tpid; - - outer_tpid =i40e_get_outer_vlan (dev);for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -2109,7 +2106,7 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,if (filter->ether_type ==RTE_ETHER_TYPE_IPV4 || filter->ether_type ==RTE_ETHER_TYPE_IPV6 || filter->ether_type ==RTE_ETHER_TYPE_LLDP || - filter->ether_type == outer_tpid) { + filter->ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
@@ -2611,7 +2608,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,uint16_t flex_size;bool cfg_flex_pit = true;bool cfg_flex_msk = true; -uint16_t outer_tpid;uint16_t ether_type;uint32_t vtc_flow_cpu;bool outer_ip = true;
@@ -2620,7 +2616,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,memset (off_arr,0 ,sizeof (off_arr));memset (len_arr,0 ,sizeof (len_arr));memset (flex_mask,0 ,I40E_FDIR_MAX_FLEX_LEN ); - outer_tpid =i40e_get_outer_vlan (dev); filter->input.flow_ext.customized_pctype = false;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -2688,7 +2683,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,if (next_type ==RTE_FLOW_ITEM_TYPE_VLAN || ether_type ==RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
@@ -2732,7 +2727,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,if (ether_type ==RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
Signature · 1 line
2.17.1
PATCH v5 4/4 net/i40e: FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking whether the fdir rule being inserted into the guaranteed space or shared space.
For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only report the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. When destroying a flow, we also assume the operation will succeed as the software has checked the flow is indeed in the hardware.
See the fdir programming status descriptor format in the datasheet for more details.
--- drivers/net/i40e/i40e_ethdev.h | 12 ++- drivers/net/i40e/i40e_fdir.c | 138 ++++++++++++++++++++++++++------- drivers/net/i40e/i40e_rxtx.c | 6 +- drivers/net/i40e/i40e_rxtx.h | 3 + 4 files changed, 124 insertions(+), 35 deletions(-)
drivers/net/i40e/i40e_ethdev.h +10 -2
@@ -264,6 +264,8 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +#define I40E_FDIR_PRG_PKT_CNT 128 +/* * Struct to store flow created. */
@@ -709,8 +711,14 @@ struct i40e_fdir_info {uint16_t match_counter_index;/* Statistic counter index used for fdir*/ struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/ +void *prg_pkt[I40E_FDIR_PRG_PKT_CNT ];/* memory for fdir program packet */ +uint64_t dma_addr[I40E_FDIR_PRG_PKT_CNT ];/* physic address of packet memory*/ +/* +* txq available buffer counter, indicates how many available buffers +* for fdir programming, initialized as I40E_FDIR_PRG_PKT_CNT +*/ +int txq_available_buf_count; +/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/*
drivers/net/i40e/i40e_fdir.c +109 -29
242 lines not on this page · raw message
drivers/net/i40e/i40e_rxtx.c +2 -4
@@ -2940,16 +2940,13 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define I40E_FDIR_NUM_RX_DESC I40E_MIN_RING_DESC -enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size;struct rte_eth_dev *dev; +uint32_t ring_size;if (!pf) {PMD_DRV_LOG (ERR ,"PF is not available" );
@@ -2996,6 +2993,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)*/ txq->q_set = TRUE; pf->fdir.txq = txq; + pf->fdir.txq_available_buf_count =I40E_FDIR_PRG_PKT_CNT ;return I40E_SUCCESS ; }
drivers/net/i40e/i40e_rxtx.h +3 -0
@@ -24,6 +24,9 @@#define I40E_MIN_RING_DESC 64#define I40E_MAX_RING_DESC 4096 +#define I40E_FDIR_NUM_TX_DESC (I40E_FDIR_PRG_PKT_CNT << 1) +#define I40E_FDIR_NUM_RX_DESC (I40E_FDIR_PRG_PKT_CNT << 1) +#define I40E_MIN_TSO_MSS 256#define I40E_MAX_TSO_MSS 9674
Signature · 1 line
2.17.1
v6 cover i40e FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
[PATCH v6 1/4] net/i40e: introducing the fdir guaranteed/shared space tracking [PATCH v6 2/4] net/i40e: FDIR flow memory management optimization [PATCH v6 2/4] net/i40e: move the i40e_get_outer_vlan to where it real needed [PATCH v6 2/4] net/i40e: FDIR update rate optimization
v6:
* Fix a code style issue
v5:
* Remove duplicated macro definition
* Replace multiplication and division with bitwise operators v4:
* Split the patch to 4
* New two functions for fdir mempool get/put.
* Rewrite function i40e_find_available_buffer().
* Move the fdir space tracking logic to i40e_flow_add_del_fdir_filter(). v3:
* Split the patch into two.
* Renamed some data structures and added some descriptions. v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace the bin_serch() with rte_bsf64()
Chenmin Sun (4):
net/i40e: introducing the fdir space tracking net/i40e: FDIR flow memory management optimization net/i40e: move the i40e_get_outer_vlan to where it real needed net/i40e: FDIR update rate optimization
drivers/net/i40e/i40e_ethdev.c | 135 +++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 83 ++++++++-- drivers/net/i40e/i40e_fdir.c | 271 ++++++++++++++++++++++++++------- drivers/net/i40e/i40e_flow.c | 108 +++++++++---- drivers/net/i40e/i40e_rxtx.c | 7 +- drivers/net/i40e/i40e_rxtx.h | 3 + 6 files changed, 494 insertions(+), 113 deletions(-)
Signature · 1 line
2.17.1
PATCH v6 1/4 net/i40e: introducing the fdir space tracking
From: Chenmin Sun <[email protected]>
This patch introduces a fdir flow management for guaranteed/shared space tracking.
The fdir space is reported by the i40e_hw_capabilities.fd_filters_guaranteed and fd_filters_best_effort. The fdir space is managed by hardware and now is tracking in software. The management algorithm is controlled by the GLQF_CTL.INVALPRIO. Detailed implementation please check in the datasheet and the description of struct i40e_fdir_info.fdir_invalprio.
This patch changes the global register GLQF_CTL. Therefore, when devarg ``support-multi-driver`` is set, the patch will not take effect to avoid affecting the normal behavior of other i40e drivers, e.g., Linux kernel driver.
--- drivers/net/i40e/i40e_ethdev.c | 41 ++++++++++++++++++++++++++++++++++ drivers/net/i40e/i40e_ethdev.h | 28 +++++++++++++++++++++-- drivers/net/i40e/i40e_fdir.c | 16 +++++++++++++ drivers/net/i40e/i40e_flow.c | 5 +++++ drivers/net/i40e/i40e_rxtx.c | 1 + 5 files changed, 89 insertions(+), 2 deletions(-)
drivers/net/i40e/i40e_ethdev.c +41 -0
@@ -26,6 +26,7 @@#include <rte_dev.h> #include <rte_tailq.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_prototype.h"
@@ -1045,8 +1046,11 @@ static int i40e_init_fdir_filter_list(struct rte_eth_dev *dev) {struct i40e_pf *pf =I40E_DEV_PRIVATE_TO_PF (dev->data->dev_private); +struct i40e_hw *hw =I40E_PF_TO_HW (pf);struct i40e_fdir_info *fdir_info = &pf->fdir;char fdir_hash_name[RTE_HASH_NAMESIZE ]; +uint32_t alloc = hw->func_caps.fd_filters_guaranteed; +uint32_t best = hw->func_caps.fd_filters_best_effort;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1067,6 +1071,7 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_INIT_LOG (ERR ,"Failed to create fdir hash table!" );return -EINVAL ; } + fdir_info->hash_map = rte_zmalloc("i40e_fdir_hash_map", sizeof(struct i40e_fdir_filter *) * I40E_MAX_FDIR_FILTER_NUM,
@@ -1077,6 +1082,15 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) ret = -ENOMEM ; goto err_fdir_hash_map_alloc; } + + fdir_info->fdir_space_size = alloc + best; + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_total_space = alloc; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_total_space; + +PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , alloc, best); +return 0 ; err_fdir_hash_map_alloc:
@@ -1101,6 +1115,30 @@ i40e_init_customized_info(struct i40e_pf *pf) pf->esp_support = false; } +static void +i40e_init_filter_invalidation (struct i40e_pf *pf) +{ +struct i40e_hw *hw =I40E_PF_TO_HW (pf); +struct i40e_fdir_info *fdir_info = &pf->fdir; +uint32_t glqf_ctl_reg =0 ; + + glqf_ctl_reg =i40e_read_rx_ctl (hw,I40E_GLQF_CTL ); +if (!pf->support_multi_driver) { + fdir_info->fdir_invalprio =1 ; + glqf_ctl_reg |=I40E_GLQF_CTL_INVALPRIO_MASK ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO set to guaranteed first" ); +i40e_write_rx_ctl (hw,I40E_GLQF_CTL , glqf_ctl_reg); + }else { +if (glqf_ctl_reg &I40E_GLQF_CTL_INVALPRIO_MASK ) { + fdir_info->fdir_invalprio =1 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: guaranteed first" ); + }else { + fdir_info->fdir_invalprio =0 ; +PMD_DRV_LOG (INFO ,"FDIR INVALPRIO is: shared first" ); + } + } +} +void i40e_init_queue_region_conf (struct rte_eth_dev *dev) {
@@ -1654,6 +1692,9 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)/* Initialize customized information */ i40e_init_customized_info (pf); +/* Initialize the filter invalidation configuration */ +i40e_init_filter_invalidation (pf); + ret =i40e_init_ethtype_filter_list (dev);if (ret <0 ) goto err_init_ethtype_filter_list;
drivers/net/i40e/i40e_ethdev.h +26 -2
@@ -698,6 +698,30 @@ struct i40e_fdir_info {struct i40e_fdir_filter **hash_map;struct rte_hash *hash_table; +/* +* Priority ordering at filter invalidation(destroying a flow) between +* "best effort" space and "guaranteed" space. +* +* 0 = At filter invalidation, the hardware first tries to increment the +* "best effort" space. The "guaranteed" space is incremented only when +* the global "best effort" space is at it max value or the "best effort" +* space of the PF is at its max value. +* 1 = At filter invalidation, the hardware first tries to increment its +* "guaranteed" space. The "best effort" space is incremented only when +* it is already at its max value. +*/ +uint32_t fdir_invalprio; +/* the total size of the fdir, this number is the sum of the guaranteed + +* shared space +*/ +uint32_t fdir_space_size; +/* the actual number of the fdir rules in hardware, initialized as 0 */ +uint32_t fdir_actual_cnt; +/* the free guaranteed space of the fdir */ +uint32_t fdir_guarantee_free_space; +/* the fdir total guaranteed space */ +uint32_t fdir_guarantee_total_space; +/* Mark if flex pit and mask is set */ bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ];
@@ -1335,8 +1359,8 @@ int i40e_add_del_fdir_filter(struct rte_eth_dev *dev,const struct rte_eth_fdir_filter *filter, bool add);int i40e_flow_add_del_fdir_filter (struct rte_eth_dev *dev, -const struct i40e_fdir_filter_conf *filter, -bool add); +const struct i40e_fdir_filter_conf *filter, +bool add);int i40e_dev_tunnel_filter_set (struct i40e_pf *pf,struct rte_eth_tunnel_filter_conf *tunnel_filter,uint8_t add);
drivers/net/i40e/i40e_fdir.c +16 -0
@@ -21,6 +21,7 @@#include <rte_tcp.h> #include <rte_sctp.h> #include <rte_hash_crc.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h"
@@ -244,6 +245,10 @@ i40e_fdir_setup(struct i40e_pf *pf) pf->fdir.dma_addr = mz->iova; pf->fdir.match_counter_index =I40E_COUNTER_INDEX_FDIR (hw->pf_id); + pf->fdir.fdir_actual_cnt =0 ; + pf->fdir.fdir_guarantee_free_space = + pf->fdir.fdir_guarantee_total_space; +PMD_DRV_LOG (INFO ,"FDIR setup successfully, with programming queue %u." , vsi->base_queue);return I40E_SUCCESS ;
@@ -1762,6 +1767,11 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, }if (add) { + fdir_info->fdir_actual_cnt++; +if (fdir_info->fdir_invalprio ==1 && + fdir_info->fdir_guarantee_free_space >0 ) + fdir_info->fdir_guarantee_free_space--; + fdir_filter =rte_zmalloc ("fdir_filter" ,sizeof (*fdir_filter),0 );if (fdir_filter ==NULL ) {
@@ -1774,6 +1784,12 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,if (ret <0 )rte_free (fdir_filter); }else { + fdir_info->fdir_actual_cnt--; +if (fdir_info->fdir_invalprio ==1 && + fdir_info->fdir_guarantee_free_space < + fdir_info->fdir_guarantee_total_space) + fdir_info->fdir_guarantee_free_space++; + ret =i40e_sw_fdir_filter_del (pf, &node->fdir.input); }
drivers/net/i40e/i40e_flow.c +5 -0
@@ -17,6 +17,7 @@#include <rte_malloc.h> #include <rte_tailq.h> #include <rte_flow_driver.h> +#include <rte_bitmap.h> #include "i40e_logs.h" #include "base/i40e_type.h"
@@ -5601,6 +5602,10 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf) } } + fdir_info->fdir_actual_cnt =0 ; + fdir_info->fdir_guarantee_free_space = + fdir_info->fdir_guarantee_total_space; +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) pf->fdir.inset_flag[pctype] =0 ;
drivers/net/i40e/i40e_rxtx.c +1 -0
@@ -2989,6 +2989,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf) txq->tx_ring_phys_addr = tz->iova; txq->tx_ring = (struct i40e_tx_desc *)tz->addr; +/* * don't need to allocate software ring and reset for the fdir * program queue just set the queue has been configured.
Signature · 1 line
2.17.1
PATCH v6 2/4 net/i40e: FDIR flow memory management optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch allocated some memory pool for flow management to avoid calling rte_zmalloc/rte_free every time.
This patch also improves the hash table operation. When adding/removing a flow, the software will directly add/delete it from the hash table. If any error occurs, it then roll back the operation it just done.
--- drivers/net/i40e/i40e_ethdev.c | 94 +++++++++++++++++++++++-- drivers/net/i40e/i40e_ethdev.h | 43 +++++++++--- drivers/net/i40e/i40e_fdir.c | 121 ++++++++++++++++++++++++--------- drivers/net/i40e/i40e_flow.c | 92 ++++++++++++++++++------- 4 files changed, 280 insertions(+), 70 deletions(-)
drivers/net/i40e/i40e_ethdev.c +87 -7
@@ -1051,6 +1051,10 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)char fdir_hash_name[RTE_HASH_NAMESIZE ];uint32_t alloc = hw->func_caps.fd_filters_guaranteed;uint32_t best = hw->func_caps.fd_filters_best_effort; +struct rte_bitmap *bmp =NULL ; +uint32_t bmp_size; +void *mem =NULL ; +uint32_t i =0 ;int ret;struct rte_hash_parameters fdir_hash_params = {
@@ -1083,6 +1087,18 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) goto err_fdir_hash_map_alloc; } + fdir_info->fdir_filter_array =rte_zmalloc ("fdir_filter" , +sizeof (struct i40e_fdir_filter ) * +I40E_MAX_FDIR_FILTER_NUM , +0 ); + +if (!fdir_info->fdir_filter_array) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir filter array!" ); + ret = -ENOMEM ; + goto err_fdir_filter_array_alloc; + } + fdir_info->fdir_space_size = alloc + best; fdir_info->fdir_actual_cnt =0 ; fdir_info->fdir_guarantee_total_space = alloc;
@@ -1091,8 +1107,53 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev)PMD_DRV_LOG (INFO ,"FDIR guarantee space: %u, best_effort space %u." , alloc, best); + fdir_info->fdir_flow_pool.pool = +rte_zmalloc ("i40e_fdir_entry" , +sizeof (struct i40e_fdir_entry ) * + fdir_info->fdir_space_size, +0 ); + +if (!fdir_info->fdir_flow_pool.pool) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for bitmap flow!" ); + ret = -ENOMEM ; + goto err_fdir_bitmap_flow_alloc; + } + +for (i =0 ; i < fdir_info->fdir_space_size; i++) + fdir_info->fdir_flow_pool.pool[i].idx = i; + + bmp_size = +rte_bitmap_get_memory_footprint (fdir_info->fdir_space_size); + mem =rte_zmalloc ("fdir_bmap" , bmp_size,RTE_CACHE_LINE_SIZE ); +if (mem ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to allocate memory for fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_mem_alloc; + } + bmp =rte_bitmap_init (fdir_info->fdir_space_size, mem, bmp_size); +if (bmp ==NULL ) { +PMD_INIT_LOG (ERR , +"Failed to initialization fdir bitmap!" ); + ret = -ENOMEM ; + goto err_fdir_bmp_alloc; + } +for (i =0 ; i < fdir_info->fdir_space_size; i++) +rte_bitmap_set (bmp, i); + + fdir_info->fdir_flow_pool.bitmap = bmp; +return 0 ; +err_fdir_bmp_alloc: +rte_free (mem); +err_fdir_mem_alloc: +rte_free (fdir_info->fdir_flow_pool.pool); +err_fdir_bitmap_flow_alloc: +rte_free (fdir_info->fdir_filter_array); +err_fdir_filter_array_alloc: +rte_free (fdir_info->hash_map); err_fdir_hash_map_alloc:rte_hash_free (fdir_info->hash_table);
@@ -1790,16 +1851,30 @@ i40e_rm_fdir_filter_list(struct i40e_pf *pf)struct i40e_fdir_info *fdir_info; fdir_info = &pf->fdir; -/* Remove all flow director rules and hash */ + +/* Remove all flow director rules */ +while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) +TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); +} + +static void +i40e_fdir_memory_cleanup (struct i40e_pf *pf) +{ +struct i40e_fdir_info *fdir_info; + + fdir_info = &pf->fdir; + +/* flow director memory cleanup */ if (fdir_info->hash_map)rte_free (fdir_info->hash_map);if (fdir_info->hash_table)rte_hash_free (fdir_info->hash_table); - -while ((p_fdir =TAILQ_FIRST (&fdir_info->fdir_list))) { -TAILQ_REMOVE (&fdir_info->fdir_list, p_fdir, rules); -rte_free (p_fdir); - } +if (fdir_info->fdir_flow_pool.bitmap) +rte_bitmap_free (fdir_info->fdir_flow_pool.bitmap); +if (fdir_info->fdir_flow_pool.pool) +rte_free (fdir_info->fdir_flow_pool.pool); +if (fdir_info->fdir_filter_array) +rte_free (fdir_info->fdir_filter_array); }void i40e_flex_payload_reg_set_default (struct i40e_hw *hw)
@@ -2659,9 +2734,14 @@ i40e_dev_close(struct rte_eth_dev *dev)/* Remove all flows */ while ((p_flow =TAILQ_FIRST (&pf->flow_list))) {TAILQ_REMOVE (&pf->flow_list, p_flow, node); -rte_free (p_flow); +/* Do not free FDIR flows since they are static allocated */ +if (p_flow->filter_type !=RTE_ETH_FILTER_FDIR ) +rte_free (p_flow); } +/* release the fdir static allocated memory */ +i40e_fdir_memory_cleanup (pf); +/* Remove all Traffic Manager configuration */ i40e_tm_conf_uninit (dev);
drivers/net/i40e/i40e_ethdev.h +34 -9
79 lines not on this page · raw message
drivers/net/i40e/i40e_fdir.c +90 -31
190 lines not on this page · raw message
drivers/net/i40e/i40e_flow.c +69 -23
184 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v6 3/4 net/i40e: move the i40e_get_outer_vlan to where it real needed
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch moves the fetching the device tpid to where it really needs, rather than fetching it every time when entered the functions. This is because this operation costs too many cycles and it is used only when matching the ethernet header.
--- drivers/net/i40e/i40e_flow.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/net/i40e/i40e_flow.c +3 -8
@@ -2047,9 +2047,6 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,const struct rte_flow_item_eth *eth_spec;const struct rte_flow_item_eth *eth_mask;enum rte_flow_item_type item_type; -uint16_t outer_tpid; - - outer_tpid =i40e_get_outer_vlan (dev);for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -2109,7 +2106,7 @@ i40e_flow_parse_ethertype_pattern(struct rte_eth_dev *dev,if (filter->ether_type ==RTE_ETHER_TYPE_IPV4 || filter->ether_type ==RTE_ETHER_TYPE_IPV6 || filter->ether_type ==RTE_ETHER_TYPE_LLDP || - filter->ether_type == outer_tpid) { + filter->ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
@@ -2611,7 +2608,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,uint16_t flex_size;bool cfg_flex_pit = true;bool cfg_flex_msk = true; -uint16_t outer_tpid;uint16_t ether_type;uint32_t vtc_flow_cpu;bool outer_ip = true;
@@ -2620,7 +2616,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,memset (off_arr,0 ,sizeof (off_arr));memset (len_arr,0 ,sizeof (len_arr));memset (flex_mask,0 ,I40E_FDIR_MAX_FLEX_LEN ); - outer_tpid =i40e_get_outer_vlan (dev); filter->input.flow_ext.customized_pctype = false;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {
@@ -2688,7 +2683,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,if (next_type ==RTE_FLOW_ITEM_TYPE_VLAN || ether_type ==RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
@@ -2732,7 +2727,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,if (ether_type ==RTE_ETHER_TYPE_IPV4 || ether_type ==RTE_ETHER_TYPE_IPV6 || - ether_type == outer_tpid) { + ether_type ==i40e_get_outer_vlan (dev)) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
Signature · 1 line
2.17.1
PATCH v6 4/4 net/i40e: FDIR update rate optimization
In reply to [email protected]From: Chenmin Sun <[email protected]>
This patch optimized the fdir update rate for i40e PF, by tracking whether the fdir rule being inserted into the guaranteed space or shared space.
For the flows that are inserted to the guaranteed space, we assume that the insertion will always succeed as the hardware only report the "no enough space left" error. In this case, the software can directly return success and no need to retrieve the result from the hardware. When destroying a flow, we also assume the operation will succeed as the software has checked the flow is indeed in the hardware.
See the fdir programming status descriptor format in the datasheet for more details.
--- drivers/net/i40e/i40e_ethdev.h | 12 ++- drivers/net/i40e/i40e_fdir.c | 138 ++++++++++++++++++++++++++------- drivers/net/i40e/i40e_rxtx.c | 6 +- drivers/net/i40e/i40e_rxtx.h | 3 + 4 files changed, 124 insertions(+), 35 deletions(-)
drivers/net/i40e/i40e_ethdev.h +10 -2
@@ -264,6 +264,8 @@ enum i40e_flxpld_layer_idx {#define I40E_DEFAULT_DCB_APP_NUM 1#define I40E_DEFAULT_DCB_APP_PRIO 3 +#define I40E_FDIR_PRG_PKT_CNT 128 +/* * Struct to store flow created. */
@@ -709,8 +711,14 @@ struct i40e_fdir_info {uint16_t match_counter_index;/* Statistic counter index used for fdir*/ struct i40e_tx_queue *txq;struct i40e_rx_queue *rxq; -void *prg_pkt;/* memory for fdir program packet */ -uint64_t dma_addr;/* physic address of packet memory*/ +void *prg_pkt[I40E_FDIR_PRG_PKT_CNT ];/* memory for fdir program packet */ +uint64_t dma_addr[I40E_FDIR_PRG_PKT_CNT ];/* physic address of packet memory*/ +/* +* txq available buffer counter, indicates how many available buffers +* for fdir programming, initialized as I40E_FDIR_PRG_PKT_CNT +*/ +int txq_available_buf_count; +/* input set bits for each pctype */ uint64_t input_set[I40E_FILTER_PCTYPE_MAX ];/*
drivers/net/i40e/i40e_fdir.c +109 -29
242 lines not on this page · raw message
drivers/net/i40e/i40e_rxtx.c +2 -4
@@ -2940,16 +2940,13 @@ i40e_dev_free_queues(struct rte_eth_dev *dev) } } -#define I40E_FDIR_NUM_TX_DESC I40E_MIN_RING_DESC -#define I40E_FDIR_NUM_RX_DESC I40E_MIN_RING_DESC -enum i40e_status_code i40e_fdir_setup_tx_resources (struct i40e_pf *pf) {struct i40e_tx_queue *txq;const struct rte_memzone *tz =NULL ; -uint32_t ring_size;struct rte_eth_dev *dev; +uint32_t ring_size;if (!pf) {PMD_DRV_LOG (ERR ,"PF is not available" );
@@ -2996,6 +2993,7 @@ i40e_fdir_setup_tx_resources(struct i40e_pf *pf)*/ txq->q_set = TRUE; pf->fdir.txq = txq; + pf->fdir.txq_available_buf_count =I40E_FDIR_PRG_PKT_CNT ;return I40E_SUCCESS ; }
drivers/net/i40e/i40e_rxtx.h +3 -0
@@ -24,6 +24,9 @@#define I40E_MIN_RING_DESC 64#define I40E_MAX_RING_DESC 4096 +#define I40E_FDIR_NUM_TX_DESC (I40E_FDIR_PRG_PKT_CNT << 1) +#define I40E_FDIR_NUM_RX_DESC (I40E_FDIR_PRG_PKT_CNT << 1) +#define I40E_MIN_TSO_MSS 256#define I40E_MAX_TSO_MSS 9674
Signature · 1 line
2.17.1
Zhang, Qi Z
AppliedRe: [dpdk-dev] [PATCH v6 0/4] i40e FDIR update rate optimization
In reply to [email protected]Quoted 50 lines
-----Original Message-----
From: Sun, Chenmin <[email protected]>
Sent: Saturday, July 18, 2020 1:37 AM
To: Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>; Wang, Haiyue <[email protected]>
Cc: [email protected]; Sun, Chenmin <[email protected]>
Subject: [PATCH v6 0/4] i40e FDIR update rate optimizationFrom: Chenmin Sun <[email protected]>
[PATCH v6 1/4] net/i40e: introducing the fdir guaranteed/shared space tracking [PATCH v6 2/4] net/i40e: FDIR flow memory management optimization [PATCH v6 2/4] net/i40e: move the
i40e_get_outer_vlanto where it real needed [PATCH v6 2/4] net/i40e: FDIR update rate optimizationv6:
* Fix a code style issue
v5:
* Remove duplicated macro definition
* Replace multiplication and division with bitwise operators v4:
* Split the patch to 4
* New two functions for fdir mempool get/put.
* Rewrite functioni40e_find_available_buffer().
* Move the fdir space tracking logic toi40e_flow_add_del_fdir_filter(). v3:
* Split the patch into two.
* Renamed some data structures and added some descriptions. v2:
* Refine commit message and code comments.
* Refine code style.
* Fixed several memory free bugs.
* Replace thebin_serch()withrte_bsf64()Chenmin Sun (4):
net/i40e: introducing the fdir space tracking net/i40e: FDIR flow memory management optimization net/i40e: move thei40e_get_outer_vlanto where it real needed net/i40e: FDIR update rate optimizationdrivers/net/i40e/i40e_ethdev.c | 135 +++++++++++++++- drivers/net/i40e/i40e_ethdev.h | 83 ++++++++-- drivers/net/i40e/i40e_fdir.c | 271 ++++++++++++++++++++++++++------- drivers/net/i40e/i40e_flow.c | 108 +++++++++---- drivers/net/i40e/i40e_rxtx.c | 7 +- drivers/net/i40e/i40e_rxtx.h | 3 + 6 files changed, 494 insertions(+), 113 deletions(-)
Quoted 2 lines
--
2.17.1
Applied to dpdk-next-net-intel.
Thanks
Qi