New upstream version 16.11.8

[deb_dpdk.git] / lib / librte_net / rte_ip.h

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 5b7554a..5234663 100644 (file)
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -170,25 +170,25 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
        /* workaround gcc strict-aliasing warning */
        uintptr_t ptr = (uintptr_t)buf;
        typedef uint16_t __attribute__((__may_alias__)) u16_p;
-       const u16_p *u16 = (const u16_p *)ptr;
-
-       while (len >= (sizeof(*u16) * 4)) {
-               sum += u16[0];
-               sum += u16[1];
-               sum += u16[2];
-               sum += u16[3];
-               len -= sizeof(*u16) * 4;
-               u16 += 4;
+       const u16_p *u16_buf = (const u16_p *)ptr;
+
+       while (len >= (sizeof(*u16_buf) * 4)) {
+               sum += u16_buf[0];
+               sum += u16_buf[1];
+               sum += u16_buf[2];
+               sum += u16_buf[3];
+               len -= sizeof(*u16_buf) * 4;
+               u16_buf += 4;
        }
-       while (len >= sizeof(*u16)) {
-               sum += *u16;
-               len -= sizeof(*u16);
-               u16 += 1;
+       while (len >= sizeof(*u16_buf)) {
+               sum += *u16_buf;
+               len -= sizeof(*u16_buf);
+               u16_buf += 1;
        }
 
        /* if length is in odd bytes */
        if (len == 1)
-               sum += *((const uint8_t *)u16);
+               sum += *((const uint8_t *)u16_buf);
 
        return sum;
 }
@@ -229,6 +229,77 @@ rte_raw_cksum(const void *buf, size_t len)
        return __rte_raw_cksum_reduce(sum);
 }
 
+/**
+ * Compute the raw (non complemented) checksum of a packet.
+ *
+ * @param m
+ *   The pointer to the mbuf.
+ * @param off
+ *   The offset in bytes to start the checksum.
+ * @param len
+ *   The length in bytes of the data to ckecksum.
+ * @param cksum
+ *   A pointer to the checksum, filled on success.
+ * @return
+ *   0 on success, -1 on error (bad length or offset).
+ */
+static inline int
+rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,
+       uint16_t *cksum)
+{
+       const struct rte_mbuf *seg;
+       const char *buf;
+       uint32_t sum, tmp;
+       uint32_t seglen, done;
+
+       /* easy case: all data in the first segment */
+       if (off + len <= rte_pktmbuf_data_len(m)) {
+               *cksum = rte_raw_cksum(rte_pktmbuf_mtod_offset(m,
+                               const char *, off), len);
+               return 0;
+       }
+
+       if (unlikely(off + len > rte_pktmbuf_pkt_len(m)))
+               return -1; /* invalid params, return a dummy value */
+
+       /* else browse the segment to find offset */
+       seglen = 0;
+       for (seg = m; seg != NULL; seg = seg->next) {
+               seglen = rte_pktmbuf_data_len(seg);
+               if (off < seglen)
+                       break;
+               off -= seglen;
+       }
+       seglen -= off;
+       buf = rte_pktmbuf_mtod_offset(seg, const char *, off);
+       if (seglen >= len) {
+               /* all in one segment */
+               *cksum = rte_raw_cksum(buf, len);
+               return 0;
+       }
+
+       /* hard case: process checksum of several segments */
+       sum = 0;
+       done = 0;
+       for (;;) {
+               tmp = __rte_raw_cksum(buf, seglen, 0);
+               if (done & 1)
+                       tmp = rte_bswap16((uint16_t)tmp);
+               sum += tmp;
+               done += seglen;
+               if (done == len)
+                       break;
+               seg = seg->next;
+               buf = rte_pktmbuf_mtod(seg, const char *);
+               seglen = rte_pktmbuf_data_len(seg);
+               if (seglen > len - done)
+                       seglen = len - done;
+       }
+
+       *cksum = __rte_raw_cksum_reduce(sum);
+       return 0;
+}
+
 /**
  * Process the IPv4 checksum of an IPv4 header.
  *
@@ -244,7 +315,7 @@ rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr)
 {
        uint16_t cksum;
        cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct ipv4_hdr));
-       return (cksum == 0xffff) ? cksum : ~cksum;
+       return (cksum == 0xffff) ? cksum : (uint16_t)~cksum;
 }
 
 /**
@@ -309,8 +380,8 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr)
        uint32_t cksum;
        uint32_t l4_len;
 
-       l4_len = rte_be_to_cpu_16(ipv4_hdr->total_length) -
-               sizeof(struct ipv4_hdr);
+       l4_len = (uint32_t)(rte_be_to_cpu_16(ipv4_hdr->total_length) -
+               sizeof(struct ipv4_hdr));
 
        cksum = rte_raw_cksum(l4_hdr, l4_len);
        cksum += rte_ipv4_phdr_cksum(ipv4_hdr, 0);
@@ -320,7 +391,7 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr)
        if (cksum == 0)
                cksum = 0xffff;
 
-       return cksum;
+       return (uint16_t)cksum;
 }
 
 /**
@@ -360,7 +431,7 @@ rte_ipv6_phdr_cksum(const struct ipv6_hdr *ipv6_hdr, uint64_t ol_flags)
                uint32_t proto; /* L4 protocol - top 3 bytes must be zero */
        } psd_hdr;
 
-       psd_hdr.proto = (ipv6_hdr->proto << 24);
+       psd_hdr.proto = (uint32_t)(ipv6_hdr->proto << 24);
        if (ol_flags & PKT_TX_TCP_SEG) {
                psd_hdr.len = 0;
        } else {
@@ -403,7 +474,7 @@ rte_ipv6_udptcp_cksum(const struct ipv6_hdr *ipv6_hdr, const void *l4_hdr)
        if (cksum == 0)
                cksum = 0xffff;
 
-       return cksum;
+       return (uint16_t)cksum;
 }
 
 #ifdef __cplusplus