net: add rte prefix to IP structure

[dpdk.git] / lib / librte_ip_frag / rte_ipv6_fragmentation.c

diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
index 62a7e4e..bfe44d4 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
@@ -18,8 +18,8 @@
  */
 
 static inline void
-__fill_ipv6hdr_frag(struct ipv6_hdr *dst,
-               const struct ipv6_hdr *src, uint16_t len, uint16_t fofs,
+__fill_ipv6hdr_frag(struct rte_ipv6_hdr *dst,
+               const struct rte_ipv6_hdr *src, uint16_t len, uint16_t fofs,
                uint32_t mf)
 {
        struct ipv6_extension_fragment *fh;
@@ -73,25 +73,28 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
        struct rte_mempool *pool_indirect)
 {
        struct rte_mbuf *in_seg = NULL;
-       struct ipv6_hdr *in_hdr;
+       struct rte_ipv6_hdr *in_hdr;
        uint32_t out_pkt_pos, in_seg_data_pos;
        uint32_t more_in_segs;
        uint16_t fragment_offset, frag_size;
+       uint64_t frag_bytes_remaining;
 
-       frag_size = (uint16_t)(mtu_size - sizeof(struct ipv6_hdr));
-
-       /* Fragment size should be a multiple of 8. */
-       RTE_ASSERT((frag_size & ~RTE_IPV6_EHDR_FO_MASK) == 0);
+       /*
+        * Ensure the IP payload length of all fragments (except the
+        * the last fragment) are a multiple of 8 bytes per RFC2460.
+        */
+       frag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct rte_ipv6_hdr),
+                                   RTE_IPV6_EHDR_FO_ALIGN);
 
        /* Check that pkts_out is big enough to hold all fragments */
        if (unlikely (frag_size * nb_pkts_out <
-           (uint16_t)(pkt_in->pkt_len - sizeof (struct ipv6_hdr))))
+           (uint16_t)(pkt_in->pkt_len - sizeof(struct rte_ipv6_hdr))))
                return -EINVAL;
 
-       in_hdr = rte_pktmbuf_mtod(pkt_in, struct ipv6_hdr *);
+       in_hdr = rte_pktmbuf_mtod(pkt_in, struct rte_ipv6_hdr *);
 
        in_seg = pkt_in;
-       in_seg_data_pos = sizeof(struct ipv6_hdr);
+       in_seg_data_pos = sizeof(struct rte_ipv6_hdr);
        out_pkt_pos = 0;
        fragment_offset = 0;
 
@@ -99,7 +102,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
        while (likely(more_in_segs)) {
                struct rte_mbuf *out_pkt = NULL, *out_seg_prev = NULL;
                uint32_t more_out_segs;
-               struct ipv6_hdr *out_hdr;
+               struct rte_ipv6_hdr *out_hdr;
 
                /* Allocate direct buffer */
                out_pkt = rte_pktmbuf_alloc(pool_direct);
@@ -109,8 +112,11 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
                }
 
                /* Reserve space for the IP header that will be built later */
-               out_pkt->data_len = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);
-               out_pkt->pkt_len  = sizeof(struct ipv6_hdr) + sizeof(struct ipv6_extension_fragment);
+               out_pkt->data_len = sizeof(struct rte_ipv6_hdr) +
+                       sizeof(struct ipv6_extension_fragment);
+               out_pkt->pkt_len  = sizeof(struct rte_ipv6_hdr) +
+                       sizeof(struct ipv6_extension_fragment);
+               frag_bytes_remaining = frag_size;
 
                out_seg_prev = out_pkt;
                more_out_segs = 1;
@@ -130,7 +136,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
 
                        /* Prepare indirect buffer */
                        rte_pktmbuf_attach(out_seg, in_seg);
-                       len = mtu_size - out_pkt->pkt_len;
+                       len = frag_bytes_remaining;
                        if (len > (in_seg->data_len - in_seg_data_pos)) {
                                len = in_seg->data_len - in_seg_data_pos;
                        }
@@ -140,11 +146,11 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
                            out_pkt->pkt_len);
                        out_pkt->nb_segs += 1;
                        in_seg_data_pos += len;
+                       frag_bytes_remaining -= len;
 
                        /* Current output packet (i.e. fragment) done ? */
-                       if (unlikely(out_pkt->pkt_len >= mtu_size)) {
+                       if (unlikely(frag_bytes_remaining == 0))
                                more_out_segs = 0;
-                       }
 
                        /* Current input segment done ? */
                        if (unlikely(in_seg_data_pos == in_seg->data_len)) {
@@ -159,14 +165,14 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
 
                /* Build the IP header */
 
-               out_hdr = rte_pktmbuf_mtod(out_pkt, struct ipv6_hdr *);
+               out_hdr = rte_pktmbuf_mtod(out_pkt, struct rte_ipv6_hdr *);
 
                __fill_ipv6hdr_frag(out_hdr, in_hdr,
-                   (uint16_t) out_pkt->pkt_len - sizeof(struct ipv6_hdr),
+                   (uint16_t) out_pkt->pkt_len - sizeof(struct rte_ipv6_hdr),
                    fragment_offset, more_in_segs);
 
                fragment_offset = (uint16_t)(fragment_offset +
-                   out_pkt->pkt_len - sizeof(struct ipv6_hdr)
+                   out_pkt->pkt_len - sizeof(struct rte_ipv6_hdr)
                        - sizeof(struct ipv6_extension_fragment));
 
                /* Write the fragment to the output list */