net: extend VXLAN header to support more extensions
RFC 1/1 net: extend VXLAN header to support more extensions
Currently, DPDK supports VXLAN and VXLAN-GPE with similar header structures and we are working on adding support for VXLAN-GBP which is another extension to VXLAN. More extension of VXLAN may be added in the future.
VXLAN and VXLAN-GBP use the same UDP port(4789) while VXLAN-GPE uses a different one, 4790. The three protocols have the same header length and overall similar header structure as below.
0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |R|R|R|R|I|R|R|R| Reserved | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | VXLAN Network Identifier (VNI) | Reserved | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
Figure 1: VXLAN Header
0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |R|R|Ver|I|P|B|O| Reserved |Next Protocol | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | VXLAN Network Identifier (VNI) | Reserved | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
Figure 2: VXLAN-GPE Header
0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |G|R|R|R|I|R|R|R|R|D|R|R|A|R|R|R| Group Policy ID | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | VXLAN Network Identifier (VNI) | Reserved | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
Figure 3: VXLAN-GBP Extension
Both VXLAN-GPE and VXLAN-GBP extended VXLAN by redefining its reserved bits, which means the packets can be processed with same pattern and most of the code can be reused. Instead of adding more new items by copying/pasting code for the VXLAN extensions in the future, it’s better to use existing VXLAN infrastructure and add support code in it.
In this patch, all the VXLAN extension header will be merged with VXLAN as union if the overlapped field has different format among protocols. The existing VXLAN-GPE will be marked as deprecated and new extensions of VXLAN should be added to VXLAN instead of a new RTE item.
--- doc/guides/rel_notes/deprecation.rst | 5 +++ lib/ethdev/rte_flow.h | 13 +++++- lib/net/rte_vxlan.h | 63 ++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 5 deletions(-)
doc/guides/rel_notes/deprecation.rst +5 -0
@@ -95,6 +95,11 @@ Deprecation Notices - ``rte_flow_item_pppoe`` - ``rte_flow_item_pppoe_proto_id`` +* ethdev: The flow item ``RTE_FLOW_ITEM_TYPE_VXLAN_GPE`` is replaced with ``RTE_FLOW_ITEM_TYPE_VXLAN``. + The item ``RTE_FLOW_ITEM_TYPE_VXLAN_GPE``, the struct ``rte_flow_item_vxlan_gpe``, its mask ``rte_flow_item_vxlan_gpe_mask``, + and the header struct ``rte_vxlan_gpe_hdr`` with the macro ``RTE_ETHER_VXLAN_GPE_HLEN`` + will be removed in DPDK 25.11. + * ethdev: Queue specific stats fields will be removed from ``struct rte_eth_stats``. Mentioned fields are: ``q_ipackets``, ``q_opackets``, ``q_ibytes``, ``q_obytes``, ``q_errors``.
lib/ethdev/rte_flow.h +11 -2
@@ -355,6 +355,7 @@ enum rte_flow_item_type { RTE_FLOW_ITEM_TYPE_GENEVE,/** +* @deprecated Replaced with ``RTE_FLOW_ITEM_TYPE_VXLAN``. * Matches a VXLAN-GPE header. * * See struct rte_flow_item_vxlan_gpe.
@@ -1096,7 +1097,11 @@ static const struct rte_flow_item_sctp rte_flow_item_sctp_mask = {/** * RTE_FLOW_ITEM_TYPE_VXLAN. * -* Matches a VXLAN header (RFC 7348). +* Matches a VXLAN header (RFC 7348), including GPE (draft-ietf-nvo3-vxlan-gpe-13.txt) +* and GBP (draft-smith-vxlan-group-policy-05.txt). +* +* GPE is distinguished with its UDP port. +* UDP port may be specified with ``rte_eth_dev_udp_tunnel_port_add()``. */ struct rte_flow_item_vxlan { union {
@@ -1339,6 +1344,7 @@ static const struct rte_flow_item_geneve rte_flow_item_geneve_mask = {#endif /** +* @deprecated Replaced with ``rte_flow_item_vxlan``. * RTE_FLOW_ITEM_TYPE_VXLAN_GPE (draft-ietf-nvo3-vxlan-gpe-05). * * Matches a VXLAN-GPE header.
@@ -1360,7 +1366,10 @@ struct rte_flow_item_vxlan_gpe { }; }; -/** Default mask for RTE_FLOW_ITEM_TYPE_VXLAN_GPE. */ +/** +* @deprecated Replaced with ``rte_flow_item_vxlan_mask``. +* Default mask for RTE_FLOW_ITEM_TYPE_VXLAN_GPE. +*/ #ifndef __cplusplusstatic const struct rte_flow_item_vxlan_gpe rte_flow_item_vxlan_gpe_mask = { .hdr.vni = "\xff\xff\xff",
lib/net/rte_vxlan.h +60 -3
81 lines not on this page · raw message
Signature · 1 line
2.34.1