unified packet type
Subsystems (2)
Re: [PATCH v8 03/18] mbuf: add definitions of unified packet types
In reply to Zhang, HelinHi Helin,
Quoted 104 lines · Helin
Hi Oliver
Thanks for your helps!
Quoted 92 lines
-----Original Message-----
From: Olivier MATZ [mailto:[email protected]]
Sent: Tuesday, June 30, 2015 4:44 PM
To: Zhang, Helin; [email protected]
Cc: Cao, Waterman; Liang, Cunming; Liu, Jijiang; Ananyev, Konstantin; Richardson, Bruce; [email protected]; Wu, Jingjing
Subject: Re: [PATCH v8 03/18] mbuf: add definitions of unified packet typesHi Helin,
This is greatly documented, thanks!
Please find a small comment below.Quoted 16 lines · Helin Zhang
As there are only 6 bit flags in
ol_flagsfor indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'structrte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_NEXT_ABI, which is disabled by default.[...]
lib/librte_mbuf/rte_mbuf.h +0
-0lib/librte_mbuf/rte_mbuf.h extern "C" { · line 202
Quoted 2 lines
lib/librte_mbuf/rte_mbuf.h +0
-0@@ -201,6 +201,493 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */
Quoted 59 lines
lib/librte_mbuf/rte_mbuf.h +58
-0+#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. Note +that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, +RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, +RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 +header from +* performance point of view. Reading annotations of +RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by +different +* hardware may be different, as different hardware may have +different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 261
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +6
-0+* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> */ +#define RTE_PTYPE_L2_MAC 0x00000001I'm wondering if
RTE_PTYPE_L2_ETHERis not a better name?
Quoted 3 lines
Ethernet includes both Data Link Layer and Physical Layer, while MAC is for Data Link Layer only. I would prefer to keep 'MAC' in the names, rather than 'ether'. Any opinions from others?
Just to precise what I'm saying: MAC is the interface between the logical link and the physical layer. It is different depending on the physical media (Ethernet, Token Ring, WLAN, ...). Every packet has a MAC layer and I think "MAC" does not bring any information.
Having "ETHER" in the name would inform the software that it can expect an ethernet header. In the future, I would expect to have more L2 types like PPP.
I also have another question about RTE_PTYPE_L2_MAC. You describe it as "<'ether type'=[0x0800|0x86DD|others]>". What is the meaning of "others"? Does it mean that it is valid to set RTE_PTYPE_L2_MAC for any received packet?
For instance, an ARP packet. The driver has the choice to set:
A- RTE_PTYPE_UNKNOWN: the driver does not know the L2 packet
type
B- RTE_PTYPE_L2_MAC: the driver knows it's an ethernet packet
(it should be the case for all received packets today as dpdk only supports ethernet ports)
C- RTE_PTYPE_L2_ARP: the driver knows that the packet carries
an ARP header after the ethernet header.
Is it correct for a driver to always set B- for all received packets?
Another thing that bothers me a bit is that L2_ARP, L2_LLDP, L2_MAC_TIMESYNC, (...) are not really L2 types. The L2 type is Ethernet. On the other hand, they are not L3 type either. So, I have no other solution. The OSI model is probably a bit too theorical, and we have to choose the solution that is the most useful for the applications, even if it does not absolutely matches the theory ;)
Regards,
Olivier
Quoted 461 lines
Regards,
HelinQuoted 17 lines
Quoted 17 lines
lib/librte_mbuf/rte_mbuf.h +15
-0+/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/** Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 282
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +6
-0+* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004Maybe ETHER should appear in these names too, what do you think?
Same as above.
Quoted 429 lines
Quoted 209 lines
lib/librte_mbuf/rte_mbuf.h +205
-0+/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not +contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains +header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> */ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not +contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> */ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot +contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> */ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains +extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot +contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be +recognized as +* fragmented. A fragmented packet cannot be recognized as any other +L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, +RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be +recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> */ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> */ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) +tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type.
Quoted 192 lines
lib/librte_mbuf/rte_mbuf.h +192
-0+* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local +Area +* Network) or GRE (Generic Routing Encapsulation) could be +recognized as this +* packet type, if they can not be recognized independently as of +hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local +Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> */ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> */ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> */ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> */ #define +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain +extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other +unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> */ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 +types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit +4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 +types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit +6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ #define +RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK)#endif
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +2
-0+/* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *
Re: [PATCH v8 03/18] mbuf: add definitions of unified packet types
Quoted 127 lines
-----Original Message-----
From: Olivier MATZ [mailto:[email protected]]
Sent: Thursday, July 2, 2015 5:32 PM
To: Zhang, Helin; [email protected]
Cc: Cao, Waterman; Liang, Cunming; Liu, Jijiang; Ananyev, Konstantin; Richardson, Bruce; [email protected]; Wu, Jingjing
Subject: Re: [PATCH v8 03/18] mbuf: add definitions of unified packet typesHi Helin,
Quoted 29 lines · Helin
Hi Oliver
Thanks for your helps!
Quoted 25 lines
-----Original Message-----
From: Olivier MATZ [mailto:[email protected]]
Sent: Tuesday, June 30, 2015 4:44 PM
To: Zhang, Helin; [email protected]
Cc: Cao, Waterman; Liang, Cunming; Liu, Jijiang; Ananyev, Konstantin; Richardson, Bruce; [email protected]; Wu, Jingjing
Subject: Re: [PATCH v8 03/18] mbuf: add definitions of unified packet typesHi Helin,
This is greatly documented, thanks!
Please find a small comment below.Quoted 10 lines · Helin Zhang
As there are only 6 bit flags in
ol_flagsfor indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'structrte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_NEXT_ABI, which is disabled by default.Quoted 8 lines
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 202
Quoted 8 lines
[...]
lib/librte_mbuf/rte_mbuf.h +0
-0@@ -201,6 +201,493 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control
Quoted 19 lines
Quoted 19 lines
data */
Quoted 18 lines
lib/librte_mbuf/rte_mbuf.h +17
-0+#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. +Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, +RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, Quoted 8 lines
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 227
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h +8
-0+RTE_PTYPE_L4_UDP + * and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. + * + * Note that L3 types values are selected for checking IPV4/IPV6 +header from + * performance point of view. Reading annotations of +RTE_ETH_IS_IPV4_HDR and + * RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 typevalues.
Quoted 43 lines
Quoted 35 lines
Quoted 35 lines
lib/librte_mbuf/rte_mbuf.h +35
-0+* +* Note that the packet types of the same packet recognized by +different +* hardware may be different, as different hardware may have +different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination +of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination +of, +* RTE_PTYPE_L2_MAC | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 261
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +6
-0+* MAC (Media Access Control) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD|others]> */ +#define RTE_PTYPE_L2_MAC 0x00000001I'm wondering if
RTE_PTYPE_L2_ETHERis not a better name?Quoted 2 lines
Ethernet includes both Data Link Layer and Physical Layer, while MAC is for Data Link Layer only. I would prefer to keep 'MAC' in the names, rather
than 'ether'.
Quoted 1 line
Any opinions from others?
Quoted 7 lines
Just to precise what I'm saying: MAC is the interface between the logical link and the physical layer. It is different depending on the physical media (Ethernet, Token Ring, WLAN, ...).
Every packet has a MAC layer and I think "MAC" does not bring any information.Having "ETHER" in the name would inform the software that it can expect an ethernet header. In the future, I would expect to have more L2 types like PPP.
OK, good explanation! I will change the name and thanks!
Quoted 5 lines
I also have another question about
RTE_PTYPE_L2_MAC. You describe it as "<'ether type'=[0x0800|0x86DD|others]>".
What is the meaning of "others"? Does it mean that it is valid to setRTE_PTYPE_L2_MACfor any received packet?
OK. I think others should be removed. As ARP/LLDP like packet types are combined together with MAC type.
Quoted 11 lines
For instance, an ARP packet. The driver has the choice to set:
A-RTE_PTYPE_UNKNOWN: the driver does not know the L2 packet
type
B-RTE_PTYPE_L2_MAC: the driver knows it's an ethernet packet
(it should be the case for all received packets today as dpdk only supports ethernet ports)
C-RTE_PTYPE_L2_ARP: the driver knows that the packet carries
an ARP header after the ethernet header.Is it correct for a driver to always set B- for all received packets?
Currently it combines ether type and other ether type based protocols together. So if it is a L2_LLDP, it could be treated as MAC + LLDP, while MAC means MAC only or MAC + L3.
Quoted 7 lines
Another thing that bothers me a bit is that
L2_ARP,L2_LLDP,L2_MAC_TIMESYNC, (...) are not really L2 types. The L2 type is Ethernet. On the other hand, they are not L3 type either.
So, I have no other solution. The OSI model is probably a bit too theorical, and we have to choose the solution that is the most useful for the applications, even if it does not absolutely matches the theory ;)
Yes, they are a bit bothering. Currently they are combined together with L2 types. Maybe it needs to define a MISC PACKET TYPE field, as we still have 4 bits available there.
Thanks,
Helin
Quoted 468 lines
Regards,
OlivierQuoted 94 lines
Regards,
HelinQuoted 17 lines
Quoted 17 lines
lib/librte_mbuf/rte_mbuf.h +15
-0+/** +* MAC (Media Access Control) packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_MAC_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ARP 0x00000003 +/** Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" { · line 282
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +6
-0+* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_LLDP 0x00000004Maybe ETHER should appear in these names too, what do you think?
Same as above.
Quoted 63 lines
Quoted 63 lines
lib/librte_mbuf/rte_mbuf.h +59
-0+/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not +contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains +header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> */ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not +contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> */ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or +maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> */ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains +extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** Quoted 8 lines
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h +8
-0+* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or +maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87],
Quoted 204 lines
Quoted 204 lines
Quoted 136 lines
lib/librte_mbuf/rte_mbuf.h +136
-0+* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> */ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be +recognized as +* fragmented. A fragmented packet cannot be recognized as any +other +L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, +RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> */ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> */ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be +recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> */ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> */ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> */ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing +Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling +packet type.
Quoted 57 lines
lib/librte_mbuf/rte_mbuf.h +57
-0+* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local +Area +* Network) or GRE (Generic Routing Encapsulation) could be +recognized as this +* packet type, if they can not be recognized independently as of +hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* MAC (Media Access Control) packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_MAC 0x00010000 +/** +* MAC (Media Access Control) packet type with VLAN (Virtual Local +Area +* Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> */ +#define RTE_PTYPE_INNER_L2_MAC_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. Quoted 8 lines
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h +8
-0+* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> */ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header.
Quoted 8 lines
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h +8
-0+* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> */ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options.
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
lib/librte_mbuf/rte_mbuf.h +16
-0+* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> */ #define +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** Quoted 8 lines
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 8 lines
lib/librte_mbuf/rte_mbuf.h +8
-0+* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain +extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87],
Quoted 112 lines
Quoted 111 lines
Quoted 94 lines
lib/librte_mbuf/rte_mbuf.h +94
-0+* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> */ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> */ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> */ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other +unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> */ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 +types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking +bit +4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 lib/librte_mbuf/rte_mbuf.h extern "C" {
Quoted 10 lines
lib/librte_mbuf/rte_mbuf.h +10
-0+types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking +bit +6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ #define +RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK)#endif
Quoted 6 lines
lib/librte_mbuf/rte_mbuf.h +2
-0+/* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *
PATCH v8 4/18 e1000: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/e1000/igb_rxtx.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/e1000/igb_rxtx.c +102 -0
@@ -590,6 +590,99 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IGB_PACKET_TYPE_IPV4 0X01 +#define IGB_PACKET_TYPE_IPV4_TCP 0X11 +#define IGB_PACKET_TYPE_IPV4_UDP 0X21 +#define IGB_PACKET_TYPE_IPV4_SCTP 0X41 +#define IGB_PACKET_TYPE_IPV4_EXT 0X03 +#define IGB_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IGB_PACKET_TYPE_IPV6 0X04 +#define IGB_PACKET_TYPE_IPV6_TCP 0X14 +#define IGB_PACKET_TYPE_IPV6_UDP 0X24 +#define IGB_PACKET_TYPE_IPV6_EXT 0X0C +#define IGB_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IGB_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IGB_PACKET_TYPE_IPV4_IPV6 0X05 +#define IGB_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IGB_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IGB_PACKET_TYPE_MAX 0X80 +#define IGB_PACKET_TYPE_MASK 0X7F +#define IGB_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +igb_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IGB_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IGB_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [IGB_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IGB_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [IGB_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IGB_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IGB_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &E1000_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IGB_PACKET_TYPE_SHIFT ) &IGB_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) +{ +uint64_t pkt_flags = ((hl_tp_rs &0x0F ) ==0 ) ?0 :PKT_RX_RSS_HASH ; + +#if defined(RTE_LIBRTE_IEEE1588 ) +static uint32_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ]; +#endif + +return pkt_flags; +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -617,6 +710,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | (((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH); } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -790,6 +884,10 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + rxm->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb.lower. + lo_dword.hs_rss.pkt_info); +#endif /* * Store the mbuf address into the next entry of the array
@@ -1024,6 +1122,10 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); first_seg->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + first_seg->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb. + lower.lo_dword.hs_rss.pkt_info); +#endif /* Prefetch data of first segment, if configured to do so. */ rte_packet_prefetch((char *)first_seg->buf_addr +
Signature · 1 line
1.9.3
PATCH v8 5/18 ixgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet type among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default. Note that around 2.5% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/ixgbe/ixgbe_rxtx.c +163 -0
@@ -860,6 +860,110 @@ end_of_tx:* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IXGBE_PACKET_TYPE_IPV4 0X01 +#define IXGBE_PACKET_TYPE_IPV4_TCP 0X11 +#define IXGBE_PACKET_TYPE_IPV4_UDP 0X21 +#define IXGBE_PACKET_TYPE_IPV4_SCTP 0X41 +#define IXGBE_PACKET_TYPE_IPV4_EXT 0X03 +#define IXGBE_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IXGBE_PACKET_TYPE_IPV6 0X04 +#define IXGBE_PACKET_TYPE_IPV6_TCP 0X14 +#define IXGBE_PACKET_TYPE_IPV6_UDP 0X24 +#define IXGBE_PACKET_TYPE_IPV6_EXT 0X0C +#define IXGBE_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IXGBE_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IXGBE_PACKET_TYPE_IPV4_IPV6 0X05 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IXGBE_PACKET_TYPE_MAX 0X80 +#define IXGBE_PACKET_TYPE_MASK 0X7F +#define IXGBE_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +ixgbe_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IXGBE_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 , + [IXGBE_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [IXGBE_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IXGBE_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IXGBE_PACKET_TYPE_SHIFT ) & +IXGBE_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +ixgbe_rxd_pkt_info_to_pkt_flags (uint16_t pkt_info) +{ + static uint64_t ip_rss_types_map[16] __rte_cache_aligned = { +0 ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH , +0 ,PKT_RX_RSS_HASH ,0 ,PKT_RX_RSS_HASH , +PKT_RX_RSS_HASH ,0 ,0 ,0 , +0 ,0 ,0 ,PKT_RX_FDIR , + }; +#ifdef RTE_LIBRTE_IEEE1588 +static uint64_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + +if (likely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return ip_pkt_etqf_map[(pkt_info >>4 ) &0X07 ] | + ip_rss_types_map[pkt_info &0XF ]; +else +return ip_rss_types_map[pkt_info &0XF ]; +#else +return ip_rss_types_map[pkt_info &0XF ]; +#endif +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -895,6 +999,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | ip_rss_types_map[hl_tp_rs & 0xF]; } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -950,7 +1055,13 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)struct rte_mbuf *mb;uint16_t pkt_len;uint64_t pkt_flags; +#ifdef RTE_NEXT_ABI +int nb_dd; +uint32_t s[LOOK_AHEAD ]; +uint16_t pkt_info[LOOK_AHEAD ]; +#else int s[LOOK_AHEAD ], nb_dd; +#endif /* RTE_NEXT_ABI */ int i, j, nb_rx =0 ;
@@ -973,6 +1084,12 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)for (j =LOOK_AHEAD -1 ; j >=0 ; --j) s[j] = rxdp[j].wb.upper.status_error; +#ifdef RTE_NEXT_ABI +for (j =LOOK_AHEAD -1 ; j >=0 ; --j) + pkt_info[j] = rxdp[j].wb.lower.lo_dword. + hs_rss.pkt_info; +#endif /* RTE_NEXT_ABI */ +/* Compute how many status bits were set */ nb_dd =0 ;for (j =0 ; j <LOOK_AHEAD ; ++j)
@@ -989,12 +1106,22 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq) mb->vlan_tci =rte_le_to_cpu_16 (rxdp[j].wb.upper.vlan);/* convert descriptor fields to rte mbuf flags */ +#ifdef RTE_NEXT_ABI + pkt_flags =rx_desc_status_to_pkt_flags (s[j]); + pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); + pkt_flags |= +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info[j]); + mb->ol_flags = pkt_flags; + mb->packet_type = +ixgbe_rxd_pkt_info_to_pkt_type (pkt_info[j]); +#else /* RTE_NEXT_ABI */ pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags ( rxdp[j].wb.lower.lo_dword.data);/* reuse status field from scan list */ pkt_flags |=rx_desc_status_to_pkt_flags (s[j]); pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); mb->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) mb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;
@@ -1211,7 +1338,11 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,union ixgbe_adv_rx_desc rxd;uint64_t dma_addr;uint32_t staterr; +#ifdef RTE_NEXT_ABI +uint32_t pkt_info; +#else uint32_t hlen_type_rss; +#endif uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx;
@@ -1329,6 +1460,19 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rxm->data_len = pkt_len; rxm->port = rxq->port_id; +#ifdef RTE_NEXT_ABI + pkt_info =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.hs_rss. + pkt_info); +/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ + rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan); + + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); + pkt_flags = pkt_flags | +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + rxm->ol_flags = pkt_flags; + rxm->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ hlen_type_rss =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.data);/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan);
@@ -1337,6 +1481,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
@@ -1410,6 +1555,23 @@ ixgbe_fill_cluster_head_buf( uint8_t port_id, uint32_t staterr) { +#ifdef RTE_NEXT_ABI +uint16_t pkt_info; +uint64_t pkt_flags; + + head->port = port_id; + +/* The vlan_tci field is only valid when PKT_RX_VLAN_PKT is +* set in the pkt_flags field. +*/ + head->vlan_tci =rte_le_to_cpu_16 (desc->wb.upper.vlan); + pkt_info =rte_le_to_cpu_32 (desc->wb.lower.lo_dword.hs_rss.pkt_info); + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags |=rx_desc_error_to_pkt_flags (staterr); + pkt_flags |=ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + head->ol_flags = pkt_flags; + head->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ uint32_t hlen_type_rss;uint64_t pkt_flags;
@@ -1425,6 +1587,7 @@ ixgbe_fill_cluster_head_buf( pkt_flags |=rx_desc_status_to_pkt_flags (staterr); pkt_flags |=rx_desc_error_to_pkt_flags (staterr); head->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) head->hash.rss =rte_le_to_cpu_32 (desc->wb.lower.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v8 6/18 i40e: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/i40e/i40e_rxtx.c | 528 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 528 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/i40e/i40e_rxtx.c +528 -0
@@ -176,6 +176,514 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)return flags; } +#ifdef RTE_NEXT_ABI +/* For each value it means, datasheet of hardware can tell more details */ +static inline uint32_t +i40e_rxd_pkt_type_mapping (uint8_t ptype) +{ + static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { +/* L2 types */ +/* [0] reserved */ + [1 ] =RTE_PTYPE_L2_MAC , + [2 ] =RTE_PTYPE_L2_MAC_TIMESYNC , +/* [3] - [5] reserved */ + [6 ] =RTE_PTYPE_L2_LLDP , +/* [7] - [10] reserved */ + [11 ] =RTE_PTYPE_L2_ARP , +/* [12] - [21] reserved */ + +/* Non tunneled IPv4 */ + [22 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [23 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [24 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [25] reserved */ + [26 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [27 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [28 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv4 --> IPv4 */ + [29 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [30 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [31 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [32] reserved */ + [33 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [34 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [35 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> IPv6 */ + [36 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [37 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [38 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [39] reserved */ + [40 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [41 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [42 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN */ + [43 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv4 */ + [44 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [45 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [46 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [47] reserved */ + [48 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [49 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [50 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv6 */ + [51 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [52 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [53 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [54] reserved */ + [55 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [56 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [57 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC */ + [58 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [59 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [60 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [61 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [62] reserved */ + [63 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [64 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [65 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [66 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [67 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [68 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [69] reserved */ + [70 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [71 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [72 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [73 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [74 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [75 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [76 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [77] reserved */ + [78 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [79 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [80 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [81 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [82 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [83 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [84] reserved */ + [85 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [86 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [87 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* Non tunneled IPv6 */ + [88 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [89 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [90 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [91] reserved */ + [92 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [93 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [94 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv6 --> IPv4 */ + [95 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [96 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [97 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [98] reserved */ + [99 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [100 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [101 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> IPv6 */ + [102 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [103 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [104 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [105] reserved */ + [106 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [107 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [108 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN */ + [109 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv4 */ + [110 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [111 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [112 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [113] reserved */ + [114 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [115 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [116 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv6 */ + [117 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [118 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [119 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [120] reserved */ + [121 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [122 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [123 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC */ + [124 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [125 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [126 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [127 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [128] reserved */ + [129 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [130 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [131 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [132 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [133 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [134 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [135] reserved */ + [136 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [137 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [138 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [139 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [140 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [141 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [142 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [143] reserved */ + [144 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [145 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [146 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [147 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [148 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [149 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [150] reserved */ + [151 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [152 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [153 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_MAC_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* All others reserved */ + }; + +return ptype_table[ptype]; +} +#else /* RTE_NEXT_ABI */ /* Translate pkt types to pkt flags */ static inline uint64_t i40e_rxd_ptype_to_pkt_flags (uint64_t qword)
@@ -443,6 +951,7 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword) return ip_ptype_map[ptype]; } +#endif /* RTE_NEXT_ABI */ #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03#define I40E_RX_DESC_EXT_STATUS_FLEXBH_FD_ID 0x01
@@ -730,11 +1239,18 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)i40e_rxd_to_vlan_tci (mb, &rxdp[j]); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + mb->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >> +I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); mb->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) mb->hash.rss =rte_le_to_cpu_32 (\ rxdp[j].wb.qword0.hi_dword.rss);
@@ -971,9 +1487,15 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)i40e_rxd_to_vlan_tci (rxm, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + rxm->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); rxm->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
@@ -1129,10 +1651,16 @@ i40e_recv_scattered_pkts(void *rx_queue,i40e_rxd_to_vlan_tci (first_seg, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + first_seg->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); first_seg->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v8 7/18 enic: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/enic/enic_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/enic/enic_main.c +26 -0
@@ -423,7 +423,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=PKT_RX_IP_CKSUM_BAD ;
@@ -432,7 +436,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Header split */ if (sop && !eop) {
@@ -445,7 +453,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, *rx_pkt_bucket = rx_pkt; rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=
@@ -457,13 +469,22 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Payload */ hdr_rx_pkt = *rx_pkt_bucket; hdr_rx_pkt->pkt_len += bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV4 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) hdr_rx_pkt->ol_flags |=
@@ -475,7 +496,12 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV6 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif } }
Signature · 1 line
1.9.3
PATCH v8 8/18 vmxnet3: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/vmxnet3/vmxnet3_rxtx.c +8 -0
@@ -649,9 +649,17 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth +1 ); if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr)) +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4_EXT ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR_EXT ; +#endif else +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!rcd->cnc) {if (!rcd->ipc)
Signature · 1 line
1.9.3
PATCH v8 9/18 fm10k: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/fm10k/fm10k_rxtx.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
v4 changes:
* Supported unified packet type of fm10k from v4.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/fm10k/fm10k_rxtx.c +27 -0
@@ -68,12 +68,37 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)static inline void rx_desc_to_ol_flags (struct rte_mbuf *m,const union fm10k_rx_desc *d) { +#ifdef RTE_NEXT_ABI +static const uint32_t + ptype_table[FM10K_RXD_PKTTYPE_MASK >>FM10K_RXD_PKTTYPE_SHIFT ] + __rte_cache_aligned = { + [FM10K_PKTTYPE_OTHER ] =RTE_PTYPE_L2_MAC , + [FM10K_PKTTYPE_IPV4 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV4 , + [FM10K_PKTTYPE_IPV4_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4_EXT , + [FM10K_PKTTYPE_IPV6 ] =RTE_PTYPE_L2_MAC |RTE_PTYPE_L3_IPV6 , + [FM10K_PKTTYPE_IPV6_EX ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6_EXT , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_MAC | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + }; + + m->packet_type = ptype_table[(d->w.pkt_info &FM10K_RXD_PKTTYPE_MASK ) + >>FM10K_RXD_PKTTYPE_SHIFT ]; +#else /* RTE_NEXT_ABI */ uint16_t ptype;static const uint16_t pt_lut[] = {0 ,PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT ,PKT_RX_IPV6_HDR ,PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 }; +#endif /* RTE_NEXT_ABI */ if (d->w.pkt_info &FM10K_RXD_RSSTYPE_MASK ) m->ol_flags |=PKT_RX_RSS_HASH ;
@@ -97,9 +122,11 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)if (unlikely (d->d.staterr &FM10K_RXD_STATUS_RXE )) m->ol_flags |=PKT_RX_RECIP_ERR ; +#ifndef RTE_NEXT_ABI ptype = (d->d.data &FM10K_RXD_PKTTYPE_MASK_L3 ) >>FM10K_RXD_PKTTYPE_SHIFT ; m->ol_flags |= pt_lut[(uint8_t )ptype]; +#endif }uint16_t
Signature · 1 line
1.9.3
PATCH v8 10/18 app/test-pipeline: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pipeline/pipeline_hash.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test-pipeline/pipeline_hash.c +13 -0
@@ -459,20 +459,33 @@ app_main_loop_rx_metadata(void) { signature =RTE_MBUF_METADATA_UINT32_PTR (m,0 ); key =RTE_MBUF_METADATA_UINT8_PTR (m,32 ); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif ip_hdr = (struct ipv4_hdr *) &m_data[sizeof (struct ether_hdr )]; ip_dst = ip_hdr->dst_addr; k32 = (uint32_t *) key; k32[0 ] = ip_dst &0xFFFFFF00 ; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif ipv6_hdr = (struct ipv6_hdr *) &m_data[sizeof (struct ether_hdr )]; ipv6_dst = ipv6_hdr->dst_addr;memcpy (key, ipv6_dst,16 ); +#ifdef RTE_NEXT_ABI + } else + continue; +#else } +#endif *signature =test_hash (key,0 ,0 ); }
Signature · 1 line
1.9.3
PATCH v8 11/18 app/testpmd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pmd/csumonly.c | 14 ++++ app/test-pmd/rxonly.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v4 changes:
* Added printing logs of packet types of each received packet in rxonly mode.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test-pmd/csumonly.c +14 -0
@@ -202,8 +202,14 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)/* Parse a vxlan header */ static void +#ifdef RTE_NEXT_ABI +parse_vxlan(struct udp_hdr *udp_hdr, + struct testpmd_offload_info *info, + uint32_t pkt_type) +#elseparse_vxlan (struct udp_hdr *udp_hdr,struct testpmd_offload_info *info, uint64_t mbuf_olflags) +#endif {struct ether_hdr *eth_hdr;
@@ -211,8 +217,12 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info,* (rfc7348) or that the rx offload flag is set (i40e only * currently) */ if (udp_hdr->dst_port != _htons(4789) && +#ifdef RTE_NEXT_ABI + RTE_ETH_IS_TUNNEL_PKT(pkt_type) == 0) +#else (mbuf_olflags & (PKT_RX_TUNNEL_IPV4_HDR | PKT_RX_TUNNEL_IPV6_HDR)) == 0) +#endif return ; info->is_tunnel =1 ;
@@ -549,7 +559,11 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)struct udp_hdr *udp_hdr; udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); +#ifdef RTE_NEXT_ABI +parse_vxlan (udp_hdr, &info, m->packet_type); +#else parse_vxlan (udp_hdr, &info, m->ol_flags); +#endif }else if (info.l4_proto ==IPPROTO_GRE ) {struct simple_gre_hdr *gre_hdr; gre_hdr = (struct simple_gre_hdr *)
app/test-pmd/rxonly.c +183 -0
211 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v8 12/18 app/test: Remove useless code
In reply to Helin ZhangSeverl useless code lines are added accidently, which blocks packet type unification. They should be deleted at all.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test/packet_burst_generator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
v4 changes:
* Removed several useless code lines which block packet type unification.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test/packet_burst_generator.c +4 -2
@@ -272,19 +272,21 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV4_HDR ; +#endif }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV6_HDR ; +#endif } pkts_burst[nb_pkt] = pkt;
Signature · 1 line
1.9.3
PATCH v8 13/18 examples/ip_fragmentation: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_fragmentation/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_fragmentation/main.c +9 -0
@@ -283,7 +283,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, len = qconf->tx_mbufs[port_out].len;/* if this is an IPv4 packet */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;/* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -317,9 +321,14 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,if (unlikely (len2 <0 ))return ; } +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if this is an IPv6 packet */ +#else }/* if this is an IPv6 packet */ else if (m->ol_flags &PKT_RX_IPV6_HDR ) { +#endif struct ipv6_hdr *ip_hdr; ipv6 =1 ;
Signature · 1 line
1.9.3
PATCH v8 14/18 examples/ip_reassembly: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_reassembly/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_reassembly/main.c +9 -0
@@ -356,7 +356,11 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid;/* if packet is IPv4 */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags & (PKT_RX_IPV4_HDR )) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;
@@ -396,9 +400,14 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type =rte_be_to_cpu_16 (ETHER_TYPE_IPv4); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if packet is IPv6 */ +#else }/* if packet is IPv6 */ else if (m->ol_flags & (PKT_RX_IPV6_HDR |PKT_RX_IPV6_HDR_EXT )) { +#endif struct ipv6_extension_fragment *frag_hdr;struct ipv6_hdr *ip_hdr;
Signature · 1 line
1.9.3
PATCH v8 15/18 examples/l3fwd-acl: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-acl/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-acl/main.c +23 -6
@@ -645,10 +645,13 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,struct ipv4_hdr *ipv4_hdr;struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(pkt, unsigned char *) + sizeof(struct ether_hdr));
@@ -667,9 +670,11 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,/* Not a valid IPv4 packet */ rte_pktmbuf_free (pkt); } - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -687,17 +692,22 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl, {struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv4[acl->num_ipv4] =MBUF_IPV4_2PROTO (pkt); acl->m_ipv4[(acl->num_ipv4)++] = pkt; - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -745,10 +755,17 @@ send_one_packet(struct rte_mbuf *m, uint32_t res)/* in the ACL list, drop it */ #ifdef L3FWDACL_DEBUG if ((res &ACL_DENY_SIGNATURE ) !=0 ) { +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) +dump_acl4_rule (m, res); +else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) +dump_acl6_rule (m, res); +#else if (m->ol_flags &PKT_RX_IPV4_HDR )dump_acl4_rule (m, res);else dump_acl6_rule (m, res); +#endif /* RTE_NEXT_ABI */ }#endif rte_pktmbuf_free (m);
Signature · 1 line
1.9.3
PATCH v8 16/18 examples/l3fwd-power: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-power/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-power/main.c +8 -0
@@ -635,7 +635,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char*)
@@ -670,8 +674,12 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,ether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ #if (APP_LOOKUP_METHOD ==APP_LOOKUP_EXACT_MATCH )struct ipv6_hdr *ipv6_hdr;
Signature · 1 line
1.9.3
PATCH v8 17/18 examples/l3fwd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd/main.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Minor bug fixes and enhancements.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd/main.c +120 -3
@@ -948,7 +948,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +sizeof (struct ether_hdr ));
@@ -979,8 +983,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr;
@@ -999,8 +1006,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else +/* Free the mbuf that contains non-IPV4/IPV6 packet */ +rte_pktmbuf_free (m); +#else } - +#endif }#ifdef DO_RFC_1812_CHECKS
@@ -1024,12 +1036,19 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon* to BAD_PORT value. */ static inline __attribute__((always_inline)) void +#ifdef RTE_NEXT_ABI +rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype) +#else rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags) +#endif {uint8_t ihl; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (ptype)) { +#else if ((flags &PKT_RX_IPV4_HDR ) !=0 ) { - +#endif ihl = ipv4_hdr->version_ihl -IPV4_MIN_VER_IHL ; ipv4_hdr->time_to_live--;
@@ -1059,11 +1078,19 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,struct ipv6_hdr *ipv6_hdr;struct ether_hdr *eth_hdr; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else if (pkt->ol_flags &PKT_RX_IPV4_HDR ) { +#endif if (rte_lpm_lookup (qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) !=0 ) next_hop = portid; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (pkt->ol_flags &PKT_RX_IPV6_HDR ) { +#endif eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr +1 ); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -1097,12 +1124,52 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, ve = val_eth[dp]; dst_port[0 ] = dp; +#ifdef RTE_NEXT_ABI +rfc1812_process (ipv4_hdr, dst_port, pkt->packet_type); +#else rfc1812_process (ipv4_hdr, dst_port, pkt->ol_flags); +#endif te =_mm_blend_epi16 (te, ve,MASK_ETH );_mm_store_si128 ((__m128i *)eth_hdr, te); } +#ifdef RTE_NEXT_ABI +/* +* Read packet_type and destination IPV4 addresses from 4 mbufs. +*/ +static inline void +processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ], +__m128i *dip, +uint32_t *ipv4_flag) +{ +struct ipv4_hdr *ipv4_hdr; +struct ether_hdr *eth_hdr; +uint32_t x0, x1, x2, x3; + + eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x0 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] = pkt[0 ]->packet_type &RTE_PTYPE_L3_IPV4 ; + + eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x1 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[1 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x2 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[2 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x3 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[3 ]->packet_type; + + dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); +} +#else /* RTE_NEXT_ABI */ /* * Read ol_flags and destination IPV4 addresses from 4 mbufs. */
@@ -1135,14 +1202,24 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); } +#endif /* RTE_NEXT_ABI */ /* * Lookup into LPM for destination port. * If lookup fails, use incoming port (portid) as destination port. */ static inline void +#ifdef RTE_NEXT_ABI +processx4_step2(const struct lcore_conf *qconf, + __m128i dip, + uint32_t ipv4_flag, + uint8_t portid, + struct rte_mbuf *pkt[FWDSTEP], + uint16_t dprt[FWDSTEP]) +#elseprocessx4_step2 (const struct lcore_conf *qconf, __m128i dip,uint32_t flag, uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP]) +#endif /* RTE_NEXT_ABI */ {rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
@@ -1152,7 +1229,11 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip =_mm_shuffle_epi8 (dip, bswap_mask);/* if all 4 packets are IPV4. */ +#ifdef RTE_NEXT_ABI +if (likely (ipv4_flag)) { +#else if (likely (flag !=0 )) { +#endif rte_lpm_lookupx4 (qconf->ipv4_lookup_struct, dip, dprt, portid); }else { dst.x = dip;
@@ -1202,6 +1283,16 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])_mm_store_si128 (p[2 ], te[2 ]);_mm_store_si128 (p[3 ], te[3 ]); +#ifdef RTE_NEXT_ABI +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), + &dst_port[0 ], pkt[0 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[1 ] +1 ), + &dst_port[1 ], pkt[1 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[2 ] +1 ), + &dst_port[2 ], pkt[2 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), + &dst_port[3 ], pkt[3 ]->packet_type); +#else /* RTE_NEXT_ABI */ rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), &dst_port[0 ], pkt[0 ]->ol_flags); rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1),
@@ -1210,6 +1301,7 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) &dst_port[2], pkt[2]->ol_flags);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), &dst_port[3 ], pkt[3 ]->ol_flags); +#endif /* RTE_NEXT_ABI */ }/*
@@ -1396,7 +1488,11 @@ main_loop(__attribute__((unused)) void *dummy)uint16_t *lp;uint16_t dst_port[MAX_PKT_BURST ];__m128i dip[MAX_PKT_BURST /FWDSTEP ]; +#ifdef RTE_NEXT_ABI +uint32_t ipv4_flag[MAX_PKT_BURST /FWDSTEP ]; +#else uint32_t flag[MAX_PKT_BURST /FWDSTEP ]; +#endif uint16_t pnum[MAX_PKT_BURST +1 ];#endif
@@ -1466,6 +1562,18 @@ main_loop(__attribute__((unused)) void *dummy)*/ int32_t n =RTE_ALIGN_FLOOR (nb_rx,4 );for (j =0 ; j < n ; j+=4 ) { +#ifdef RTE_NEXT_ABI +uint32_t pkt_type = + pkts_burst[j]->packet_type & + pkts_burst[j+1 ]->packet_type & + pkts_burst[j+2 ]->packet_type & + pkts_burst[j+3 ]->packet_type; +if (pkt_type &RTE_PTYPE_L3_IPV4 ) { +simple_ipv4_fwd_4pkts ( + &pkts_burst[j], portid, qconf); + }else if (pkt_type & +RTE_PTYPE_L3_IPV6 ) { +#else /* RTE_NEXT_ABI */ uint32_t ol_flag = pkts_burst[j]->ol_flags & pkts_burst[j+1 ]->ol_flags & pkts_burst[j+2 ]->ol_flags
@@ -1474,6 +1582,7 @@ main_loop(__attribute__((unused)) void *dummy)simple_ipv4_fwd_4pkts (&pkts_burst[j], portid, qconf); }else if (ol_flag &PKT_RX_IPV6_HDR ) { +#endif /* RTE_NEXT_ABI */ simple_ipv6_fwd_4pkts (&pkts_burst[j], portid, qconf); }else {
@@ -1498,13 +1607,21 @@ main_loop(__attribute__((unused)) void *dummy)for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step1 (&pkts_burst[j], &dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + &ipv4_flag[j /FWDSTEP ]); +#else &flag[j / FWDSTEP]); +#endif } k =RTE_ALIGN_FLOOR (nb_rx,FWDSTEP );for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step2 (qconf, dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + ipv4_flag[j /FWDSTEP ], portid, +#else flag[j /FWDSTEP ], portid, +#endif &pkts_burst[j], &dst_port[j]); }
Signature · 1 line
1.9.3
PATCH v8 18/18 mbuf: remove old packet type bit masks
In reply to Helin ZhangAs unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.c | 4 ++++ lib/librte_mbuf/rte_mbuf.h | 4 ++++ 2 files changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
* Redefined the bit masks for packet RX offload flags.
v5 changes:
* Rolled back the bit masks of RX flags, for ABI compatibility.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
lib/librte_mbuf/rte_mbuf.c +4 -0
@@ -251,14 +251,18 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */ /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */ /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */ +#ifndef RTE_NEXT_ABI case PKT_RX_IPV4_HDR :return "PKT_RX_IPV4_HDR" ;case PKT_RX_IPV4_HDR_EXT :return "PKT_RX_IPV4_HDR_EXT" ;case PKT_RX_IPV6_HDR :return "PKT_RX_IPV6_HDR" ;case PKT_RX_IPV6_HDR_EXT :return "PKT_RX_IPV6_HDR_EXT" ; +#endif /* RTE_NEXT_ABI */ case PKT_RX_IEEE1588_PTP :return "PKT_RX_IEEE1588_PTP" ;case PKT_RX_IEEE1588_TMST :return "PKT_RX_IEEE1588_TMST" ; +#ifndef RTE_NEXT_ABI case PKT_RX_TUNNEL_IPV4_HDR :return "PKT_RX_TUNNEL_IPV4_HDR" ;case PKT_RX_TUNNEL_IPV6_HDR :return "PKT_RX_TUNNEL_IPV6_HDR" ; +#endif /* RTE_NEXT_ABI */ default :return NULL ; } }
lib/librte_mbuf/rte_mbuf.h +4 -0
@@ -91,14 +91,18 @@ extern "C" {#define PKT_RX_HBUF_OVERFLOW (0ULL << 0)/**< Header buffer overflow. */ #define PKT_RX_RECIP_ERR (0ULL << 0)/**< Hardware processing error. */ #define PKT_RX_MAC_ERR (0ULL << 0)/**< MAC error. */ +#ifndef RTE_NEXT_ABI #define PKT_RX_IPV4_HDR (1ULL << 5)/**< RX packet with IPv4 header. */ #define PKT_RX_IPV4_HDR_EXT (1ULL << 6)/**< RX packet with extended IPv4 header. */ #define PKT_RX_IPV6_HDR (1ULL << 7)/**< RX packet with IPv6 header. */ #define PKT_RX_IPV6_HDR_EXT (1ULL << 8)/**< RX packet with extended IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_IEEE1588_PTP (1ULL << 9)/**< RX IEEE1588 L2 Ethernet PT Packet. */ #define PKT_RX_IEEE1588_TMST (1ULL << 10)/**< RX IEEE1588 L2/L4 timestamped packet.*/ +#ifndef RTE_NEXT_ABI #define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11)/**< RX tunnel packet with IPv4 header.*/ #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12)/**< RX tunnel packet with IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_FDIR_ID (1ULL << 13)/**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14)/**< Flexible bytes reported if FDIR match. */ #define PKT_RX_QINQ_PKT (1ULL << 15)/**< RX packet with double VLAN stripped. */
Signature · 1 line
1.9.3
Quoted 130 lines
-----Original Message-----
From: Zhang, Helin
Sent: Tuesday, June 23, 2015 2:50 AM
To: [email protected]
Cc: Cao, Waterman; Liang, Cunming; Liu, Jijiang; Ananyev, Konstantin; Richardson, Bruce; [email protected]; [email protected]; Wu, Jingjing; Zhang, Helin
Subject: [PATCH v8 00/18] unified packet typeCurrently only 6 bits which are stored in
ol_flagsare used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bitspacket_typein mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored inol_flagfield should be deleted at all, and 6 bits ofol_flagscan be save as the benifit.Initially, 32 bits of
packet_typecan be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of
RTE_NEXT_ABI. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.Note that this patch set should be integrated after another patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflict during integration. As both patch sets modified 'struct
rte_mbuf', and the final layout of the 'structrte_mbuf' is key to vectorized ixgbe PMD.v2 changes:
* Enlarged thepacket_typefield from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'structrte_kni_mbuf' for KNI according to the mbuf changes.
* Used redefined packet types and enlargedpacket_typefield for all PMDs and corresponding applications.
* Removed changes in bond and its relevant application, as there is no need at all according to the recent bond changes.v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unification fromapp/test/packet_burst_generator.c.v5 changes:
* Added more detailed description for each packet types, together with examples.
* Rolled back the macro definitions of RX packet flags, for ABI compitability.v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.v7 changes:
* RenamedRTE_UNIFIED_PKT_TYPEtoRTE_NEXT_ABI.
* Integrated with patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflicts during merging.v8 changes:
* Moved the field of 'vlan_tci_outer' in 'structrte_mbuf' to the end of the 1st cache line, to avoid breaking any vectorized PMD storing, as fields of 'packet_type,pkt_len,data_len,vlan_tci, rss' should be in an contiguous 128 bits.Helin Zhang (18):
mbuf: redefinepacket_typeinrte_mbuf
ixgbe: support unified packet type in vectorized PMD
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
mbuf: remove old packet type bit masksapp/test-pipeline/pipeline_hash.c | 13 + app/test-pmd/csumonly.c | 14 + app/test-pmd/rxonly.c | 183 +++++++ app/test/packet_burst_generator.c | 6 +- drivers/net/e1000/igb_rxtx.c | 102 ++++ drivers/net/enic/enic_main.c | 26 + drivers/net/fm10k/fm10k_rxtx.c | 27 ++ drivers/net/i40e/i40e_rxtx.c | 528 +++++++++++++++++++++ drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++ drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 ++- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 + examples/ip_fragmentation/main.c | 9 + examples/ip_reassembly/main.c | 9 + examples/l3fwd-acl/main.c | 29 +- examples/l3fwd-power/main.c | 8 + examples/l3fwd/main.c | 123 ++++- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 + lib/librte_mbuf/rte_mbuf.c | 4 + lib/librte_mbuf/rte_mbuf.h | 517 ++++++++++++++++++++ 19 files changed, 1837 insertions(+), 13 deletions(-)
Quoted 1 line
--
Quoted 1 line
1.9.3
Liu, Yong
Tested-by- Tested Commit: 7e1fa1de8a536c68f6af76cf8d222a9e948c93ba
- OS: Fedora20 3.15.5
- GCC: gcc version 4.8.3 20140911
- CPU: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
- NIC: Intel Corporation XL710 10-Gigabit SFI/SFP+ [8086:1572]
- NIC: Intel Corporation 82599ES 10-Gigabit SFI/SFP+ [8086:10fb]
- NIC: Intel Corporation I350 Gigabit Network Connection [8086:1521]
- Default x86_64-native-linuxapp-gcc configuration
- Prerequisites: Enable CONFIG_RTE_NEXT_ABI in dpdk configuration Disable CONFIG_RTE_IXGBE_INC_VECTOR in dpdk configuration
- Total 10 cases, 10 passed, 0 failed
- Case: L2 packet type detect
Description: check L2 only packet can be normally detected by Fortville Command / instruction:
Start testpmd and enable rxonly verbose mode
./x86_64-native-linuxapp-gcc/app/testpmd -c f -n 4 -- -i --txqflags=0x0
set fwd rxonly
set verbose 1
start
Send time sync packet and verify Timesync packet detected Send ARP packet and verify ARP packet detected
Send LLDP packet and verify LLDP packet detected
- Case: IPv4&L4 packet type detect
Description: check L3 and L4 packet can be normally detected
Fortville did not detect whether packet contian ipv4 header options, so L3 type will be shown as IPV4_EXT_UNKNOWN
Command / instruction:
Start testpmd and enable rxonly verbose mode
Send IP only packet and verify L3 packet detected
Send IP+UDP packet and verify L3&L4 packet detected
Send IP+TCP packet and verify L3&L4 packet detected
Send IP+SCTP packet and verify L3&L4 packet detected
Send IP+ICMP packet and verify L3&L4 packet detected
Send IP fragment+TCP packet and verify L3&L4 packet detected
- Case: IPv6&L4 packet type detect
Description: check IPv6 and L4 packet can be normally detected
Fortville did not detect whether packet contian ipv6 extension options, so L3 type will be shown as IPV6_EXT_UNKNOWN
Command / instruction:
Start testpmd and enable rxonly verbose mode
Send IPv6 only packet and verify L3 packet detected
Send IPv6+UDP packet and verify L3&L4 packet detected
Send IPv6+TCP packet and verify L3&L4 packet detected
Send IPv6 fragment+TCP packet and verify L3&L4 packet detected
- Case: IP in IPv4 tunnel packet type detect
Description: check tunnel packet can be normally detected by Fortville Command / instruction:
Send IPv4+IPv4 fragment packet and verify tunnel packet detected Send IPv4+IPv4 packet and verify tunnel packet detected Send IPv4+IPv4+UDP packet and verify tunnel packet detected Send IPv4+IPv4+TCP packet and verify tunnel packet detected Send IPv4+IPv4+SCTP packet and verify tunnel packet detected Send IPv4+IPv4+ICMP packet and verify tunnel packet detected Send IPv4+IPv6 fragment packet and verify tunnel packet detected Send IPv4+IPv6 packet and verify tunnel packet detected Send IPv4+IPv6+UDP packet and verify tunnel packet detected Send IPv4+IPv6+TCP packet and verify tunnel packet detected Send IPv4+IPv6+SCTP packet and verify tunnel packet detected Send IPv4+IPv6+ICMP packet and verify tunnel packet detected
- Case: IPv6 in IPv4 tunnel packet type detect by niantic
Description: check tunnel packet can be normally detected by Niantic
Niantic only can detect few types of ip in ip tunnel packets, this case designed to test them.
Command / instruction:
Send IPv4+IPv6 packet and verify tunnel packet detected Send IPv4+IPv6_EXT packet and verify tunnel packet detected Send IPv4+IPv6+UDP packet and verify tunnel packet detected Send IPv4+IPv6+TCP packet and verify tunnel packet detected Send IPv4+IPv6_EXT+UDP packet and verify tunnel packet detected Send IPv4+IPv6_EXT+TCP packet and verify tunnel packet detected
- Case: IP in IPv6 tunnel packet type detect
Description: check tunnel packet can be normally detected by Fortville Command / instruction:
Send IPv6+IPv4 fragment packet and verify tunnel packet detected Send IPv6+IPv4 packet and verify tunnel packet detected Send IPv6+IPv4+UDP packet and verify tunnel packet detected Send IPv6+IPv4+TCP packet and verify tunnel packet detected Send IPv6+IPv4+SCTP packet and verify tunnel packet detected Send IPv6+IPv4+ICMP packet and verify tunnel packet detected Send IPv6+IPv6 fragment packet and verify tunnel packet detected Send IPv6+IPv6 packet and verify tunnel packet detected Send IPv6+IPv6+UDP packet and verify tunnel packet detected Send IPv6+IPv6+TCP packet and verify tunnel packet detected Send IPv6+IPv6+SCTP packet and verify tunnel packet detected Send IPv6+IPv6+ICMP packet and verify tunnel packet detected
- Case: NVGRE tunnel packet type detect
Description: check tunnel packet can be normally detected by Fortville
Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types will be displayed as GRENAT
Command / instruction:
Send IPv4+NVGRE fragment packet and verify tunnel packet detected Send IPV4+NVGRE+MAC packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN+IPv4 fragment packet and verify tunnel packet detected
Send IPv4+NVGRE+MAC_VLAN+IPv4 packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN+IPv4+UDP packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN+IPv4+TCP packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN+IPv4+SCTP packet and verify tunnel packet detected
Send IPv4+NVGRE+MAC_VLAN+IPv4+ICMP packet and verify tunnel packet detected
Send IPv4+NVGRE+MAC_VLAN+IPv6+IPv6 fragment acket and verify tunnel packet detected
Send IPv4+NVGRE+MAC_VLAN+IPv6 packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN+IPv6+UDP packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN+IPv6+TCP packet and verify tunnel packet detected Send IPv4+NVGRE+MAC_VLAN+IPv6+SCTP packet and verify tunnel packet detected
Send IPv4+NVGRE+MAC_VLAN+IPv6+ICMP packet and verify tunnel packet detected
- Case: NVGRE in IPv6 tunnel packet type detect
Description: check tunnel packet can be normally detected by Fortville
Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types will be displayed as GRENAT
Command / instruction:
Send IPV6+NVGRE+MAC packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv4 fragment packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv4 packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv4+UDP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv4+TCP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv4+SCTP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv4+ICMP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv6 fragment packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv6 packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv6+UDP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv6+TCP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv6+SCTP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC+IPv6+ICMP packet and verify tunnel packet detected
Send IPV6+NVGRE+MAC_VLAN+IPv4 fragment packet and verify tunnel packet detected
Send IPV6+NVGRE+MAC_VLAN+IPv4 packet and verify tunnel packet detected Send IPV6+NVGRE+MAC_VLAN+IPv4+UDP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC_VLAN+IPv4+TCP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC_VLAN+IPv4+SCTP packet and verify tunnel packet detected
Send IPV6+NVGRE+MAC_VLAN+IPv4+ICMP packet and verify tunnel packet detected
Send IPV6+NVGRE+MAC_VLAN+IPv6 fragment packet and verify tunnel packet detected
Send IPV6+NVGRE+MAC_VLAN+IPv6 packet and verify tunnel packet detected Send IPV6+NVGRE+MAC_VLAN+IPv6+UDP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC_VLAN+IPv6+TCP packet and verify tunnel packet detected Send IPV6+NVGRE+MAC_VLAN+IPv6+SCTP packet and verify tunnel packet detected
Send IPV6+NVGRE+MAC_VLAN+IPv6+ICMP packet and verify tunnel packet detected
Send IPV6+NVGRE+MAC_VLAN+IPv6 fragment packet and verify tunnel packet detected
- Case: GRE tunnel packet type detect
Description: check tunnel packet can be normally detected by Fortville
Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types will be displayed as GRENAT
Command / instruction:
Send IPv4+GRE+IPv4 fragment packet and verify tunnel packet detected Send IPv4+GRE+IPv4 packet and verify tunnel packet detected Send IPv4+GRE+IPv4+UDP packet and verify tunnel packet detected Send IPv4+GRE+IPv4+TCP packet and verify tunnel packet detected Send IPv4+GRE+IPv4+SCTP packet and verify tunnel packet detected Send IPv4+GRE+IPv4+ICMP packet and verify tunnel packet detected Send IPv4+GRE packet and verify tunnel packet detected
- Case: Vxlan tunnel packet type detect
Description: check tunnel packet can be normally detected by Fortville
Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types will be displayed as GRENAT
Command / instruction:
Add vxlan tunnle port filter on receive port
rx_vxlan_port add 4789 0
Send IPv4+Vxlan+MAC+IPv4 fragment packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv4 packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv4+UDP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv4+TCP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv4+SCTP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv4+ICMP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv6 fragment packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv6 packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv6+UDP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv6+TCP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv6+SCTP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC+IPv6+ICMP packet and verify tunnel packet detected Send IPv4+Vxlan+MAC packet and verify tunnel packet detected
Quoted 171 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Ananyev, Konstantin
Sent: Wednesday, June 24, 2015 12:14 AM
To: Zhang, Helin; [email protected]
Subject: Re: [dpdk-dev] [PATCH v8 00/18] unified packet typeQuoted 5 lines
-----Original Message-----
From: Zhang, Helin
Sent: Tuesday, June 23, 2015 2:50 AM
To: [email protected]
Cc: Cao, Waterman; Liang, Cunming; Liu, Jijiang; Ananyev, Konstantin;Richardson, Bruce; [email protected];
Quoted 4 lines
[email protected]; Wu, Jingjing; Zhang, Helin
Subject: [PATCH v8 00/18] unified packet typeCurrently only 6 bits which are stored in
ol_flagsare used to indicatethe
Quoted 1 line
packet types. This is not enough, as some NIC hardware can recognize
quite
Quoted 1 line
a lot of packet types, e.g i40e hardware can recognize more than 150
packet
Quoted 1 line
types. Hiding those packet types hides hardware offload capabilities
which
Quoted 3 lines
could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bits
packet_typein mbuf structure can be changed to 32 bits and usedfor
Quoted 1 line
this purpose. In addition, all packet types stored in
ol_flagfieldshould
Quoted 3 lines
be deleted at all, and 6 bits of
ol_flagscan be save as the benifit.Initially, 32 bits of
packet_typecan be divided into several sub fieldsto
Quoted 1 line
indicate different packet type information of a packet. The initial
design
Quoted 1 line
is to divide those bits into fields for L2 types, L3 types, L4 types,
tunnel
Quoted 1 line
types, inner L2 types, inner L3 types and inner L4 types. All PMDs
should
Quoted 1 line
translate the offloaded packet types into these 7 fields of information,
for
Quoted 4 lines
user applications.
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can
enable
Quoted 1 line
it manually by defining the macro of
RTE_NEXT_ABI. The code changes willbe
Quoted 1 line
valid by default in a future release, and the old version will be
deleted
Quoted 3 lines
accordingly, after the ABI change process is done.
Note that this patch set should be integrated after another patch set
for
Quoted 1 line
'[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly
solve
Quoted 1 line
the conflict during integration. As both patch sets modified 'struct
rte_mbuf',Quoted 1 line
and the final layout of the 'struct
rte_mbuf' is key to vectorized ixgbePMD.
Quoted 5 lines
v2 changes:
* Enlarged thepacket_typefield from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'structrte_kni_mbuf' for KNI according to the mbufchanges.
Quoted 1 line
* Used redefined packet types and enlarged
packet_typefield for allPMDs
Quoted 2 lines
and corresponding applications.
* Removed changes in bond and its relevant application, as there is noneed
Quoted 10 lines
at all according to the recent bond changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.Quoted 6 lines
v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unificationfrom
Quoted 4 lines
app/test/packet_burst_generator.c.v5 changes:
* Added more detailed description for each packet types, together withexamples.
Quoted 1 line
* Rolled back the macro definitions of RX packet flags, for ABI
compitability.
Quoted 8 lines
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.v7 changes:
* RenamedRTE_UNIFIED_PKT_TYPEtoRTE_NEXT_ABI.
* Integrated with patch set for '[PATCH v3 0/7] support i40e QinQstripping
Quoted 4 lines
and insertion', to clearly solve the conflicts during merging.
v8 changes:
* Moved the field of 'vlan_tci_outer' in 'structrte_mbuf' to the end ofthe 1st
Quoted 2 lines
cache line, to avoid breaking any vectorized PMD storing, as fields of '
packet_type,pkt_len,data_len,vlan_tci, rss' should be in ancontiguous 128
Quoted 29 lines
bits.
Helin Zhang (18):
mbuf: redefinepacket_typeinrte_mbuf
ixgbe: support unified packet type in vectorized PMD
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
mbuf: remove old packet type bit masksQuoted 8 lines
app/test-pipeline/pipeline_hash.c | 13 + app/test-pmd/csumonly.c | 14 + app/test-pmd/rxonly.c | 183 +++++++ app/test/packet_burst_generator.c | 6 +- drivers/net/e1000/igb_rxtx.c | 102 ++++ drivers/net/enic/enic_main.c | 26 + drivers/net/fm10k/fm10k_rxtx.c | 27 ++ drivers/net/i40e/i40e_rxtx.c | 528+++++++++++++++++++++
Quoted 11 lines
drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++ drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 ++- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 + examples/ip_fragmentation/main.c | 9 + examples/ip_reassembly/main.c | 9 + examples/l3fwd-acl/main.c | 29 +- examples/l3fwd-power/main.c | 8 + examples/l3fwd/main.c | 123 ++++- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 + lib/librte_mbuf/rte_mbuf.c | 4 + lib/librte_mbuf/rte_mbuf.h | 517++++++++++++++++++++
Quoted 3 lines
19 files changed, 1837 insertions(+), 13 deletions(-)--
Quoted 1 line
1.9.3
v9 cover unified packet type
In reply to Helin ZhangCurrently only 6 bits which are stored in ol_flags are used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bits packet_type in mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored in ol_flag field should be deleted at all, and 6 bits of ol_flags can be save as the benifit.
Initially, 32 bits of packet_type can be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of RTE_NEXT_ABI. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.
Note that this patch set should be integrated after another patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflict during integration. As both patch sets modified 'struct rte_mbuf', and the final layout of the 'struct rte_mbuf' is key to vectorized ixgbe PMD.
Its v8 version was acked by Konstantin Ananyev <[email protected]>
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
* Used redefined packet types and enlarged packet_type field for all PMDs and corresponding applications.
* Removed changes in bond and its relevant application, as there is no need at all according to the recent bond changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.
v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unification from app/test/packet_burst_generator.c.
v5 changes:
* Added more detailed description for each packet types, together with examples.
* Rolled back the macro definitions of RX packet flags, for ABI compitability.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflicts during merging.
v8 changes:
* Moved the field of 'vlan_tci_outer' in 'struct rte_mbuf' to the end of the 1st cache line, to avoid breaking any vectorized PMD storing, as fields of 'packet_type, pkt_len, data_len, vlan_tci, rss' should be in an contiguous 128 bits.
v9 changes:
* Put the mbuf changes and vector PMD changes together, as they are tightly relevant.
* Renamed MAC to ETHER in packet type names.
* Corrected the packet type explanation of RTE_PTYPE_L2_ETHER.
* Reworked newly added cxgbe driver and tep_termination example application to support unified packet type, which is disabled by default.
Helin Zhang (19):
mbuf: redefine packet_type in rte_mbuf
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type
cxgbe: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
examples/tep_termination: replace bit mask based packet type with
unified packet type
mbuf: remove old packet type bit masks
app/test-pipeline/pipeline_hash.c | 13 + app/test-pmd/csumonly.c | 14 + app/test-pmd/rxonly.c | 183 +++++++ app/test/packet_burst_generator.c | 6 +- drivers/net/cxgbe/sge.c | 8 + drivers/net/e1000/igb_rxtx.c | 104 ++++ drivers/net/enic/enic_main.c | 26 + drivers/net/fm10k/fm10k_rxtx.c | 27 + drivers/net/i40e/i40e_rxtx.c | 554 +++++++++++++++++++++ drivers/net/ixgbe/ixgbe_rxtx.c | 163 ++++++ drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 ++- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 + examples/ip_fragmentation/main.c | 9 + examples/ip_reassembly/main.c | 9 + examples/l3fwd-acl/main.c | 29 +- examples/l3fwd-power/main.c | 8 + examples/l3fwd/main.c | 123 ++++- examples/tep_termination/vxlan.c | 4 + .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 + lib/librte_mbuf/rte_mbuf.c | 4 + lib/librte_mbuf/rte_mbuf.h | 516 +++++++++++++++++++ 21 files changed, 1876 insertions(+), 13 deletions(-)
Signature · 1 line
1.9.3
PATCH v9 1/19 mbuf: redefine packet_type in rte_mbuf
In order to unify the packet type, the field of 'packet_type' in 'struct rte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'struct rte_mbuf' are re-organized to support this change for Vector PMD. As 'struct rte_kni_mbuf' for KNI should be right mapped to 'struct rte_mbuf', it should be modified accordingly. In ixgbe PMD driver, corresponding changes are added for the mbuf changes, especially the bit masks of packet type for 'ol_flags' are replaced by unified packet type. In addition, more packet types (UDP, TCP and SCTP) are supported in vectorized ixgbe PMD. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
Note that around 2% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 +++++++++++++++++++++- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 ++ lib/librte_mbuf/rte_mbuf.h | 26 ++++++++ 3 files changed, 105 insertions(+), 2 deletions(-)
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with changes of QinQ stripping/insertion.
v8 changes:
* Moved the field of 'vlan_tci_outer' in 'struct rte_mbuf' to the end of the 1st cache line, to avoid breaking any vectorized PMD storing.
v9 changes:
* Put the mbuf changes and vector PMD changes together, as they are tightly relevant.
drivers/net/ixgbe/ixgbe_rxtx_vec.c +73 -2
@@ -134,6 +134,12 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq)*/ #ifdef RTE_IXGBE_RX_OLFLAGS_ENABLE +#ifdef RTE_NEXT_ABI +#define OLFLAGS_MASK_V (((uint64_t)PKT_RX_VLAN_PKT << 48) | \ + ((uint64_t)PKT_RX_VLAN_PKT << 32) | \ + ((uint64_t)PKT_RX_VLAN_PKT << 16) | \ + ((uint64_t)PKT_RX_VLAN_PKT)) +#else #define OLFLAGS_MASK ((uint16_t)(PKT_RX_VLAN_PKT | PKT_RX_IPV4_HDR |\ PKT_RX_IPV4_HDR_EXT | PKT_RX_IPV6_HDR |\ PKT_RX_IPV6_HDR_EXT))
@@ -142,11 +148,26 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq) ((uint64_t)OLFLAGS_MASK << 16) | \ ((uint64_t)OLFLAGS_MASK))#define PTYPE_SHIFT (1) +#endif /* RTE_NEXT_ABI */ +#define VTAG_SHIFT (3)static inline void desc_to_olflags_v (__m128i descs[4 ],struct rte_mbuf **rx_pkts) { +#ifdef RTE_NEXT_ABI +__m128i vtag0, vtag1; +union { +uint16_t e[4 ]; +uint64_t dword; + } vol; + + vtag0 =_mm_unpackhi_epi16 (descs[0 ], descs[1 ]); + vtag1 =_mm_unpackhi_epi16 (descs[2 ], descs[3 ]); + vtag1 =_mm_unpacklo_epi32 (vtag0, vtag1); + vtag1 =_mm_srli_epi16 (vtag1,VTAG_SHIFT ); + vol.dword =_mm_cvtsi128_si64 (vtag1) &OLFLAGS_MASK_V ; +#else __m128i ptype0, ptype1, vtag0, vtag1; union { uint16_t e[4];
@@ -166,6 +187,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts) ptype1 =_mm_or_si128 (ptype1, vtag1); vol.dword =_mm_cvtsi128_si64 (ptype1) &OLFLAGS_MASK_V ; +#endif /* RTE_NEXT_ABI */ rx_pkts[0 ]->ol_flags = vol.e[0 ]; rx_pkts[1 ]->ol_flags = vol.e[1 ];
@@ -196,6 +218,18 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,int pos;uint64_t var;__m128i shuf_msk; +#ifdef RTE_NEXT_ABI +__m128i crc_adjust =_mm_set_epi16 ( +0 ,0 ,0 ,/* ignore non-length fields */ + -rxq->crc_len,/* sub crc on data_len */ +0 ,/* ignore high-16bits of pkt_len */ + -rxq->crc_len,/* sub crc on pkt_len */ +0 ,0 /* ignore pkt_type field */ + ); +__m128i dd_check, eop_check; +__m128i desc_mask =_mm_set_epi32 (0xFFFFFFFF ,0xFFFFFFFF , +0xFFFFFFFF ,0xFFFF07F0 ); +#else __m128i crc_adjust = _mm_set_epi16( 0, 0, 0, 0, /* ignore non-length fields */ 0, /* ignore high-16bits of pkt_len */
@@ -204,6 +238,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,0 /* ignore pkt_type field */ );__m128i dd_check, eop_check; +#endif /* RTE_NEXT_ABI */ if (unlikely (nb_pkts <RTE_IXGBE_VPMD_RX_BURST ))return 0 ;
@@ -232,6 +267,18 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts, eop_check =_mm_set_epi64x (0x0000000200000002LL ,0x0000000200000002LL );/* mask to shuffle from desc. to mbuf */ +#ifdef RTE_NEXT_ABI + shuf_msk =_mm_set_epi8 ( +7 ,6 ,5 ,4 ,/* octet 4~7, 32bits rss */ +15 ,14 ,/* octet 14~15, low 16 bits vlan_macip */ +13 ,12 ,/* octet 12~13, 16 bits data_len */ +0xFF ,0xFF ,/* skip high 16 bits pkt_len, zero out */ +13 ,12 ,/* octet 12~13, low 16 bits pkt_len */ +0xFF ,0xFF ,/* skip high 16 bits pkt_type */ +1 ,/* octet 1, 8 bits pkt_type field */ +0 /* octet 0, 4 bits offset 4 pkt_type field */ + ); +#else shuf_msk = _mm_set_epi8( 7, 6, 5, 4, /* octet 4~7, 32bits rss */ 0xFF, 0xFF, /* skip high 16 bits vlan_macip, zero out */
@@ -241,18 +288,28 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,13 ,12 ,/* octet 12~13, 16 bits data_len */ 0xFF ,0xFF /* skip pkt_type field */ ); +#endif /* RTE_NEXT_ABI */ /* Cache is empty -> need to scan the buffer rings, but first move * the next 'n' mbufs into the cache */ sw_ring = &rxq->sw_ring[rxq->rx_tail]; -/* -* A. load 4 packet in one loop +#ifdef RTE_NEXT_ABI +/* A. load 4 packet in one loop +* [A*. mask out 4 unused dirty field in desc] * B. copy 4 mbuf point from swring to rx_pkts * C. calc the number of DD bits among the 4 packets * [C*. extract the end-of-packet bit, if requested] * D. fill info. from desc to mbuf */ +#else +/* A. load 4 packet in one loop +* B. copy 4 mbuf point from swring to rx_pkts +* C. calc the number of DD bits among the 4 packets +* [C*. extract the end-of-packet bit, if requested] +* D. fill info. from desc to mbuf +*/ +#endif /* RTE_NEXT_ABI */ for (pos =0 , nb_pkts_recd =0 ; pos <RTE_IXGBE_VPMD_RX_BURST ; pos +=RTE_IXGBE_DESCS_PER_LOOP , rxdp +=RTE_IXGBE_DESCS_PER_LOOP ) {
@@ -289,6 +346,16 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,/* B.2 copy 2 mbuf point into rx_pkts */ _mm_storeu_si128 ((__m128i *)&rx_pkts[pos+2 ], mbp2); +#ifdef RTE_NEXT_ABI +/* A* mask out 0~3 bits RSS type */ + descs[3 ] =_mm_and_si128 (descs[3 ], desc_mask); + descs[2 ] =_mm_and_si128 (descs[2 ], desc_mask); + +/* A* mask out 0~3 bits RSS type */ + descs[1 ] =_mm_and_si128 (descs[1 ], desc_mask); + descs[0 ] =_mm_and_si128 (descs[0 ], desc_mask); +#endif /* RTE_NEXT_ABI */ +/* avoid compiler reorder optimization */ rte_compiler_barrier ();
@@ -301,7 +368,11 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,/* C.1 4=>2 filter staterr info only */ sterr_tmp1 =_mm_unpackhi_epi32 (descs[1 ], descs[0 ]); +#ifdef RTE_NEXT_ABI +/* set ol_flags with vlan packet type */ +#else /* set ol_flags with packet type and vlan tag */ +#endif /* RTE_NEXT_ABI */ desc_to_olflags_v (descs, &rx_pkts[pos]);/* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +6 -0
@@ -117,9 +117,15 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ +#ifdef RTE_NEXT_ABI +char pad2[4 ]; +uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +#else char pad2[2 ];uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +#endif /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));
lib/librte_mbuf/rte_mbuf.h +26 -0
@@ -276,6 +276,28 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; +#ifdef RTE_NEXT_ABI +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. +*/ +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; + +uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ +#else /* RTE_NEXT_ABI */ /** * The packet type, which is used to indicate ordinary packet and also * tunneled packet format, i.e. each number is represented a type of
@@ -287,6 +309,7 @@ struct rte_mbuf {uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ uint16_t vlan_tci_outer;/**< Outer VLAN Tag Control Identifier (CPU order) */ +#endif /* RTE_NEXT_ABI */ union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
@@ -307,6 +330,9 @@ struct rte_mbuf { } hash;/**< hash information */ uint32_t seqn;/**< Sequence number. See also rte_reorder_insert() */ +#ifdef RTE_NEXT_ABI +uint16_t vlan_tci_outer;/**< Outer VLAN Tag Control Identifier (CPU order) */ +#endif /* RTE_NEXT_ABI */ /* second cache line - fields only used in slow path or on TX */ MARKER cacheline1 __rte_cache_aligned;
Signature · 1 line
1.9.3
PATCH v9 2/19 mbuf: add definitions of unified packet types
In reply to Helin ZhangAs there are only 6 bit flags in ol_flags for indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'struct rte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.h | 486 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 486 insertions(+)
v3 changes:
* Put the definitions of unified packet type into a single patch.
v4 changes:
* Added detailed description of each packet types.
v5 changes:
* Re-worded the commit logs.
* Added more detailed description for all packet types, together with examples.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
* Corrected the packet type explanation of RTE_PTYPE_L2_ETHER.
lib/librte_mbuf/rte_mbuf.h +486 -0
@@ -202,6 +202,492 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */ +#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 header from +* performance point of view. Reading annotations of RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by different +* hardware may be different, as different hardware may have different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_ETHER | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_ETHER | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** +* Ethernet packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD]> +*/ +#define RTE_PTYPE_L2_ETHER 0x00000001 +/** +* Ethernet packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_ETHER_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ETHER_ARP 0x00000003 +/** +* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_ETHER_LLDP 0x00000004 +/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be recognized as +* fragmented. A fragmented packet cannot be recognized as any other L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> +*/ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local Area +* Network) or GRE (Generic Routing Encapsulation) could be recognized as this +* packet type, if they can not be recognized independently as of hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* Ethernet packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_ETHER 0x00010000 +/** +* Ethernet packet type with VLAN (Virtual Local Area Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> +*/ +#define RTE_PTYPE_INNER_L2_ETHER_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit 6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ +#define RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK) +#endif /* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *
Signature · 1 line
1.9.3
PATCH v9 3/19 e1000: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/e1000/igb_rxtx.c | 104 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/e1000/igb_rxtx.c +104 -0
@@ -590,6 +590,101 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IGB_PACKET_TYPE_IPV4 0X01 +#define IGB_PACKET_TYPE_IPV4_TCP 0X11 +#define IGB_PACKET_TYPE_IPV4_UDP 0X21 +#define IGB_PACKET_TYPE_IPV4_SCTP 0X41 +#define IGB_PACKET_TYPE_IPV4_EXT 0X03 +#define IGB_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IGB_PACKET_TYPE_IPV6 0X04 +#define IGB_PACKET_TYPE_IPV6_TCP 0X14 +#define IGB_PACKET_TYPE_IPV6_UDP 0X24 +#define IGB_PACKET_TYPE_IPV6_EXT 0X0C +#define IGB_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IGB_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IGB_PACKET_TYPE_IPV4_IPV6 0X05 +#define IGB_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IGB_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IGB_PACKET_TYPE_MAX 0X80 +#define IGB_PACKET_TYPE_MASK 0X7F +#define IGB_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +igb_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IGB_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IGB_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 , + [IGB_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT , + [IGB_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 , + [IGB_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IGB_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IGB_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &E1000_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IGB_PACKET_TYPE_SHIFT ) &IGB_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) +{ +uint64_t pkt_flags = ((hl_tp_rs &0x0F ) ==0 ) ?0 :PKT_RX_RSS_HASH ; + +#if defined(RTE_LIBRTE_IEEE1588 ) +static uint32_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ]; +#endif + +return pkt_flags; +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -617,6 +712,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | (((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH); } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -790,6 +886,10 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + rxm->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb.lower. + lo_dword.hs_rss.pkt_info); +#endif /* * Store the mbuf address into the next entry of the array
@@ -1024,6 +1124,10 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); first_seg->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + first_seg->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb. + lower.lo_dword.hs_rss.pkt_info); +#endif /* Prefetch data of first segment, if configured to do so. */ rte_packet_prefetch((char *)first_seg->buf_addr +
Signature · 1 line
1.9.3
PATCH v9 4/19 ixgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet type among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default. Note that around 2.5% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/ixgbe/ixgbe_rxtx.c +163 -0
@@ -860,6 +860,110 @@ end_of_tx:* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IXGBE_PACKET_TYPE_IPV4 0X01 +#define IXGBE_PACKET_TYPE_IPV4_TCP 0X11 +#define IXGBE_PACKET_TYPE_IPV4_UDP 0X21 +#define IXGBE_PACKET_TYPE_IPV4_SCTP 0X41 +#define IXGBE_PACKET_TYPE_IPV4_EXT 0X03 +#define IXGBE_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IXGBE_PACKET_TYPE_IPV6 0X04 +#define IXGBE_PACKET_TYPE_IPV6_TCP 0X14 +#define IXGBE_PACKET_TYPE_IPV6_UDP 0X24 +#define IXGBE_PACKET_TYPE_IPV6_EXT 0X0C +#define IXGBE_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IXGBE_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IXGBE_PACKET_TYPE_IPV4_IPV6 0X05 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IXGBE_PACKET_TYPE_MAX 0X80 +#define IXGBE_PACKET_TYPE_MASK 0X7F +#define IXGBE_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +ixgbe_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IXGBE_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 , + [IXGBE_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT , + [IXGBE_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IXGBE_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IXGBE_PACKET_TYPE_SHIFT ) & +IXGBE_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +ixgbe_rxd_pkt_info_to_pkt_flags (uint16_t pkt_info) +{ + static uint64_t ip_rss_types_map[16] __rte_cache_aligned = { +0 ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH , +0 ,PKT_RX_RSS_HASH ,0 ,PKT_RX_RSS_HASH , +PKT_RX_RSS_HASH ,0 ,0 ,0 , +0 ,0 ,0 ,PKT_RX_FDIR , + }; +#ifdef RTE_LIBRTE_IEEE1588 +static uint64_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + +if (likely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return ip_pkt_etqf_map[(pkt_info >>4 ) &0X07 ] | + ip_rss_types_map[pkt_info &0XF ]; +else +return ip_rss_types_map[pkt_info &0XF ]; +#else +return ip_rss_types_map[pkt_info &0XF ]; +#endif +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -895,6 +999,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | ip_rss_types_map[hl_tp_rs & 0xF]; } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -950,7 +1055,13 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)struct rte_mbuf *mb;uint16_t pkt_len;uint64_t pkt_flags; +#ifdef RTE_NEXT_ABI +int nb_dd; +uint32_t s[LOOK_AHEAD ]; +uint16_t pkt_info[LOOK_AHEAD ]; +#else int s[LOOK_AHEAD ], nb_dd; +#endif /* RTE_NEXT_ABI */ int i, j, nb_rx =0 ;
@@ -973,6 +1084,12 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)for (j =LOOK_AHEAD -1 ; j >=0 ; --j) s[j] = rxdp[j].wb.upper.status_error; +#ifdef RTE_NEXT_ABI +for (j =LOOK_AHEAD -1 ; j >=0 ; --j) + pkt_info[j] = rxdp[j].wb.lower.lo_dword. + hs_rss.pkt_info; +#endif /* RTE_NEXT_ABI */ +/* Compute how many status bits were set */ nb_dd =0 ;for (j =0 ; j <LOOK_AHEAD ; ++j)
@@ -989,12 +1106,22 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq) mb->vlan_tci =rte_le_to_cpu_16 (rxdp[j].wb.upper.vlan);/* convert descriptor fields to rte mbuf flags */ +#ifdef RTE_NEXT_ABI + pkt_flags =rx_desc_status_to_pkt_flags (s[j]); + pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); + pkt_flags |= +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info[j]); + mb->ol_flags = pkt_flags; + mb->packet_type = +ixgbe_rxd_pkt_info_to_pkt_type (pkt_info[j]); +#else /* RTE_NEXT_ABI */ pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags ( rxdp[j].wb.lower.lo_dword.data);/* reuse status field from scan list */ pkt_flags |=rx_desc_status_to_pkt_flags (s[j]); pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); mb->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) mb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;
@@ -1211,7 +1338,11 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,union ixgbe_adv_rx_desc rxd;uint64_t dma_addr;uint32_t staterr; +#ifdef RTE_NEXT_ABI +uint32_t pkt_info; +#else uint32_t hlen_type_rss; +#endif uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx;
@@ -1329,6 +1460,19 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rxm->data_len = pkt_len; rxm->port = rxq->port_id; +#ifdef RTE_NEXT_ABI + pkt_info =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.hs_rss. + pkt_info); +/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ + rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan); + + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); + pkt_flags = pkt_flags | +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + rxm->ol_flags = pkt_flags; + rxm->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ hlen_type_rss =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.data);/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan);
@@ -1337,6 +1481,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
@@ -1410,6 +1555,23 @@ ixgbe_fill_cluster_head_buf( uint8_t port_id, uint32_t staterr) { +#ifdef RTE_NEXT_ABI +uint16_t pkt_info; +uint64_t pkt_flags; + + head->port = port_id; + +/* The vlan_tci field is only valid when PKT_RX_VLAN_PKT is +* set in the pkt_flags field. +*/ + head->vlan_tci =rte_le_to_cpu_16 (desc->wb.upper.vlan); + pkt_info =rte_le_to_cpu_32 (desc->wb.lower.lo_dword.hs_rss.pkt_info); + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags |=rx_desc_error_to_pkt_flags (staterr); + pkt_flags |=ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + head->ol_flags = pkt_flags; + head->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ uint32_t hlen_type_rss;uint64_t pkt_flags;
@@ -1425,6 +1587,7 @@ ixgbe_fill_cluster_head_buf( pkt_flags |=rx_desc_status_to_pkt_flags (staterr); pkt_flags |=rx_desc_error_to_pkt_flags (staterr); head->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) head->hash.rss =rte_le_to_cpu_32 (desc->wb.lower.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v9 5/19 i40e: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/i40e/i40e_rxtx.c | 554 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 554 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/i40e/i40e_rxtx.c +554 -0
@@ -176,6 +176,540 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)return flags; } +#ifdef RTE_NEXT_ABI +/* For each value it means, datasheet of hardware can tell more details */ +static inline uint32_t +i40e_rxd_pkt_type_mapping (uint8_t ptype) +{ + static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { +/* L2 types */ +/* [0] reserved */ + [1 ] =RTE_PTYPE_L2_ETHER , + [2 ] =RTE_PTYPE_L2_ETHER_TIMESYNC , +/* [3] - [5] reserved */ + [6 ] =RTE_PTYPE_L2_ETHER_LLDP , +/* [7] - [10] reserved */ + [11 ] =RTE_PTYPE_L2_ETHER_ARP , +/* [12] - [21] reserved */ + +/* Non tunneled IPv4 */ + [22 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [23 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [24 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [25] reserved */ + [26 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [27 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [28 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv4 --> IPv4 */ + [29 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [30 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [31 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [32] reserved */ + [33 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [34 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [35 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> IPv6 */ + [36 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [37 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [38 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [39] reserved */ + [40 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [41 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [42 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN */ + [43 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv4 */ + [44 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [45 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [46 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [47] reserved */ + [48 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [49 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [50 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv6 */ + [51 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [52 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [53 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [54] reserved */ + [55 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [56 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [57 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC */ + [58 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [59 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [60 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [61 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [62] reserved */ + [63 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [64 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [65 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [66 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [67 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [68 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [69] reserved */ + [70 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [71 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [72 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [73 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [74 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [75 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [76 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [77] reserved */ + [78 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [79 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [80 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [81 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [82 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [83 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [84] reserved */ + [85 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [86 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [87 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* Non tunneled IPv6 */ + [88 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [89 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [90 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [91] reserved */ + [92 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [93 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [94 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv6 --> IPv4 */ + [95 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [96 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [97 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [98] reserved */ + [99 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [100 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [101 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> IPv6 */ + [102 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [103 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [104 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [105] reserved */ + [106 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [107 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [108 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN */ + [109 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv4 */ + [110 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [111 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [112 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [113] reserved */ + [114 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [115 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [116 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv6 */ + [117 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [118 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [119 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [120] reserved */ + [121 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [122 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [123 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC */ + [124 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [125 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [126 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [127 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [128] reserved */ + [129 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [130 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [131 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [132 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [133 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [134 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [135] reserved */ + [136 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [137 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [138 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [139 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [140 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [141 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [142 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [143] reserved */ + [144 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [145 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [146 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [147 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [148 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [149 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [150] reserved */ + [151 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [152 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [153 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* All others reserved */ + }; + +return ptype_table[ptype]; +} +#else /* RTE_NEXT_ABI */ /* Translate pkt types to pkt flags */ static inline uint64_t i40e_rxd_ptype_to_pkt_flags (uint64_t qword)
@@ -443,6 +977,7 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword) return ip_ptype_map[ptype]; } +#endif /* RTE_NEXT_ABI */ #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03#define I40E_RX_DESC_EXT_STATUS_FLEXBH_FD_ID 0x01
@@ -730,11 +1265,18 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)i40e_rxd_to_vlan_tci (mb, &rxdp[j]); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + mb->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >> +I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); mb->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) mb->hash.rss =rte_le_to_cpu_32 (\ rxdp[j].wb.qword0.hi_dword.rss);
@@ -971,9 +1513,15 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)i40e_rxd_to_vlan_tci (rxm, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + rxm->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); rxm->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
@@ -1129,10 +1677,16 @@ i40e_recv_scattered_pkts(void *rx_queue,i40e_rxd_to_vlan_tci (first_seg, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + first_seg->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); first_seg->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v9 6/19 enic: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/enic/enic_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/enic/enic_main.c +26 -0
@@ -423,7 +423,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=PKT_RX_IP_CKSUM_BAD ;
@@ -432,7 +436,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Header split */ if (sop && !eop) {
@@ -445,7 +453,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, *rx_pkt_bucket = rx_pkt; rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=
@@ -457,13 +469,22 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Payload */ hdr_rx_pkt = *rx_pkt_bucket; hdr_rx_pkt->pkt_len += bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV4 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) hdr_rx_pkt->ol_flags |=
@@ -475,7 +496,12 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV6 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif } }
Signature · 1 line
1.9.3
PATCH v9 7/19 vmxnet3: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/vmxnet3/vmxnet3_rxtx.c +8 -0
@@ -649,9 +649,17 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth +1 ); if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr)) +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4_EXT ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR_EXT ; +#endif else +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!rcd->cnc) {if (!rcd->ipc)
Signature · 1 line
1.9.3
PATCH v9 8/19 fm10k: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/fm10k/fm10k_rxtx.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
v4 changes:
* Supported unified packet type of fm10k from v4.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/fm10k/fm10k_rxtx.c +27 -0
@@ -68,12 +68,37 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)static inline void rx_desc_to_ol_flags (struct rte_mbuf *m,const union fm10k_rx_desc *d) { +#ifdef RTE_NEXT_ABI +static const uint32_t + ptype_table[FM10K_RXD_PKTTYPE_MASK >>FM10K_RXD_PKTTYPE_SHIFT ] + __rte_cache_aligned = { + [FM10K_PKTTYPE_OTHER ] =RTE_PTYPE_L2_ETHER , + [FM10K_PKTTYPE_IPV4 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4 , + [FM10K_PKTTYPE_IPV4_EX ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT , + [FM10K_PKTTYPE_IPV6 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6 , + [FM10K_PKTTYPE_IPV6_EX ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + }; + + m->packet_type = ptype_table[(d->w.pkt_info &FM10K_RXD_PKTTYPE_MASK ) + >>FM10K_RXD_PKTTYPE_SHIFT ]; +#else /* RTE_NEXT_ABI */ uint16_t ptype;static const uint16_t pt_lut[] = {0 ,PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT ,PKT_RX_IPV6_HDR ,PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 }; +#endif /* RTE_NEXT_ABI */ if (d->w.pkt_info &FM10K_RXD_RSSTYPE_MASK ) m->ol_flags |=PKT_RX_RSS_HASH ;
@@ -97,9 +122,11 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)if (unlikely (d->d.staterr &FM10K_RXD_STATUS_RXE )) m->ol_flags |=PKT_RX_RECIP_ERR ; +#ifndef RTE_NEXT_ABI ptype = (d->d.data &FM10K_RXD_PKTTYPE_MASK_L3 ) >>FM10K_RXD_PKTTYPE_SHIFT ; m->ol_flags |= pt_lut[(uint8_t )ptype]; +#endif }uint16_t
Signature · 1 line
1.9.3
PATCH v9 9/19 cxgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/cxgbe/sge.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v9 changes:
* Added unified packet type support in newly added cxgbe driver.
drivers/net/cxgbe/sge.c +8 -0
@@ -1326,14 +1326,22 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp, mbuf->port = pkt->iff;if (pkt->l2info &htonl (F_RXF_IP )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV4 ; +#else mbuf->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (unlikely (!csum_ok)) mbuf->ol_flags |=PKT_RX_IP_CKSUM_BAD ;if ((pkt->l2info &htonl (F_RXF_UDP |F_RXF_TCP )) && !csum_ok) mbuf->ol_flags |=PKT_RX_L4_CKSUM_BAD ; }else if (pkt->l2info &htonl (F_RXF_IP6 )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV6 ; +#else mbuf->ol_flags |=PKT_RX_IPV6_HDR ; +#endif } mbuf->port = pkt->iff;
Signature · 1 line
1.9.3
PATCH v9 10/19 app/test-pipeline: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pipeline/pipeline_hash.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test-pipeline/pipeline_hash.c +13 -0
@@ -459,20 +459,33 @@ app_main_loop_rx_metadata(void) { signature =RTE_MBUF_METADATA_UINT32_PTR (m,0 ); key =RTE_MBUF_METADATA_UINT8_PTR (m,32 ); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif ip_hdr = (struct ipv4_hdr *) &m_data[sizeof (struct ether_hdr )]; ip_dst = ip_hdr->dst_addr; k32 = (uint32_t *) key; k32[0 ] = ip_dst &0xFFFFFF00 ; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif ipv6_hdr = (struct ipv6_hdr *) &m_data[sizeof (struct ether_hdr )]; ipv6_dst = ipv6_hdr->dst_addr;memcpy (key, ipv6_dst,16 ); +#ifdef RTE_NEXT_ABI + } else + continue; +#else } +#endif *signature =test_hash (key,0 ,0 ); }
Signature · 1 line
1.9.3
PATCH v9 11/19 app/testpmd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pmd/csumonly.c | 14 ++++ app/test-pmd/rxonly.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v4 changes:
* Added printing logs of packet types of each received packet in rxonly mode.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
app/test-pmd/csumonly.c +14 -0
@@ -202,8 +202,14 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)/* Parse a vxlan header */ static void +#ifdef RTE_NEXT_ABI +parse_vxlan(struct udp_hdr *udp_hdr, + struct testpmd_offload_info *info, + uint32_t pkt_type) +#elseparse_vxlan (struct udp_hdr *udp_hdr,struct testpmd_offload_info *info, uint64_t mbuf_olflags) +#endif {struct ether_hdr *eth_hdr;
@@ -211,8 +217,12 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info,* (rfc7348) or that the rx offload flag is set (i40e only * currently) */ if (udp_hdr->dst_port != _htons(4789) && +#ifdef RTE_NEXT_ABI + RTE_ETH_IS_TUNNEL_PKT(pkt_type) == 0) +#else (mbuf_olflags & (PKT_RX_TUNNEL_IPV4_HDR | PKT_RX_TUNNEL_IPV6_HDR)) == 0) +#endif return ; info->is_tunnel =1 ;
@@ -549,7 +559,11 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)struct udp_hdr *udp_hdr; udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); +#ifdef RTE_NEXT_ABI +parse_vxlan (udp_hdr, &info, m->packet_type); +#else parse_vxlan (udp_hdr, &info, m->ol_flags); +#endif }else if (info.l4_proto ==IPPROTO_GRE ) {struct simple_gre_hdr *gre_hdr; gre_hdr = (struct simple_gre_hdr *)
app/test-pmd/rxonly.c +183 -0
211 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v9 12/19 app/test: Remove useless code
In reply to Helin ZhangSeverl useless code lines are added accidently, which blocks packet type unification. They should be deleted at all.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test/packet_burst_generator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
v4 changes:
* Removed several useless code lines which block packet type unification.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test/packet_burst_generator.c +4 -2
@@ -273,19 +273,21 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV4_HDR ; +#endif }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV6_HDR ; +#endif } pkts_burst[nb_pkt] = pkt;
Signature · 1 line
1.9.3
PATCH v9 13/19 examples/ip_fragmentation: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_fragmentation/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_fragmentation/main.c +9 -0
@@ -283,7 +283,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, len = qconf->tx_mbufs[port_out].len;/* if this is an IPv4 packet */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;/* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -317,9 +321,14 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,if (unlikely (len2 <0 ))return ; } +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if this is an IPv6 packet */ +#else }/* if this is an IPv6 packet */ else if (m->ol_flags &PKT_RX_IPV6_HDR ) { +#endif struct ipv6_hdr *ip_hdr; ipv6 =1 ;
Signature · 1 line
1.9.3
PATCH v9 14/19 examples/ip_reassembly: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_reassembly/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_reassembly/main.c +9 -0
@@ -356,7 +356,11 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid;/* if packet is IPv4 */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags & (PKT_RX_IPV4_HDR )) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;
@@ -396,9 +400,14 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type =rte_be_to_cpu_16 (ETHER_TYPE_IPv4); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if packet is IPv6 */ +#else }/* if packet is IPv6 */ else if (m->ol_flags & (PKT_RX_IPV6_HDR |PKT_RX_IPV6_HDR_EXT )) { +#endif struct ipv6_extension_fragment *frag_hdr;struct ipv6_hdr *ip_hdr;
Signature · 1 line
1.9.3
PATCH v9 15/19 examples/l3fwd-acl: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-acl/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-acl/main.c +23 -6
@@ -645,10 +645,13 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,struct ipv4_hdr *ipv4_hdr;struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,sizeof (struct ether_hdr ));
@@ -667,9 +670,11 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,/* Not a valid IPv4 packet */ rte_pktmbuf_free (pkt); } - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -687,17 +692,22 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl, {struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv4[acl->num_ipv4] =MBUF_IPV4_2PROTO (pkt); acl->m_ipv4[(acl->num_ipv4)++] = pkt; - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -745,10 +755,17 @@ send_one_packet(struct rte_mbuf *m, uint32_t res)/* in the ACL list, drop it */ #ifdef L3FWDACL_DEBUG if ((res &ACL_DENY_SIGNATURE ) !=0 ) { +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) +dump_acl4_rule (m, res); +else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) +dump_acl6_rule (m, res); +#else if (m->ol_flags &PKT_RX_IPV4_HDR )dump_acl4_rule (m, res);else dump_acl6_rule (m, res); +#endif /* RTE_NEXT_ABI */ }#endif rte_pktmbuf_free (m);
Signature · 1 line
1.9.3
PATCH v9 16/19 examples/l3fwd-power: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-power/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-power/main.c +8 -0
@@ -635,7 +635,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
@@ -670,8 +674,12 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,ether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ #if (APP_LOOKUP_METHOD ==APP_LOOKUP_EXACT_MATCH )struct ipv6_hdr *ipv6_hdr;
Signature · 1 line
1.9.3
PATCH v9 17/19 examples/l3fwd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd/main.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Minor bug fixes and enhancements.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd/main.c +120 -3
@@ -939,7 +939,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,sizeof (struct ether_hdr ));
@@ -970,8 +974,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr;
@@ -990,8 +997,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else +/* Free the mbuf that contains non-IPV4/IPV6 packet */ +rte_pktmbuf_free (m); +#else } - +#endif }#ifdef DO_RFC_1812_CHECKS
@@ -1015,12 +1027,19 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon* to BAD_PORT value. */ static inline __attribute__((always_inline)) void +#ifdef RTE_NEXT_ABI +rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype) +#else rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags) +#endif {uint8_t ihl; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (ptype)) { +#else if ((flags &PKT_RX_IPV4_HDR ) !=0 ) { - +#endif ihl = ipv4_hdr->version_ihl -IPV4_MIN_VER_IHL ; ipv4_hdr->time_to_live--;
@@ -1050,11 +1069,19 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,struct ipv6_hdr *ipv6_hdr;struct ether_hdr *eth_hdr; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else if (pkt->ol_flags &PKT_RX_IPV4_HDR ) { +#endif if (rte_lpm_lookup (qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) !=0 ) next_hop = portid; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (pkt->ol_flags &PKT_RX_IPV6_HDR ) { +#endif eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr +1 ); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -1088,12 +1115,52 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, ve = val_eth[dp]; dst_port[0 ] = dp; +#ifdef RTE_NEXT_ABI +rfc1812_process (ipv4_hdr, dst_port, pkt->packet_type); +#else rfc1812_process (ipv4_hdr, dst_port, pkt->ol_flags); +#endif te =_mm_blend_epi16 (te, ve,MASK_ETH );_mm_store_si128 ((__m128i *)eth_hdr, te); } +#ifdef RTE_NEXT_ABI +/* +* Read packet_type and destination IPV4 addresses from 4 mbufs. +*/ +static inline void +processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ], +__m128i *dip, +uint32_t *ipv4_flag) +{ +struct ipv4_hdr *ipv4_hdr; +struct ether_hdr *eth_hdr; +uint32_t x0, x1, x2, x3; + + eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x0 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] = pkt[0 ]->packet_type &RTE_PTYPE_L3_IPV4 ; + + eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x1 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[1 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x2 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[2 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x3 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[3 ]->packet_type; + + dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); +} +#else /* RTE_NEXT_ABI */ /* * Read ol_flags and destination IPV4 addresses from 4 mbufs. */
@@ -1126,14 +1193,24 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); } +#endif /* RTE_NEXT_ABI */ /* * Lookup into LPM for destination port. * If lookup fails, use incoming port (portid) as destination port. */ static inline void +#ifdef RTE_NEXT_ABI +processx4_step2(const struct lcore_conf *qconf, + __m128i dip, + uint32_t ipv4_flag, + uint8_t portid, + struct rte_mbuf *pkt[FWDSTEP], + uint16_t dprt[FWDSTEP]) +#elseprocessx4_step2 (const struct lcore_conf *qconf, __m128i dip,uint32_t flag, uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP]) +#endif /* RTE_NEXT_ABI */ {rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
@@ -1143,7 +1220,11 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip =_mm_shuffle_epi8 (dip, bswap_mask);/* if all 4 packets are IPV4. */ +#ifdef RTE_NEXT_ABI +if (likely (ipv4_flag)) { +#else if (likely (flag !=0 )) { +#endif rte_lpm_lookupx4 (qconf->ipv4_lookup_struct, dip, dprt, portid); }else { dst.x = dip;
@@ -1193,6 +1274,16 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])_mm_store_si128 (p[2 ], te[2 ]);_mm_store_si128 (p[3 ], te[3 ]); +#ifdef RTE_NEXT_ABI +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), + &dst_port[0 ], pkt[0 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[1 ] +1 ), + &dst_port[1 ], pkt[1 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[2 ] +1 ), + &dst_port[2 ], pkt[2 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), + &dst_port[3 ], pkt[3 ]->packet_type); +#else /* RTE_NEXT_ABI */ rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), &dst_port[0 ], pkt[0 ]->ol_flags); rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1),
@@ -1201,6 +1292,7 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) &dst_port[2], pkt[2]->ol_flags);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), &dst_port[3 ], pkt[3 ]->ol_flags); +#endif /* RTE_NEXT_ABI */ }/*
@@ -1387,7 +1479,11 @@ main_loop(__attribute__((unused)) void *dummy)uint16_t *lp;uint16_t dst_port[MAX_PKT_BURST ];__m128i dip[MAX_PKT_BURST /FWDSTEP ]; +#ifdef RTE_NEXT_ABI +uint32_t ipv4_flag[MAX_PKT_BURST /FWDSTEP ]; +#else uint32_t flag[MAX_PKT_BURST /FWDSTEP ]; +#endif uint16_t pnum[MAX_PKT_BURST +1 ];#endif
@@ -1457,6 +1553,18 @@ main_loop(__attribute__((unused)) void *dummy)*/ int32_t n =RTE_ALIGN_FLOOR (nb_rx,4 );for (j =0 ; j < n ; j+=4 ) { +#ifdef RTE_NEXT_ABI +uint32_t pkt_type = + pkts_burst[j]->packet_type & + pkts_burst[j+1 ]->packet_type & + pkts_burst[j+2 ]->packet_type & + pkts_burst[j+3 ]->packet_type; +if (pkt_type &RTE_PTYPE_L3_IPV4 ) { +simple_ipv4_fwd_4pkts ( + &pkts_burst[j], portid, qconf); + }else if (pkt_type & +RTE_PTYPE_L3_IPV6 ) { +#else /* RTE_NEXT_ABI */ uint32_t ol_flag = pkts_burst[j]->ol_flags & pkts_burst[j+1 ]->ol_flags & pkts_burst[j+2 ]->ol_flags
@@ -1465,6 +1573,7 @@ main_loop(__attribute__((unused)) void *dummy)simple_ipv4_fwd_4pkts (&pkts_burst[j], portid, qconf); }else if (ol_flag &PKT_RX_IPV6_HDR ) { +#endif /* RTE_NEXT_ABI */ simple_ipv6_fwd_4pkts (&pkts_burst[j], portid, qconf); }else {
@@ -1489,13 +1598,21 @@ main_loop(__attribute__((unused)) void *dummy)for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step1 (&pkts_burst[j], &dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + &ipv4_flag[j /FWDSTEP ]); +#else &flag[j / FWDSTEP]); +#endif } k =RTE_ALIGN_FLOOR (nb_rx,FWDSTEP );for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step2 (qconf, dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + ipv4_flag[j /FWDSTEP ], portid, +#else flag[j /FWDSTEP ], portid, +#endif &pkts_burst[j], &dst_port[j]); }
Signature · 1 line
1.9.3
PATCH v9 18/19 examples/tep_termination: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/tep_termination/vxlan.c | 4 ++++ 1 file changed, 4 insertions(+)
v9 changes:
* Used unified packet type to check if it is a VXLAN packet, included in RTE_NEXT_ABI which is disabled by default.
examples/tep_termination/vxlan.c +4 -0
@@ -180,8 +180,12 @@ decapsulation(struct rte_mbuf *pkt)* (rfc7348) or that the rx offload flag is set (i40e only * currently)*/ if (udp_hdr->dst_port !=rte_cpu_to_be_16 (DEFAULT_VXLAN_PORT ) && +#ifdef RTE_NEXT_ABI + ((pkt->packet_type &RTE_PTYPE_TUNNEL_MASK ) ==0 ) +#else (pkt->ol_flags & (PKT_RX_TUNNEL_IPV4_HDR |PKT_RX_TUNNEL_IPV6_HDR )) ==0 ) +#endifreturn -1 ; outer_header_len = info.outer_l2_len + info.outer_l3_len +sizeof (struct udp_hdr ) +sizeof (struct vxlan_hdr );
Signature · 1 line
1.9.3
PATCH v9 19/19 mbuf: remove old packet type bit masks
In reply to Helin ZhangAs unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.c | 4 ++++ lib/librte_mbuf/rte_mbuf.h | 4 ++++ 2 files changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
* Redefined the bit masks for packet RX offload flags.
v5 changes:
* Rolled back the bit masks of RX flags, for ABI compatibility.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
lib/librte_mbuf/rte_mbuf.c +4 -0
@@ -251,14 +251,18 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */ /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */ /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */ +#ifndef RTE_NEXT_ABI case PKT_RX_IPV4_HDR :return "PKT_RX_IPV4_HDR" ;case PKT_RX_IPV4_HDR_EXT :return "PKT_RX_IPV4_HDR_EXT" ;case PKT_RX_IPV6_HDR :return "PKT_RX_IPV6_HDR" ;case PKT_RX_IPV6_HDR_EXT :return "PKT_RX_IPV6_HDR_EXT" ; +#endif /* RTE_NEXT_ABI */ case PKT_RX_IEEE1588_PTP :return "PKT_RX_IEEE1588_PTP" ;case PKT_RX_IEEE1588_TMST :return "PKT_RX_IEEE1588_TMST" ; +#ifndef RTE_NEXT_ABI case PKT_RX_TUNNEL_IPV4_HDR :return "PKT_RX_TUNNEL_IPV4_HDR" ;case PKT_RX_TUNNEL_IPV6_HDR :return "PKT_RX_TUNNEL_IPV6_HDR" ; +#endif /* RTE_NEXT_ABI */ default :return NULL ; } }
lib/librte_mbuf/rte_mbuf.h +4 -0
@@ -92,14 +92,18 @@ extern "C" {#define PKT_RX_HBUF_OVERFLOW (0ULL << 0)/**< Header buffer overflow. */ #define PKT_RX_RECIP_ERR (0ULL << 0)/**< Hardware processing error. */ #define PKT_RX_MAC_ERR (0ULL << 0)/**< MAC error. */ +#ifndef RTE_NEXT_ABI #define PKT_RX_IPV4_HDR (1ULL << 5)/**< RX packet with IPv4 header. */ #define PKT_RX_IPV4_HDR_EXT (1ULL << 6)/**< RX packet with extended IPv4 header. */ #define PKT_RX_IPV6_HDR (1ULL << 7)/**< RX packet with IPv6 header. */ #define PKT_RX_IPV6_HDR_EXT (1ULL << 8)/**< RX packet with extended IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_IEEE1588_PTP (1ULL << 9)/**< RX IEEE1588 L2 Ethernet PT Packet. */ #define PKT_RX_IEEE1588_TMST (1ULL << 10)/**< RX IEEE1588 L2/L4 timestamped packet.*/ +#ifndef RTE_NEXT_ABI #define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11)/**< RX tunnel packet with IPv4 header.*/ #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12)/**< RX tunnel packet with IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_FDIR_ID (1ULL << 13)/**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14)/**< Flexible bytes reported if FDIR match. */ #define PKT_RX_QINQ_PKT (1ULL << 15)/**< RX packet with double VLAN stripped. */
Signature · 1 line
1.9.3
v10 cover unified packet type
In reply to Helin ZhangCurrently only 6 bits which are stored in ol_flags are used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bits packet_type in mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored in ol_flag field should be deleted at all, and 6 bits of ol_flags can be save as the benifit.
Initially, 32 bits of packet_type can be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of RTE_NEXT_ABI. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.
Note that this patch set should be integrated after another patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflict during integration. As both patch sets modified 'struct rte_mbuf', and the final layout of the 'struct rte_mbuf' is key to vectorized ixgbe PMD.
Its v8 version was acked by Konstantin Ananyev <[email protected]>
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
* Used redefined packet types and enlarged packet_type field for all PMDs and corresponding applications.
* Removed changes in bond and its relevant application, as there is no need at all according to the recent bond changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Put vector ixgbe changes right after mbuf changes.
* Disabled vector ixgbe PMD by default, as mbuf layout changed, and then re-enabled it after vector ixgbe PMD updated.
* Put the definitions of unified packet type into a single patch.
* Minor bug fixes and enhancements in l3fwd example.
v4 changes:
* Added detailed description of each packet types.
* Supported unified packet type of fm10k.
* Added printing logs of packet types of each received packet for rxonly mode in testpmd.
* Removed several useless code lines which block packet type unification from app/test/packet_burst_generator.c.
v5 changes:
* Added more detailed description for each packet types, together with examples.
* Rolled back the macro definitions of RX packet flags, for ABI compitability.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with patch set for '[PATCH v3 0/7] support i40e QinQ stripping and insertion', to clearly solve the conflicts during merging.
v8 changes:
* Moved the field of 'vlan_tci_outer' in 'struct rte_mbuf' to the end of the 1st cache line, to avoid breaking any vectorized PMD storing, as fields of 'packet_type, pkt_len, data_len, vlan_tci, rss' should be in an contiguous 128 bits.
v9 changes:
* Put the mbuf changes and vector PMD changes together, as they are tightly relevant.
* Renamed MAC to ETHER in packet type names.
* Corrected the packet type explanation of RTE_PTYPE_L2_ETHER.
* Reworked newly added cxgbe driver and tep_termination example application to support unified packet type, which is disabled by default.
v10 changes:
* Fixed a compile error in tep_termination, when RTE_NEXT_ABI is enabled.
Helin Zhang (19):
mbuf: redefine packet_type in rte_mbuf
mbuf: add definitions of unified packet types
e1000: replace bit mask based packet type with unified packet type
ixgbe: replace bit mask based packet type with unified packet type
i40e: replace bit mask based packet type with unified packet type
enic: replace bit mask based packet type with unified packet type
vmxnet3: replace bit mask based packet type with unified packet type
fm10k: replace bit mask based packet type with unified packet type
cxgbe: replace bit mask based packet type with unified packet type app/test-pipeline: replace bit mask based packet type with unified
packet type
app/testpmd: replace bit mask based packet type with unified packet
type
app/test: Remove useless code
examples/ip_fragmentation: replace bit mask based packet type with
unified packet type
examples/ip_reassembly: replace bit mask based packet type with
unified packet type
examples/l3fwd-acl: replace bit mask based packet type with unified
packet type
examples/l3fwd-power: replace bit mask based packet type with unified
packet type
examples/l3fwd: replace bit mask based packet type with unified packet
type
examples/tep_termination: replace bit mask based packet type with
unified packet type
mbuf: remove old packet type bit masks
app/test-pipeline/pipeline_hash.c | 13 + app/test-pmd/csumonly.c | 14 + app/test-pmd/rxonly.c | 183 +++++++ app/test/packet_burst_generator.c | 6 +- drivers/net/cxgbe/sge.c | 8 + drivers/net/e1000/igb_rxtx.c | 104 ++++ drivers/net/enic/enic_main.c | 26 + drivers/net/fm10k/fm10k_rxtx.c | 27 + drivers/net/i40e/i40e_rxtx.c | 554 +++++++++++++++++++++ drivers/net/ixgbe/ixgbe_rxtx.c | 163 ++++++ drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 ++- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 + examples/ip_fragmentation/main.c | 9 + examples/ip_reassembly/main.c | 9 + examples/l3fwd-acl/main.c | 29 +- examples/l3fwd-power/main.c | 8 + examples/l3fwd/main.c | 123 ++++- examples/tep_termination/vxlan.c | 4 + .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 + lib/librte_mbuf/rte_mbuf.c | 4 + lib/librte_mbuf/rte_mbuf.h | 516 +++++++++++++++++++ 21 files changed, 1876 insertions(+), 13 deletions(-)
Signature · 1 line
1.9.3
PATCH v10 1/19 mbuf: redefine packet_type in rte_mbuf
In order to unify the packet type, the field of 'packet_type' in 'struct rte_mbuf' needs to be extended from 16 to 32 bits. Accordingly, some fields in 'struct rte_mbuf' are re-organized to support this change for Vector PMD. As 'struct rte_kni_mbuf' for KNI should be right mapped to 'struct rte_mbuf', it should be modified accordingly. In ixgbe PMD driver, corresponding changes are added for the mbuf changes, especially the bit masks of packet type for 'ol_flags' are replaced by unified packet type. In addition, more packet types (UDP, TCP and SCTP) are supported in vectorized ixgbe PMD. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
Note that around 2% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- drivers/net/ixgbe/ixgbe_rxtx_vec.c | 75 +++++++++++++++++++++- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 6 ++ lib/librte_mbuf/rte_mbuf.h | 26 ++++++++ 3 files changed, 105 insertions(+), 2 deletions(-)
v2 changes:
* Enlarged the packet_type field from 16 bits to 32 bits.
* Redefined the packet type sub-fields.
* Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes.
v3 changes:
* Put the mbuf layout changes into a single patch.
* Disabled vector ixgbe PMD by default, as mbuf layout changed.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
* Integrated with changes of QinQ stripping/insertion.
v8 changes:
* Moved the field of 'vlan_tci_outer' in 'struct rte_mbuf' to the end of the 1st cache line, to avoid breaking any vectorized PMD storing.
v9 changes:
* Put the mbuf changes and vector PMD changes together, as they are tightly relevant.
drivers/net/ixgbe/ixgbe_rxtx_vec.c +73 -2
@@ -134,6 +134,12 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq)*/ #ifdef RTE_IXGBE_RX_OLFLAGS_ENABLE +#ifdef RTE_NEXT_ABI +#define OLFLAGS_MASK_V (((uint64_t)PKT_RX_VLAN_PKT << 48) | \ + ((uint64_t)PKT_RX_VLAN_PKT << 32) | \ + ((uint64_t)PKT_RX_VLAN_PKT << 16) | \ + ((uint64_t)PKT_RX_VLAN_PKT)) +#else #define OLFLAGS_MASK ((uint16_t)(PKT_RX_VLAN_PKT | PKT_RX_IPV4_HDR |\ PKT_RX_IPV4_HDR_EXT | PKT_RX_IPV6_HDR |\ PKT_RX_IPV6_HDR_EXT))
@@ -142,11 +148,26 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq) ((uint64_t)OLFLAGS_MASK << 16) | \ ((uint64_t)OLFLAGS_MASK))#define PTYPE_SHIFT (1) +#endif /* RTE_NEXT_ABI */ +#define VTAG_SHIFT (3)static inline void desc_to_olflags_v (__m128i descs[4 ],struct rte_mbuf **rx_pkts) { +#ifdef RTE_NEXT_ABI +__m128i vtag0, vtag1; +union { +uint16_t e[4 ]; +uint64_t dword; + } vol; + + vtag0 =_mm_unpackhi_epi16 (descs[0 ], descs[1 ]); + vtag1 =_mm_unpackhi_epi16 (descs[2 ], descs[3 ]); + vtag1 =_mm_unpacklo_epi32 (vtag0, vtag1); + vtag1 =_mm_srli_epi16 (vtag1,VTAG_SHIFT ); + vol.dword =_mm_cvtsi128_si64 (vtag1) &OLFLAGS_MASK_V ; +#else __m128i ptype0, ptype1, vtag0, vtag1; union { uint16_t e[4];
@@ -166,6 +187,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts) ptype1 =_mm_or_si128 (ptype1, vtag1); vol.dword =_mm_cvtsi128_si64 (ptype1) &OLFLAGS_MASK_V ; +#endif /* RTE_NEXT_ABI */ rx_pkts[0 ]->ol_flags = vol.e[0 ]; rx_pkts[1 ]->ol_flags = vol.e[1 ];
@@ -196,6 +218,18 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,int pos;uint64_t var;__m128i shuf_msk; +#ifdef RTE_NEXT_ABI +__m128i crc_adjust =_mm_set_epi16 ( +0 ,0 ,0 ,/* ignore non-length fields */ + -rxq->crc_len,/* sub crc on data_len */ +0 ,/* ignore high-16bits of pkt_len */ + -rxq->crc_len,/* sub crc on pkt_len */ +0 ,0 /* ignore pkt_type field */ + ); +__m128i dd_check, eop_check; +__m128i desc_mask =_mm_set_epi32 (0xFFFFFFFF ,0xFFFFFFFF , +0xFFFFFFFF ,0xFFFF07F0 ); +#else __m128i crc_adjust = _mm_set_epi16( 0, 0, 0, 0, /* ignore non-length fields */ 0, /* ignore high-16bits of pkt_len */
@@ -204,6 +238,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,0 /* ignore pkt_type field */ );__m128i dd_check, eop_check; +#endif /* RTE_NEXT_ABI */ if (unlikely (nb_pkts <RTE_IXGBE_VPMD_RX_BURST ))return 0 ;
@@ -232,6 +267,18 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts, eop_check =_mm_set_epi64x (0x0000000200000002LL ,0x0000000200000002LL );/* mask to shuffle from desc. to mbuf */ +#ifdef RTE_NEXT_ABI + shuf_msk =_mm_set_epi8 ( +7 ,6 ,5 ,4 ,/* octet 4~7, 32bits rss */ +15 ,14 ,/* octet 14~15, low 16 bits vlan_macip */ +13 ,12 ,/* octet 12~13, 16 bits data_len */ +0xFF ,0xFF ,/* skip high 16 bits pkt_len, zero out */ +13 ,12 ,/* octet 12~13, low 16 bits pkt_len */ +0xFF ,0xFF ,/* skip high 16 bits pkt_type */ +1 ,/* octet 1, 8 bits pkt_type field */ +0 /* octet 0, 4 bits offset 4 pkt_type field */ + ); +#else shuf_msk = _mm_set_epi8( 7, 6, 5, 4, /* octet 4~7, 32bits rss */ 0xFF, 0xFF, /* skip high 16 bits vlan_macip, zero out */
@@ -241,18 +288,28 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,13 ,12 ,/* octet 12~13, 16 bits data_len */ 0xFF ,0xFF /* skip pkt_type field */ ); +#endif /* RTE_NEXT_ABI */ /* Cache is empty -> need to scan the buffer rings, but first move * the next 'n' mbufs into the cache */ sw_ring = &rxq->sw_ring[rxq->rx_tail]; -/* -* A. load 4 packet in one loop +#ifdef RTE_NEXT_ABI +/* A. load 4 packet in one loop +* [A*. mask out 4 unused dirty field in desc] * B. copy 4 mbuf point from swring to rx_pkts * C. calc the number of DD bits among the 4 packets * [C*. extract the end-of-packet bit, if requested] * D. fill info. from desc to mbuf */ +#else +/* A. load 4 packet in one loop +* B. copy 4 mbuf point from swring to rx_pkts +* C. calc the number of DD bits among the 4 packets +* [C*. extract the end-of-packet bit, if requested] +* D. fill info. from desc to mbuf +*/ +#endif /* RTE_NEXT_ABI */ for (pos =0 , nb_pkts_recd =0 ; pos <RTE_IXGBE_VPMD_RX_BURST ; pos +=RTE_IXGBE_DESCS_PER_LOOP , rxdp +=RTE_IXGBE_DESCS_PER_LOOP ) {
@@ -289,6 +346,16 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,/* B.2 copy 2 mbuf point into rx_pkts */ _mm_storeu_si128 ((__m128i *)&rx_pkts[pos+2 ], mbp2); +#ifdef RTE_NEXT_ABI +/* A* mask out 0~3 bits RSS type */ + descs[3 ] =_mm_and_si128 (descs[3 ], desc_mask); + descs[2 ] =_mm_and_si128 (descs[2 ], desc_mask); + +/* A* mask out 0~3 bits RSS type */ + descs[1 ] =_mm_and_si128 (descs[1 ], desc_mask); + descs[0 ] =_mm_and_si128 (descs[0 ], desc_mask); +#endif /* RTE_NEXT_ABI */ +/* avoid compiler reorder optimization */ rte_compiler_barrier ();
@@ -301,7 +368,11 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,/* C.1 4=>2 filter staterr info only */ sterr_tmp1 =_mm_unpackhi_epi32 (descs[1 ], descs[0 ]); +#ifdef RTE_NEXT_ABI +/* set ol_flags with vlan packet type */ +#else /* set ol_flags with packet type and vlan tag */ +#endif /* RTE_NEXT_ABI */ desc_to_olflags_v (descs, &rx_pkts[pos]);/* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +6 -0
@@ -117,9 +117,15 @@ struct rte_kni_mbuf {uint16_t data_off;/**< Start address of data in segment buffer. */ char pad1[4 ];uint64_t ol_flags;/**< Offload features. */ +#ifdef RTE_NEXT_ABI +char pad2[4 ]; +uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +#else char pad2[2 ];uint16_t data_len;/**< Amount of data in segment buffer. */ uint32_t pkt_len;/**< Total pkt len: sum of all segment data_len. */ +#endif /* fields on second cache line */ char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE)));
lib/librte_mbuf/rte_mbuf.h +26 -0
@@ -276,6 +276,28 @@ struct rte_mbuf {/* remaining bytes are set on RX when pulling packet from descriptor */ MARKER rx_descriptor_fields1; +#ifdef RTE_NEXT_ABI +/* +* The packet type, which is the combination of outer/inner L2, L3, L4 +* and tunnel types. +*/ +union { +uint32_t packet_type;/**< L2/L3/L4 and tunnel information. */ +struct { +uint32_t l2_type:4 ;/**< (Outer) L2 type. */ +uint32_t l3_type:4 ;/**< (Outer) L3 type. */ +uint32_t l4_type:4 ;/**< (Outer) L4 type. */ +uint32_t tun_type:4 ;/**< Tunnel type. */ +uint32_t inner_l2_type:4 ;/**< Inner L2 type. */ +uint32_t inner_l3_type:4 ;/**< Inner L3 type. */ +uint32_t inner_l4_type:4 ;/**< Inner L4 type. */ + }; + }; + +uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ +uint16_t data_len;/**< Amount of data in segment buffer. */ +uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ +#else /* RTE_NEXT_ABI */ /** * The packet type, which is used to indicate ordinary packet and also * tunneled packet format, i.e. each number is represented a type of
@@ -287,6 +309,7 @@ struct rte_mbuf {uint32_t pkt_len;/**< Total pkt len: sum of all segments. */ uint16_t vlan_tci;/**< VLAN Tag Control Identifier (CPU order) */ uint16_t vlan_tci_outer;/**< Outer VLAN Tag Control Identifier (CPU order) */ +#endif /* RTE_NEXT_ABI */ union {uint32_t rss;/**< RSS hash result if RSS enabled */ struct {
@@ -307,6 +330,9 @@ struct rte_mbuf { } hash;/**< hash information */ uint32_t seqn;/**< Sequence number. See also rte_reorder_insert() */ +#ifdef RTE_NEXT_ABI +uint16_t vlan_tci_outer;/**< Outer VLAN Tag Control Identifier (CPU order) */ +#endif /* RTE_NEXT_ABI */ /* second cache line - fields only used in slow path or on TX */ MARKER cacheline1 __rte_cache_aligned;
Signature · 1 line
1.9.3
Re: [PATCH v10 01/19] mbuf: redefine packet_type in rte_mbuf
2015-07-10 00:31, Helin Zhang:
Quoted 2 lines
To avoid breaking ABI compatibility, all the changes would be enabled by
RTE_NEXT_ABI, which is disabled by default.
It is enabled by default.
This comment will be removed from all patches of the series.
PATCH v10 2/19 mbuf: add definitions of unified packet types
In reply to Helin ZhangAs there are only 6 bit flags in ol_flags for indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'struct rte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.h | 486 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 486 insertions(+)
v3 changes:
* Put the definitions of unified packet type into a single patch.
v4 changes:
* Added detailed description of each packet types.
v5 changes:
* Re-worded the commit logs.
* Added more detailed description for all packet types, together with examples.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
* Corrected the packet type explanation of RTE_PTYPE_L2_ETHER.
lib/librte_mbuf/rte_mbuf.h +486 -0
@@ -202,6 +202,492 @@ extern "C" {/* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)/**< Mbuf contains control data */ +#ifdef RTE_NEXT_ABI +/* +* 32 bits are divided into several fields to mark packet types. Note that +* each field is indexical. +* - Bit 3:0 is for L2 types. +* - Bit 7:4 is for L3 or outer L3 (for tunneling case) types. +* - Bit 11:8 is for L4 or outer L4 (for tunneling case) types. +* - Bit 15:12 is for tunnel types. +* - Bit 19:16 is for inner L2 types. +* - Bit 23:20 is for inner L3 types. +* - Bit 27:24 is for inner L4 types. +* - Bit 31:28 is reserved. +* +* To be compatible with Vector PMD, RTE_PTYPE_L3_IPV4, RTE_PTYPE_L3_IPV4_EXT, +* RTE_PTYPE_L3_IPV6, RTE_PTYPE_L3_IPV6_EXT, RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP +* and RTE_PTYPE_L4_SCTP should be kept as below in a contiguous 7 bits. +* +* Note that L3 types values are selected for checking IPV4/IPV6 header from +* performance point of view. Reading annotations of RTE_ETH_IS_IPV4_HDR and +* RTE_ETH_IS_IPV6_HDR is needed for any future changes of L3 type values. +* +* Note that the packet types of the same packet recognized by different +* hardware may be different, as different hardware may have different +* capability of packet type recognition. +* +* examples: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=0x29 +* | 'version'=6, 'next header'=0x3A +* | 'ICMPv6 header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_ETHER | +* RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_IP | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_ICMP. +* +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x2F +* | 'GRE header' +* | 'version'=6, 'next header'=0x11 +* | 'UDP header'> +* will be recognized on i40e hardware as packet type combination of, +* RTE_PTYPE_L2_ETHER | +* RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_TUNNEL_GRENAT | +* RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +* RTE_PTYPE_INNER_L4_UDP. +*/ +#define RTE_PTYPE_UNKNOWN 0x00000000 +/** +* Ethernet packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=[0x0800|0x86DD]> +*/ +#define RTE_PTYPE_L2_ETHER 0x00000001 +/** +* Ethernet packet type for time sync. +* +* Packet format: +* <'ether type'=0x88F7> +*/ +#define RTE_PTYPE_L2_ETHER_TIMESYNC 0x00000002 +/** +* ARP (Address Resolution Protocol) packet type. +* +* Packet format: +* <'ether type'=0x0806> +*/ +#define RTE_PTYPE_L2_ETHER_ARP 0x00000003 +/** +* LLDP (Link Layer Discovery Protocol) packet type. +* +* Packet format: +* <'ether type'=0x88CC> +*/ +#define RTE_PTYPE_L2_ETHER_LLDP 0x00000004 +/** +* Mask of layer 2 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L2_MASK 0x0000000f +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* header option. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_L3_IPV4 0x00000010 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and contains header +* options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_L3_IPV4_EXT 0x00000030 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and does not contain any +* extension header. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_L3_IPV6 0x00000040 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* header options. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_L3_IPV4_EXT_UNKNOWN 0x00000090 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and contains extension +* headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_L3_IPV6_EXT 0x000000c0 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for outer packet for tunneling cases, and may or maynot contain +* extension headers. +* +* Packet format: +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_L3_IPV6_EXT_UNKNOWN 0x000000e0 +/** +* Mask of layer 3 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L3_MASK 0x000000f0 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_L4_TCP 0x00000100 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_L4_UDP 0x00000200 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, which can be recognized as +* fragmented. A fragmented packet cannot be recognized as any other L4 types +* (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP, +* RTE_PTYPE_L4_NONFRAG). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_L4_FRAG 0x00000300 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_L4_SCTP 0x00000400 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_L4_ICMP 0x00000500 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for outer packet for tunneling cases. +* +* It refers to those packets of any IP types, while cannot be recognized as +* any of above L4 types (RTE_PTYPE_L4_TCP, RTE_PTYPE_L4_UDP, +* RTE_PTYPE_L4_FRAG, RTE_PTYPE_L4_SCTP, RTE_PTYPE_L4_ICMP). +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_L4_NONFRAG 0x00000600 +/** +* Mask of layer 4 packet types. +* It is used for outer packet for tunneling cases. +*/ +#define RTE_PTYPE_L4_MASK 0x00000f00 +/** +* IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=[4|41]> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[4|41]> +*/ +#define RTE_PTYPE_TUNNEL_IP 0x00001000 +/** +* GRE (Generic Routing Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47> +*/ +#define RTE_PTYPE_TUNNEL_GRE 0x00002000 +/** +* VXLAN (Virtual eXtensible Local Area Network) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=4798> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=4798> +*/ +#define RTE_PTYPE_TUNNEL_VXLAN 0x00003000 +/** +* NVGRE (Network Virtualization using Generic Routing Encapsulation) tunneling +* packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=47 +* | 'protocol type'=0x6558> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=47 +* | 'protocol type'=0x6558'> +*/ +#define RTE_PTYPE_TUNNEL_NVGRE 0x00004000 +/** +* GENEVE (Generic Network Virtualization Encapsulation) tunneling packet type. +* +* Packet format: +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17 +* | 'destination port'=6081> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17 +* | 'destination port'=6081> +*/ +#define RTE_PTYPE_TUNNEL_GENEVE 0x00005000 +/** +* Tunneling packet type of Teredo, VXLAN (Virtual eXtensible Local Area +* Network) or GRE (Generic Routing Encapsulation) could be recognized as this +* packet type, if they can not be recognized independently as of hardware +* capability. +*/ +#define RTE_PTYPE_TUNNEL_GRENAT 0x00006000 +/** +* Mask of tunneling packet types. +*/ +#define RTE_PTYPE_TUNNEL_MASK 0x0000f000 +/** +* Ethernet packet type. +* It is used for inner packet type only. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD]> +*/ +#define RTE_PTYPE_INNER_L2_ETHER 0x00010000 +/** +* Ethernet packet type with VLAN (Virtual Local Area Network) tag. +* +* Packet format (inner only): +* <'ether type'=[0x800|0x86DD], vlan=[1-4095]> +*/ +#define RTE_PTYPE_INNER_L2_ETHER_VLAN 0x00020000 +/** +* Mask of inner layer 2 packet types. +*/ +#define RTE_PTYPE_INNER_L2_MASK 0x000f0000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and does not contain any header option. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=5> +*/ +#define RTE_PTYPE_INNER_L3_IPV4 0x00100000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and contains header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[6-15], 'options'> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT 0x00200000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and does not contain any extension header. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=0x3B> +*/ +#define RTE_PTYPE_INNER_L3_IPV6 0x00300000 +/** +* IP (Internet Protocol) version 4 packet type. +* It is used for inner packet only, and may or maynot contain header options. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'ihl'=[5-15], <'options'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN 0x00400000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and contains extension headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* 'extension headers'> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT 0x00500000 +/** +* IP (Internet Protocol) version 6 packet type. +* It is used for inner packet only, and may or maynot contain extension +* headers. +* +* Packet format (inner only): +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=[0x3B|0x0|0x2B|0x2C|0x32|0x33|0x3C|0x87], +* <'extension headers'>> +*/ +#define RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN 0x00600000 +/** +* Mask of inner layer 3 packet types. +*/ +#define RTE_PTYPE_INNER_INNER_L3_MASK 0x00f00000 +/** +* TCP (Transmission Control Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=6, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=6> +*/ +#define RTE_PTYPE_INNER_L4_TCP 0x01000000 +/** +* UDP (User Datagram Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=17, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=17> +*/ +#define RTE_PTYPE_INNER_L4_UDP 0x02000000 +/** +* Fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have layer 4 packet. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'MF'=1> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=44> +*/ +#define RTE_PTYPE_INNER_L4_FRAG 0x03000000 +/** +* SCTP (Stream Control Transmission Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=132, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=132> +*/ +#define RTE_PTYPE_INNER_L4_SCTP 0x04000000 +/** +* ICMP (Internet Control Message Protocol) packet type. +* It is used for inner packet only. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'=1, 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'=1> +*/ +#define RTE_PTYPE_INNER_L4_ICMP 0x05000000 +/** +* Non-fragmented IP (Internet Protocol) packet type. +* It is used for inner packet only, and may or maynot have other unknown layer +* 4 packet types. +* +* Packet format (inner only): +* <'ether type'=0x0800 +* | 'version'=4, 'protocol'!=[6|17|132|1], 'MF'=0> +* or, +* <'ether type'=0x86DD +* | 'version'=6, 'next header'!=[6|17|44|132|1]> +*/ +#define RTE_PTYPE_INNER_L4_NONFRAG 0x06000000 +/** +* Mask of inner layer 4 packet types. +*/ +#define RTE_PTYPE_INNER_L4_MASK 0x0f000000 + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV4_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV4) + +/** +* Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by +* one, bit 6 is selected to be used for IPv4 only. Then checking bit 6 can +* determin if it is an IPV4 packet. +*/ +#define RTE_ETH_IS_IPV6_HDR (ptype) ((ptype) & RTE_PTYPE_L3_IPV6) + +/* Check if it is a tunneling packet */ +#define RTE_ETH_IS_TUNNEL_PKT (ptype) ((ptype) & RTE_PTYPE_TUNNEL_MASK) +#endif /* RTE_NEXT_ABI */ +/** * Get the name of a RX offload flag *
Signature · 1 line
1.9.3
Re: [PATCH v10 02/19] mbuf: add definitions of unified packet types
Quoted 11 lines · Helin Zhang
As there are only 6 bit flags in
ol_flagsfor indicating packet types, which is not enough to describe all the possible packet types hardware can recognize. For example, i40e hardware can recognize more than 150 packet types. Unified packet type is composed of L2 type, L3 type, L4 type, tunnel type, inner L2 type, inner L3 type and inner L4 type fields, and can be stored in 'structrte_mbuf' of 32 bits field 'packet_type'.
To avoid breaking ABI compatibility, all the changes would be enabled byRTE_NEXT_ABI, which is disabled by default.Signed-off-by Helin Zhang <[email protected]>
PATCH v10 3/19 e1000: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/e1000/igb_rxtx.c | 104 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/e1000/igb_rxtx.c +104 -0
@@ -590,6 +590,101 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IGB_PACKET_TYPE_IPV4 0X01 +#define IGB_PACKET_TYPE_IPV4_TCP 0X11 +#define IGB_PACKET_TYPE_IPV4_UDP 0X21 +#define IGB_PACKET_TYPE_IPV4_SCTP 0X41 +#define IGB_PACKET_TYPE_IPV4_EXT 0X03 +#define IGB_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IGB_PACKET_TYPE_IPV6 0X04 +#define IGB_PACKET_TYPE_IPV6_TCP 0X14 +#define IGB_PACKET_TYPE_IPV6_UDP 0X24 +#define IGB_PACKET_TYPE_IPV6_EXT 0X0C +#define IGB_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IGB_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IGB_PACKET_TYPE_IPV4_IPV6 0X05 +#define IGB_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IGB_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IGB_PACKET_TYPE_MAX 0X80 +#define IGB_PACKET_TYPE_MASK 0X7F +#define IGB_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +igb_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IGB_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IGB_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 , + [IGB_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT , + [IGB_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 , + [IGB_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IGB_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IGB_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IGB_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IGB_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IGB_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &E1000_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IGB_PACKET_TYPE_SHIFT ) &IGB_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) +{ +uint64_t pkt_flags = ((hl_tp_rs &0x0F ) ==0 ) ?0 :PKT_RX_RSS_HASH ; + +#if defined(RTE_LIBRTE_IEEE1588 ) +static uint32_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >>4 ) &0x07 ]; +#endif + +return pkt_flags; +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -617,6 +712,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | (((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH); } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -790,6 +886,10 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + rxm->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb.lower. + lo_dword.hs_rss.pkt_info); +#endif /* * Store the mbuf address into the next entry of the array
@@ -1024,6 +1124,10 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); first_seg->ol_flags = pkt_flags; +#ifdef RTE_NEXT_ABI + first_seg->packet_type =igb_rxd_pkt_info_to_pkt_type (rxd.wb. + lower.lo_dword.hs_rss.pkt_info); +#endif /* Prefetch data of first segment, if configured to do so. */ rte_packet_prefetch((char *)first_seg->buf_addr +
Signature · 1 line
1.9.3
PATCH v10 4/19 ixgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet type among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default. Note that around 2.5% performance drop (64B) was observed of doing 4 ports (1 port per 82599 card) IO forwarding on the same SNB core.
--- drivers/net/ixgbe/ixgbe_rxtx.c | 163 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/ixgbe/ixgbe_rxtx.c +163 -0
@@ -859,6 +859,110 @@ end_of_tx:* RX functions * **********************************************************************/ +#ifdef RTE_NEXT_ABI +#define IXGBE_PACKET_TYPE_IPV4 0X01 +#define IXGBE_PACKET_TYPE_IPV4_TCP 0X11 +#define IXGBE_PACKET_TYPE_IPV4_UDP 0X21 +#define IXGBE_PACKET_TYPE_IPV4_SCTP 0X41 +#define IXGBE_PACKET_TYPE_IPV4_EXT 0X03 +#define IXGBE_PACKET_TYPE_IPV4_EXT_SCTP 0X43 +#define IXGBE_PACKET_TYPE_IPV6 0X04 +#define IXGBE_PACKET_TYPE_IPV6_TCP 0X14 +#define IXGBE_PACKET_TYPE_IPV6_UDP 0X24 +#define IXGBE_PACKET_TYPE_IPV6_EXT 0X0C +#define IXGBE_PACKET_TYPE_IPV6_EXT_TCP 0X1C +#define IXGBE_PACKET_TYPE_IPV6_EXT_UDP 0X2C +#define IXGBE_PACKET_TYPE_IPV4_IPV6 0X05 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_TCP 0X15 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_UDP 0X25 +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT 0X0D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D +#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D +#define IXGBE_PACKET_TYPE_MAX 0X80 +#define IXGBE_PACKET_TYPE_MASK 0X7F +#define IXGBE_PACKET_TYPE_SHIFT 0X04 +static inline uint32_t +ixgbe_rxd_pkt_info_to_pkt_type (uint16_t pkt_info) +{ +static const uint32_t + ptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = { + [IXGBE_PACKET_TYPE_IPV4 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 , + [IXGBE_PACKET_TYPE_IPV4_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT , + [IXGBE_PACKET_TYPE_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV4_IPV6 ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 , + [IXGBE_PACKET_TYPE_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT , + [IXGBE_PACKET_TYPE_IPV4_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_TCP , + [IXGBE_PACKET_TYPE_IPV4_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6 |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT |RTE_PTYPE_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT |RTE_PTYPE_INNER_L4_UDP , + [IXGBE_PACKET_TYPE_IPV4_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_SCTP , + [IXGBE_PACKET_TYPE_IPV4_EXT_SCTP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT |RTE_PTYPE_L4_SCTP , + }; +if (unlikely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return RTE_PTYPE_UNKNOWN ; + + pkt_info = (pkt_info >>IXGBE_PACKET_TYPE_SHIFT ) & +IXGBE_PACKET_TYPE_MASK ; + +return ptype_table[pkt_info]; +} + +static inline uint64_t +ixgbe_rxd_pkt_info_to_pkt_flags (uint16_t pkt_info) +{ + static uint64_t ip_rss_types_map[16] __rte_cache_aligned = { +0 ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH ,PKT_RX_RSS_HASH , +0 ,PKT_RX_RSS_HASH ,0 ,PKT_RX_RSS_HASH , +PKT_RX_RSS_HASH ,0 ,0 ,0 , +0 ,0 ,0 ,PKT_RX_FDIR , + }; +#ifdef RTE_LIBRTE_IEEE1588 +static uint64_t ip_pkt_etqf_map[8 ] = { +0 ,0 ,0 ,PKT_RX_IEEE1588_PTP , +0 ,0 ,0 ,0 , + }; + +if (likely (pkt_info &IXGBE_RXDADV_PKTTYPE_ETQF )) +return ip_pkt_etqf_map[(pkt_info >>4 ) &0X07 ] | + ip_rss_types_map[pkt_info &0XF ]; +else +return ip_rss_types_map[pkt_info &0XF ]; +#else +return ip_rss_types_map[pkt_info &0XF ]; +#endif +} +#else /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_hlen_type_rss_to_pkt_flags (uint32_t hl_tp_rs) {
@@ -894,6 +998,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)#endif return pkt_flags | ip_rss_types_map[hl_tp_rs & 0xF]; } +#endif /* RTE_NEXT_ABI */ static inline uint64_t rx_desc_status_to_pkt_flags (uint32_t rx_status)
@@ -949,7 +1054,13 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)struct rte_mbuf *mb;uint16_t pkt_len;uint64_t pkt_flags; +#ifdef RTE_NEXT_ABI +int nb_dd; +uint32_t s[LOOK_AHEAD ]; +uint16_t pkt_info[LOOK_AHEAD ]; +#else int s[LOOK_AHEAD ], nb_dd; +#endif /* RTE_NEXT_ABI */ int i, j, nb_rx =0 ;
@@ -972,6 +1083,12 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq)for (j =LOOK_AHEAD -1 ; j >=0 ; --j) s[j] = rxdp[j].wb.upper.status_error; +#ifdef RTE_NEXT_ABI +for (j =LOOK_AHEAD -1 ; j >=0 ; --j) + pkt_info[j] = rxdp[j].wb.lower.lo_dword. + hs_rss.pkt_info; +#endif /* RTE_NEXT_ABI */ +/* Compute how many status bits were set */ nb_dd =0 ;for (j =0 ; j <LOOK_AHEAD ; ++j)
@@ -988,12 +1105,22 @@ ixgbe_rx_scan_hw_ring(struct ixgbe_rx_queue *rxq) mb->vlan_tci =rte_le_to_cpu_16 (rxdp[j].wb.upper.vlan);/* convert descriptor fields to rte mbuf flags */ +#ifdef RTE_NEXT_ABI + pkt_flags =rx_desc_status_to_pkt_flags (s[j]); + pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); + pkt_flags |= +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info[j]); + mb->ol_flags = pkt_flags; + mb->packet_type = +ixgbe_rxd_pkt_info_to_pkt_type (pkt_info[j]); +#else /* RTE_NEXT_ABI */ pkt_flags =rx_desc_hlen_type_rss_to_pkt_flags ( rxdp[j].wb.lower.lo_dword.data);/* reuse status field from scan list */ pkt_flags |=rx_desc_status_to_pkt_flags (s[j]); pkt_flags |=rx_desc_error_to_pkt_flags (s[j]); mb->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) mb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;
@@ -1210,7 +1337,11 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,union ixgbe_adv_rx_desc rxd;uint64_t dma_addr;uint32_t staterr; +#ifdef RTE_NEXT_ABI +uint32_t pkt_info; +#else uint32_t hlen_type_rss; +#endif uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx;
@@ -1328,6 +1459,19 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rxm->data_len = pkt_len; rxm->port = rxq->port_id; +#ifdef RTE_NEXT_ABI + pkt_info =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.hs_rss. + pkt_info); +/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ + rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan); + + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); + pkt_flags = pkt_flags | +ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + rxm->ol_flags = pkt_flags; + rxm->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ hlen_type_rss =rte_le_to_cpu_32 (rxd.wb.lower.lo_dword.data);/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci =rte_le_to_cpu_16 (rxd.wb.upper.vlan);
@@ -1336,6 +1480,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, pkt_flags = pkt_flags |rx_desc_status_to_pkt_flags (staterr); pkt_flags = pkt_flags |rx_desc_error_to_pkt_flags (staterr); rxm->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) rxm->hash.rss = rxd.wb.lower.hi_dword.rss;
@@ -1409,6 +1554,23 @@ ixgbe_fill_cluster_head_buf( uint8_t port_id, uint32_t staterr) { +#ifdef RTE_NEXT_ABI +uint16_t pkt_info; +uint64_t pkt_flags; + + head->port = port_id; + +/* The vlan_tci field is only valid when PKT_RX_VLAN_PKT is +* set in the pkt_flags field. +*/ + head->vlan_tci =rte_le_to_cpu_16 (desc->wb.upper.vlan); + pkt_info =rte_le_to_cpu_32 (desc->wb.lower.lo_dword.hs_rss.pkt_info); + pkt_flags =rx_desc_status_to_pkt_flags (staterr); + pkt_flags |=rx_desc_error_to_pkt_flags (staterr); + pkt_flags |=ixgbe_rxd_pkt_info_to_pkt_flags (pkt_info); + head->ol_flags = pkt_flags; + head->packet_type =ixgbe_rxd_pkt_info_to_pkt_type (pkt_info); +#else /* RTE_NEXT_ABI */ uint32_t hlen_type_rss;uint64_t pkt_flags;
@@ -1424,6 +1586,7 @@ ixgbe_fill_cluster_head_buf( pkt_flags |=rx_desc_status_to_pkt_flags (staterr); pkt_flags |=rx_desc_error_to_pkt_flags (staterr); head->ol_flags = pkt_flags; +#endif /* RTE_NEXT_ABI */ if (likely (pkt_flags &PKT_RX_RSS_HASH )) head->hash.rss =rte_le_to_cpu_32 (desc->wb.lower.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v10 5/19 i40e: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/i40e/i40e_rxtx.c | 554 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 554 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/i40e/i40e_rxtx.c +554 -0
@@ -176,6 +176,540 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)return flags; } +#ifdef RTE_NEXT_ABI +/* For each value it means, datasheet of hardware can tell more details */ +static inline uint32_t +i40e_rxd_pkt_type_mapping (uint8_t ptype) +{ + static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { +/* L2 types */ +/* [0] reserved */ + [1 ] =RTE_PTYPE_L2_ETHER , + [2 ] =RTE_PTYPE_L2_ETHER_TIMESYNC , +/* [3] - [5] reserved */ + [6 ] =RTE_PTYPE_L2_ETHER_LLDP , +/* [7] - [10] reserved */ + [11 ] =RTE_PTYPE_L2_ETHER_ARP , +/* [12] - [21] reserved */ + +/* Non tunneled IPv4 */ + [22 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [23 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [24 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [25] reserved */ + [26 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [27 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [28 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv4 --> IPv4 */ + [29 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [30 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [31 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [32] reserved */ + [33 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [34 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [35 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> IPv6 */ + [36 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [37 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [38 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [39] reserved */ + [40 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [41 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [42 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN */ + [43 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv4 */ + [44 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [45 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [46 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [47] reserved */ + [48 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [49 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [50 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> IPv6 */ + [51 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [52 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [53 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [54] reserved */ + [55 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [56 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [57 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC */ + [58 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [59 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [60 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [61 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [62] reserved */ + [63 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [64 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [65 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [66 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [67 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [68 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [69] reserved */ + [70 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [71 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [72 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [73 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [74 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [75 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [76 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [77] reserved */ + [78 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [79 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [80 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv4 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [81 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [82 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [83 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [84] reserved */ + [85 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [86 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [87 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* Non tunneled IPv6 */ + [88 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_FRAG , + [89 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_NONFRAG , + [90 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_UDP , +/* [91] reserved */ + [92 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_TCP , + [93 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_SCTP , + [94 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_L4_ICMP , + +/* IPv6 --> IPv4 */ + [95 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [96 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [97 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [98] reserved */ + [99 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [100 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [101 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> IPv6 */ + [102 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [103 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [104 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [105] reserved */ + [106 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [107 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [108 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_IP | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN */ + [109 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv4 */ + [110 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [111 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [112 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [113] reserved */ + [114 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [115 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [116 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> IPv6 */ + [117 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [118 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [119 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [120] reserved */ + [121 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [122 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [123 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC */ + [124 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv4 */ + [125 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [126 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [127 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [128] reserved */ + [129 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [130 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [131 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC --> IPv6 */ + [132 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [133 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [134 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [135] reserved */ + [136 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [137 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [138 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT |RTE_PTYPE_INNER_L2_ETHER | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN */ + [139 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv4 */ + [140 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [141 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [142 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [143] reserved */ + [144 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [145 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [146 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* IPv6 --> GRE/Teredo/VXLAN --> MAC/VLAN --> IPv6 */ + [147 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_FRAG , + [148 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_NONFRAG , + [149 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_UDP , +/* [150] reserved */ + [151 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_TCP , + [152 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_SCTP , + [153 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_TUNNEL_GRENAT | +RTE_PTYPE_INNER_L2_ETHER_VLAN | +RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN | +RTE_PTYPE_INNER_L4_ICMP , + +/* All others reserved */ + }; + +return ptype_table[ptype]; +} +#else /* RTE_NEXT_ABI */ /* Translate pkt types to pkt flags */ static inline uint64_t i40e_rxd_ptype_to_pkt_flags (uint64_t qword)
@@ -443,6 +977,7 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword) return ip_ptype_map[ptype]; } +#endif /* RTE_NEXT_ABI */ #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03#define I40E_RX_DESC_EXT_STATUS_FLEXBH_FD_ID 0x01
@@ -730,11 +1265,18 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)i40e_rxd_to_vlan_tci (mb, &rxdp[j]); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + mb->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >> +I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); mb->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) mb->hash.rss =rte_le_to_cpu_32 (\ rxdp[j].wb.qword0.hi_dword.rss);
@@ -971,9 +1513,15 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)i40e_rxd_to_vlan_tci (rxm, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + rxm->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); rxm->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
@@ -1129,10 +1677,16 @@ i40e_recv_scattered_pkts(void *rx_queue,i40e_rxd_to_vlan_tci (first_seg, &rxd); pkt_flags =i40e_rxd_status_to_pkt_flags (qword1); pkt_flags |=i40e_rxd_error_to_pkt_flags (qword1); +#ifdef RTE_NEXT_ABI + first_seg->packet_type = +i40e_rxd_pkt_type_mapping ((uint8_t )((qword1 & +I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT )); +#else pkt_flags |=i40e_rxd_ptype_to_pkt_flags (qword1); first_seg->packet_type = (uint16_t )((qword1 &I40E_RXD_QW1_PTYPE_MASK ) >>I40E_RXD_QW1_PTYPE_SHIFT ); +#endif /* RTE_NEXT_ABI */ if (pkt_flags &PKT_RX_RSS_HASH ) rxm->hash.rss =rte_le_to_cpu_32 (rxd.wb.qword0.hi_dword.rss);
Signature · 1 line
1.9.3
PATCH v10 6/19 enic: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/enic/enic_main.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/enic/enic_main.c +26 -0
@@ -423,7 +423,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=PKT_RX_IP_CKSUM_BAD ;
@@ -432,7 +436,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Header split */ if (sop && !eop) {
@@ -445,7 +453,11 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, *rx_pkt_bucket = rx_pkt; rx_pkt->pkt_len = bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) rx_pkt->ol_flags |=
@@ -457,13 +469,22 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + rx_pkt->packet_type =RTE_PTYPE_L3_IPV6 ; +#else rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }else {/* Payload */ hdr_rx_pkt = *rx_pkt_bucket; hdr_rx_pkt->pkt_len += bytes_written;if (ipv4) { +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV4 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!csum_not_calc) {if (unlikely (!ipv4_csum_ok)) hdr_rx_pkt->ol_flags |=
@@ -475,7 +496,12 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq,PKT_RX_L4_CKSUM_BAD ; } } else if (ipv6) +#ifdef RTE_NEXT_ABI + hdr_rx_pkt->packet_type = +RTE_PTYPE_L3_IPV6 ; +#else hdr_rx_pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif } }
Signature · 1 line
1.9.3
PATCH v10 7/19 vmxnet3: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
drivers/net/vmxnet3/vmxnet3_rxtx.c +8 -0
@@ -649,9 +649,17 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth +1 ); if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr)) +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4_EXT ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR_EXT ; +#endif else +#ifdef RTE_NEXT_ABI + rxm->packet_type =RTE_PTYPE_L3_IPV4 ; +#else rxm->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (!rcd->cnc) {if (!rcd->ipc)
Signature · 1 line
1.9.3
PATCH v10 8/19 fm10k: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/fm10k/fm10k_rxtx.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
v4 changes:
* Supported unified packet type of fm10k from v4.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
drivers/net/fm10k/fm10k_rxtx.c +27 -0
@@ -68,12 +68,37 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)static inline void rx_desc_to_ol_flags (struct rte_mbuf *m,const union fm10k_rx_desc *d) { +#ifdef RTE_NEXT_ABI +static const uint32_t + ptype_table[FM10K_RXD_PKTTYPE_MASK >>FM10K_RXD_PKTTYPE_SHIFT ] + __rte_cache_aligned = { + [FM10K_PKTTYPE_OTHER ] =RTE_PTYPE_L2_ETHER , + [FM10K_PKTTYPE_IPV4 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV4 , + [FM10K_PKTTYPE_IPV4_EX ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4_EXT , + [FM10K_PKTTYPE_IPV6 ] =RTE_PTYPE_L2_ETHER |RTE_PTYPE_L3_IPV6 , + [FM10K_PKTTYPE_IPV6_EX ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6_EXT , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_TCP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_TCP , + [FM10K_PKTTYPE_IPV4 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV4 |RTE_PTYPE_L4_UDP , + [FM10K_PKTTYPE_IPV6 |FM10K_PKTTYPE_UDP ] =RTE_PTYPE_L2_ETHER | +RTE_PTYPE_L3_IPV6 |RTE_PTYPE_L4_UDP , + }; + + m->packet_type = ptype_table[(d->w.pkt_info &FM10K_RXD_PKTTYPE_MASK ) + >>FM10K_RXD_PKTTYPE_SHIFT ]; +#else /* RTE_NEXT_ABI */ uint16_t ptype;static const uint16_t pt_lut[] = {0 ,PKT_RX_IPV4_HDR ,PKT_RX_IPV4_HDR_EXT ,PKT_RX_IPV6_HDR ,PKT_RX_IPV6_HDR_EXT ,0 ,0 ,0 }; +#endif /* RTE_NEXT_ABI */ if (d->w.pkt_info &FM10K_RXD_RSSTYPE_MASK ) m->ol_flags |=PKT_RX_RSS_HASH ;
@@ -97,9 +122,11 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)if (unlikely (d->d.staterr &FM10K_RXD_STATUS_RXE )) m->ol_flags |=PKT_RX_RECIP_ERR ; +#ifndef RTE_NEXT_ABI ptype = (d->d.data &FM10K_RXD_PKTTYPE_MASK_L3 ) >>FM10K_RXD_PKTTYPE_SHIFT ; m->ol_flags |= pt_lut[(uint8_t )ptype]; +#endif }uint16_t
Signature · 1 line
1.9.3
PATCH v10 9/19 cxgbe: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- drivers/net/cxgbe/sge.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v9 changes:
* Added unified packet type support in newly added cxgbe driver.
drivers/net/cxgbe/sge.c +8 -0
@@ -1326,14 +1326,22 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp, mbuf->port = pkt->iff;if (pkt->l2info &htonl (F_RXF_IP )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV4 ; +#else mbuf->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (unlikely (!csum_ok)) mbuf->ol_flags |=PKT_RX_IP_CKSUM_BAD ;if ((pkt->l2info &htonl (F_RXF_UDP |F_RXF_TCP )) && !csum_ok) mbuf->ol_flags |=PKT_RX_L4_CKSUM_BAD ; }else if (pkt->l2info &htonl (F_RXF_IP6 )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV6 ; +#else mbuf->ol_flags |=PKT_RX_IPV6_HDR ; +#endif } mbuf->port = pkt->iff;
Signature · 1 line
1.9.3
PATCH v10 10/19 app/test-pipeline: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pipeline/pipeline_hash.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test-pipeline/pipeline_hash.c +13 -0
@@ -459,20 +459,33 @@ app_main_loop_rx_metadata(void) { signature =RTE_MBUF_METADATA_UINT32_PTR (m,0 ); key =RTE_MBUF_METADATA_UINT8_PTR (m,32 ); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif ip_hdr = (struct ipv4_hdr *) &m_data[sizeof (struct ether_hdr )]; ip_dst = ip_hdr->dst_addr; k32 = (uint32_t *) key; k32[0 ] = ip_dst &0xFFFFFF00 ; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif ipv6_hdr = (struct ipv6_hdr *) &m_data[sizeof (struct ether_hdr )]; ipv6_dst = ipv6_hdr->dst_addr;memcpy (key, ipv6_dst,16 ); +#ifdef RTE_NEXT_ABI + } else + continue; +#else } +#endif *signature =test_hash (key,0 ,0 ); }
Signature · 1 line
1.9.3
PATCH v10 11/19 app/testpmd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test-pmd/csumonly.c | 14 ++++ app/test-pmd/rxonly.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v4 changes:
* Added printing logs of packet types of each received packet in rxonly mode.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
v9 changes:
* Renamed MAC to ETHER in packet type names.
app/test-pmd/csumonly.c +14 -0
@@ -202,8 +202,14 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)/* Parse a vxlan header */ static void +#ifdef RTE_NEXT_ABI +parse_vxlan(struct udp_hdr *udp_hdr, + struct testpmd_offload_info *info, + uint32_t pkt_type) +#elseparse_vxlan (struct udp_hdr *udp_hdr,struct testpmd_offload_info *info, uint64_t mbuf_olflags) +#endif {struct ether_hdr *eth_hdr;
@@ -211,8 +217,12 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info,* (rfc7348) or that the rx offload flag is set (i40e only * currently) */ if (udp_hdr->dst_port != _htons(4789) && +#ifdef RTE_NEXT_ABI + RTE_ETH_IS_TUNNEL_PKT(pkt_type) == 0) +#else (mbuf_olflags & (PKT_RX_TUNNEL_IPV4_HDR | PKT_RX_TUNNEL_IPV6_HDR)) == 0) +#endif return ; info->is_tunnel =1 ;
@@ -549,7 +559,11 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)struct udp_hdr *udp_hdr; udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); +#ifdef RTE_NEXT_ABI +parse_vxlan (udp_hdr, &info, m->packet_type); +#else parse_vxlan (udp_hdr, &info, m->ol_flags); +#endif }else if (info.l4_proto ==IPPROTO_GRE ) {struct simple_gre_hdr *gre_hdr; gre_hdr = (struct simple_gre_hdr *)
app/test-pmd/rxonly.c +183 -0
211 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v10 12/19 app/test: Remove useless code
In reply to Helin ZhangSeverl useless code lines are added accidently, which blocks packet type unification. They should be deleted at all.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- app/test/packet_burst_generator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
v4 changes:
* Removed several useless code lines which block packet type unification.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
app/test/packet_burst_generator.c +4 -2
@@ -273,19 +273,21 @@ nomore_mbuf:if (ipv4) { pkt->vlan_tci = ETHER_TYPE_IPv4; pkt->l3_len =sizeof (struct ipv4_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV4_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV4_HDR ; +#endif }else { pkt->vlan_tci = ETHER_TYPE_IPv6; pkt->l3_len =sizeof (struct ipv6_hdr ); - +#ifndef RTE_NEXT_ABI if (vlan_enabled) pkt->ol_flags =PKT_RX_IPV6_HDR |PKT_RX_VLAN_PKT ;else pkt->ol_flags =PKT_RX_IPV6_HDR ; +#endif } pkts_burst[nb_pkt] = pkt;
Signature · 1 line
1.9.3
PATCH v10 13/19 examples/ip_fragmentation: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_fragmentation/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_fragmentation/main.c +9 -0
@@ -283,7 +283,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, len = qconf->tx_mbufs[port_out].len;/* if this is an IPv4 packet */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;/* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -317,9 +321,14 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,if (unlikely (len2 <0 ))return ; } +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if this is an IPv6 packet */ +#else }/* if this is an IPv6 packet */ else if (m->ol_flags &PKT_RX_IPV6_HDR ) { +#endif struct ipv6_hdr *ip_hdr; ipv6 =1 ;
Signature · 1 line
1.9.3
PATCH v10 14/19 examples/ip_reassembly: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/ip_reassembly/main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/ip_reassembly/main.c +9 -0
@@ -356,7 +356,11 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, dst_port = portid;/* if packet is IPv4 */ +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags & (PKT_RX_IPV4_HDR )) { +#endif struct ipv4_hdr *ip_hdr;uint32_t ip_dst;
@@ -396,9 +400,14 @@ reassemble(struct rte_mbuf *m, uint8_t portid, uint32_t queue, } eth_hdr->ether_type =rte_be_to_cpu_16 (ETHER_TYPE_IPv4); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +/* if packet is IPv6 */ +#else }/* if packet is IPv6 */ else if (m->ol_flags & (PKT_RX_IPV6_HDR |PKT_RX_IPV6_HDR_EXT )) { +#endif struct ipv6_extension_fragment *frag_hdr;struct ipv6_hdr *ip_hdr;
Signature · 1 line
1.9.3
PATCH v10 15/19 examples/l3fwd-acl: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-acl/main.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-acl/main.c +23 -6
@@ -645,10 +645,13 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,struct ipv4_hdr *ipv4_hdr;struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif ipv4_hdr = rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *,sizeof (struct ether_hdr ));
@@ -667,9 +670,11 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl,/* Not a valid IPv4 packet */ rte_pktmbuf_free (pkt); } - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -687,17 +692,22 @@ prepare_one_packet(struct rte_mbuf **pkts_in, struct acl_search_t *acl, {struct rte_mbuf *pkt = pkts_in[index]; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else int type = pkt->ol_flags & (PKT_RX_IPV4_HDR |PKT_RX_IPV6_HDR );if (type ==PKT_RX_IPV4_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv4[acl->num_ipv4] =MBUF_IPV4_2PROTO (pkt); acl->m_ipv4[(acl->num_ipv4)++] = pkt; - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (type ==PKT_RX_IPV6_HDR ) { - +#endif /* Fill acl structure */ acl->data_ipv6[acl->num_ipv6] =MBUF_IPV6_2PROTO (pkt); acl->m_ipv6[(acl->num_ipv6)++] = pkt;
@@ -745,10 +755,17 @@ send_one_packet(struct rte_mbuf *m, uint32_t res)/* in the ACL list, drop it */ #ifdef L3FWDACL_DEBUG if ((res &ACL_DENY_SIGNATURE ) !=0 ) { +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) +dump_acl4_rule (m, res); +else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) +dump_acl6_rule (m, res); +#else if (m->ol_flags &PKT_RX_IPV4_HDR )dump_acl4_rule (m, res);else dump_acl6_rule (m, res); +#endif /* RTE_NEXT_ABI */ }#endif rte_pktmbuf_free (m);
Signature · 1 line
1.9.3
PATCH v10 16/19 examples/l3fwd-power: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd-power/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd-power/main.c +8 -0
@@ -635,7 +635,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
@@ -670,8 +674,12 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,ether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ #if (APP_LOOKUP_METHOD ==APP_LOOKUP_EXACT_MATCH )struct ipv6_hdr *ipv6_hdr;
Signature · 1 line
1.9.3
PATCH v10 17/19 examples/l3fwd: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/l3fwd/main.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
v3 changes:
* Minor bug fixes and enhancements.
v5 changes:
* Re-worded the commit logs.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
examples/l3fwd/main.c +120 -3
@@ -939,7 +939,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (m->packet_type)) { +#else if (m->ol_flags &PKT_RX_IPV4_HDR ) { +#endif /* Handle IPv4 headers.*/ ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,sizeof (struct ether_hdr ));
@@ -970,8 +974,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); - +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (m->packet_type)) { +#else }else { +#endif /* Handle IPv6 headers.*/ struct ipv6_hdr *ipv6_hdr;
@@ -990,8 +997,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconether_addr_copy (&ports_eth_addr[dst_port], ð_hdr->s_addr);send_single_packet (m, dst_port); +#ifdef RTE_NEXT_ABI + }else +/* Free the mbuf that contains non-IPV4/IPV6 packet */ +rte_pktmbuf_free (m); +#else } - +#endif }#ifdef DO_RFC_1812_CHECKS
@@ -1015,12 +1027,19 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon* to BAD_PORT value. */ static inline __attribute__((always_inline)) void +#ifdef RTE_NEXT_ABI +rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t ptype) +#else rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags) +#endif {uint8_t ihl; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (ptype)) { +#else if ((flags &PKT_RX_IPV4_HDR ) !=0 ) { - +#endif ihl = ipv4_hdr->version_ihl -IPV4_MIN_VER_IHL ; ipv4_hdr->time_to_live--;
@@ -1050,11 +1069,19 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,struct ipv6_hdr *ipv6_hdr;struct ether_hdr *eth_hdr; +#ifdef RTE_NEXT_ABI +if (RTE_ETH_IS_IPV4_HDR (pkt->packet_type)) { +#else if (pkt->ol_flags &PKT_RX_IPV4_HDR ) { +#endif if (rte_lpm_lookup (qconf->ipv4_lookup_struct, dst_ipv4, &next_hop) !=0 ) next_hop = portid; +#ifdef RTE_NEXT_ABI + }else if (RTE_ETH_IS_IPV6_HDR (pkt->packet_type)) { +#else }else if (pkt->ol_flags &PKT_RX_IPV6_HDR ) { +#endif eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *); ipv6_hdr = (struct ipv6_hdr *)(eth_hdr +1 ); if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
@@ -1088,12 +1115,52 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt, ve = val_eth[dp]; dst_port[0 ] = dp; +#ifdef RTE_NEXT_ABI +rfc1812_process (ipv4_hdr, dst_port, pkt->packet_type); +#else rfc1812_process (ipv4_hdr, dst_port, pkt->ol_flags); +#endif te =_mm_blend_epi16 (te, ve,MASK_ETH );_mm_store_si128 ((__m128i *)eth_hdr, te); } +#ifdef RTE_NEXT_ABI +/* +* Read packet_type and destination IPV4 addresses from 4 mbufs. +*/ +static inline void +processx4_step1 (struct rte_mbuf *pkt[FWDSTEP ], +__m128i *dip, +uint32_t *ipv4_flag) +{ +struct ipv4_hdr *ipv4_hdr; +struct ether_hdr *eth_hdr; +uint32_t x0, x1, x2, x3; + + eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x0 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] = pkt[0 ]->packet_type &RTE_PTYPE_L3_IPV4 ; + + eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x1 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[1 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x2 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[2 ]->packet_type; + + eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *); + ipv4_hdr = (struct ipv4_hdr *)(eth_hdr +1 ); + x3 = ipv4_hdr->dst_addr; + ipv4_flag[0 ] &= pkt[3 ]->packet_type; + + dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); +} +#else /* RTE_NEXT_ABI */ /* * Read ol_flags and destination IPV4 addresses from 4 mbufs. */
@@ -1126,14 +1193,24 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag) dip[0 ] =_mm_set_epi32 (x3, x2, x1, x0); } +#endif /* RTE_NEXT_ABI */ /* * Lookup into LPM for destination port. * If lookup fails, use incoming port (portid) as destination port. */ static inline void +#ifdef RTE_NEXT_ABI +processx4_step2(const struct lcore_conf *qconf, + __m128i dip, + uint32_t ipv4_flag, + uint8_t portid, + struct rte_mbuf *pkt[FWDSTEP], + uint16_t dprt[FWDSTEP]) +#elseprocessx4_step2 (const struct lcore_conf *qconf, __m128i dip,uint32_t flag, uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP]) +#endif /* RTE_NEXT_ABI */ {rte_xmm_t dst; const __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
@@ -1143,7 +1220,11 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag, dip =_mm_shuffle_epi8 (dip, bswap_mask);/* if all 4 packets are IPV4. */ +#ifdef RTE_NEXT_ABI +if (likely (ipv4_flag)) { +#else if (likely (flag !=0 )) { +#endif rte_lpm_lookupx4 (qconf->ipv4_lookup_struct, dip, dprt, portid); }else { dst.x = dip;
@@ -1193,6 +1274,16 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])_mm_store_si128 (p[2 ], te[2 ]);_mm_store_si128 (p[3 ], te[3 ]); +#ifdef RTE_NEXT_ABI +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), + &dst_port[0 ], pkt[0 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[1 ] +1 ), + &dst_port[1 ], pkt[1 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[2 ] +1 ), + &dst_port[2 ], pkt[2 ]->packet_type); +rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), + &dst_port[3 ], pkt[3 ]->packet_type); +#else /* RTE_NEXT_ABI */ rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[0 ] +1 ), &dst_port[0 ], pkt[0 ]->ol_flags); rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1),
@@ -1201,6 +1292,7 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP]) &dst_port[2], pkt[2]->ol_flags);rfc1812_process ((struct ipv4_hdr *)((struct ether_hdr *)p[3 ] +1 ), &dst_port[3 ], pkt[3 ]->ol_flags); +#endif /* RTE_NEXT_ABI */ }/*
@@ -1387,7 +1479,11 @@ main_loop(__attribute__((unused)) void *dummy)uint16_t *lp;uint16_t dst_port[MAX_PKT_BURST ];__m128i dip[MAX_PKT_BURST /FWDSTEP ]; +#ifdef RTE_NEXT_ABI +uint32_t ipv4_flag[MAX_PKT_BURST /FWDSTEP ]; +#else uint32_t flag[MAX_PKT_BURST /FWDSTEP ]; +#endif uint16_t pnum[MAX_PKT_BURST +1 ];#endif
@@ -1457,6 +1553,18 @@ main_loop(__attribute__((unused)) void *dummy)*/ int32_t n =RTE_ALIGN_FLOOR (nb_rx,4 );for (j =0 ; j < n ; j+=4 ) { +#ifdef RTE_NEXT_ABI +uint32_t pkt_type = + pkts_burst[j]->packet_type & + pkts_burst[j+1 ]->packet_type & + pkts_burst[j+2 ]->packet_type & + pkts_burst[j+3 ]->packet_type; +if (pkt_type &RTE_PTYPE_L3_IPV4 ) { +simple_ipv4_fwd_4pkts ( + &pkts_burst[j], portid, qconf); + }else if (pkt_type & +RTE_PTYPE_L3_IPV6 ) { +#else /* RTE_NEXT_ABI */ uint32_t ol_flag = pkts_burst[j]->ol_flags & pkts_burst[j+1 ]->ol_flags & pkts_burst[j+2 ]->ol_flags
@@ -1465,6 +1573,7 @@ main_loop(__attribute__((unused)) void *dummy)simple_ipv4_fwd_4pkts (&pkts_burst[j], portid, qconf); }else if (ol_flag &PKT_RX_IPV6_HDR ) { +#endif /* RTE_NEXT_ABI */ simple_ipv6_fwd_4pkts (&pkts_burst[j], portid, qconf); }else {
@@ -1489,13 +1598,21 @@ main_loop(__attribute__((unused)) void *dummy)for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step1 (&pkts_burst[j], &dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + &ipv4_flag[j /FWDSTEP ]); +#else &flag[j / FWDSTEP]); +#endif } k =RTE_ALIGN_FLOOR (nb_rx,FWDSTEP );for (j =0 ; j != k; j +=FWDSTEP ) {processx4_step2 (qconf, dip[j /FWDSTEP ], +#ifdef RTE_NEXT_ABI + ipv4_flag[j /FWDSTEP ], portid, +#else flag[j /FWDSTEP ], portid, +#endif &pkts_burst[j], &dst_port[j]); }
Signature · 1 line
1.9.3
PATCH v10 18/19 examples/tep_termination: replace bit mask based packet type with unified packet type
In reply to Helin ZhangTo unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type.
To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- examples/tep_termination/vxlan.c | 4 ++++ 1 file changed, 4 insertions(+)
v9 changes:
* Used unified packet type to check if it is a VXLAN packet, included in RTE_NEXT_ABI which is disabled by default.
v10 changes:
* Fixed a compile error.
examples/tep_termination/vxlan.c +4 -0
@@ -180,8 +180,12 @@ decapsulation(struct rte_mbuf *pkt)* (rfc7348) or that the rx offload flag is set (i40e only * currently)*/ if (udp_hdr->dst_port !=rte_cpu_to_be_16 (DEFAULT_VXLAN_PORT ) && +#ifdef RTE_NEXT_ABI + (pkt->packet_type &RTE_PTYPE_TUNNEL_MASK ) ==0 ) +#else (pkt->ol_flags & (PKT_RX_TUNNEL_IPV4_HDR | PKT_RX_TUNNEL_IPV6_HDR)) == 0) +#endifreturn -1 ; outer_header_len = info.outer_l2_len + info.outer_l3_len +sizeof (struct udp_hdr ) +sizeof (struct vxlan_hdr );
Signature · 1 line
1.9.3
PATCH v10 19/19 mbuf: remove old packet type bit masks
In reply to Helin ZhangAs unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default.
--- lib/librte_mbuf/rte_mbuf.c | 4 ++++ lib/librte_mbuf/rte_mbuf.h | 4 ++++ 2 files changed, 8 insertions(+)
v2 changes:
* Used redefined packet types and enlarged packet_type field in mbuf.
* Redefined the bit masks for packet RX offload flags.
v5 changes:
* Rolled back the bit masks of RX flags, for ABI compatibility.
v6 changes:
* Disabled the code changes for unified packet type by default, to avoid breaking ABI compatibility.
v7 changes:
* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.
lib/librte_mbuf/rte_mbuf.c +4 -0
@@ -251,14 +251,18 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask)/* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */ /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */ /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */ +#ifndef RTE_NEXT_ABI case PKT_RX_IPV4_HDR :return "PKT_RX_IPV4_HDR" ;case PKT_RX_IPV4_HDR_EXT :return "PKT_RX_IPV4_HDR_EXT" ;case PKT_RX_IPV6_HDR :return "PKT_RX_IPV6_HDR" ;case PKT_RX_IPV6_HDR_EXT :return "PKT_RX_IPV6_HDR_EXT" ; +#endif /* RTE_NEXT_ABI */ case PKT_RX_IEEE1588_PTP :return "PKT_RX_IEEE1588_PTP" ;case PKT_RX_IEEE1588_TMST :return "PKT_RX_IEEE1588_TMST" ; +#ifndef RTE_NEXT_ABI case PKT_RX_TUNNEL_IPV4_HDR :return "PKT_RX_TUNNEL_IPV4_HDR" ;case PKT_RX_TUNNEL_IPV6_HDR :return "PKT_RX_TUNNEL_IPV6_HDR" ; +#endif /* RTE_NEXT_ABI */ default :return NULL ; } }
lib/librte_mbuf/rte_mbuf.h +4 -0
@@ -92,14 +92,18 @@ extern "C" {#define PKT_RX_HBUF_OVERFLOW (0ULL << 0)/**< Header buffer overflow. */ #define PKT_RX_RECIP_ERR (0ULL << 0)/**< Hardware processing error. */ #define PKT_RX_MAC_ERR (0ULL << 0)/**< MAC error. */ +#ifndef RTE_NEXT_ABI #define PKT_RX_IPV4_HDR (1ULL << 5)/**< RX packet with IPv4 header. */ #define PKT_RX_IPV4_HDR_EXT (1ULL << 6)/**< RX packet with extended IPv4 header. */ #define PKT_RX_IPV6_HDR (1ULL << 7)/**< RX packet with IPv6 header. */ #define PKT_RX_IPV6_HDR_EXT (1ULL << 8)/**< RX packet with extended IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_IEEE1588_PTP (1ULL << 9)/**< RX IEEE1588 L2 Ethernet PT Packet. */ #define PKT_RX_IEEE1588_TMST (1ULL << 10)/**< RX IEEE1588 L2/L4 timestamped packet.*/ +#ifndef RTE_NEXT_ABI #define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11)/**< RX tunnel packet with IPv4 header.*/ #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12)/**< RX tunnel packet with IPv6 header. */ +#endif /* RTE_NEXT_ABI */ #define PKT_RX_FDIR_ID (1ULL << 13)/**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14)/**< Flexible bytes reported if FDIR match. */ #define PKT_RX_QINQ_PKT (1ULL << 15)/**< RX packet with double VLAN stripped. */
Signature · 1 line
1.9.3
Re: [PATCH v10 19/19] mbuf: remove old packet type bit masks
2015-07-10 00:31, Helin Zhang:
Quoted 2 lines
As unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed.
It breaks mlx4 and cxgbe drivers.
The mlx4 driver didn't have the chance to be updated in this series. Adrien, please, could you help Helin to convert ol_flags to packet type?
The cxgbe changes need to be updated after78fc1a716ae8 ("cxgbe: improve Rx performance")
I suggest this update:
drivers/net/cxgbe/sge.c +8 -0
@@ -1419,7 +1419,11 @@ static int process_responses(struct sge_rspq *q, int budget,unmap_rx_buf (&rxq->fl);if (cpl->l2info &htonl (F_RXF_IP )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV4 ; +#else pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (unlikely (!csum_ok)) pkt->ol_flags |=PKT_RX_IP_CKSUM_BAD ;
@@ -1427,7 +1431,11 @@ static int process_responses(struct sge_rspq *q, int budget, htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok) pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; }else if (cpl->l2info &htonl (F_RXF_IP6 )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV6 ; +#else pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }
Re: [PATCH v10 19/19] mbuf: remove old packet type bit masks
Hi Thomas
Quoted 8 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Monday, July 13, 2015 9:13 AM
To: Zhang, Helin
Cc: [email protected]; Adrien Mazarguil
Subject: Re: [dpdk-dev] [PATCH v10 19/19] mbuf: remove old packet type bit masks
Quoted 8 lines
2015-07-10 00:31, Helin Zhang:
Quoted 2 lines
As unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed.
It breaks mlx4 and cxgbe drivers.
The mlx4 driver didn't have the chance to be updated in this series. Adrien, please, could you help Helin to convert
ol_flagsto packet type?
I think I have already reworked with that changes in v9 and v10 recently.
http://www.dpdk.org/dev/patchwork/patch/6253/
Regards,
Helin
Quoted 33 lines
The cxgbe changes need to be updated after
78fc1a716ae8("cxgbe: improve Rx performance") I suggest this update:drivers/net/cxgbe/sge.c +4
-0@@ -1419,7 +1419,11 @@ static int process_responses(struct sge_rspq *q, int budget,unmap_rx_buf (&rxq->fl);if (cpl->l2info &htonl (F_RXF_IP )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV4 ; +#else pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (unlikely (!csum_ok)) pkt->ol_flags |=
PKT_RX_IP_CKSUM_BAD;drivers/net/cxgbe/sge.c +4
-0@@ -1427,7 +1431,11 @@ static int process_responses(struct sge_rspq *q, int budget, htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok) pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; }else if (cpl->l2info &htonl (F_RXF_IP6 )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV6 ; +#else pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }
Re: [PATCH v10 19/19] mbuf: remove old packet type bit masks
2015-07-13 16:25, Zhang, Helin:
Quoted 6 lines
From: Thomas Monjalon [mailto:[email protected]]
Quoted 5 lines
2015-07-10 00:31, Helin Zhang:
Quoted 2 lines
As unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed.
It breaks mlx4 and cxgbe drivers.
[...]
Quoted 2 lines
I think I have already reworked with that changes in v9 and v10 recently.
http://www.dpdk.org/dev/patchwork/patch/6253/
No, your changes were for t4_ethrx_handler().
Since recent cxgbe change, we also need to update process_responses().
Quoted 33 lines
Quoted 32 lines
The cxgbe changes need to be updated after
78fc1a716ae8("cxgbe: improve Rx performance") I suggest this update:drivers/net/cxgbe/sge.c +4
-0@@ -1419,7 +1419,11 @@ static int process_responses(struct sge_rspq *q, int budget,unmap_rx_buf (&rxq->fl);if (cpl->l2info &htonl (F_RXF_IP )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV4 ; +#else pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (unlikely (!csum_ok)) pkt->ol_flags |=
PKT_RX_IP_CKSUM_BAD;drivers/net/cxgbe/sge.c +4
-0@@ -1427,7 +1431,11 @@ static int process_responses(struct sge_rspq *q, int budget, htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok) pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; }else if (cpl->l2info &htonl (F_RXF_IP6 )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV6 ; +#else pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }
Re: [PATCH v10 19/19] mbuf: remove old packet type bit masks
Quoted 16 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Monday, July 13, 2015 9:28 AM
To: Zhang, Helin
Cc: [email protected]; Adrien Mazarguil; Rahul Lakkireddy
Subject: Re: [dpdk-dev] [PATCH v10 19/19] mbuf: remove old packet type bit masks2015-07-13 16:25, Zhang, Helin:
Quoted 5 lines
From: Thomas Monjalon [mailto:[email protected]]
Quoted 4 lines
2015-07-10 00:31, Helin Zhang:
Quoted 2 lines
As unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed.
Quoted 7 lines
Quoted 1 line
Quoted 1 line
It breaks mlx4 and cxgbe drivers.
[...]
Quoted 2 lines
I think I have already reworked with that changes in v9 and v10 recently.
http://www.dpdk.org/dev/patchwork/patch/6253/No, your changes were for
t4_ethrx_handler().
Since recent cxgbe change, we also need to updateprocess_responses().
OK. Thanks! It involves so many components.
Thank you all for helping on unified packet type!
- Helin
Quoted 35 lines
Quoted 34 lines
Quoted 33 lines
The cxgbe changes need to be updated after
78fc1a716ae8("cxgbe: improve Rx performance") I suggest this update:drivers/net/cxgbe/sge.c +4
-0@@ -1419,7 +1419,11 @@ static int process_responses(struct sge_rspq *q, int budget,unmap_rx_buf (&rxq->fl);if (cpl->l2info &htonl (F_RXF_IP )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type = +RTE_PTYPE_L3_IPV4 ;#else pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (unlikely (!csum_ok)) pkt->ol_flags |=
PKT_RX_IP_CKSUM_BAD;drivers/net/cxgbe/sge.c +4
-0@@ -1427,7 +1431,11 @@ static int process_responses(struct sge_rspq *q, int budget, htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok) pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; }else if (cpl->l2info &htonl (F_RXF_IP6 )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type = +RTE_PTYPE_L3_IPV6 ;#else pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif }
Zhang, Helin
Acked-byRe: [PATCH v10 19/19] mbuf: remove old packet type bit masks
In reply to Thomas MonjalonQuoted 50 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Monday, July 13, 2015 9:13 AM
To: Zhang, Helin
Cc: [email protected]; Adrien Mazarguil
Subject: Re: [dpdk-dev] [PATCH v10 19/19] mbuf: remove old packet type bit masks2015-07-10 00:31, Helin Zhang:
Quoted 2 lines
As unified packet types are used instead, those old bit masks and the relevant macros for packet type indication need to be removed.
It breaks mlx4 and cxgbe drivers.
The mlx4 driver didn't have the chance to be updated in this series. Adrien, please, could you help Helin to convert
ol_flagsto packet type?The cxgbe changes need to be updated after
78fc1a716ae8("cxgbe: improve Rx performance") I suggest this update:drivers/net/cxgbe/sge.c +4
-0@@ -1419,7 +1419,11 @@ static int process_responses(struct sge_rspq *q, int budget,unmap_rx_buf (&rxq->fl);if (cpl->l2info &htonl (F_RXF_IP )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV4 ; +#else pkt->ol_flags |=PKT_RX_IPV4_HDR ; +#endif if (unlikely (!csum_ok)) pkt->ol_flags |=
PKT_RX_IP_CKSUM_BAD;drivers/net/cxgbe/sge.c +4
-0@@ -1427,7 +1431,11 @@ static int process_responses(struct sge_rspq *q, int budget, htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok) pkt->ol_flags |=PKT_RX_L4_CKSUM_BAD ; }else if (cpl->l2info &htonl (F_RXF_IP6 )) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type =RTE_PTYPE_L3_IPV6 ; +#else pkt->ol_flags |=PKT_RX_IPV6_HDR ; +#endif
Quoted 1 line
}
PATCH 1/1 mlx4: replace some offload flags with packet type
In reply to Thomas MonjalonThe workaround for Tx tunnel offloading can now be replaced with packet type flag checking.
The ol_flags for IPv4/IPv6 and tunnel Rx offloading are replaced with packet type flags.
---
On Rx side, the tunnel type cannot be set.
So RTE_ETH_IS_TUNNEL_PKT() will return wrong even if RTE_PTYPE_INNER_* is set. What about fixing RTE_ETH_IS_TUNNEL_PKT() to handle this case?
drivers/net/mlx4/mlx4.c | 58 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-)
drivers/net/mlx4/mlx4.c +53 -5
@@ -1263,14 +1263,17 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)/* HW does not support checksum offloads at arbitrary * offsets but automatically recognizes the packet * type. For inner L3/L4 checksums, only VXLAN (UDP) -* tunnels are currently supported. -* -* FIXME: since PKT_TX_UDP_TUNNEL_PKT has been removed, +* tunnels are currently supported. */ +#ifdef RTE_NEXT_ABI + if (RTE_ETH_IS_TUNNEL_PKT(buf->packet_type)) +#else +/* FIXME: since PKT_TX_UDP_TUNNEL_PKT has been removed, * the outer packet type is unknown. All we know is * that the L2 header is of unusual length (not * ETHER_HDR_LEN with or without 802.1Q header). */ if ((buf->l2_len !=ETHER_HDR_LEN ) && (buf->l2_len != (ETHER_HDR_LEN + 4))) +#endif send_flags |=IBV_EXP_QP_BURST_TUNNEL ; }if (likely (segs ==1 )) {
@@ -2485,6 +2488,41 @@ rxq_cleanup(struct rxq *rxq)memset (rxq,0 ,sizeof (*rxq)); } +#ifdef RTE_NEXT_ABI +/** +* Translate RX completion flags to packet type. +* +* @param flags +* RX completion flags returned by poll_length_flags(). +* +* @return +* Packet type for struct rte_mbuf. +*/ +static inline uint32_t +rxq_cq_to_pkt_type (uint32_t flags) +{ +uint32_t pkt_type =0 ; + +if (flags &IBV_EXP_CQ_RX_TUNNEL_PACKET ) + pkt_type |= +TRANSPOSE (flags, +IBV_EXP_CQ_RX_OUTER_IPV4_PACKET ,RTE_PTYPE_L3_IPV4 ) | +TRANSPOSE (flags, +IBV_EXP_CQ_RX_OUTER_IPV6_PACKET ,RTE_PTYPE_L3_IPV6 ) | +TRANSPOSE (flags, +IBV_EXP_CQ_RX_IPV4_PACKET ,RTE_PTYPE_INNER_L3_IPV4 ) | +TRANSPOSE (flags, +IBV_EXP_CQ_RX_IPV6_PACKET ,RTE_PTYPE_INNER_L3_IPV6 ); +else + pkt_type |= +TRANSPOSE (flags, +IBV_EXP_CQ_RX_IPV4_PACKET ,RTE_PTYPE_L3_IPV4 ) | +TRANSPOSE (flags, +IBV_EXP_CQ_RX_IPV6_PACKET ,RTE_PTYPE_L3_IPV6 ); +return pkt_type; +} +#endif /* RTE_NEXT_ABI */ +/** * Translate RX completion flags to offload flags. *
@@ -2499,11 +2537,13 @@ rxq_cleanup(struct rxq *rxq)static inline uint32_t rxq_cq_to_ol_flags (const struct rxq *rxq,uint32_t flags) { -uint32_t ol_flags; +uint32_t ol_flags =0 ; - ol_flags = +#ifndef RTE_NEXT_ABI + ol_flags |=TRANSPOSE (flags,IBV_EXP_CQ_RX_IPV4_PACKET ,PKT_RX_IPV4_HDR ) |TRANSPOSE (flags,IBV_EXP_CQ_RX_IPV6_PACKET ,PKT_RX_IPV6_HDR ); +#endif if (rxq->csum) ol_flags |= TRANSPOSE(~flags,
@@ -2519,12 +2559,14 @@ rxq_cq_to_ol_flags(const struct rxq *rxq, uint32_t flags)*/ if ((flags & IBV_EXP_CQ_RX_TUNNEL_PACKET) && (rxq->csum_l2tun)) ol_flags |= +#ifndef RTE_NEXT_ABI TRANSPOSE(flags, IBV_EXP_CQ_RX_OUTER_IPV4_PACKET, PKT_RX_TUNNEL_IPV4_HDR) | TRANSPOSE(flags, IBV_EXP_CQ_RX_OUTER_IPV6_PACKET, PKT_RX_TUNNEL_IPV6_HDR) | +#endif TRANSPOSE(~flags, IBV_EXP_CQ_RX_OUTER_IP_CSUM_OK, PKT_RX_IP_CKSUM_BAD) |
@@ -2716,6 +2758,9 @@ mlx4_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)NB_SEGS (pkt_buf) = j;PORT (pkt_buf) = rxq->port_id;PKT_LEN (pkt_buf) = pkt_buf_len; +#ifdef RTE_NEXT_ABI + pkt_buf->packet_type =rxq_cq_to_pkt_type (flags); +#endif pkt_buf->ol_flags =rxq_cq_to_ol_flags (rxq, flags);/* Return packet. */
@@ -2876,6 +2921,9 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)NEXT (seg) =NULL ;PKT_LEN (seg) = len;DATA_LEN (seg) = len; +#ifdef RTE_NEXT_ABI + seg->packet_type =rxq_cq_to_pkt_type (flags); +#endif seg->ol_flags =rxq_cq_to_ol_flags (rxq, flags);/* Return packet. */
Signature · 1 line
2.4.2
Re: [PATCH] mlx4: replace some offload flags with packet type
Quoted 60 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Wednesday, July 15, 2015 10:32 AM
To: Zhang, Helin
Cc: [email protected]
Subject: [PATCH] mlx4: replace some offload flags with packet typeThe workaround for Tx tunnel offloading can now be replaced with packet type flag checking.
Theol_flagsfor IPv4/IPv6 and tunnel Rx offloading are replaced with packet type flags.Signed-off-by Thomas Monjalon <[email protected]>Acked-by Adrien Mazarguil <[email protected]>---
On Rx side, the tunnel type cannot be set.
SoRTE_ETH_IS_TUNNEL_PKT()will return wrong even if RTE_PTYPE_INNER_* is set.
What about fixingRTE_ETH_IS_TUNNEL_PKT()to handle this case?drivers/net/mlx4/mlx4.c | 58 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-)drivers/net/mlx4/mlx4.c index renamed from drivers/net/mlx4/mlx4.c +0
-0f4491e7..3f5e9f3 100644
drivers/net/mlx4/mlx4.c +9
-3@@ -1263,14 +1263,17 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) /* HW does not support checksum offloads at arbitrary * offsets but automatically recognizes the packet * type. For inner L3/L4 checksums, only VXLAN (UDP) -* tunnels are currently supported. -* -* FIXME: since PKT_TX_UDP_TUNNEL_PKT has been removed, + * tunnels are currently supported. */ #ifdef RTE_NEXT_ABI + if (RTE_ETH_IS_TUNNEL_PKT(buf->packet_type)) +#else + /* FIXME: since PKT_TX_UDP_TUNNEL_PKT has been removed, * the outer packet type is unknown. All we know is * that the L2 header is of unusual length (not * ETHER_HDR_LEN with or without 802.1Q header). */ if ((buf->l2_len != ETHER_HDR_LEN) && (buf->l2_len != (ETHER_HDR_LEN + 4))) +#endif send_flags |= IBV_EXP_QP_BURST_TUNNEL; } if (likely(segs == 1)) {@@ -2485,6 +2488,41 @@ rxq_cleanup(struct rxq *rxq)memset (rxq,0 ,sizeof (*rxq)); } +#ifdef RTE_NEXT_ABI +/** +* Translate RX completion flags to packet type. +*
drivers/net/mlx4/mlx4.c rxq_cleanup(struct rxq *rxq) · line 2504
Quoted 10 lines
drivers/net/mlx4/mlx4.c +10
-0+* @param flags +* RX completion flags returned by poll_length_flags(). +* +* @return +* Packet type for struct rte_mbuf. +*/ +static inline uint32_t +rxq_cq_to_pkt_type (uint32_t flags) +{ +uint32_t pkt_type =0 ;
Initial value of 0 seems not needed.
drivers/net/mlx4/mlx4.c rxq_cleanup(struct rxq *rxq) · line 2507
Quoted 3 lines
drivers/net/mlx4/mlx4.c +3
-0+ +if (flags &IBV_EXP_CQ_RX_TUNNEL_PACKET ) + pkt_type |=
Operand of 'OR' is not needed at all.
Quoted 12 lines
drivers/net/mlx4/mlx4.c +2
-0+ TRANSPOSE(flags, + IBV_EXP_CQ_RX_OUTER_IPV4_PACKET,
RTE_PTYPE_L3_IPV4) |drivers/net/mlx4/mlx4.c +2
-0+ TRANSPOSE(flags, + IBV_EXP_CQ_RX_OUTER_IPV6_PACKET,
RTE_PTYPE_L3_IPV6) |drivers/net/mlx4/mlx4.c +2
-0+ TRANSPOSE(flags, + IBV_EXP_CQ_RX_IPV4_PACKET,
RTE_PTYPE_INNER_L3_IPV4) |drivers/net/mlx4/mlx4.c +2
-0+ TRANSPOSE(flags, + IBV_EXP_CQ_RX_IPV6_PACKET,
RTE_PTYPE_INNER_L3_IPV6);
drivers/net/mlx4/mlx4.c rxq_cleanup(struct rxq *rxq) · line 2517
Quoted 2 lines
drivers/net/mlx4/mlx4.c +2
-0+else + pkt_type |=
Operand of 'OR' is not needed at all.
Regards,
Helin
Quoted 66 lines
drivers/net/mlx4/mlx4.c +2
-0+TRANSPOSE (flags, +IBV_EXP_CQ_RX_IPV4_PACKET ,RTE_PTYPE_L3_IPV4 )|
drivers/net/mlx4/mlx4.c +9
-2+TRANSPOSE (flags, +IBV_EXP_CQ_RX_IPV6_PACKET ,RTE_PTYPE_L3_IPV6 ); + return pkt_type; +} +#endif /* RTE_NEXT_ABI */ +/** * Translate RX completion flags to offload flags. * @@ -2499,11 +2537,13 @@ rxq_cleanup(struct rxq *rxq) static inline uint32_t rxq_cq_to_ol_flags(const struct rxq *rxq, uint32_t flags) { - uint32_t ol_flags; + uint32_t ol_flags = 0; - ol_flags = +#ifndef RTE_NEXT_ABI + ol_flags |=TRANSPOSE (flags,IBV_EXP_CQ_RX_IPV4_PACKET ,PKT_RX_IPV4_HDR )|
TRANSPOSE(flags,IBV_EXP_CQ_RX_IPV6_PACKET,PKT_RX_IPV6_HDR);drivers/net/mlx4/mlx4.c +3
-0+#endif if (rxq->csum) ol_flags |= TRANSPOSE(~flags,@@ -2519,12 +2559,14 @@ rxq_cq_to_ol_flags(const struct rxq *rxq, uint32_tflags) */ if ((flags & IBV_EXP_CQ_RX_TUNNEL_PACKET) && (rxq->csum_l2tun)) ol_flags |= +#ifndef RTE_NEXT_ABI TRANSPOSE (flags,IBV_EXP_CQ_RX_OUTER_IPV4_PACKET ,PKT_RX_TUNNEL_IPV4_HDR ) |TRANSPOSE (flags,IBV_EXP_CQ_RX_OUTER_IPV6_PACKET ,PKT_RX_TUNNEL_IPV6_HDR ) | +#endif TRANSPOSE(~flags, IBV_EXP_CQ_RX_OUTER_IP_CSUM_OK,drivers/net/mlx4/mlx4.c +4
-1PKT_RX_IP_CKSUM_BAD) |@@ -2716,6 +2758,9 @@ mlx4_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)NB_SEGS (pkt_buf) = j;PORT (pkt_buf) = rxq->port_id;PKT_LEN (pkt_buf) = pkt_buf_len; +#ifdef RTE_NEXT_ABI + pkt_buf->packet_type =rxq_cq_to_pkt_type (flags);#endif pkt_buf->ol_flags =rxq_cq_to_ol_flags (rxq, flags);/* Return packet. */ @@ -2876,6 +2921,9 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)NEXT (seg ) =NULL ;PKT_LEN (seg) = len;DATA_LEN (seg) = len; +#ifdef RTE_NEXT_ABI + seg->packet_type =rxq_cq_to_pkt_type (flags);#endif seg->ol_flags =rxq_cq_to_ol_flags (rxq, flags);/* Return packet. */ --2.4.2
Re: [PATCH] mlx4: replace some offload flags with packet type
2015-07-15 18:06, Zhang, Helin:
Quoted 7 lines
Quoted 7 lines
The workaround for Tx tunnel offloading can now be replaced with packet type flag checking.
Theol_flagsfor IPv4/IPv6 and tunnel Rx offloading are replaced with packet type flags.Signed-off-by Thomas Monjalon <[email protected]>Acked-by Adrien Mazarguil <[email protected]>
[...]
Quoted 7 lines
drivers/net/mlx4/mlx4.c rxq_cleanup(struct rxq *rxq) · line 2504
Quoted 1 line
drivers/net/mlx4/mlx4.c +1
-0+uint32_t pkt_type =0 ;Initial value of 0 seems not needed.
drivers/net/mlx4/mlx4.c rxq_cleanup(struct rxq *rxq) · line 2507
Quoted 3 lines
drivers/net/mlx4/mlx4.c +3
-0+ +if (flags &IBV_EXP_CQ_RX_TUNNEL_PACKET ) + pkt_type |=Operand of 'OR' is not needed at all.
Matter of taste (OR allows to add more flags before).
Applied with above changes.
2015-07-10 00:31, Helin Zhang:
Quoted 17 lines
Currently only 6 bits which are stored in
ol_flagsare used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improving performance and for end users. So an unified packet types are needed to support all possible PMDs. A 16 bitspacket_typein mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored inol_flagfield should be deleted at all, and 6 bits ofol_flagscan be save as the benifit.Initially, 32 bits of
packet_typecan be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.
Quoted 5 lines
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of
RTE_NEXT_ABI. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.
Applied with fixes for cxgbe and mlx4, thanks everyone
The macro RTE_ETH_IS_TUNNEL_PKT may need to take RTE_PTYPE_INNER_* into account.
Quoted 34 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Wednesday, July 15, 2015 4:01 PM
To: Zhang, Helin
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v10 00/19] unified packet type2015-07-10 00:31, Helin Zhang:
Quoted 5 lines
Currently only 6 bits which are stored in
ol_flagsare used to indicate the packet types. This is not enough, as some NIC hardware can recognize quite a lot of packet types, e.g i40e hardware can recognize more than 150 packet types. Hiding those packet types hides hardware offload capabilities which could be quite useful for improvingperformance and for end users.
Quoted 12 lines
So an unified packet types are needed to support all possible PMDs. A 16 bits
packet_typein mbuf structure can be changed to 32 bits and used for this purpose. In addition, all packet types stored inol_flagfield should be deleted at all, and 6 bits ofol_flagscan be save as the benifit.Initially, 32 bits of
packet_typecan be divided into several sub fields to indicate different packet type information of a packet. The initial design is to divide those bits into fields for L2 types, L3 types, L4 types, tunnel types, inner L2 types, inner L3 types and inner L4 types. All PMDs should translate the offloaded packet types into these 7 fields of information, for user applications.Quoted 5 lines
To avoid breaking ABI compatibility, currently all the code changes for unified packet type are disabled at compile time by default. Users can enable it manually by defining the macro of
RTE_NEXT_ABI. The code changes will be valid by default in a future release, and the old version will be deleted accordingly, after the ABI change process is done.
Quoted 4 lines
Applied with fixes for cxgbe and mlx4, thanks everyone
The macro
RTE_ETH_IS_TUNNEL_PKTmay need to take RTE_PTYPE_INNER_* into account.
Thank you so much!
Thanks to all the contributors!
Helin