import 15.2.0 Octopus source

[ceph.git] / ceph / src / seastar / dpdk / lib / librte_ip_frag / rte_ipv4_fragmentation.c

diff --git a/ceph/src/seastar/dpdk/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/ceph/src/seastar/dpdk/lib/librte_ip_frag/rte_ipv4_fragmentation.c
index a2259e8035334c6a7e3a98d479b79b41a4ca66d4..a96fb03e4ce60c1d15d0b8038c16f66239bc0cb8 100644 (file)
--- a/ceph/src/seastar/dpdk/lib/librte_ip_frag/rte_ipv4_fragmentation.c
+++ b/ceph/src/seastar/dpdk/lib/librte_ip_frag/rte_ipv4_fragmentation.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stddef.h>
@@ -48,7 +19,7 @@
 #define        IPV4_HDR_DF_MASK                        (1 << IPV4_HDR_DF_SHIFT)
 #define        IPV4_HDR_MF_MASK                        (1 << IPV4_HDR_MF_SHIFT)
 
-#define        IPV4_HDR_FO_MASK                        ((1 << IPV4_HDR_FO_SHIFT) - 1)
+#define        IPV4_HDR_FO_ALIGN                       (1 << IPV4_HDR_FO_SHIFT)
 
 static inline void __fill_ipv4hdr_frag(struct ipv4_hdr *dst,
                const struct ipv4_hdr *src, uint16_t len, uint16_t fofs,
@@ -103,11 +74,14 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
        uint32_t out_pkt_pos, in_seg_data_pos;
        uint32_t more_in_segs;
        uint16_t fragment_offset, flag_offset, frag_size;
+       uint16_t frag_bytes_remaining;
 
-       frag_size = (uint16_t)(mtu_size - sizeof(struct ipv4_hdr));
-
-       /* Fragment size should be a multiply of 8. */
-       RTE_ASSERT((frag_size & IPV4_HDR_FO_MASK) == 0);
+       /*
+        * Ensure the IP payload length of all fragments is aligned to a
+        * multiple of 8 bytes as per RFC791 section 2.3.
+        */
+       frag_size = RTE_ALIGN_FLOOR((mtu_size - sizeof(struct ipv4_hdr)),
+                                   IPV4_HDR_FO_ALIGN);
 
        in_hdr = rte_pktmbuf_mtod(pkt_in, struct ipv4_hdr *);
        flag_offset = rte_cpu_to_be_16(in_hdr->fragment_offset);
@@ -142,6 +116,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
                /* Reserve space for the IP header that will be built later */
                out_pkt->data_len = sizeof(struct ipv4_hdr);
                out_pkt->pkt_len = sizeof(struct ipv4_hdr);
+               frag_bytes_remaining = frag_size;
 
                out_seg_prev = out_pkt;
                more_out_segs = 1;
@@ -161,7 +136,7 @@ rte_ipv4_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;
                        }
@@ -171,9 +146,10 @@ rte_ipv4_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 ? */