ethdev: add L2TPv3 over IP header to flow API
PATCH v3 1/2 ethdev: add L2TPv3 over IP header to flow API
This patch adds the new flow item RTE_FLOW_ITEM_TYPE_L2TPV3OIP to flow API to match a L2TPv3 over IP header. This patch supports only L2TPv3 over IP header format which is different to L2TPv2/L2TPv3 over UDP. The difference in header formats between L2TPv3 over IP and L2TP over UDP require a separate implementation for each.
---
v3 changes: adding testpmd docs updates
--- app/test-pmd/cmdline_flow.c | 33 +++++++++++++++++++++ doc/guides/prog_guide/rte_flow.rst | 8 +++++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 +++ lib/librte_ethdev/rte_flow.c | 1 + lib/librte_ethdev/rte_flow.h | 29 +++++++++++++++++- 5 files changed, 74 insertions(+), 1 deletion(-)
app/test-pmd/cmdline_flow.c +33 -0
@@ -213,6 +213,8 @@ enum index {ITEM_TAG ,ITEM_TAG_DATA ,ITEM_TAG_INDEX , +ITEM_L2TPV3OIP , +ITEM_L2TPV3OIP_SESSION_ID ,/* Validate/create actions. */ ACTIONS,
@@ -746,6 +748,7 @@ static const enum index next_item[] = {ITEM_PPPOE_PROTO_ID ,ITEM_HIGIG2 ,ITEM_TAG , +ITEM_L2TPV3OIP ,END_SET , ZERO, };
@@ -1030,6 +1033,12 @@ static const enum index item_tag[] = { ZERO, }; +static const enum index item_l2tpv3oip[] = { +ITEM_L2TPV3OIP_SESSION_ID , +ITEM_NEXT , +ZERO , +}; +static const enum index next_action[] = {ACTION_END ,ACTION_VOID ,
@@ -2593,6 +2602,22 @@ static const struct token token_list[] = { NEXT_ENTRY(ITEM_PARAM_IS)), .args = ARGS(ARGS_ENTRY(struct rte_flow_item_tag, index)), }, + [ITEM_L2TPV3OIP] = { + .name = "l2tpv3oip", + .help = "match L2TPv3 over IP header", + .priv =PRIV_ITEM (L2TPV3OIP , + sizeof(struct rte_flow_item_l2tpv3oip)), + .next = NEXT(item_l2tpv3oip), + .call = parse_vc, + }, + [ITEM_L2TPV3OIP_SESSION_ID] = { + .name = "session_id", + .help = "session identifier", + .next = NEXT(item_l2tpv3oip, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv3oip, + session_id)), + }, +/* Validate/create actions. */ [ACTIONS] = { .name = "actions",
@@ -6238,6 +6263,10 @@ flow_item_default_mask(const struct rte_flow_item *item)break ;case RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID : mask = &rte_flow_item_pppoe_proto_id_mask; +break ; +case RTE_FLOW_ITEM_TYPE_L2TPV3OIP : + mask = &rte_flow_item_l2tpv3oip_mask; +break ;default :break ; }
@@ -6327,6 +6356,10 @@ cmd_set_raw_parsed(const struct buffer *in)case RTE_FLOW_ITEM_TYPE_GENEVE : size =sizeof (struct rte_flow_item_geneve );break ; +case RTE_FLOW_ITEM_TYPE_L2TPV3OIP : + size =sizeof (struct rte_flow_item_l2tpv3oip ); + proto =0x73 ; +break ;default :printf ("Error - Not supported item\n" ); *total_size =0 ;
doc/guides/prog_guide/rte_flow.rst +8 -0
@@ -1336,6 +1336,14 @@ Broadcom switches. - Default ``mask`` matches classification and vlan. +Item: ``L2TPV3OIP`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Matches a L2TPv3 over IP header. + +- ``session_id``: L2TPv3 over IP session identifier. +- Default ``mask`` matches session_id only. + Actions ~~~~~~~
doc/guides/testpmd_app_ug/testpmd_funcs.rst +4 -0
@@ -3954,6 +3954,10 @@ This section lists supported pattern items and their attributes, if any. - ``proto_id {unsigned}``: PPP protocol identifier. +- ``l2tpv3oip``: match L2TPv3 over IP header. + + - ``session_id {unsigned}``: L2TPv3 over IP session identifier. + Actions list ^^^^^^^^^^^^
lib/librte_ethdev/rte_flow.c +1 -0
@@ -93,6 +93,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {MK_FLOW_ITEM (IGMP ,sizeof (struct rte_flow_item_igmp )),MK_FLOW_ITEM (AH ,sizeof (struct rte_flow_item_ah )),MK_FLOW_ITEM (HIGIG2 ,sizeof (struct rte_flow_item_higig2_hdr )), + MK_FLOW_ITEM(L2TPV3OIP, sizeof(struct rte_flow_item_l2tpv3oip)), };/** Generate flow_action[] entry. */
lib/librte_ethdev/rte_flow.h +28 -1
@@ -502,7 +502,7 @@ enum rte_flow_item_type {*/ RTE_FLOW_ITEM_TYPE_HIGIG2, -/* +/** * [META] * * Matches a tag value.
@@ -510,6 +510,16 @@ enum rte_flow_item_type {* See struct rte_flow_item_tag. */ RTE_FLOW_ITEM_TYPE_TAG , + +/** +* Matches a L2TPv3 over IP header. +* +* Configure flow for L2TPv3 over IP packets. +* +* See struct rte_flow_item_l2tpv3oip. +*/ + RTE_FLOW_ITEM_TYPE_L2TPV3OIP, + };/**
@@ -1373,6 +1383,23 @@ static const struct rte_flow_item_tag rte_flow_item_tag_mask = { };#endif +/** +* RTE_FLOW_ITEM_TYPE_L2TPV3OIP. +* +* Matches a L2TPv3 over IP header. +*/ +struct rte_flow_item_l2tpv3oip { +rte_be32_t session_id;/**< Session ID. */ +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_L2TPV3OIP. */ +#ifndef __cplusplus +static const struct rte_flow_item_l2tpv3oip rte_flow_item_l2tpv3oip_mask = { + .session_id =RTE_BE32 (UINT32_MAX ), +}; +#endif + +/** * @warning * @b EXPERIMENTAL: this structure may change without prior notice
Signature · 1 line
2.17.1
PATCH v3 2/2 net/i40e: support FDIR for L2TPv3 over IP
Adding FDIR support for L2TPv3 over IP header matching and adding a new customized pctype for l2tpv3 over IP.
---
v3 changes:
* removing testpmd doc update as this patch focus only on i40e PMD
* remove unused structure from i40e_ethdev.h
--- drivers/net/i40e/i40e_ethdev.c | 11 ++++++- drivers/net/i40e/i40e_ethdev.h | 43 +++++++++++++++++-------- drivers/net/i40e/i40e_fdir.c | 40 +++++++++++++++++++++--- drivers/net/i40e/i40e_flow.c | 57 ++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 19 deletions(-)
drivers/net/i40e/i40e_ethdev.c +10 -1
@@ -12351,6 +12351,14 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg, new_pctype =i40e_find_customized_pctype (pf,I40E_CUSTOMIZED_GTPU ); + else if (!strcmp(name, "IPV4_L2TPV3")) + new_pctype = +i40e_find_customized_pctype (pf, +I40E_CUSTOMIZED_IPV4_L2TPV3 ); + else if (!strcmp(name, "IPV6_L2TPV3")) + new_pctype = +i40e_find_customized_pctype (pf, +I40E_CUSTOMIZED_IPV6_L2TPV3 );if (new_pctype) {if (op ==RTE_PMD_I40E_PKG_OP_WR_ADD ) { new_pctype->pctype = pctype_value;
@@ -12544,7 +12552,8 @@ i40e_update_customized_ptype(struct rte_eth_dev *dev, uint8_t *pkg,RTE_PTYPE_TUNNEL_GRENAT ; in_tunnel = true; }else if (!strncasecmp (name,"L2TPV2CTL" ,9 ) || - !strncasecmp (name,"L2TPV2" ,6 )) { + !strncasecmp (name,"L2TPV2" ,6 ) || + !strncasecmp (name,"L2TPV3" ,6 )) { ptype_mapping[i].sw_ptype |=RTE_PTYPE_TUNNEL_L2TP ; in_tunnel = true;
drivers/net/i40e/i40e_ethdev.h +30 -13
66 lines not on this page · raw message
drivers/net/i40e/i40e_fdir.c +35 -5
@@ -33,6 +33,10 @@#define IPV6_ADDR_LEN 16#endif +#ifndef IPPROTO_L2TP +#define IPPROTO_L2TP 115 +#endif +#define I40E_FDIR_PKT_LEN 512#define I40E_FDIR_IP_DEFAULT_LEN 420#define I40E_FDIR_IP_DEFAULT_TTL 0x40
@@ -1026,7 +1030,12 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf, pctype ==I40E_FILTER_PCTYPE_NONF_IPV4_SCTP || pctype ==I40E_FILTER_PCTYPE_NONF_IPV4_OTHER || pctype ==I40E_FILTER_PCTYPE_FRAG_IPV4 || - is_customized_pctype) { + ((is_customized_pctype) && + ((cus_pctype->index ==I40E_CUSTOMIZED_GTPC ) || + (cus_pctype->index ==I40E_CUSTOMIZED_GTPU_IPV4 ) || + (cus_pctype->index ==I40E_CUSTOMIZED_GTPU_IPV6 ) || + (cus_pctype->index ==I40E_CUSTOMIZED_GTPU ) || + (cus_pctype->index == I40E_CUSTOMIZED_IPV4_L2TPV3)))) { ip = (struct rte_ipv4_hdr *)raw_pkt; *ether_type =rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV4 );
@@ -1054,12 +1063,16 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf, cus_pctype->index ==I40E_CUSTOMIZED_GTPU_IPV6 || cus_pctype->index == I40E_CUSTOMIZED_GTPU) ip->next_proto_id = IPPROTO_UDP; + else if (cus_pctype->index == I40E_CUSTOMIZED_IPV4_L2TPV3) + ip->next_proto_id = IPPROTO_L2TP; len +=sizeof (struct rte_ipv4_hdr ); }else if (pctype ==I40E_FILTER_PCTYPE_NONF_IPV6_TCP || pctype ==I40E_FILTER_PCTYPE_NONF_IPV6_UDP || pctype ==I40E_FILTER_PCTYPE_NONF_IPV6_SCTP || pctype ==I40E_FILTER_PCTYPE_NONF_IPV6_OTHER || - pctype ==I40E_FILTER_PCTYPE_FRAG_IPV6 ) { + pctype ==I40E_FILTER_PCTYPE_FRAG_IPV6 || + ((is_customized_pctype) && + (cus_pctype->index ==I40E_CUSTOMIZED_IPV6_L2TPV3 ))) { ip6 = (struct rte_ipv6_hdr *)raw_pkt; *ether_type =rte_cpu_to_be_16 (RTE_ETHER_TYPE_IPV6 );
@@ -1069,9 +1082,12 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf, I40E_FDIR_IPv6_TC_OFFSET)); ip6->payload_len =rte_cpu_to_be_16 (I40E_FDIR_IPv6_PAYLOAD_LEN); - ip6->proto = fdir_input->flow.ipv6_flow.proto ? - fdir_input->flow.ipv6_flow.proto : - next_proto[fdir_input->pctype]; +if (!is_customized_pctype) + ip6->proto = fdir_input->flow.ipv6_flow.proto ? + fdir_input->flow.ipv6_flow.proto : + next_proto[fdir_input->pctype]; +else if (cus_pctype->index ==I40E_CUSTOMIZED_IPV6_L2TPV3 ) + ip6->proto =IPPROTO_L2TP ; ip6->hop_limits = fdir_input->flow.ipv6_flow.hop_limits ? fdir_input->flow.ipv6_flow.hop_limits : I40E_FDIR_IPv6_DEFAULT_HOP_LIMITS;
@@ -1115,6 +1131,7 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,struct rte_flow_item_gtp *gtp;struct rte_ipv4_hdr *gtp_ipv4;struct rte_ipv6_hdr *gtp_ipv6; +struct rte_flow_item_l2tpv3oip *l2tpv3oip;uint8_t size, dst =0 ;uint8_t i, pit_idx, set_idx =I40E_FLXPLD_L4_IDX ;/* use l4 by default*/ int len;
@@ -1285,6 +1302,19 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf, }else payload = (unsigned char *)gtp +sizeof (struct rte_flow_item_gtp ); + }else if (cus_pctype->index ==I40E_CUSTOMIZED_IPV4_L2TPV3 || + cus_pctype->index ==I40E_CUSTOMIZED_IPV6_L2TPV3 ) { + l2tpv3oip = (struct rte_flow_item_l2tpv3oip *)(raw_pkt + + len); + +if (cus_pctype->index ==I40E_CUSTOMIZED_IPV4_L2TPV3 ) + l2tpv3oip->session_id = + fdir_input->flow.ip4_l2tpv3oip_flow.session_id; +else + l2tpv3oip->session_id = + fdir_input->flow.ip6_l2tpv3oip_flow.session_id; + payload = (unsigned char *)l2tpv3oip + +sizeof (struct rte_flow_item_l2tpv3oip ); } }else { PMD_DRV_LOG(ERR, "unknown pctype %u.",
drivers/net/i40e/i40e_flow.c +57 -0
87 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v3 2/2] net/i40e: support FDIR for L2TPv3 over IP
Quoted 9 lines · Rory Sexton
Adding FDIR support for L2TPv3 over IP header matching and adding a new customized pctype for l2tpv3 over IP.
Signed-off-by Rory Sexton <[email protected]>Signed-off-by Dariusz Jagus <[email protected]>---
v3 changes:
* removing testpmd doc update as this patch focus only on i40e PMD
* remove unused structure fromi40e_ethdev.h
Hi Beilei,
Is this version good to go?
Thanks,
ferruh
Re: [dpdk-dev] [PATCH v3 2/2] net/i40e: support FDIR for L2TPv3 over IP
In reply to Rory SextonQuoted 11 lines
-----Original Message-----
From: Sexton, Rory
Sent: Tuesday, January 7, 2020 11:40 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; [email protected]; [email protected]
Cc: Sexton, Rory <[email protected]>; Jagus, DariuszX <[email protected]>
Subject: [PATCH v3 2/2] net/i40e: support FDIR for L2TPv3 over IP
Quoted 5 lines
Adding FDIR support for L2TPv3 over IP header matching and adding a new customized pctype for l2tpv3 over IP.
Signed-off-by Rory Sexton <[email protected]>Signed-off-by Dariusz Jagus <[email protected]>
Re: [dpdk-dev] [PATCH v3 2/2] net/i40e: support FDIR for L2TPv3 over IP
Quoted 23 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Xing, Beilei
Sent: Monday, January 13, 2020 11:22 AM
To: Sexton, Rory <[email protected]>; [email protected]; Zhang, Qi Z <[email protected]>; [email protected]; [email protected]
Cc: Jagus, DariuszX <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v3 2/2] net/i40e: support FDIR for L2TPv3 over IPQuoted 10 lines
-----Original Message-----
From: Sexton, Rory
Sent: Tuesday, January 7, 2020 11:40 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>; [email protected]; [email protected]
Cc: Sexton, Rory <[email protected]>; Jagus, DariuszX <[email protected]>
Subject: [PATCH v3 2/2] net/i40e: support FDIR for L2TPv3 over IP
Quoted 7 lines
Quoted 5 lines
Adding FDIR support for L2TPv3 over IP header matching and adding a new customized pctype for l2tpv3 over IP.
Signed-off-by Rory Sexton <[email protected]>Signed-off-by Dariusz Jagus <[email protected]>Acked-by Beilei Xing <[email protected]>
Sorry, NACK the patch since there's compilation issue with clang and coding style issue.
Please check http://mails.dpdk.org/archives/test-report/2020-January/112422.html and http://mails.dpdk.org/archives/test-report/2020-January/112412.html
BTW, Doc update is needed in release notes, please also describe what's the supported input set for the new PCTYPE.
Beilei
Re: [dpdk-dev] [PATCH v3 2/2] net/i40e: support FDIR for L2TPv3 over IP
Hi Beilei,
PSB
Regards,
Rory
Quoted 7 lines
Sorry, NACK the patch since there's compilation issue with clang and coding style issue.
Please check http://mails.dpdk.org/archives/test-report/2020-January/112422.html and http://mails.dpdk.org/archives/test-report/2020-January/112412.html
BTW, Doc update is needed in release notes, please also describe what's the supported input set for the new PCTYPE.Beilei
The compilation issue is because for some reason patch 1/2 of this patch-set which affects rte_flow api was not applied before compiling this patch with DPDK test framework.
http://mails.dpdk.org/archives/test-report/2020-January/112422.html
The errors in above would have been avoided if the first patch of this patch-set had been applied before this 2/2 patch. Not sure why this happened. I've confirmed manually that there are no issues with clang compilation when first patch of set is applied correctly.
As regards coding style issue (http://mails.dpdk.org/archives/test-report/2020-January/112412.html).
CHECK:ASSIGNMENT_CONTINUATIONS: Assignment operator '=' should be on the previous line #343: FILE: drivers/net/i40e/i40e_flow.c:3059:
+ filter->input.flow.ip4_l2tpv3oip_flow.session_id
+ = l2tpv3oip_spec->session_id;
If the '=' operator is moved to previous line then the line will exceed 80 characters. There are similar cases earlier in this same file which I followed to keep code consistent throughout. Please advise which style you prefer to be used, line exceeding 80 chars or '=' operator on 2nd line.
See an earlier example for this case in same file, drivers/net/i40e/i40e_flow.c:2900, which I used as example for how to base coding style for such case:
filter->input.flow.sctp4_flow.verify_tag
= sctp_spec->hdr.tag;I will do DOC update for release notes separately and describe the supported input set for new PCTYPE there.
Quoted 8 lines · Rory Sexton
This patch adds the new flow item
RTE_FLOW_ITEM_TYPE_L2TPV3OIPto flow API to match a L2TPv3 over IP header. This patch supports only L2TPv3 over IP header format which is different to L2TPv2/L2TPv3 over UDP. The difference in header formats between L2TPv3 over IP and L2TP over UDP require a separate implementation for each.Signed-off-by Rory Sexton <[email protected]>Signed-off-by Dariusz Jagus <[email protected]>
Hi Ori,
Any concern on this version, can we proceed with it?
Hi
Quoted 17 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Friday, January 10, 2020 8:26 PM
To: Rory Sexton <[email protected]>; [email protected]; [email protected]; [email protected]; Adrien Mazarguil <[email protected]>; Ori Kam <[email protected]>
Cc: Dariusz Jagus <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v3 1/2] ethdev: add L2TPv3 over IP header to flow APIQuoted 6 lines · Rory Sexton
This patch adds the new flow item
RTE_FLOW_ITEM_TYPE_L2TPV3OIPto flow API to match a L2TPv3 over IP header. This patch supports only L2TPv3 over IP header format which is different to L2TPv2/L2TPv3 over UDP. The difference in header formats between L2TPv3 over IP and L2TP over UDP require a separate implementation for each.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Rory Sexton <[email protected]>Signed-off-by Dariusz Jagus <[email protected]>Hi Ori,
Any concern on this version, can we proceed with it?
I just acked it in the original thread.
Thanks, and sorry for the long review time.
Ori
Quoted 17 lines
-----Original Message-----
From: Rory Sexton <[email protected]>
Sent: Tuesday, January 7, 2020 5:40 PM
To: [email protected]; [email protected]; [email protected]; Adrien Mazarguil <[email protected]>; Ori Kam <[email protected]>
Cc: Rory Sexton <[email protected]>; Dariusz Jagus <[email protected]>
Subject: [PATCH v3 1/2] ethdev: add L2TPv3 over IP header to flow APIThis patch adds the new flow item
RTE_FLOW_ITEM_TYPE_L2TPV3OIPto flow API to match a L2TPv3 over IP header. This patch supports only L2TPv3 over IP header format which is different to L2TPv2/L2TPv3 over UDP. The difference in header formats between L2TPv3 over IP and L2TP over UDP require a separate implementation for each.
Quoted 5 lines
Signed-off-by Rory Sexton <[email protected]>Signed-off-by Dariusz Jagus <[email protected]>---
v3 changes: adding testpmd docs updates
---
Thanks,
Ori