net/mlx5: fix build with strict alignment enabled
authorAli Alnubani <alialnu@mellanox.com>
Thu, 17 Oct 2019 07:19:31 +0000 (10:19 +0300)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 23 Oct 2019 14:43:10 +0000 (16:43 +0200)
This patch converts some of the casts to unaligned integer types.
The memcpy call is replaced with explicit copying because it
may require type qualifiers in some environments.

Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template")
Cc: stable@dpdk.org
Reported-by: Jeremy Plsek <jplsek@iol.unh.edu>
Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
drivers/net/mlx5/mlx5_rxtx.c

index 20c1946..5ec2b48 100644 (file)
@@ -2747,27 +2747,33 @@ mlx5_tx_dseg_iptr(struct mlx5_txq_data *restrict txq,
        /* Unrolled implementation of generic rte_memcpy. */
        dst = (uintptr_t)&dseg->inline_data[0];
        src = (uintptr_t)buf;
+       if (len & 0x08) {
 #ifdef RTE_ARCH_STRICT_ALIGN
-       memcpy(dst, src, len);
+               assert(dst == RTE_PTR_ALIGN(dst, sizeof(uint32_t)));
+               *(uint32_t *)dst = *(unaligned_uint32_t *)src;
+               dst += sizeof(uint32_t);
+               src += sizeof(uint32_t);
+               *(uint32_t *)dst = *(unaligned_uint32_t *)src;
+               dst += sizeof(uint32_t);
+               src += sizeof(uint32_t);
 #else
-       if (len & 0x08) {
-               *(uint64_t *)dst = *(uint64_t *)src;
+               *(uint64_t *)dst = *(unaligned_uint64_t *)src;
                dst += sizeof(uint64_t);
                src += sizeof(uint64_t);
+#endif
        }
        if (len & 0x04) {
-               *(uint32_t *)dst = *(uint32_t *)src;
+               *(uint32_t *)dst = *(unaligned_uint32_t *)src;
                dst += sizeof(uint32_t);
                src += sizeof(uint32_t);
        }
        if (len & 0x02) {
-               *(uint16_t *)dst = *(uint16_t *)src;
+               *(uint16_t *)dst = *(unaligned_uint16_t *)src;
                dst += sizeof(uint16_t);
                src += sizeof(uint16_t);
        }
        if (len & 0x01)
                *(uint8_t *)dst = *(uint8_t *)src;
-#endif
 }
 
 /**