net/mlx5: DR, Replace CRC32 implementation to use kernel lib

Use kernel function to calculate crc32 Instead of dr implementation
since it has the same algorithm "slice by 8".

Fixes: 26d688e33f88 ("net/mlx5: DR, Add Steering entry (STE) utilities")
Signed-off-by: Hamdan Igbaria <hamdani@mellanox.com>
Reviewed-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 5708fcc079ca1d7c2ca9de649bbf29718f3db292..a6f390fdb971deb4df34182e2d79b4416e30a163 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -70,7 +70,7 @@ mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/tls.o en_accel/tls_rxtx.o en_accel/t
 
 mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/dr_domain.o steering/dr_table.o \
                                        steering/dr_matcher.o steering/dr_rule.o \
-                                       steering/dr_icm_pool.o steering/dr_crc32.o \
+                                       steering/dr_icm_pool.o \
                                        steering/dr_ste.o steering/dr_send.o \
                                        steering/dr_cmd.o steering/dr_fw.o \
                                        steering/dr_action.o steering/fs_dr.o

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_crc32.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_crc32.c
deleted file mode 100644 (file)
index 9e2eccb..0000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_crc32.c
+++ /dev/null
@@ -1,98 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
-/* Copyright (c) 2019 Mellanox Technologies. */
-
-/* Copyright (c) 2011-2015 Stephan Brumme. All rights reserved.
- * Slicing-by-16 contributed by Bulat Ziganshin
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the author be held liable for any damages arising from the
- * of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software.
- * 2. If you use this software in a product, an acknowledgment in the product
- *    documentation would be appreciated but is not required.
- * 3. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- *
- * Taken from http://create.stephan-brumme.com/crc32/ and adapted.
- */
-
-#include "dr_types.h"
-
-#define DR_STE_CRC_POLY 0xEDB88320L
-
-static u32 dr_ste_crc_tab32[8][256];
-
-static void dr_crc32_calc_lookup_entry(u32 (*tbl)[256], u8 i, u8 j)
-{
-       tbl[i][j] = (tbl[i - 1][j] >> 8) ^ tbl[0][tbl[i - 1][j] & 0xff];
-}
-
-void mlx5dr_crc32_init_table(void)
-{
-       u32 crc, i, j;
-
-       for (i = 0; i < 256; i++) {
-               crc = i;
-               for (j = 0; j < 8; j++) {
-                       if (crc & 0x00000001L)
-                               crc = (crc >> 1) ^ DR_STE_CRC_POLY;
-                       else
-                               crc = crc >> 1;
-               }
-               dr_ste_crc_tab32[0][i] = crc;
-       }
-
-       /* Init CRC lookup tables according to crc_slice_8 algorithm */
-       for (i = 0; i < 256; i++) {
-               dr_crc32_calc_lookup_entry(dr_ste_crc_tab32, 1, i);
-               dr_crc32_calc_lookup_entry(dr_ste_crc_tab32, 2, i);
-               dr_crc32_calc_lookup_entry(dr_ste_crc_tab32, 3, i);
-               dr_crc32_calc_lookup_entry(dr_ste_crc_tab32, 4, i);
-               dr_crc32_calc_lookup_entry(dr_ste_crc_tab32, 5, i);
-               dr_crc32_calc_lookup_entry(dr_ste_crc_tab32, 6, i);
-               dr_crc32_calc_lookup_entry(dr_ste_crc_tab32, 7, i);
-       }
-}
-
-/* Compute CRC32 (Slicing-by-8 algorithm) */
-u32 mlx5dr_crc32_slice8_calc(const void *input_data, size_t length)
-{
-       const u32 *curr = (const u32 *)input_data;
-       const u8 *curr_char;
-       u32 crc = 0, one, two;
-
-       if (!input_data)
-               return 0;
-
-       /* Process eight bytes at once (Slicing-by-8) */
-       while (length >= 8) {
-               one = *curr++ ^ crc;
-               two = *curr++;
-
-               crc = dr_ste_crc_tab32[0][(two >> 24) & 0xff]
-                       ^ dr_ste_crc_tab32[1][(two >> 16) & 0xff]
-                       ^ dr_ste_crc_tab32[2][(two >> 8) & 0xff]
-                       ^ dr_ste_crc_tab32[3][two & 0xff]
-                       ^ dr_ste_crc_tab32[4][(one >> 24) & 0xff]
-                       ^ dr_ste_crc_tab32[5][(one >> 16) & 0xff]
-                       ^ dr_ste_crc_tab32[6][(one >> 8) & 0xff]
-                       ^ dr_ste_crc_tab32[7][one & 0xff];
-
-               length -= 8;
-       }
-
-       curr_char = (const u8 *)curr;
-       /* Remaining 1 to 7 bytes (standard algorithm) */
-       while (length-- != 0)
-               crc = (crc >> 8) ^ dr_ste_crc_tab32[0][(crc & 0xff)
-                       ^ *curr_char++];
-
-       return ((crc >> 24) & 0xff) | ((crc << 8) & 0xff0000) |
-               ((crc >> 8) & 0xff00) | ((crc << 24) & 0xff000000);
-}

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c
index 5b24732b18c0d1122ef34b34bd5411cc6ea575ba..a9da961d4d2f366b84f725353035dec1e3bb7b91 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c
@@ -326,9 +326,6 @@ mlx5dr_domain_create(struct mlx5_core_dev *mdev, enum mlx5dr_domain_type type)
                goto uninit_resourses;
        }
 
