mbuf: add Tx offloading flags for tunnels

Replace PKT_TX_VXLAN_CKSUM with PKT_TX_UDP_TUNNEL_PKT in order to indicate
a packet is an UDP tunneling packet, and introduce 3 TX offload flags for
outer IP TX checksum, which are PKT_TX_OUTER_IP_CKSUM, PKT_TX_OUTER_IPV4
and PKT_TX_OUTER_IPV6 respectively.
Rework csum forward engine and i40e PMD due to these changes.

Signed-off-by: Jijiang Liu <jijiang.liu@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index da4bca4..5f7dffc 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -256,7 +256,7 @@ process_outer_cksums(void *outer_l3_hdr, uint16_t outer_ethertype,
        uint64_t ol_flags = 0;
 
        if (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM)
-               ol_flags |= PKT_TX_VXLAN_CKSUM;
+               ol_flags |= PKT_TX_UDP_TUNNEL_PKT;
 
        if (outer_ethertype == _htons(ETHER_TYPE_IPv4)) {
                ipv4_hdr->hdr_checksum = 0;
@@ -469,7 +469,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
                                { PKT_TX_UDP_CKSUM, PKT_TX_L4_MASK },
                                { PKT_TX_TCP_CKSUM, PKT_TX_L4_MASK },
                                { PKT_TX_SCTP_CKSUM, PKT_TX_L4_MASK },
-                               { PKT_TX_VXLAN_CKSUM, PKT_TX_VXLAN_CKSUM },
+                               { PKT_TX_UDP_TUNNEL_PKT, PKT_TX_UDP_TUNNEL_PKT },
+                               { PKT_TX_IPV4, PKT_TX_IPV4 },
+                               { PKT_TX_IPV6, PKT_TX_IPV6 },
+                               { PKT_TX_OUTER_IP_CKSUM, PKT_TX_OUTER_IP_CKSUM },
+                               { PKT_TX_OUTER_IPV4, PKT_TX_OUTER_IPV4 },
+                               { PKT_TX_OUTER_IPV6, PKT_TX_OUTER_IPV6 },
                                { PKT_TX_TCP_SEG, PKT_TX_TCP_SEG },
                        };
                        unsigned j;

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index 87c2963..1b14e02 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -240,8 +240,13 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask)
        case PKT_TX_SCTP_CKSUM: return "PKT_TX_SCTP_CKSUM";
        case PKT_TX_UDP_CKSUM: return "PKT_TX_UDP_CKSUM";
        case PKT_TX_IEEE1588_TMST: return "PKT_TX_IEEE1588_TMST";
-       case PKT_TX_VXLAN_CKSUM: return "PKT_TX_VXLAN_CKSUM";
+       case PKT_TX_UDP_TUNNEL_PKT: return "PKT_TX_UDP_TUNNEL_PKT";
        case PKT_TX_TCP_SEG: return "PKT_TX_TCP_SEG";
+       case PKT_TX_IPV4: return "PKT_TX_IPV4";
+       case PKT_TX_IPV6: return "PKT_TX_IPV6";
+       case PKT_TX_OUTER_IP_CKSUM: return "PKT_TX_OUTER_IP_CKSUM";
+       case PKT_TX_OUTER_IPV4: return "PKT_TX_OUTER_IPV4";
+       case PKT_TX_OUTER_IPV6: return "PKT_TX_OUTER_IPV6";
        default: return NULL;
        }
 }

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index cbadf8e..83e71af 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -118,7 +118,9 @@ extern "C" {
  */
 #define PKT_TX_TCP_SEG       (1ULL << 49)
 
-#define PKT_TX_VXLAN_CKSUM   (1ULL << 50) /**< TX checksum of VXLAN computed by NIC */
+/** TX packet is an UDP tunneled packet. It must be specified when using
+ *  outer checksum offload (PKT_TX_OUTER_IP_CKSUM) */
+#define PKT_TX_UDP_TUNNEL_PKT (1ULL << 50) /**< TX packet is an UDP tunneled packet */
 #define PKT_TX_IEEE1588_TMST (1ULL << 51) /**< TX IEEE1588 packet to timestamp. */
 
 /**
@@ -149,6 +151,16 @@ extern "C" {
 
 #define PKT_TX_VLAN_PKT      (1ULL << 57) /**< TX packet is a 802.1q VLAN packet. */
 
+/** Outer IP checksum of TX packet, computed by NIC for tunneling packet.
+ *  The tunnel type must also be specified, ex: PKT_TX_UDP_TUNNEL_PKT. */
+#define PKT_TX_OUTER_IP_CKSUM   (1ULL << 58)
+
+/** Packet is outer IPv4 without requiring IP checksum offload for tunneling packet. */
+#define PKT_TX_OUTER_IPV4   (1ULL << 59)
+
+/** Tell the NIC it's an outer IPv6 packet for tunneling packet */
+#define PKT_TX_OUTER_IPV6    (1ULL << 60)
+
 /* Use final bit of flags to indicate a control mbuf */
 #define CTRL_MBUF_FLAG       (1ULL << 63) /**< Mbuf contains control data */
 

diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c
index 63c872d..e80a7b1 100644 (file)
--- a/lib/librte_pmd_i40e/i40e_rxtx.c
+++ b/lib/librte_pmd_i40e/i40e_rxtx.c
@@ -478,7 +478,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags,
        }
 
        /* VXLAN packet TX checksum offload */
-       if (unlikely(ol_flags & PKT_TX_VXLAN_CKSUM)) {
+       if (unlikely(ol_flags & PKT_TX_UDP_TUNNEL_PKT)) {
                uint8_t l4tun_len;
 
                l4tun_len = ETHER_VXLAN_HLEN + inner_l2_len;
@@ -1158,8 +1158,8 @@ i40e_calc_context_desc(uint64_t flags)
 {
        uint64_t mask = 0ULL;
 
-       if (flags | PKT_TX_VXLAN_CKSUM)
-               mask |= PKT_TX_VXLAN_CKSUM;
+       if (flags | PKT_TX_UDP_TUNNEL_PKT)
+               mask |= PKT_TX_UDP_TUNNEL_PKT;
 
 #ifdef RTE_LIBRTE_IEEE1588
        mask |= PKT_TX_IEEE1588_TMST;