net: fix Tx VLAN flag for offload emulation

[dpdk.git] / lib / librte_net / rte_net.h

diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
index 0e97901..1697071 100644 (file)
--- a/lib/librte_net/rte_net.h
+++ b/lib/librte_net/rte_net.h
@@ -28,6 +28,33 @@ struct rte_net_hdr_lens {
        uint8_t inner_l4_len;
 };
 
+/**
+ * Skip IPv6 header extensions.
+ *
+ * This function skips all IPv6 extensions, returning size of
+ * complete header including options and final protocol value.
+ *
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * @param proto
+ *   Protocol field of IPv6 header.
+ * @param m
+ *   The packet mbuf to be parsed.
+ * @param off
+ *   On input, must contain the offset to the first byte following
+ *   IPv6 header, on output, contains offset to the first byte
+ *   of next layer (after any IPv6 extension header)
+ * @param frag
+ *   Contains 1 in output if packet is an IPv6 fragment.
+ * @return
+ *   Protocol that follows IPv6 header.
+ *   -1 if an error occurs during mbuf parsing.
+ */
+int __rte_experimental
+rte_net_skip_ip6_ext(uint16_t proto, const struct rte_mbuf *m, uint32_t *off,
+       int *frag);
+
 /**
  * Parse an Ethernet packet to get its packet type.
  *
@@ -91,18 +118,41 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
        struct udp_hdr *udp_hdr;
        uint64_t inner_l3_offset = m->l2_len;
 
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+       /*
+        * Does packet set any of available offloads?
+        * Mainly it is required to avoid fragmented headers check if
+        * no offloads are requested.
+        */
+       if (!(ol_flags & PKT_TX_OFFLOAD_MASK))
+               return 0;
+#endif
+
        if ((ol_flags & PKT_TX_OUTER_IP_CKSUM) ||
                (ol_flags & PKT_TX_OUTER_IPV6))
                inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
 
-       if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
-               if (ol_flags & PKT_TX_IPV4) {
-                       ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
-                                       inner_l3_offset);
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+       /*
+        * Check if headers are fragmented.
+        * The check could be less strict depending on which offloads are
+        * requested and headers to be used, but let's keep it simple.
+        */
+       if (unlikely(rte_pktmbuf_data_len(m) <
+                    inner_l3_offset + m->l3_len + m->l4_len))
+               return -ENOTSUP;
+#endif
+
+       if (ol_flags & PKT_TX_IPV4) {
+               ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
+                               inner_l3_offset);
 
-                       if (ol_flags & PKT_TX_IP_CKSUM)
-                               ipv4_hdr->hdr_checksum = 0;
+               if (ol_flags & PKT_TX_IP_CKSUM)
+                       ipv4_hdr->hdr_checksum = 0;
+       }
 
+       if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
+               if (ol_flags & PKT_TX_IPV4) {
                        udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
                                        m->l3_len);
                        udp_hdr->dgram_cksum = rte_ipv4_phdr_cksum(ipv4_hdr,
@@ -119,12 +169,6 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
        } else if ((ol_flags & PKT_TX_TCP_CKSUM) ||
                        (ol_flags & PKT_TX_TCP_SEG)) {
                if (ol_flags & PKT_TX_IPV4) {
-                       ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
-                                       inner_l3_offset);
-
-                       if (ol_flags & PKT_TX_IP_CKSUM)
-                               ipv4_hdr->hdr_checksum = 0;
-
                        /* non-TSO tcp or TSO */
                        tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr +
                                        m->l3_len);