-       /* Init CRC table for htbl CRC calculation */
-       mlx5dr_crc32_init_table();
-
        return dmn;
 
 uninit_resourses:

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
index 4efe1b0be4a84b2cee79a5d0f9052c37edebacb1..7e9d6cfc356fdfdf35caa801f308072d702db2a8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
@@ -2,6 +2,7 @@
 /* Copyright (c) 2019 Mellanox Technologies. */
 
 #include <linux/types.h>
+#include <linux/crc32.h>
 #include "dr_types.h"
 
 #define DR_STE_CRC_POLY 0xEDB88320L
@@ -107,6 +108,13 @@ struct dr_hw_ste_format {
        u8 mask[DR_STE_SIZE_MASK];
 };
 
+static u32 dr_ste_crc32_calc(const void *input_data, size_t length)
+{
+       u32 crc = crc32(0, input_data, length);
+
+       return htonl(crc);
+}
+
 u32 mlx5dr_ste_calc_hash_index(u8 *hw_ste_p, struct mlx5dr_ste_htbl *htbl)
 {
        struct dr_hw_ste_format *hw_ste = (struct dr_hw_ste_format *)hw_ste_p;
@@ -128,7 +136,7 @@ u32 mlx5dr_ste_calc_hash_index(u8 *hw_ste_p, struct mlx5dr_ste_htbl *htbl)
                bit = bit >> 1;
        }
 
-       crc32 = mlx5dr_crc32_slice8_calc(masked, DR_STE_SIZE_TAG);
+       crc32 = dr_ste_crc32_calc(masked, DR_STE_SIZE_TAG);
        index = crc32 & (htbl->chunk->num_of_entries - 1);
 
        return index;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
index 1cb3769d4e3c84deb5e17bc76f81440511b6659c..d6d9bc5f4adfd828d5a776b0dbacbbc2684c7af7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
@@ -962,9 +962,6 @@ void mlx5dr_ste_copy_param(u8 match_criteria,
                           struct mlx5dr_match_param *set_param,
                           struct mlx5dr_match_parameters *mask);
 
-void mlx5dr_crc32_init_table(void);
-u32 mlx5dr_crc32_slice8_calc(const void *input_data, size_t length);
-
 struct mlx5dr_qp {
        struct mlx5_core_dev *mdev;
        struct mlx5_wq_qp wq;