net/ice/base: enable FDIR support for IPV6_NETX_PROTO
PATCH 1/1 net/ice/base: enable FDIR support for IPV6_NETX_PROTO
To support the new DDP and be compatible with the old version DDP file, API function 'check_ddp_support_proto_id' is added to detect if the required protocol ID is supported by the current DDP file.
Add new protocol ID IPV6_NETX_PROTO support for PF FDIR if current DDP is new DDP and keep behavior if it is the old version DDP.
--- drivers/net/ice/base/ice_flow.c | 16 +++++++++- drivers/net/ice/base/ice_parser.c | 40 ++++++++++++++++++++++++ drivers/net/ice/base/ice_parser.h | 1 + drivers/net/ice/base/ice_protocol_type.h | 1 + 4 files changed, 57 insertions(+), 1 deletion(-)
drivers/net/ice/base/ice_flow.c +15 -1
@@ -1370,6 +1370,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,u16 sib_mask =0 ;u16 mask;u16 off; +bool exist; flds = params->prof->segs[seg].fields;
@@ -1410,7 +1411,16 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,break ;case ICE_FLOW_FIELD_IDX_IPV6_TTL :case ICE_FLOW_FIELD_IDX_IPV6_PROT : - prot_id = seg ==0 ?ICE_PROT_IPV6_OF_OR_S :ICE_PROT_IPV6_IL ; + exist =check_ddp_support_proto_id (hw, +ICE_PROT_IPV6_NEXT_PROTO ); +if (!exist) + prot_id = seg ==0 ? +ICE_PROT_IPV6_OF_OR_S : +ICE_PROT_IPV6_IL ; +else + prot_id = seg ==0 ? +ICE_PROT_IPV6_NEXT_PROTO : +ICE_PROT_IPV6_IL ;/* TTL and PROT share the same extraction seq. entry. * Each is considered a sibling to the other in terms of sharing
@@ -1543,6 +1553,10 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params, flds[fld].xtrct.disp = (u8)(ice_flds_info[fld].off % ese_bits); flds[fld].xtrct.idx = params->es_cnt; flds[fld].xtrct.mask = ice_flds_info[fld].mask; +if (prot_id ==ICE_PROT_IPV6_NEXT_PROTO ) { + flds[fld].xtrct.off =0 ; + flds[fld].xtrct.disp =0 ; + }/* Adjust the next field-entry index after accommodating the number of * entries this field consumes
drivers/net/ice/base/ice_parser.c +40 -0
@@ -552,3 +552,43 @@ void ice_parser_profile_dump(struct ice_hw *hw, struct ice_parser_profile *prof)ice_info (hw,"flags = 0x%04x\n" , prof->flags);ice_info (hw,"flags_msk = 0x%04x\n" , prof->flags_msk); } + +/** +* check_ddp_support_proto_id - check DDP package file support protocol ID +* @hw: pointer to the HW struct +* @proto_id: protocol ID value +* +* This function maintains the compatibility of the program process by checking +* whether the current DDP file supports the required protocol ID. +*/ +bool check_ddp_support_proto_id (struct ice_hw *hw,enum ice_prot_id proto_id) +{ +struct ice_proto_grp_item *proto_grp_table; +struct ice_proto_grp_item *proto_grp; +bool exist = false; +u16 idx =0 ; +u16 i; + + proto_grp_table =ice_proto_grp_table_get (hw); +if (!proto_grp_table) + goto exit; + +do { + proto_grp = &proto_grp_table[idx]; +if (idx != proto_grp->idx) +break ; + +for (i =0 ; i <ICE_PROTO_COUNT_PER_GRP ; i++) { +if (proto_grp->po[i].proto_id == proto_id) { + exist = true; + goto exit; + } + } + + idx++; + }while (idx); + +exit: +ice_free (hw, proto_grp_table); +return exist; +}
drivers/net/ice/base/ice_parser.h +1 -0
@@ -110,4 +110,5 @@ enum ice_status ice_parser_profile_init(struct ice_parser_result *rslt, struct ice_parser_profile *prof);void ice_parser_profile_dump (struct ice_hw *hw,struct ice_parser_profile *prof); +bool check_ddp_support_proto_id (struct ice_hw *hw,enum ice_prot_id proto_id);#endif /* _ICE_PARSER_H_ */
drivers/net/ice/base/ice_protocol_type.h +1 -0
@@ -163,6 +163,7 @@ enum ice_prot_id {ICE_PROT_IPV6_OF_OR_S =40 ,ICE_PROT_IPV6_IL =41 ,ICE_PROT_IPV6_IL_IL =42 , +ICE_PROT_IPV6_NEXT_PROTO =43 ,ICE_PROT_IPV6_FRAG =47 ,ICE_PROT_TCP_IL =49 , ICE_PROT_UDP_OF = 52,
Signature · 1 line
2.25.1
PATCH v2 1/1 net/ice/base: enable FDIR support for IPV6_NETX_PROTO
To support the new DDP and be compatible with the old version DDP file, API function 'check_ddp_support_proto_id' is added to detect if the required protocol ID is supported by the current DDP file.
Add new protocol ID IPV6_NETX_PROTO support for PF FDIR if current DDP is new DDP and keep behavior if it is the old version DDP.
v2: rebase and optimize the API function
--- drivers/net/ice/base/ice_flow.c | 16 ++++++++++- drivers/net/ice/base/ice_parser.c | 35 ++++++++++++++++++++++++ drivers/net/ice/base/ice_parser.h | 2 ++ drivers/net/ice/base/ice_proto_grp.c | 1 - drivers/net/ice/base/ice_proto_grp.h | 1 + drivers/net/ice/base/ice_protocol_type.h | 1 + 6 files changed, 54 insertions(+), 2 deletions(-)
drivers/net/ice/base/ice_flow.c +15 -1
@@ -1370,6 +1370,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,u16 sib_mask =0 ;u16 mask;u16 off; +bool exist; flds = params->prof->segs[seg].fields;
@@ -1410,7 +1411,16 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,break ;case ICE_FLOW_FIELD_IDX_IPV6_TTL :case ICE_FLOW_FIELD_IDX_IPV6_PROT : - prot_id = seg ==0 ?ICE_PROT_IPV6_OF_OR_S :ICE_PROT_IPV6_IL ; + prot_id =ICE_PROT_IPV6_NEXT_PROTO ; + exist =ice_check_ddp_support_proto_id (hw, prot_id); +if (!exist) + prot_id = seg ==0 ? +ICE_PROT_IPV6_OF_OR_S : +ICE_PROT_IPV6_IL ; +else + prot_id = seg ==0 ? +ICE_PROT_IPV6_NEXT_PROTO : +ICE_PROT_IPV6_IL ;/* TTL and PROT share the same extraction seq. entry. * Each is considered a sibling to the other in terms of sharing
@@ -1543,6 +1553,10 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params, flds[fld].xtrct.disp = (u8)(ice_flds_info[fld].off % ese_bits); flds[fld].xtrct.idx = params->es_cnt; flds[fld].xtrct.mask = ice_flds_info[fld].mask; +if (prot_id ==ICE_PROT_IPV6_NEXT_PROTO ) { + flds[fld].xtrct.off =0 ; + flds[fld].xtrct.disp =0 ; + }/* Adjust the next field-entry index after accommodating the number of * entries this field consumes
drivers/net/ice/base/ice_parser.c +35 -0
@@ -552,3 +552,38 @@ void ice_parser_profile_dump(struct ice_hw *hw, struct ice_parser_profile *prof)ice_info (hw,"flags = 0x%04x\n" , prof->flags);ice_info (hw,"flags_msk = 0x%04x\n" , prof->flags_msk); } + +/** +* ice_check_ddp_support_proto_id - check DDP package file support protocol ID +* @hw: pointer to the HW struct +* @proto_id: protocol ID value +* +* This function maintains the compatibility of the program process by checking +* whether the current DDP file supports the required protocol ID. +*/ +bool ice_check_ddp_support_proto_id (struct ice_hw *hw, +enum ice_prot_id proto_id) +{ +struct ice_proto_grp_item *proto_grp_table; +struct ice_proto_grp_item *proto_grp; +bool exist = false; +u16 idx, i; + + proto_grp_table =ice_proto_grp_table_get (hw); +if (!proto_grp_table) +return false; + +for (idx =0 ; idx <ICE_PROTO_GRP_TABLE_SIZE ; idx++) { + proto_grp = &proto_grp_table[idx]; +for (i =0 ; i <ICE_PROTO_COUNT_PER_GRP ; i++) { +if (proto_grp->po[i].proto_id == proto_id) { + exist = true; + goto exit; + } + } + } + +exit: +ice_free (hw, proto_grp_table); +return exist; +}
drivers/net/ice/base/ice_parser.h +2 -0
@@ -110,4 +110,6 @@ enum ice_status ice_parser_profile_init(struct ice_parser_result *rslt, struct ice_parser_profile *prof);void ice_parser_profile_dump (struct ice_hw *hw,struct ice_parser_profile *prof); +bool ice_check_ddp_support_proto_id (struct ice_hw *hw, +enum ice_prot_id proto_id);#endif /* _ICE_PARSER_H_ */
drivers/net/ice/base/ice_proto_grp.c +0 -1
@@ -5,7 +5,6 @@#include "ice_common.h" #include "ice_parser_util.h" -#define ICE_PROTO_GRP_TABLE_SIZE 192static void _proto_off_dump (struct ice_hw *hw,struct ice_proto_off *po,int idx)
drivers/net/ice/base/ice_proto_grp.h +1 -0
@@ -6,6 +6,7 @@#define _ICE_PROTO_GRP_H_#define ICE_PROTO_COUNT_PER_GRP 8 +#define ICE_PROTO_GRP_TABLE_SIZE 192struct ice_proto_off {bool polarity;/* true: positive, false: nagtive */
drivers/net/ice/base/ice_protocol_type.h +1 -0
@@ -163,6 +163,7 @@ enum ice_prot_id {ICE_PROT_IPV6_OF_OR_S =40 ,ICE_PROT_IPV6_IL =41 ,ICE_PROT_IPV6_IL_IL =42 , +ICE_PROT_IPV6_NEXT_PROTO =43 ,ICE_PROT_IPV6_FRAG =47 ,ICE_PROT_TCP_IL =49 , ICE_PROT_UDP_OF = 52,
Signature · 1 line
2.25.1
Quoted 15 lines
-----Original Message-----
From: Wang, Jie1X <[email protected]>
Sent: Saturday, May 7, 2022 5:14 PM
To: [email protected]
Cc: Yang, SteveX <[email protected]>; Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; Wang, Jie1X <[email protected]>
Subject: [PATCH v2]net/ice/base: enable FDIR support forIPV6_NETX_PROTOTo support the new DDP and be compatible with the old version DDP file, API function '
check_ddp_support_proto_id' is added to detect if the required protocol ID is supported by the current DDP file.
Quoted 6 lines
Add new protocol ID
IPV6_NETX_PROTOsupport for PF FDIR if current DDP is new DDP and keep behavior if it is the old version DDP.v2: rebase and optimize the API function
Signed-off-by Jie Wang <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi
11/05/2022 16:31, Zhang, Qi Z:
Quoted 9 lines
From: Wang, Jie1X <[email protected]>
Quoted 8 lines
To support the new DDP and be compatible with the old version DDP file, API function '
check_ddp_support_proto_id' is added to detect if the required protocol ID is supported by the current DDP file.Add new protocol ID
IPV6_NETX_PROTOsupport for PF FDIR if current DDP is new DDP and keep behavior if it is the old version DDP.
Quoted 7 lines
Quoted 3 lines
v2: rebase and optimize the API function
Signed-off-by Jie Wang <[email protected]>Acked-by Qi Zhang <[email protected]>Applied to dpdk-next-net-intel.
Do you mean NEXT_PROTO instead of NETX?
Qi, I expect you fix this kind of mistake while merging please, thank you.
Quoted 25 lines
-----Original Message-----
From: Thomas Monjalon <[email protected]>
Sent: Wednesday, May 11, 2022 10:55 PM
To: Wang, Jie1X <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Yang, SteveX <[email protected]>; Yang, Qiming <[email protected]>
Subject: Re: [PATCH v2]net/ice/base: enable FDIR support forIPV6_NETX_PROTO11/05/2022 16:31, Zhang, Qi Z:
Quoted 13 lines
From: Wang, Jie1X <[email protected]>
Quoted 11 lines
To support the new DDP and be compatible with the old version DDP file, API function '
check_ddp_support_proto_id' is added to detect if the required protocol ID is supported by the current DDP file.Add new protocol ID
IPV6_NETX_PROTOsupport for PF FDIR if current DDP is new DDP and keep behavior if it is the old version DDP.v2: rebase and optimize the API function
Signed-off-by Jie Wang <[email protected]>
Quoted 7 lines
Quoted 3 lines
Acked-by Qi Zhang <[email protected]>Applied to dpdk-next-net-intel.
Do you mean
NEXT_PROTOinstead of NETX?Qi, I expect you fix this kind of mistake while merging please, thank you.
Yes, it should be NEXT_PROTO, I have fixed in dpdk-next-net-intel. thanks