net/i40e: fix FDIR input set conflict issue
PATCH 1/1 net/i40e: fix FDIR input set conflict issue
From: Beilei Xing <[email protected]>
Currently, there'll be conflict error when running the folowing commands:
1. flow create 0 ingress
pattern eth / ipv4 / udp src is 32 / end actions queue index 2 / end
2. flow destroy 0 rule 0
3. flow create 0 ingress
pattern eth / ipv4 / udp dst is 32 / end actions queue index 2 / end
This patch fixes the input set conflict issue.
--- drivers/net/i40e/i40e_ethdev.c | 5 +++++ drivers/net/i40e/i40e_ethdev.h | 2 +- drivers/net/i40e/i40e_fdir.c | 7 ++++--- drivers/net/i40e/i40e_flow.c | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-)
drivers/net/i40e/i40e_ethdev.c +5 -0
@@ -1087,6 +1087,7 @@ 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; +enum i40e_filter_pctype pctype;struct rte_bitmap *bmp =NULL ;uint32_t bmp_size;void *mem =NULL ;
@@ -1135,6 +1136,10 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) goto err_fdir_filter_array_alloc; } +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; + pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) + pf->fdir.flow_count[pctype] =0 ; + fdir_info->fdir_space_size = alloc + best; fdir_info->fdir_actual_cnt =0 ; fdir_info->fdir_guarantee_total_space = alloc;
drivers/net/i40e/i40e_ethdev.h +1 -1
@@ -788,7 +788,7 @@ struct i40e_fdir_info {bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ]; -bool inset_flag[I40E_FILTER_PCTYPE_MAX ];/* Mark if input set is set */ +uint32_t flow_count[I40E_FILTER_PCTYPE_MAX ];uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER ]; };
drivers/net/i40e/i40e_fdir.c +4 -3
@@ -1607,13 +1607,13 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf, }/* Check if the configuration is conflicted */ -if (pf->fdir.inset_flag[pctype] && +if (pf->fdir.flow_count[pctype] &&memcmp (&pf->fdir.input_set[pctype], &input_set,sizeof (uint64_t ))) {PMD_DRV_LOG (ERR ,"Conflict with the first rule's input set." );return -EINVAL ; } -if (pf->fdir.inset_flag[pctype] && +if (pf->fdir.flow_count[pctype] && !memcmp (&pf->fdir.input_set[pctype], &input_set,sizeof (uint64_t )))return 0 ;
@@ -1666,7 +1666,6 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf,I40E_WRITE_FLUSH (hw); pf->fdir.input_set[pctype] = input_set; - pf->fdir.inset_flag[pctype] =1 ;return 0 ; }
@@ -1890,11 +1889,13 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, }if (add) { + fdir_info->flow_count[pctype]++; fdir_info->fdir_actual_cnt++;if (fdir_info->fdir_invalprio ==1 && fdir_info->fdir_guarantee_free_space >0 ) fdir_info->fdir_guarantee_free_space--; } else { + fdir_info->flow_count[pctype]--; fdir_info->fdir_actual_cnt--; if (fdir_info->fdir_invalprio == 1 && fdir_info->fdir_guarantee_free_space <
drivers/net/i40e/i40e_flow.c +1 -1
@@ -4940,7 +4940,7 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) { - pf->fdir.inset_flag[pctype] =0 ; + pf->fdir.flow_count[pctype] =0 ; pf->fdir.flex_mask_flag[pctype] =0 ; }
Signature · 1 line
2.26.2
PATCH v2 1/1 net/i40e: fix FDIR input set conflict issue
From: Beilei Xing <[email protected]>
Currently, there'll be conflict error when running the following commands:
1. flow create 0 ingress
pattern eth / ipv4 / udp src is 32 / end actions queue index 2 / end
2. flow destroy 0 rule 0
3. flow create 0 ingress
pattern eth / ipv4 / udp dst is 32 / end actions queue index 2 / end
This patch fixes the input set conflict issue.
---
V2 change:
- fix typo.
drivers/net/i40e/i40e_ethdev.c | 5 +++++ drivers/net/i40e/i40e_ethdev.h | 2 +- drivers/net/i40e/i40e_fdir.c | 7 ++++--- drivers/net/i40e/i40e_flow.c | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-)
drivers/net/i40e/i40e_ethdev.c +5 -0
@@ -1087,6 +1087,7 @@ 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; +enum i40e_filter_pctype pctype;struct rte_bitmap *bmp =NULL ;uint32_t bmp_size;void *mem =NULL ;
@@ -1135,6 +1136,10 @@ i40e_init_fdir_filter_list(struct rte_eth_dev *dev) goto err_fdir_filter_array_alloc; } +for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; + pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) + pf->fdir.flow_count[pctype] =0 ; + fdir_info->fdir_space_size = alloc + best; fdir_info->fdir_actual_cnt =0 ; fdir_info->fdir_guarantee_total_space = alloc;
drivers/net/i40e/i40e_ethdev.h +1 -1
@@ -788,7 +788,7 @@ struct i40e_fdir_info {bool flex_pit_flag[I40E_MAX_FLXPLD_LAYER ];bool flex_mask_flag[I40E_FILTER_PCTYPE_MAX ]; -bool inset_flag[I40E_FILTER_PCTYPE_MAX ];/* Mark if input set is set */ +uint32_t flow_count[I40E_FILTER_PCTYPE_MAX ];uint32_t flex_flow_count[I40E_MAX_FLXPLD_LAYER ]; };
drivers/net/i40e/i40e_fdir.c +4 -3
@@ -1607,13 +1607,13 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf, }/* Check if the configuration is conflicted */ -if (pf->fdir.inset_flag[pctype] && +if (pf->fdir.flow_count[pctype] &&memcmp (&pf->fdir.input_set[pctype], &input_set,sizeof (uint64_t ))) {PMD_DRV_LOG (ERR ,"Conflict with the first rule's input set." );return -EINVAL ; } -if (pf->fdir.inset_flag[pctype] && +if (pf->fdir.flow_count[pctype] && !memcmp (&pf->fdir.input_set[pctype], &input_set,sizeof (uint64_t )))return 0 ;
@@ -1666,7 +1666,6 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf,I40E_WRITE_FLUSH (hw); pf->fdir.input_set[pctype] = input_set; - pf->fdir.inset_flag[pctype] =1 ;return 0 ; }
@@ -1890,11 +1889,13 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, }if (add) { + fdir_info->flow_count[pctype]++; fdir_info->fdir_actual_cnt++;if (fdir_info->fdir_invalprio ==1 && fdir_info->fdir_guarantee_free_space >0 ) fdir_info->fdir_guarantee_free_space--; } else { + fdir_info->flow_count[pctype]--; fdir_info->fdir_actual_cnt--; if (fdir_info->fdir_invalprio == 1 && fdir_info->fdir_guarantee_free_space <
drivers/net/i40e/i40e_flow.c +1 -1
@@ -4940,7 +4940,7 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)for (pctype =I40E_FILTER_PCTYPE_NONF_IPV4_UDP ; pctype <=I40E_FILTER_PCTYPE_L2_PAYLOAD ; pctype++) { - pf->fdir.inset_flag[pctype] =0 ; + pf->fdir.flow_count[pctype] =0 ; pf->fdir.flex_mask_flag[pctype] =0 ; }
Signature · 1 line
2.26.2
Quoted 19 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of [email protected]
Sent: Thursday, June 24, 2021 3:30 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>; [email protected]
Subject: [dpdk-dev] [PATCH v2] net/i40e: fix FDIR input set conflict issueFrom: Beilei Xing <[email protected]>
Currently, there'll be conflict error when running the following commands:
1. flow create 0 ingress
pattern eth / ipv4 / udp src is 32 / end
actions queue index 2 / end
2. flow destroy 0 rule 0
3. flow create 0 ingress
pattern eth / ipv4 / udp dst is 32 / end
actions queue index 2 / end
Quoted 7 lines
This patch fixes the input set conflict issue.
Fixes 42044b69c67d ("net/i40e: support input set selection for FDIR")Fixes 4a072ad43442 ("net/i40e: fix flow director config after flow validate")Signed-off-by Beilei Xing <[email protected]>
Zhang, Qi Z
AppliedQuoted 30 lines
-----Original Message-----
From: Chen, LingliX <[email protected]>
Sent: Thursday, June 24, 2021 5:35 PM
To: Xing, Beilei <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>; [email protected]
Subject: RE: [dpdk-dev] [PATCH v2] net/i40e: fix FDIR input set conflict issueQuoted 20 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of [email protected]
Sent: Thursday, June 24, 2021 3:30 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>; [email protected]
Subject: [dpdk-dev] [PATCH v2] net/i40e: fix FDIR input set conflict issueFrom: Beilei Xing <[email protected]>
Currently, there'll be conflict error when running the following commands:
1. flow create 0 ingress
pattern eth / ipv4 / udp src is 32 / end
actions queue index 2 / end
2. flow destroy 0 rule 0
3. flow create 0 ingress
pattern eth / ipv4 / udp dst is 32 / end
actions queue index 2 / endThis patch fixes the input set conflict issue.
Quoted 7 lines
Quoted 5 lines
Fixes 42044b69c67d ("net/i40e: support input set selection for FDIR")Fixes 4a072ad43442 ("net/i40e: fix flow director config after flow validate")Signed-off-by Beilei Xing <[email protected]>Tested-by Lingli Chen <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi