ip_pipeline: add QinQ PPPoE encapsulation action
PATCH 1/1 ip_pipeline: add QinQ PPPoE encapsulation action
Add implementation of QinQ PPPoE packet encapsulation action.
--- examples/ip_pipeline/cli.c | 43 +++++++++++++++++- lib/librte_net/rte_ether.h | 1 + lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 4 files changed, 119 insertions(+), 2 deletions(-)
examples/ip_pipeline/cli.c +41 -2
@@ -1290,11 +1290,13 @@ cmd_table_action_profile(char **tokens, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; - }else { + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; +else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; } - p.action_mask |=1LLU <<RTE_TABLE_ACTION_ENCAP ; t0 +=2 + n_extra_tokens; }/* encap */
@@ -3391,6 +3393,43 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if ((n_tokens <10 ) || +parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + (svlan_pcp >0x7 ) || +parser_read_uint32 (&svlan_dei, tokens[4 ]) || + (svlan_dei >0x1 ) || +parser_read_uint32 (&svlan_vid, tokens[5 ]) || + (svlan_vid >0xFFF ) || +parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + (cvlan_pcp >0x7 ) || +parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + (cvlan_dei >0x1 ) || +parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + (cvlan_vid >0xFFF ) || +parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
lib/librte_net/rte_ether.h +1 -0
@@ -300,6 +300,7 @@ struct vxlan_hdr {#define ETHER_TYPE_ARP 0x0806/**< Arp Protocol. */ #define ETHER_TYPE_RARP 0x8035/**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100/**< IEEE 802.1Q VLAN tagging. */ +#define ETHER_TYPE_PPPoE 0x8864/**< PPPoE Session Stage */ #define ETHER_TYPE_QINQ 0x88A8/**< IEEE 802.1ad QinQ tagging. */ #define ETHER_TYPE_ETAG 0x893F/**< IEEE 802.1BR E-Tag. */ #define ETHER_TYPE_1588 0x88F7/**< IEEE 802.1AS 1588 Precise Time Protocol. */
lib/librte_pipeline/rte_table_action.c +61 -0
103 lines not on this page · raw message
lib/librte_pipeline/rte_table_action.h +16 -0
@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {* Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether } */ RTE_TABLE_ACTION_ENCAP_VXLAN , + +/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */ + RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE, };/** Pre-computed Ethernet header fields for encapsulation action. */
@@ -529,6 +532,16 @@ struct rte_table_action_encap_config { }; }; +/** QinQ_PPPoE encap paramaeters. */ +struct rte_table_encap_ether_qinq_pppoe { + +/** Only valid when *type* is set to QinQ. */ +struct rte_table_action_ether_hdr ether; +struct rte_table_action_vlan_hdr svlan;/**< Service VLAN header. */ +struct rte_table_action_vlan_hdr cvlan;/**< Customer VLAN header. */ +struct rte_table_action_pppoe_hdr pppoe;/**< PPPoE/PPP headers. */ +}; +/** Encap action parameters (per table rule). */ struct rte_table_action_encap_params {/** Encapsulation type. */
@@ -553,6 +566,9 @@ struct rte_table_action_encap_params {/** Only valid when *type* is set to VXLAN. */ struct rte_table_action_encap_vxlan_params vxlan; + +/** Only valid when *type* is set to QinQ_PPPoE. */ +struct rte_table_encap_ether_qinq_pppoe qinq_pppoe; }; };
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH v2 1/1 ip_pipeline: add QinQ PPPoE encapsulation action
Add implementation of QinQ PPPoE packet encapsulation action.
---
v2:Fix changes from check patch
--- examples/ip_pipeline/cli.c | 43 +++++++++++++++++- lib/librte_net/rte_ether.h | 1 + lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 4 files changed, 119 insertions(+), 2 deletions(-)
examples/ip_pipeline/cli.c +41 -2
@@ -1290,11 +1290,13 @@ cmd_table_action_profile(char **tokens, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; - }else { + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; +else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; } - p.action_mask |=1LLU <<RTE_TABLE_ACTION_ENCAP ; t0 +=2 + n_extra_tokens; }/* encap */
@@ -3391,6 +3393,43 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if ((n_tokens <10 ) || +parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + (svlan_pcp >0x7 ) || +parser_read_uint32 (&svlan_dei, tokens[4 ]) || + (svlan_dei >0x1 ) || +parser_read_uint32 (&svlan_vid, tokens[5 ]) || + (svlan_vid >0xFFF ) || +parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + (cvlan_pcp >0x7 ) || +parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + (cvlan_dei >0x1 ) || +parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + (cvlan_vid >0xFFF ) || +parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
lib/librte_net/rte_ether.h +1 -0
@@ -300,6 +300,7 @@ struct vxlan_hdr {#define ETHER_TYPE_ARP 0x0806/**< Arp Protocol. */ #define ETHER_TYPE_RARP 0x8035/**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100/**< IEEE 802.1Q VLAN tagging. */ +#define ETHER_TYPE_PPPoE 0x8864/**< PPPoE Session Stage */ #define ETHER_TYPE_QINQ 0x88A8/**< IEEE 802.1ad QinQ tagging. */ #define ETHER_TYPE_ETAG 0x893F/**< IEEE 802.1BR E-Tag. */ #define ETHER_TYPE_1588 0x88F7/**< IEEE 802.1AS 1588 Precise Time Protocol. */
lib/librte_pipeline/rte_table_action.c +61 -0
103 lines not on this page · raw message
lib/librte_pipeline/rte_table_action.h +16 -0
@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {* Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether } */ RTE_TABLE_ACTION_ENCAP_VXLAN , + +/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */ + RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE, };/** Pre-computed Ethernet header fields for encapsulation action. */
@@ -529,6 +532,16 @@ struct rte_table_action_encap_config { }; }; +/** QinQ_PPPoE encap paramaeters. */ +struct rte_table_encap_ether_qinq_pppoe { + +/** Only valid when *type* is set to QinQ. */ +struct rte_table_action_ether_hdr ether; +struct rte_table_action_vlan_hdr svlan;/**< Service VLAN header. */ +struct rte_table_action_vlan_hdr cvlan;/**< Customer VLAN header. */ +struct rte_table_action_pppoe_hdr pppoe;/**< PPPoE/PPP headers. */ +}; +/** Encap action parameters (per table rule). */ struct rte_table_action_encap_params {/** Encapsulation type. */
@@ -553,6 +566,9 @@ struct rte_table_action_encap_params {/** Only valid when *type* is set to VXLAN. */ struct rte_table_action_encap_vxlan_params vxlan; + +/** Only valid when *type* is set to QinQ_PPPoE. */ +struct rte_table_encap_ether_qinq_pppoe qinq_pppoe; }; };
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Hi Nemanja,
examples/ip_pipeline/cli.c
Quoted 25 lines
-----Original Message-----
From: Marjanovic, Nemanja
Sent: Monday, January 14, 2019 10:23 AM
To: [email protected]
Cc: Singh, Jasvinder <[email protected]>; Dumitrescu, Cristian <[email protected]>; Marjanovic, Nemanja <[email protected]>
Subject: [PATCH v2]ip_pipeline: add QinQ PPPoE encapsulation actionAdd implementation of QinQ PPPoE packet encapsulation action.
Signed-off-by Nemanja Marjanovic <[email protected]>---
v2:Fix changes from check patch--- examples/ip_pipeline/cli.c | 43 +++++++++++++++++- lib/librte_net/rte_ether.h | 1 + lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 4 files changed, 119 insertions(+), 2 deletions(-)examples/ip_pipeline/cli.c +0
-0
We need to add support for this new packet encapsulation in the Soft NIC CLI, we don't want it to get out of sync with IP pipeline. Basically, add essentially the same CLI code in drivers/net/softnic/rte_eth_softnic_cli.c, can you please do this?
Quoted 6 lines
examples/ip_pipeline/cli.c +0
-1@@ -1290,11 +1290,13 @@ cmd_table_action_profile(char **tokens, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; - }else {
examples/ip_pipeline/cli.c cmd_table_action_profile(char **tokens, · line 1300
Quoted 10 lines
examples/ip_pipeline/cli.c +4
-1+ }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; +else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; } -
Please put back this blank line.
Quoted 35 lines
examples/ip_pipeline/cli.c +27
-0p.action_mask |=1LLU <<RTE_TABLE_ACTION_ENCAP ; t0 +=2 + n_extra_tokens; }/* encap */ @@ -3391,6 +3393,43 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if ((n_tokens <10 ) || +parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + (svlan_pcp >0x7 ) || +parser_read_uint32 (&svlan_dei, tokens[4 ]) || + (svlan_dei >0x1 ) || +parser_read_uint32 (&svlan_vid, tokens[5 ]) || + (svlan_vid >0xFFF ) || +parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + (cvlan_pcp >0x7 ) || +parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + (cvlan_dei >0x1 ) || +parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + (cvlan_vid >0xFFF ) || +parser_read_uint16 (&a- >encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ;
examples/ip_pipeline/cli.c parse_table_action_encap(char **tokens, · line 3433
Quoted 10 lines
examples/ip_pipeline/cli.c +10
-0+ a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + } +
Please add this new encap in the cmd_table_action_profile_help string, as well in the comment describing the table action options (search for "table_action ::= ") in this file.
lib/librte_net/rte_ether.h struct vxlan_hdr { · line 303
Quoted 12 lines
examples/ip_pipeline/cli.c +0
-0/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {examples/ip_pipeline/cli.c +0
-0uint32_t label, tc, ttl;lib/librte_net/rte_ether.h +1
-0@@ -300,6 +300,7 @@ struct vxlan_hdr {#define ETHER_TYPE_ARP 0x0806/**< Arp Protocol. */ #define ETHER_TYPE_RARP 0x8035/**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100/**< IEEE 802.1Q VLAN tagging. */ +#define ETHER_TYPE_PPPoE 0x8864/**< PPPoE Session Stage */
Please add both PPPoE session and PPPoE discovery ethertypes, and call them accordingly. Please keep the existing naming convention, i.e. keep names all upper case for the purpose of these macros: PPPOE_DISCOVERY and PPPOE_SESSION (as opposed to lover case "o" in PPPoE).
Quoted 171 lines
lib/librte_net/rte_ether.h +0
-0#define ETHER_TYPE_QINQ 0x88A8/**< IEEE 802.1ad QinQ tagging. */ #define ETHER_TYPE_ETAG 0x893F/**< IEEE 802.1BR E-Tag. */ #define ETHER_TYPE_1588 0x88F7/**< IEEE 802.1AS 1588 Precise Time Protocol. */
lib/librte_pipeline/rte_table_action.c +1
-0@@ -432,6 +432,7 @@ encap_valid(enum rte_table_action_encap_type encap)case RTE_TABLE_ACTION_ENCAP_MPLS :case RTE_TABLE_ACTION_ENCAP_PPPOE :case RTE_TABLE_ACTION_ENCAP_VXLAN : +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE :return 1 ;default :lib/librte_pipeline/rte_table_action.c +10
-0return 0 ;@@ -532,6 +533,13 @@ struct encap_vxlan_ipv6_vlan_data {struct vxlan_hdr vxlan; } __attribute__((__packed__)); +struct encap_qinq_pppoe_data { +struct ether_hdr ether; +struct vlan_hdr svlan; +struct vlan_hdr cvlan; +struct pppoe_ppp_hdr pppoe_ppp; +} __attribute__((__packed__ )); +static size_t encap_data_size (struct rte_table_action_encap_config *encap) {@@ -563,6 +571,9 @@ encap_data_size(struct rte_table_action_encap_config *encap) elsereturn sizeof (struct encap_vxlan_ipv6_data ); +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return sizeof (struct encap_qinq_pppoe_data ); +default :return 0 ;lib/librte_pipeline/rte_table_action.c +3
-0}@@ -599,6 +610,9 @@ encap_apply_check(structrte_table_action_encap_params *p, case RTE_TABLE_ACTION_ENCAP_VXLAN: return 0; +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return 0 ; +default :return -EINVAL ;lib/librte_pipeline/rte_table_action.c +32
-0}@@ -676,6 +690,38 @@ encap_qinq_apply(void *data,return 0 ; } +static int +encap_qinq_pppoe_apply (void *data, +struct rte_table_action_encap_params *p) +{ +struct encap_qinq_pppoe_data *d = data; + +/* Ethernet */ +ether_addr_copy (&p->qinq.ether.da, &d->ether.d_addr); +ether_addr_copy (&p->qinq.ether.sa, &d->ether.s_addr); + d->ether.ether_type =rte_htons (ETHER_TYPE_VLAN ); + +/* SVLAN */ + d->svlan.vlan_tci =rte_htons (VLAN (p->qinq.svlan.pcp, + p->qinq.svlan.dei, + p->qinq.svlan.vid)); + d->svlan.eth_proto =rte_htons (ETHER_TYPE_VLAN ); + +/* CVLAN */ + d->cvlan.vlan_tci =rte_htons (VLAN (p->qinq.cvlan.pcp, + p->qinq.cvlan.dei, + p->qinq.cvlan.vid)); + d->cvlan.eth_proto =rte_htons (ETHER_TYPE_PPPoE); + +/* PPPoE and PPP*/ + d->pppoe_ppp.ver_type_code =rte_htons (0x1100 ); + d->pppoe_ppp.session_id =rte_htons (p- >qinq_pppoe.pppoe.session_id); + d->pppoe_ppp.length =0 ;/* not pre-computed */ + d->pppoe_ppp.protocol =rte_htons (PPP_PROTOCOL_IP ); + +return 0 ; +} + static int encap_mpls_apply(void *data,lib/librte_pipeline/rte_table_action.c +15
-0struct rte_table_action_encap_params *p)@@ -921,6 +967,9 @@ encap_apply(void *data,case RTE_TABLE_ACTION_ENCAP_VXLAN :return encap_vxlan_apply (data, p, cfg); +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return encap_qinq_pppoe_apply (data, p); +default :return -EINVAL ; }@@ -1119,6 +1168,18 @@ pkt_work_encap(struct rte_mbuf *mbuf,break ; } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : + { +struct encap_qinq_pppoe_data *qinq_pppoe = +encap (ip, data,sizeof (struct encap_qinq_pppoe_data )); + qinq_pppoe->pppoe_ppp.length =rte_htons (total_length +2 ); + mbuf->data_off = ip_offset - (sizeof (struct rte_mbuf ) + +sizeof (struct encap_qinq_pppoe_data )); + mbuf->pkt_len = mbuf->data_len = total_length + +sizeof (struct encap_qinq_pppoe_data ); +break ; + } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN :lib/librte_pipeline/rte_table_action.c +0
-0{if (cfg->vxlan.ip_version)lib/librte_pipeline/rte_table_action.h +10
-0@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {* Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether } */ RTE_TABLE_ACTION_ENCAP_VXLAN , + +/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */ + RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE, };/** Pre-computed Ethernet header fields for encapsulation action. */ @@ -529,6 +532,16 @@ struct rte_table_action_encap_config { }; }; +/** QinQ_PPPoE encap paramaeters. */ +struct rte_table_encap_ether_qinq_pppoe { + +/** Only valid when *type* is set to QinQ. */ +struct rte_table_action_ether_hdr ether; +struct rte_table_action_vlan_hdr svlan;/**< Service VLAN header. */ +struct rte_table_action_vlan_hdr cvlan;/**< Customer VLAN header. */
lib/librte_pipeline/rte_table_action.h +1
-0+struct rte_table_action_pppoe_hdr pppoe;/**< PPPoE/PPP headers. */
lib/librte_pipeline/rte_table_action.h +5
-1+}; +/** Encap action parameters (per table rule). */ struct rte_table_action_encap_params {/** Encapsulation type. */ @@ -553,6 +566,9 @@ struct rte_table_action_encap_params {/** Only valid when *type* is set to VXLAN. */ struct rte_table_action_encap_vxlan_params vxlan; + +/** Only valid when *type* is set to QinQ_PPPoE. */ +struct rte_table_encap_ether_qinq_pppoe qinq_pppoe; }; }; --
Quoted 1 line
2.17.1
Thanks,
Cristian
PATCH v3 1/1 ip_pipeline: add QinQ PPPoE encapsulation action
In reply to Marjanovic,NemanjaAdd implementation of QinQ PPPoE packet encapsulation action.
---
v2:Fix changes from check patch
v3:Changed to use internally defined ETHER_TYPE_PPPOE_SESSION macro
--- examples/ip_pipeline/cli.c | 46 ++++++++++++++++++- lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 3 files changed, 121 insertions(+), 2 deletions(-)
examples/ip_pipeline/cli.c +44 -2
@@ -1022,7 +1022,7 @@ static const char cmd_table_action_profile_help[] =" tc <n_tc>\n" " stats none | pkts | bytes | both]\n" " [tm spp <n_subports_per_port> pps <n_pipes_per_subport>]\n" -" [encap ether | vlan | qinq | mpls | pppoe |\n" +" [encap ether | vlan | qinq | mpls | pppoe | qinq_pppoe \n" " vxlan offset <ether_offset> ipv4 | ipv6 vlan on | off]\n" " [nat src | dst\n" " proto udp | tcp]\n"
@@ -1290,7 +1290,10 @@ cmd_table_action_profile(char **tokens, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; - }else { + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; +else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; }
@@ -3090,6 +3093,7 @@ parse_match(char **tokens,* ether <da> <sa> * | vlan <da> <sa> <pcp> <dei> <vid> * | qinq <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> +* | qinq_pppoe <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> <session_id> * | mpls unicast | multicast * <da> <sa> * label0 <label> <tc> <ttl>
@@ -3391,6 +3395,44 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if ((n_tokens <10 ) || +parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + (svlan_pcp >0x7 ) || +parser_read_uint32 (&svlan_dei, tokens[4 ]) || + (svlan_dei >0x1 ) || +parser_read_uint32 (&svlan_vid, tokens[5 ]) || + (svlan_vid >0xFFF ) || +parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + (cvlan_pcp >0x7 ) || +parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + (cvlan_dei >0x1 ) || +parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + (cvlan_vid >0xFFF ) || +parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
lib/librte_pipeline/rte_table_action.c +61 -0
103 lines not on this page · raw message
lib/librte_pipeline/rte_table_action.h +16 -0
@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {* Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether } */ RTE_TABLE_ACTION_ENCAP_VXLAN , + +/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */ + RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE, };/** Pre-computed Ethernet header fields for encapsulation action. */
@@ -529,6 +532,16 @@ struct rte_table_action_encap_config { }; }; +/** QinQ_PPPoE encap paramaeters. */ +struct rte_table_encap_ether_qinq_pppoe { + +/** Only valid when *type* is set to QinQ. */ +struct rte_table_action_ether_hdr ether; +struct rte_table_action_vlan_hdr svlan;/**< Service VLAN header. */ +struct rte_table_action_vlan_hdr cvlan;/**< Customer VLAN header. */ +struct rte_table_action_pppoe_hdr pppoe;/**< PPPoE/PPP headers. */ +}; +/** Encap action parameters (per table rule). */ struct rte_table_action_encap_params {/** Encapsulation type. */
@@ -553,6 +566,9 @@ struct rte_table_action_encap_params {/** Only valid when *type* is set to VXLAN. */ struct rte_table_action_encap_vxlan_params vxlan; + +/** Only valid when *type* is set to QinQ_PPPoE. */ +struct rte_table_encap_ether_qinq_pppoe qinq_pppoe; }; };
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH v4 1/4 pipeline: support QinQ PPPoE encap
From: "Nemanja Marjanovic" <[email protected]>
Add support of QinQ PPPoE packet encapsulation action.
---
v4:Splitting of patches for easier review
--- lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 2 files changed, 77 insertions(+)
lib/librte_pipeline/rte_table_action.c +61 -0
@@ -432,6 +432,7 @@ encap_valid(enum rte_table_action_encap_type encap)case RTE_TABLE_ACTION_ENCAP_MPLS :case RTE_TABLE_ACTION_ENCAP_PPPOE :case RTE_TABLE_ACTION_ENCAP_VXLAN : +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE :return 1 ;default :return 0 ;
@@ -532,6 +533,13 @@ struct encap_vxlan_ipv6_vlan_data {struct vxlan_hdr vxlan; } __attribute__((__packed__)); +struct encap_qinq_pppoe_data { +struct ether_hdr ether; +struct vlan_hdr svlan; +struct vlan_hdr cvlan; +struct pppoe_ppp_hdr pppoe_ppp; +} __attribute__((__packed__ )); +static size_t encap_data_size (struct rte_table_action_encap_config *encap) {
@@ -563,6 +571,9 @@ encap_data_size(struct rte_table_action_encap_config *encap)else return sizeof (struct encap_vxlan_ipv6_data ); +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return sizeof (struct encap_qinq_pppoe_data ); +default :return 0 ; }
@@ -599,6 +610,9 @@ encap_apply_check(struct rte_table_action_encap_params *p,case RTE_TABLE_ACTION_ENCAP_VXLAN :return 0 ; +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return 0 ; +default :return -EINVAL ; }
@@ -676,6 +690,38 @@ encap_qinq_apply(void *data,return 0 ; } +static int +encap_qinq_pppoe_apply (void *data, +struct rte_table_action_encap_params *p) +{ +struct encap_qinq_pppoe_data *d = data; + +/* Ethernet */ +ether_addr_copy (&p->qinq.ether.da, &d->ether.d_addr); +ether_addr_copy (&p->qinq.ether.sa, &d->ether.s_addr); + d->ether.ether_type =rte_htons (ETHER_TYPE_VLAN ); + +/* SVLAN */ + d->svlan.vlan_tci =rte_htons (VLAN (p->qinq.svlan.pcp, + p->qinq.svlan.dei, + p->qinq.svlan.vid)); + d->svlan.eth_proto =rte_htons (ETHER_TYPE_VLAN ); + +/* CVLAN */ + d->cvlan.vlan_tci =rte_htons (VLAN (p->qinq.cvlan.pcp, + p->qinq.cvlan.dei, + p->qinq.cvlan.vid)); + d->cvlan.eth_proto =rte_htons (ETHER_TYPE_PPPOE_SESSION ); + +/* PPPoE and PPP*/ + d->pppoe_ppp.ver_type_code =rte_htons (0x1100 ); + d->pppoe_ppp.session_id =rte_htons (p->qinq_pppoe.pppoe.session_id); + d->pppoe_ppp.length =0 ;/* not pre-computed */ + d->pppoe_ppp.protocol =rte_htons (PPP_PROTOCOL_IP ); + +return 0 ; +} +static int encap_mpls_apply (void *data,struct rte_table_action_encap_params *p)
@@ -921,6 +967,9 @@ encap_apply(void *data,case RTE_TABLE_ACTION_ENCAP_VXLAN :return encap_vxlan_apply (data, p, cfg); +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return encap_qinq_pppoe_apply (data, p); +default :return -EINVAL ; }
@@ -1119,6 +1168,18 @@ pkt_work_encap(struct rte_mbuf *mbuf,break ; } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : + { +struct encap_qinq_pppoe_data *qinq_pppoe = +encap (ip, data,sizeof (struct encap_qinq_pppoe_data )); + qinq_pppoe->pppoe_ppp.length =rte_htons (total_length +2 ); + mbuf->data_off = ip_offset - (sizeof (struct rte_mbuf ) + +sizeof (struct encap_qinq_pppoe_data )); + mbuf->pkt_len = mbuf->data_len = total_length + +sizeof (struct encap_qinq_pppoe_data ); +break ; + } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN : {if (cfg->vxlan.ip_version)
lib/librte_pipeline/rte_table_action.h +16 -0
@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {* Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether } */ RTE_TABLE_ACTION_ENCAP_VXLAN , + +/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */ + RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE, };/** Pre-computed Ethernet header fields for encapsulation action. */
@@ -529,6 +532,16 @@ struct rte_table_action_encap_config { }; }; +/** QinQ_PPPoE encap paramaeters. */ +struct rte_table_encap_ether_qinq_pppoe { + +/** Only valid when *type* is set to QinQ. */ +struct rte_table_action_ether_hdr ether; +struct rte_table_action_vlan_hdr svlan;/**< Service VLAN header. */ +struct rte_table_action_vlan_hdr cvlan;/**< Customer VLAN header. */ +struct rte_table_action_pppoe_hdr pppoe;/**< PPPoE/PPP headers. */ +}; +/** Encap action parameters (per table rule). */ struct rte_table_action_encap_params {/** Encapsulation type. */
@@ -553,6 +566,9 @@ struct rte_table_action_encap_params {/** Only valid when *type* is set to VXLAN. */ struct rte_table_action_encap_vxlan_params vxlan; + +/** Only valid when *type* is set to QinQ_PPPoE. */ +struct rte_table_encap_ether_qinq_pppoe qinq_pppoe; }; };
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH v4 2/4 examples/ip_pipeline: support QinQ PPPoE encap
From: "Nemanja Marjanovic" <[email protected]>
Add implementation of QinQ PPPoE packet encapsulation action.
---
v4:Splitting of patches for easier review
--- examples/ip_pipeline/cli.c | 46 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-)
examples/ip_pipeline/cli.c +44 -2
@@ -1022,7 +1022,7 @@ static const char cmd_table_action_profile_help[] =" tc <n_tc>\n" " stats none | pkts | bytes | both]\n" " [tm spp <n_subports_per_port> pps <n_pipes_per_subport>]\n" -" [encap ether | vlan | qinq | mpls | pppoe |\n" +" [encap ether | vlan | qinq | mpls | pppoe | qinq_pppoe \n" " vxlan offset <ether_offset> ipv4 | ipv6 vlan on | off]\n" " [nat src | dst\n" " proto udp | tcp]\n"
@@ -1290,7 +1290,10 @@ cmd_table_action_profile(char **tokens, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; - }else { + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; +else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; }
@@ -3090,6 +3093,7 @@ parse_match(char **tokens,* ether <da> <sa> * | vlan <da> <sa> <pcp> <dei> <vid> * | qinq <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> +* | qinq_pppoe <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> <session_id> * | mpls unicast | multicast * <da> <sa> * label0 <label> <tc> <ttl>
@@ -3391,6 +3395,44 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if ((n_tokens <10 ) || +parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + (svlan_pcp >0x7 ) || +parser_read_uint32 (&svlan_dei, tokens[4 ]) || + (svlan_dei >0x1 ) || +parser_read_uint32 (&svlan_vid, tokens[5 ]) || + (svlan_vid >0xFFF ) || +parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + (cvlan_pcp >0x7 ) || +parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + (cvlan_dei >0x1 ) || +parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + (cvlan_vid >0xFFF ) || +parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH v4 3/4 net/softnic: support QinQ PPPoE encap
In reply to Nemanja MarjanovicFrom: "Nemanja Marjanovic" <[email protected]>
Add implementation of QinQ PPPoE packet encapsulation action.
---
v4:Added implementation of QinQ PPPoE packet encapsulation action.
--- drivers/net/softnic/rte_eth_softnic_cli.c | 44 ++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-)
drivers/net/softnic/rte_eth_softnic_cli.c +43 -1
@@ -1335,7 +1335,7 @@ cmd_port_in_action_profile(struct pmd_internals *softnic,* tc <n_tc> * stats none | pkts | bytes | both] * [tm spp <n_subports_per_port> pps <n_pipes_per_subport>] -* [encap ether | vlan | qinq | mpls | pppoe | +* [encap ether | vlan | qinq | mpls | pppoe | qinq_pppoe | * vxlan offset <ether_offset> ipv4 | ipv6 vlan on | off] * [nat src | dst * proto udp | tcp]
@@ -1612,10 +1612,14 @@ cmd_table_action_profile(struct pmd_internals *softnic, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) { + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; }else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; } + p.action_mask |=1LLU <<RTE_TABLE_ACTION_ENCAP ; t0 +=2 + n_extra_tokens; }/* encap */
@@ -3353,6 +3357,7 @@ parse_match(char **tokens,* ether <da> <sa> * | vlan <da> <sa> <pcp> <dei> <vid> * | qinq <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> +* | qinq_pppoe <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> <session_id> * | mpls unicast | multicast * <da> <sa> * label0 <label> <tc> <ttl>
@@ -3658,6 +3663,43 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if (n_tokens <10 || +softnic_parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +softnic_parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +softnic_parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + svlan_pcp >0x7 || +softnic_parser_read_uint32 (&svlan_dei, tokens[4 ]) || + svlan_dei >0x1 || +softnic_parser_read_uint32 (&svlan_vid, tokens[5 ]) || + svlan_vid >0xFFF || +softnic_parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + cvlan_pcp >0x7 || +softnic_parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + cvlan_dei >0x1 || +softnic_parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + cvlan_vid >0xFFF || +softnic_parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH v4 4/4 net: add PPPoE ethertypes
In reply to Nemanja MarjanovicFrom: "Nemanja Marjanovic" <[email protected]>
Add PPPoE ethertypes in to rte_ether.h.
---
v4:Added PPPoE ethertypes in to rte_ether.h.
--- lib/librte_net/rte_ether.h | 2 ++ lib/librte_pipeline/rte_table_action.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
lib/librte_net/rte_ether.h +2 -0
@@ -301,6 +301,8 @@ struct vxlan_hdr {#define ETHER_TYPE_RARP 0x8035/**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100/**< IEEE 802.1Q VLAN tagging. */ #define ETHER_TYPE_QINQ 0x88A8/**< IEEE 802.1ad QinQ tagging. */ +#define ETHER_TYPE_PPPOE_DISCOVERY 0x8863/**< PPPoE Discovery Stage. */ +#define ETHER_TYPE_PPPOE_SESSION 0x8864/**< PPPoE Session Stage. */ #define ETHER_TYPE_ETAG 0x893F/**< IEEE 802.1BR E-Tag. */ #define ETHER_TYPE_1588 0x88F7/**< IEEE 802.1AS 1588 Precise Time Protocol. */ #define ETHER_TYPE_SLOW 0x8809/**< Slow protocols (LACP and Marker). */
lib/librte_pipeline/rte_table_action.c +0 -2
@@ -485,8 +485,6 @@ struct encap_mpls_data {uint32_t mpls_count; } __attribute__((__packed__)); -#define ETHER_TYPE_PPPOE_SESSION 0x8864 -#define PPP_PROTOCOL_IP 0x0021struct pppoe_ppp_hdr {
Signature · 13 lines
2.17.1 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Re: [PATCH v4 4/4] net: add PPPoE ethertypes
+Cc Olivier, maintainer
18/01/2019 10:12, Nemanja Marjanovic:
Quoted 39 lines
From: "Nemanja Marjanovic" <[email protected]>
Add PPPoE ethertypes in to
rte_ether.h.Signed-off-by Nemanja Marjanovic <[email protected]>---
v4:Added PPPoE ethertypes in torte_ether.h.--- lib/librte_net/rte_ether.h | 2 ++ lib/librte_pipeline/rte_table_action.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)lib/librte_net/rte_ether.h +2
-0@@ -301,6 +301,8 @@ struct vxlan_hdr {#define ETHER_TYPE_RARP 0x8035/**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100/**< IEEE 802.1Q VLAN tagging. */ #define ETHER_TYPE_QINQ 0x88A8/**< IEEE 802.1ad QinQ tagging. */ +#define ETHER_TYPE_PPPOE_DISCOVERY 0x8863/**< PPPoE Discovery Stage. */ +#define ETHER_TYPE_PPPOE_SESSION 0x8864/**< PPPoE Session Stage. */ #define ETHER_TYPE_ETAG 0x893F/**< IEEE 802.1BR E-Tag. */ #define ETHER_TYPE_1588 0x88F7/**< IEEE 802.1AS 1588 Precise Time Protocol. */ #define ETHER_TYPE_SLOW 0x8809/**< Slow protocols (LACP and Marker). */ lib/librte_pipeline/rte_table_action.c +0
-2@@ -485,8 +485,6 @@ struct encap_mpls_data {uint32_t mpls_count; } __attribute__((__packed__)); -#define ETHER_TYPE_PPPOE_SESSION 0x8864 -#define PPP_PROTOCOL_IP 0x0021struct pppoe_ppp_hdr {
PATCH v5 1/4 pipeline: support QinQ PPPoE encap
In reply to Nemanja MarjanovicFrom: "Marjanovic,Nemanja" <[email protected]>
Add support of QinQ PPPoE packet encapsulation action.
---
v5:Removing footer from patch.
--- lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 2 files changed, 77 insertions(+)
lib/librte_pipeline/rte_table_action.c +61 -0
@@ -432,6 +432,7 @@ encap_valid(enum rte_table_action_encap_type encap)case RTE_TABLE_ACTION_ENCAP_MPLS :case RTE_TABLE_ACTION_ENCAP_PPPOE :case RTE_TABLE_ACTION_ENCAP_VXLAN : +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE :return 1 ;default :return 0 ;
@@ -532,6 +533,13 @@ struct encap_vxlan_ipv6_vlan_data {struct vxlan_hdr vxlan; } __attribute__((__packed__)); +struct encap_qinq_pppoe_data { +struct ether_hdr ether; +struct vlan_hdr svlan; +struct vlan_hdr cvlan; +struct pppoe_ppp_hdr pppoe_ppp; +} __attribute__((__packed__ )); +static size_t encap_data_size (struct rte_table_action_encap_config *encap) {
@@ -563,6 +571,9 @@ encap_data_size(struct rte_table_action_encap_config *encap)else return sizeof (struct encap_vxlan_ipv6_data ); +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return sizeof (struct encap_qinq_pppoe_data ); +default :return 0 ; }
@@ -599,6 +610,9 @@ encap_apply_check(struct rte_table_action_encap_params *p,case RTE_TABLE_ACTION_ENCAP_VXLAN :return 0 ; +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return 0 ; +default :return -EINVAL ; }
@@ -676,6 +690,38 @@ encap_qinq_apply(void *data,return 0 ; } +static int +encap_qinq_pppoe_apply (void *data, +struct rte_table_action_encap_params *p) +{ +struct encap_qinq_pppoe_data *d = data; + +/* Ethernet */ +ether_addr_copy (&p->qinq.ether.da, &d->ether.d_addr); +ether_addr_copy (&p->qinq.ether.sa, &d->ether.s_addr); + d->ether.ether_type =rte_htons (ETHER_TYPE_VLAN ); + +/* SVLAN */ + d->svlan.vlan_tci =rte_htons (VLAN (p->qinq.svlan.pcp, + p->qinq.svlan.dei, + p->qinq.svlan.vid)); + d->svlan.eth_proto =rte_htons (ETHER_TYPE_VLAN ); + +/* CVLAN */ + d->cvlan.vlan_tci =rte_htons (VLAN (p->qinq.cvlan.pcp, + p->qinq.cvlan.dei, + p->qinq.cvlan.vid)); + d->cvlan.eth_proto =rte_htons (ETHER_TYPE_PPPOE_SESSION ); + +/* PPPoE and PPP*/ + d->pppoe_ppp.ver_type_code =rte_htons (0x1100 ); + d->pppoe_ppp.session_id =rte_htons (p->qinq_pppoe.pppoe.session_id); + d->pppoe_ppp.length =0 ;/* not pre-computed */ + d->pppoe_ppp.protocol =rte_htons (PPP_PROTOCOL_IP ); + +return 0 ; +} +static int encap_mpls_apply (void *data,struct rte_table_action_encap_params *p)
@@ -921,6 +967,9 @@ encap_apply(void *data,case RTE_TABLE_ACTION_ENCAP_VXLAN :return encap_vxlan_apply (data, p, cfg); +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return encap_qinq_pppoe_apply (data, p); +default :return -EINVAL ; }
@@ -1119,6 +1168,18 @@ pkt_work_encap(struct rte_mbuf *mbuf,break ; } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : + { +struct encap_qinq_pppoe_data *qinq_pppoe = +encap (ip, data,sizeof (struct encap_qinq_pppoe_data )); + qinq_pppoe->pppoe_ppp.length =rte_htons (total_length +2 ); + mbuf->data_off = ip_offset - (sizeof (struct rte_mbuf ) + +sizeof (struct encap_qinq_pppoe_data )); + mbuf->pkt_len = mbuf->data_len = total_length + +sizeof (struct encap_qinq_pppoe_data ); +break ; + } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN : {if (cfg->vxlan.ip_version)
lib/librte_pipeline/rte_table_action.h +16 -0
@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {* Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether } */ RTE_TABLE_ACTION_ENCAP_VXLAN , + +/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */ + RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE, };/** Pre-computed Ethernet header fields for encapsulation action. */
@@ -529,6 +532,16 @@ struct rte_table_action_encap_config { }; }; +/** QinQ_PPPoE encap paramaeters. */ +struct rte_table_encap_ether_qinq_pppoe { + +/** Only valid when *type* is set to QinQ. */ +struct rte_table_action_ether_hdr ether; +struct rte_table_action_vlan_hdr svlan;/**< Service VLAN header. */ +struct rte_table_action_vlan_hdr cvlan;/**< Customer VLAN header. */ +struct rte_table_action_pppoe_hdr pppoe;/**< PPPoE/PPP headers. */ +}; +/** Encap action parameters (per table rule). */ struct rte_table_action_encap_params {/** Encapsulation type. */
@@ -553,6 +566,9 @@ struct rte_table_action_encap_params {/** Only valid when *type* is set to VXLAN. */ struct rte_table_action_encap_vxlan_params vxlan; + +/** Only valid when *type* is set to QinQ_PPPoE. */ +struct rte_table_encap_ether_qinq_pppoe qinq_pppoe; }; };
Signature · 1 line
2.17.1
PATCH v5 2/4 examples/ip_pipeline: support QinQ PPPoE encap
From: "Marjanovic,Nemanja" <[email protected]>
Add implementation of QinQ PPPoE packet encapsulation action.
---
v5:Removing footer from patch
--- examples/ip_pipeline/cli.c | 46 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-)
examples/ip_pipeline/cli.c +44 -2
@@ -1022,7 +1022,7 @@ static const char cmd_table_action_profile_help[] =" tc <n_tc>\n" " stats none | pkts | bytes | both]\n" " [tm spp <n_subports_per_port> pps <n_pipes_per_subport>]\n" -" [encap ether | vlan | qinq | mpls | pppoe |\n" +" [encap ether | vlan | qinq | mpls | pppoe | qinq_pppoe \n" " vxlan offset <ether_offset> ipv4 | ipv6 vlan on | off]\n" " [nat src | dst\n" " proto udp | tcp]\n"
@@ -1290,7 +1290,10 @@ cmd_table_action_profile(char **tokens, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; - }else { + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; +else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; }
@@ -3090,6 +3093,7 @@ parse_match(char **tokens,* ether <da> <sa> * | vlan <da> <sa> <pcp> <dei> <vid> * | qinq <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> +* | qinq_pppoe <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> <session_id> * | mpls unicast | multicast * <da> <sa> * label0 <label> <tc> <ttl>
@@ -3391,6 +3395,44 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if ((n_tokens <10 ) || +parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + (svlan_pcp >0x7 ) || +parser_read_uint32 (&svlan_dei, tokens[4 ]) || + (svlan_dei >0x1 ) || +parser_read_uint32 (&svlan_vid, tokens[5 ]) || + (svlan_vid >0xFFF ) || +parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + (cvlan_pcp >0x7 ) || +parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + (cvlan_dei >0x1 ) || +parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + (cvlan_vid >0xFFF ) || +parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
Signature · 1 line
2.17.1
PATCH v5 3/4 net/softnic: support QinQ PPPoE encap
In reply to Nemanja MarjanovicFrom: "Marjanovic,Nemanja" <[email protected]>
Add implementation of QinQ PPPoE packet encapsulation action.
---
v5:Removing footer from patch.
--- drivers/net/softnic/rte_eth_softnic_cli.c | 44 ++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-)
drivers/net/softnic/rte_eth_softnic_cli.c +43 -1
@@ -1335,7 +1335,7 @@ cmd_port_in_action_profile(struct pmd_internals *softnic,* tc <n_tc> * stats none | pkts | bytes | both] * [tm spp <n_subports_per_port> pps <n_pipes_per_subport>] -* [encap ether | vlan | qinq | mpls | pppoe | +* [encap ether | vlan | qinq | mpls | pppoe | qinq_pppoe | * vxlan offset <ether_offset> ipv4 | ipv6 vlan on | off] * [nat src | dst * proto udp | tcp]
@@ -1612,10 +1612,14 @@ cmd_table_action_profile(struct pmd_internals *softnic, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) { + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; }else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; } + p.action_mask |=1LLU <<RTE_TABLE_ACTION_ENCAP ; t0 +=2 + n_extra_tokens; }/* encap */
@@ -3353,6 +3357,7 @@ parse_match(char **tokens,* ether <da> <sa> * | vlan <da> <sa> <pcp> <dei> <vid> * | qinq <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> +* | qinq_pppoe <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> <session_id> * | mpls unicast | multicast * <da> <sa> * label0 <label> <tc> <ttl>
@@ -3658,6 +3663,43 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if (n_tokens <10 || +softnic_parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +softnic_parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +softnic_parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + svlan_pcp >0x7 || +softnic_parser_read_uint32 (&svlan_dei, tokens[4 ]) || + svlan_dei >0x1 || +softnic_parser_read_uint32 (&svlan_vid, tokens[5 ]) || + svlan_vid >0xFFF || +softnic_parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + cvlan_pcp >0x7 || +softnic_parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + cvlan_dei >0x1 || +softnic_parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + cvlan_vid >0xFFF || +softnic_parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
Signature · 1 line
2.17.1
PATCH v5 4/4 net: add PPPoE ethertypes
In reply to Nemanja MarjanovicFrom: "Marjanovic,Nemanja" <[email protected]>
Add PPPoE ethertypes in to rte_ether.h.
---
v5:Removing footer from patch.
--- lib/librte_net/rte_ether.h | 2 ++ lib/librte_pipeline/rte_table_action.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
lib/librte_net/rte_ether.h +2 -0
@@ -301,6 +301,8 @@ struct vxlan_hdr {#define ETHER_TYPE_RARP 0x8035/**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100/**< IEEE 802.1Q VLAN tagging. */ #define ETHER_TYPE_QINQ 0x88A8/**< IEEE 802.1ad QinQ tagging. */ +#define ETHER_TYPE_PPPOE_DISCOVERY 0x8863/**< PPPoE Discovery Stage. */ +#define ETHER_TYPE_PPPOE_SESSION 0x8864/**< PPPoE Session Stage. */ #define ETHER_TYPE_ETAG 0x893F/**< IEEE 802.1BR E-Tag. */ #define ETHER_TYPE_1588 0x88F7/**< IEEE 802.1AS 1588 Precise Time Protocol. */ #define ETHER_TYPE_SLOW 0x8809/**< Slow protocols (LACP and Marker). */
lib/librte_pipeline/rte_table_action.c +0 -2
@@ -485,8 +485,6 @@ struct encap_mpls_data {uint32_t mpls_count; } __attribute__((__packed__)); -#define ETHER_TYPE_PPPOE_SESSION 0x8864 -#define PPP_PROTOCOL_IP 0x0021struct pppoe_ppp_hdr {
Signature · 1 line
2.17.1
PATCH v6 1/4 pipeline: support QinQ PPPoE encap
From: "Nemanja Marjanovic" <[email protected]>
Add support of QinQ PPPoE packet encapsulation action.
---
v5:Removing footer from patch.
v6:Added missing acks.
--- lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 2 files changed, 77 insertions(+)
lib/librte_pipeline/rte_table_action.c +61 -0
@@ -432,6 +432,7 @@ encap_valid(enum rte_table_action_encap_type encap)case RTE_TABLE_ACTION_ENCAP_MPLS :case RTE_TABLE_ACTION_ENCAP_PPPOE :case RTE_TABLE_ACTION_ENCAP_VXLAN : +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE :return 1 ;default :return 0 ;
@@ -532,6 +533,13 @@ struct encap_vxlan_ipv6_vlan_data {struct vxlan_hdr vxlan; } __attribute__((__packed__)); +struct encap_qinq_pppoe_data { +struct ether_hdr ether; +struct vlan_hdr svlan; +struct vlan_hdr cvlan; +struct pppoe_ppp_hdr pppoe_ppp; +} __attribute__((__packed__ )); +static size_t encap_data_size (struct rte_table_action_encap_config *encap) {
@@ -563,6 +571,9 @@ encap_data_size(struct rte_table_action_encap_config *encap)else return sizeof (struct encap_vxlan_ipv6_data ); +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return sizeof (struct encap_qinq_pppoe_data ); +default :return 0 ; }
@@ -599,6 +610,9 @@ encap_apply_check(struct rte_table_action_encap_params *p,case RTE_TABLE_ACTION_ENCAP_VXLAN :return 0 ; +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return 0 ; +default :return -EINVAL ; }
@@ -676,6 +690,38 @@ encap_qinq_apply(void *data,return 0 ; } +static int +encap_qinq_pppoe_apply (void *data, +struct rte_table_action_encap_params *p) +{ +struct encap_qinq_pppoe_data *d = data; + +/* Ethernet */ +ether_addr_copy (&p->qinq.ether.da, &d->ether.d_addr); +ether_addr_copy (&p->qinq.ether.sa, &d->ether.s_addr); + d->ether.ether_type =rte_htons (ETHER_TYPE_VLAN ); + +/* SVLAN */ + d->svlan.vlan_tci =rte_htons (VLAN (p->qinq.svlan.pcp, + p->qinq.svlan.dei, + p->qinq.svlan.vid)); + d->svlan.eth_proto =rte_htons (ETHER_TYPE_VLAN ); + +/* CVLAN */ + d->cvlan.vlan_tci =rte_htons (VLAN (p->qinq.cvlan.pcp, + p->qinq.cvlan.dei, + p->qinq.cvlan.vid)); + d->cvlan.eth_proto =rte_htons (ETHER_TYPE_PPPOE_SESSION ); + +/* PPPoE and PPP*/ + d->pppoe_ppp.ver_type_code =rte_htons (0x1100 ); + d->pppoe_ppp.session_id =rte_htons (p->qinq_pppoe.pppoe.session_id); + d->pppoe_ppp.length =0 ;/* not pre-computed */ + d->pppoe_ppp.protocol =rte_htons (PPP_PROTOCOL_IP ); + +return 0 ; +} +static int encap_mpls_apply (void *data,struct rte_table_action_encap_params *p)
@@ -921,6 +967,9 @@ encap_apply(void *data,case RTE_TABLE_ACTION_ENCAP_VXLAN :return encap_vxlan_apply (data, p, cfg); +case RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : +return encap_qinq_pppoe_apply (data, p); +default :return -EINVAL ; }
@@ -1119,6 +1168,18 @@ pkt_work_encap(struct rte_mbuf *mbuf,break ; } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE : + { +struct encap_qinq_pppoe_data *qinq_pppoe = +encap (ip, data,sizeof (struct encap_qinq_pppoe_data )); + qinq_pppoe->pppoe_ppp.length =rte_htons (total_length +2 ); + mbuf->data_off = ip_offset - (sizeof (struct rte_mbuf ) + +sizeof (struct encap_qinq_pppoe_data )); + mbuf->pkt_len = mbuf->data_len = total_length + +sizeof (struct encap_qinq_pppoe_data ); +break ; + } +case 1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN : {if (cfg->vxlan.ip_version)
lib/librte_pipeline/rte_table_action.h +16 -0
@@ -380,6 +380,9 @@ enum rte_table_action_encap_type {* Ether -> { Ether | VLAN | IP | UDP | VXLAN | Ether } */ RTE_TABLE_ACTION_ENCAP_VXLAN , + +/** IP -> { Ether | S-VLAN | C-VLAN | PPPoE | PPP | IP } */ + RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE, };/** Pre-computed Ethernet header fields for encapsulation action. */
@@ -529,6 +532,16 @@ struct rte_table_action_encap_config { }; }; +/** QinQ_PPPoE encap paramaeters. */ +struct rte_table_encap_ether_qinq_pppoe { + +/** Only valid when *type* is set to QinQ. */ +struct rte_table_action_ether_hdr ether; +struct rte_table_action_vlan_hdr svlan;/**< Service VLAN header. */ +struct rte_table_action_vlan_hdr cvlan;/**< Customer VLAN header. */ +struct rte_table_action_pppoe_hdr pppoe;/**< PPPoE/PPP headers. */ +}; +/** Encap action parameters (per table rule). */ struct rte_table_action_encap_params {/** Encapsulation type. */
@@ -553,6 +566,9 @@ struct rte_table_action_encap_params {/** Only valid when *type* is set to VXLAN. */ struct rte_table_action_encap_vxlan_params vxlan; + +/** Only valid when *type* is set to QinQ_PPPoE. */ +struct rte_table_encap_ether_qinq_pppoe qinq_pppoe; }; };
Signature · 1 line
2.17.1
PATCH v6 2/4 examples/ip_pipeline: support QinQ PPPoE encap
From: "Nemanja Marjanovic" <[email protected]>
Add implementation of QinQ PPPoE packet encapsulation action.
---
v5:Removing footer from patch.
v6:Added missing acks.
--- examples/ip_pipeline/cli.c | 46 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-)
examples/ip_pipeline/cli.c +44 -2
@@ -1022,7 +1022,7 @@ static const char cmd_table_action_profile_help[] =" tc <n_tc>\n" " stats none | pkts | bytes | both]\n" " [tm spp <n_subports_per_port> pps <n_pipes_per_subport>]\n" -" [encap ether | vlan | qinq | mpls | pppoe |\n" +" [encap ether | vlan | qinq | mpls | pppoe | qinq_pppoe \n" " vxlan offset <ether_offset> ipv4 | ipv6 vlan on | off]\n" " [nat src | dst\n" " proto udp | tcp]\n"
@@ -1290,7 +1290,10 @@ cmd_table_action_profile(char **tokens, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; - }else { + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; +else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; }
@@ -3090,6 +3093,7 @@ parse_match(char **tokens,* ether <da> <sa> * | vlan <da> <sa> <pcp> <dei> <vid> * | qinq <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> +* | qinq_pppoe <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> <session_id> * | mpls unicast | multicast * <da> <sa> * label0 <label> <tc> <ttl>
@@ -3391,6 +3395,44 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if ((n_tokens <10 ) || +parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + (svlan_pcp >0x7 ) || +parser_read_uint32 (&svlan_dei, tokens[4 ]) || + (svlan_dei >0x1 ) || +parser_read_uint32 (&svlan_vid, tokens[5 ]) || + (svlan_vid >0xFFF ) || +parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + (cvlan_pcp >0x7 ) || +parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + (cvlan_dei >0x1 ) || +parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + (cvlan_vid >0xFFF ) || +parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
Signature · 1 line
2.17.1
PATCH v6 3/4 net/softnic: support QinQ PPPoE encap
In reply to Nemanja MarjanovicFrom: "Nemanja Marjanovic" <[email protected]>
Add implementation of QinQ PPPoE packet encapsulation action.
---
v5:Removing footer from patch.
v6:Added missing acks.
--- drivers/net/softnic/rte_eth_softnic_cli.c | 44 ++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-)
drivers/net/softnic/rte_eth_softnic_cli.c +43 -1
@@ -1335,7 +1335,7 @@ cmd_port_in_action_profile(struct pmd_internals *softnic,* tc <n_tc> * stats none | pkts | bytes | both] * [tm spp <n_subports_per_port> pps <n_pipes_per_subport>] -* [encap ether | vlan | qinq | mpls | pppoe | +* [encap ether | vlan | qinq | mpls | pppoe | qinq_pppoe | * vxlan offset <ether_offset> ipv4 | ipv6 vlan on | off] * [nat src | dst * proto udp | tcp]
@@ -1612,10 +1612,14 @@ cmd_table_action_profile(struct pmd_internals *softnic, p.encap.encap_mask =1LLU <<RTE_TABLE_ACTION_ENCAP_VXLAN ; n_extra_tokens =5 ; + }else if (strcmp (tokens[t0 +1 ],"qinq_pppoe" ) ==0 ) { + p.encap.encap_mask = +1LLU <<RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; }else {snprintf (out, out_size,MSG_ARG_MISMATCH ,"encap" );return ; } + p.action_mask |=1LLU <<RTE_TABLE_ACTION_ENCAP ; t0 +=2 + n_extra_tokens; }/* encap */
@@ -3353,6 +3357,7 @@ parse_match(char **tokens,* ether <da> <sa> * | vlan <da> <sa> <pcp> <dei> <vid> * | qinq <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> +* | qinq_pppoe <da> <sa> <pcp> <dei> <vid> <pcp> <dei> <vid> <session_id> * | mpls unicast | multicast * <da> <sa> * label0 <label> <tc> <ttl>
@@ -3658,6 +3663,43 @@ parse_table_action_encap(char **tokens,return 1 +9 ; } +/* qinq_pppoe */ +if (n_tokens && (strcmp (tokens[0 ],"qinq_pppoe" ) ==0 )) { +uint32_t svlan_pcp, svlan_dei, svlan_vid; +uint32_t cvlan_pcp, cvlan_dei, cvlan_vid; + +if (n_tokens <10 || +softnic_parse_mac_addr (tokens[1 ], + &a->encap.qinq_pppoe.ether.da) || +softnic_parse_mac_addr (tokens[2 ], + &a->encap.qinq_pppoe.ether.sa) || +softnic_parser_read_uint32 (&svlan_pcp, tokens[3 ]) || + svlan_pcp >0x7 || +softnic_parser_read_uint32 (&svlan_dei, tokens[4 ]) || + svlan_dei >0x1 || +softnic_parser_read_uint32 (&svlan_vid, tokens[5 ]) || + svlan_vid >0xFFF || +softnic_parser_read_uint32 (&cvlan_pcp, tokens[6 ]) || + cvlan_pcp >0x7 || +softnic_parser_read_uint32 (&cvlan_dei, tokens[7 ]) || + cvlan_dei >0x1 || +softnic_parser_read_uint32 (&cvlan_vid, tokens[8 ]) || + cvlan_vid >0xFFF || +softnic_parser_read_uint16 (&a->encap.qinq_pppoe.pppoe.session_id, + tokens[9 ])) +return 0 ; + + a->encap.qinq_pppoe.svlan.pcp = svlan_pcp &0x7 ; + a->encap.qinq_pppoe.svlan.dei = svlan_dei &0x1 ; + a->encap.qinq_pppoe.svlan.vid = svlan_vid &0xFFF ; + a->encap.qinq_pppoe.cvlan.pcp = cvlan_pcp &0x7 ; + a->encap.qinq_pppoe.cvlan.dei = cvlan_dei &0x1 ; + a->encap.qinq_pppoe.cvlan.vid = cvlan_vid &0xFFF ; + a->encap.type =RTE_TABLE_ACTION_ENCAP_QINQ_PPPOE ; + a->action_mask |=1 <<RTE_TABLE_ACTION_ENCAP ; +return 1 +10 ; + } +/* mpls */ if (n_tokens && (strcmp (tokens[0 ],"mpls" ) ==0 )) {uint32_t label, tc, ttl;
Signature · 1 line
2.17.1
PATCH v6 4/4 net: add PPPoE ethertypes
In reply to Nemanja MarjanovicFrom: "Nemanja Marjanovic" <[email protected]>
Add PPPoE ethertypes in to rte_ether.h.
---
v5:Removing footer from patch.
v6:Added missing acks.
--- lib/librte_net/rte_ether.h | 2 ++ lib/librte_pipeline/rte_table_action.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
lib/librte_net/rte_ether.h +2 -0
@@ -301,6 +301,8 @@ struct vxlan_hdr {#define ETHER_TYPE_RARP 0x8035/**< Reverse Arp Protocol. */ #define ETHER_TYPE_VLAN 0x8100/**< IEEE 802.1Q VLAN tagging. */ #define ETHER_TYPE_QINQ 0x88A8/**< IEEE 802.1ad QinQ tagging. */ +#define ETHER_TYPE_PPPOE_DISCOVERY 0x8863/**< PPPoE Discovery Stage. */ +#define ETHER_TYPE_PPPOE_SESSION 0x8864/**< PPPoE Session Stage. */ #define ETHER_TYPE_ETAG 0x893F/**< IEEE 802.1BR E-Tag. */ #define ETHER_TYPE_1588 0x88F7/**< IEEE 802.1AS 1588 Precise Time Protocol. */ #define ETHER_TYPE_SLOW 0x8809/**< Slow protocols (LACP and Marker). */
lib/librte_pipeline/rte_table_action.c +0 -2
@@ -485,8 +485,6 @@ struct encap_mpls_data {uint32_t mpls_count; } __attribute__((__packed__)); -#define ETHER_TYPE_PPPOE_SESSION 0x8864 -#define PPP_PROTOCOL_IP 0x0021struct pppoe_ppp_hdr {
Signature · 1 line
2.17.1
Dumitrescu, Cristian
AppliedRe: [PATCH v6 1/4] pipeline: support QinQ PPPoE encap
In reply to Nemanja MarjanovicQuoted 13 lines
-----Original Message-----
From: Marjanovic, Nemanja
Sent: Monday, January 21, 2019 11:11 AM
To: [email protected]
Cc: Singh, Jasvinder <[email protected]>; Dumitrescu, Cristian <[email protected]>; Marjanovic, Nemanja <[email protected]>
Subject: [PATCH v6 1/4] pipeline: support QinQ PPPoE encapFrom: "Nemanja Marjanovic" <[email protected]>
Quoted 8 lines
Add support of QinQ PPPoE packet encapsulation action.
Signed-off-by Nemanja Marjanovic <[email protected]>---
v5:Removing footer from patch.
v6:Added missing acks.
---
Applied to next-qos tree, thanks!
Re: [PATCH v4 1/4] pipeline: support QinQ PPPoE encap
In reply to Nemanja MarjanovicQuoted 15 lines
-----Original Message-----
From: Marjanovic, Nemanja
Sent: Friday, January 18, 2019 9:12 AM
To: [email protected]
Cc: Singh, Jasvinder <[email protected]>; Dumitrescu, Cristian <[email protected]>; Marjanovic, Nemanja <[email protected]>
Subject: [PATCH v4 1/4] pipeline: support QinQ PPPoE encapFrom: "Nemanja Marjanovic" <[email protected]>
Add support of QinQ PPPoE packet encapsulation action.
Quoted 8 lines
Signed-off-by Nemanja Marjanovic <[email protected]>---
v4:Splitting of patches for easier review--- lib/librte_pipeline/rte_table_action.c | 61 ++++++++++++++++++++++++++ lib/librte_pipeline/rte_table_action.h | 16 +++++++ 2 files changed, 77 insertions(+)