From patchwork Wed Sep 15 21:40:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 98956 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 955D0A0C41; Wed, 15 Sep 2021 23:41:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D25BF410E0; Wed, 15 Sep 2021 23:41:02 +0200 (CEST) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by mails.dpdk.org (Postfix) with ESMTP id D32FE4003C for ; Wed, 15 Sep 2021 23:41:00 +0200 (CEST) Received: by mail-lf1-f41.google.com with SMTP id i7so9845005lfr.13 for ; Wed, 15 Sep 2021 14:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=alfCy+6jX511g0kVPSW28xQKdwJuSD1AESWa1MiO/8o=; b=qREZlsuIhxtoULuv7GcOIhZFG1/ciI9EAZ7Q0qN+apm2dY1i9PjmPCv4J/qF9rUtIl wpMCvjWm9iEJk7c9/n4KSGtC6VJ1txq6aKSn041dppER3Mv/PT6vySr44tO7byZBH/uj 0gBuLJYnozMh9RozbozL4ADmWDDVXkKXepvf+z9Ju+NitMnVAQgXDzyW6QK8c3+xbwnX GwMlWjvkAw/r3PD4Xo0B8vs9IpjLMyyykOuZz49fvjUHW828ObogVzwb3WltOtD7Cb2c YQeiS2uFnQezSt1DkZGDQlsce3moYz/orJfV4p+v4N3iqkxV1emmfxbSiQd8I28SFw3+ 6nxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=alfCy+6jX511g0kVPSW28xQKdwJuSD1AESWa1MiO/8o=; b=FIDVxPjS/bkLcW6gveZoUo49hzUK8oXlK3eRnivLWHtnntlSdqJKxO/aq+sEk4rMVw RqvE+x4yMASb+Ftq6O+Zeab3kQ4QzxxZRTIwbF/bPHNFzlEV1TK3vUqmUAbsEODkUuib Hxf6hWDr/yXkSvyYaAMoTZyZQGzBSdPMz4ZGqS3NAYU5AMiFgzisgbaiSARZ9niu0m3P A0i28BcVAZbeUX5p2qQeAHI0/kxOspKiz2IdoULjhzM73SVL3iVhmJFKQYTMS2uE0I5i kV/Ls3ue97S4boCFnPiS1Rvbvamqs9pXmh3MsI7emtbVbCrjXO/MaIgV8S1Ct3J6wOXL y9GA== X-Gm-Message-State: AOAM533tgWWLD/MvWDkQinO/hjUwNFPPbetvcjd1PUD+/sCtHDtPVVep G098T24hI9R/kGqzLdvgY9Xdx/tvJbQcHQ== X-Google-Smtp-Source: ABdhPJyCI7wwrMhk1uXj/bK+wBSzXGXz+GdyBoKvJTWRXm7OUpO0kv6BuuLB3tUkBrDEvMRxCnfSqg== X-Received: by 2002:a2e:4951:: with SMTP id b17mr1934699ljd.414.1631742060039; Wed, 15 Sep 2021 14:41:00 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:40:59 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk , Ashish Gupta , Fiona Trahe , Narcisa Ana Maria Vasile , Pallavi Kadam , Ray Kinsella , Tyler Retzlaff Date: Thu, 16 Sep 2021 00:40:48 +0300 Message-Id: <20210915214052.143098-2-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> References: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/5] compressdev: rename fields for Windows compatibility X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Windows SDK headers define `min` and `max` macros which break definition of `struct rte_param_log2_range`. Rename the structure fields to `minimum` and `maximum` to allow inclusion of both DPDK and Windows headers in the same file. Deprecation notice: https://mails.dpdk.org/archives/dev/2021-July/215270.html Signed-off-by: Dmitry Kozlyuk --- app/test-compress-perf/comp_perf_test_common.c | 6 +++--- app/test-compress-perf/main.c | 2 +- doc/guides/rel_notes/deprecation.rst | 3 --- doc/guides/rel_notes/release_20_11.rst | 3 +++ drivers/compress/isal/isal_compress_pmd_ops.c | 4 ++-- drivers/compress/mlx5/mlx5_compress.c | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 4 ++-- drivers/compress/qat/qat_comp_pmd.c | 2 +- drivers/compress/zlib/zlib_pmd_ops.c | 4 ++-- lib/compressdev/rte_compressdev.h | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/test-compress-perf/comp_perf_test_common.c b/app/test-compress-perf/comp_perf_test_common.c index b402a0d839..b85323049f 100644 --- a/app/test-compress-perf/comp_perf_test_common.c +++ b/app/test-compress-perf/comp_perf_test_common.c @@ -35,10 +35,10 @@ param_range_check(uint16_t size, const struct rte_param_log2_range *range) unsigned int next_size; /* Check lower/upper bounds */ - if (size < range->min) + if (size < range->minimum) return -1; - if (size > range->max) + if (size > range->maximum) return -1; /* If range is actually only one value, size is correct */ @@ -46,7 +46,7 @@ param_range_check(uint16_t size, const struct rte_param_log2_range *range) return 0; /* Check if value is one of the supported sizes */ - for (next_size = range->min; next_size <= range->max; + for (next_size = range->minimum; next_size <= range->maximum; next_size += range->increment) if (size == next_size) return 0; diff --git a/app/test-compress-perf/main.c b/app/test-compress-perf/main.c index cc9951a9b1..9fe6160f4a 100644 --- a/app/test-compress-perf/main.c +++ b/app/test-compress-perf/main.c @@ -93,7 +93,7 @@ comp_perf_check_capabilities(struct comp_test_data *test_data, uint8_t cdev_id) } } else /* Set window size to PMD maximum if none was specified */ - test_data->window_sz = cap->window_size.max; + test_data->window_sz = cap->window_size.maximum; /* Check if chained mbufs is supported */ if (test_data->max_sgl_segs > 1 && diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 76a4abfd6b..7b848528ff 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -196,9 +196,6 @@ Deprecation Notices and ``rte_vhost_driver_set_protocol_features`` functions will be removed and the API functions will be made stable in DPDK 21.11. -* compressdev: ``min`` and ``max`` fields of ``rte_param_log2_range`` structure - will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers. - * cryptodev: ``min`` and ``max`` fields of ``rte_crypto_param_range`` structure will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers. diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index d07fd815dc..d93790c3b1 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -662,6 +662,9 @@ API Changes * sched: Removed ``tb_rate``, ``tc_rate``, ``tc_period`` and ``tb_size`` from ``struct rte_sched_subport_params``. +* compressdev: Renamed ``min`` and ``max`` fields of ``rte_param_log2_range`` + structure to ``minimum`` and ``maximum``, respectively. + ABI Changes ----------- diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c index 9b42147a0b..3a736794dc 100644 --- a/drivers/compress/isal/isal_compress_pmd_ops.c +++ b/drivers/compress/isal/isal_compress_pmd_ops.c @@ -22,8 +22,8 @@ static const struct rte_compressdev_capabilities isal_pmd_capabilities[] = { RTE_COMP_FF_CRC32_CHECKSUM | RTE_COMP_FF_ADLER32_CHECKSUM, .window_size = { - .min = 15, - .max = 15, + .minimum = 15, + .maximum = 15, .increment = 0 }, }, diff --git a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c index c5e0a83a8c..5ec936c7db 100644 --- a/drivers/compress/mlx5/mlx5_compress.c +++ b/drivers/compress/mlx5/mlx5_compress.c @@ -90,7 +90,7 @@ static const struct rte_compressdev_capabilities mlx5_caps[] = { RTE_COMP_FF_SHAREABLE_PRIV_XFORM | RTE_COMP_FF_HUFFMAN_FIXED | RTE_COMP_FF_HUFFMAN_DYNAMIC, - .window_size = {.min = 10, .max = 15, .increment = 1}, + .window_size = {.minimum = 10, .maximum = 15, .increment = 1}, }, { .algo = RTE_COMP_ALGO_LIST_END, diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/octeontx/otx_zip_pmd.c index dd62285b86..9b8aef9809 100644 --- a/drivers/compress/octeontx/otx_zip_pmd.c +++ b/drivers/compress/octeontx/otx_zip_pmd.c @@ -19,8 +19,8 @@ static const struct rte_compressdev_capabilities RTE_COMP_FF_HUFFMAN_DYNAMIC, /* Non sharable Priv XFORM and Stateless */ .window_size = { - .min = 1, - .max = 14, + .minimum = 1, + .maximum = 14, .increment = 1 /* size supported 2^1 to 2^14 */ }, diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c index caac7839e9..b79d35b85d 100644 --- a/drivers/compress/qat/qat_comp_pmd.c +++ b/drivers/compress/qat/qat_comp_pmd.c @@ -29,7 +29,7 @@ static const struct rte_compressdev_capabilities qat_comp_gen_capabilities[] = { RTE_COMP_FF_OOP_SGL_IN_LB_OUT | RTE_COMP_FF_OOP_LB_IN_SGL_OUT | RTE_COMP_FF_STATEFUL_DECOMPRESSION, - .window_size = {.min = 15, .max = 15, .increment = 0} }, + .window_size = {.minimum = 15, .maximum = 15, .increment = 0} }, {RTE_COMP_ALGO_LIST_END, 0, {0, 0, 0} } }; static void diff --git a/drivers/compress/zlib/zlib_pmd_ops.c b/drivers/compress/zlib/zlib_pmd_ops.c index 0a73aed949..50222f942e 100644 --- a/drivers/compress/zlib/zlib_pmd_ops.c +++ b/drivers/compress/zlib/zlib_pmd_ops.c @@ -16,8 +16,8 @@ static const struct rte_compressdev_capabilities zlib_pmd_capabilities[] = { RTE_COMP_FF_HUFFMAN_FIXED | RTE_COMP_FF_HUFFMAN_DYNAMIC), .window_size = { - .min = 8, - .max = 15, + .minimum = 8, + .maximum = 15, .increment = 1 }, }, diff --git a/lib/compressdev/rte_compressdev.h b/lib/compressdev/rte_compressdev.h index 2840c27c6c..c6cea3e9c4 100644 --- a/lib/compressdev/rte_compressdev.h +++ b/lib/compressdev/rte_compressdev.h @@ -30,8 +30,8 @@ extern "C" { * Final value will be 2^value. */ struct rte_param_log2_range { - uint8_t min; /**< Minimum log2 value */ - uint8_t max; /**< Maximum log2 value */ + uint8_t minimum; /**< Minimum log2 value */ + uint8_t maximum; /**< Maximum log2 value */ uint8_t increment; /**< If a range of sizes are supported, * this parameter is used to indicate From patchwork Wed Sep 15 21:40:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 98957 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 867DAA0C41; Wed, 15 Sep 2021 23:41:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C740410F0; Wed, 15 Sep 2021 23:41:05 +0200 (CEST) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mails.dpdk.org (Postfix) with ESMTP id 327C8410E7 for ; Wed, 15 Sep 2021 23:41:03 +0200 (CEST) Received: by mail-lf1-f46.google.com with SMTP id p29so9947559lfa.11 for ; Wed, 15 Sep 2021 14:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sBBBXPwWq4hDSDy7yi5nR/t4xANsKh4BB0DhgK/cYjA=; b=eJaOrEtnmlt33ug2t89wm3EbUqMoGBmucSuZ1jSdwfqq2iJu+D+KNb1IoqKGLZp1Nq xCzwZS+6ANQJGGGJDEh2Bxc2D2IZZbj09WKP4J6aESjiGJASQuFL0p1oxqTlRYy0YvEe oMc725/CYWvRfj5eEHvvHLypFBRUROTAcS7csJvAAvNrMS4D0O2PftCg224gkhfssGco CcNhXSdQkbJH1wVgJ9I768OySR3l2HNDkIJt1RpeS3tZn+grnkEODXHVYuTT754M58Q9 3CNPpgCvtNXaqeat3C8tdL1j8s8ODKg/jDsakVVgqBuTtQigsaPLvpX1tuFSt+2nIVJo qrvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sBBBXPwWq4hDSDy7yi5nR/t4xANsKh4BB0DhgK/cYjA=; b=5BX9nQhrDZZkpnZDXDWOIxZ68y1PNx5poIKSCNmlVkQV2gjs55kerL3DoHkRJK8iE4 nWfiN95sdqSczvGGK5tv9/e+VlOuRwPUJeArUyvJB8ZgTumEkFDHCQrjpHbUAqWKstw4 pKOzxD/z1iG/nb+ScJkg1RWHiUcY7jPnqFQEOBG1zxsVDv7d+o0vOHnR5ZMBjd/TKTWW wkL9FmyHSkPt9fSxxMK+BZ3E6SPMPUjVVNkEjE45GOw0zSbaCLL0p9K1cW0yuEZdBIqw JEj0s12fBBZZQFJyF/SVgIbaL024TJOtovvtAblAkEgW3A+L/STBlPAPymBT+jwhol6e rxYg== X-Gm-Message-State: AOAM532OMJgBSSKv8GgYu9rlh5b2jFvi36wSu5itZrAugEeI2VdaUD2l 4l6lA6u2qnXESF8EtOybU4R/4ZPdLCOW1g== X-Google-Smtp-Source: ABdhPJy1RTFPldofbiF1gjA8lBGgNx9GoM3ajthB+0vqoRU0jbVP3EYvhfuEkgA8BJzPo6dvOEybOg== X-Received: by 2002:a05:651c:b12:: with SMTP id b18mr1892757ljr.512.1631742061394; Wed, 15 Sep 2021 14:41:01 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:41:00 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk , Akhil Goyal , Declan Doherty , Narcisa Ana Maria Vasile , Pallavi Kadam , Ray Kinsella , Tyler Retzlaff Date: Thu, 16 Sep 2021 00:40:49 +0300 Message-Id: <20210915214052.143098-3-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> References: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/5] cryptodev: rename fields for Windows compatibility X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Windows SDK headers define `min` and `max` macros which break definition of `struct rte_crypto_param_range`. Rename the structure fields to `minimum` and `maximum` to allow inclusion of both DPDK and Windows headers in the same file. Deprecation notice: https://mails.dpdk.org/archives/dev/2021-July/215270.html Signed-off-by: Dmitry Kozlyuk --- app/test/test_cryptodev_asym.c | 4 +- doc/guides/rel_notes/deprecation.rst | 3 - doc/guides/rel_notes/release_20_11.rst | 3 + drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 28 +- .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 284 +++++----- drivers/crypto/armv8/rte_armv8_pmd_ops.c | 24 +- drivers/crypto/bcmfs/bcmfs_sym_capabilities.c | 288 +++++----- drivers/crypto/caam_jr/caam_jr_capabilities.c | 88 +-- drivers/crypto/ccp/ccp_pmd_ops.c | 208 ++++---- .../crypto/cnxk/cnxk_cryptodev_capabilities.c | 300 +++++------ drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 280 +++++----- drivers/crypto/dpaa_sec/dpaa_sec.h | 208 ++++---- drivers/crypto/kasumi/rte_kasumi_pmd_ops.c | 16 +- drivers/crypto/mlx5/mlx5_crypto.c | 8 +- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 192 +++---- .../crypto/nitrox/nitrox_sym_capabilities.c | 56 +- drivers/crypto/null/null_crypto_pmd_ops.c | 12 +- .../octeontx/otx_cryptodev_capabilities.c | 252 ++++----- .../octeontx2/otx2_cryptodev_capabilities.c | 284 +++++----- drivers/crypto/openssl/rte_openssl_pmd_ops.c | 208 ++++---- drivers/crypto/qat/qat_asym_capabilities.h | 12 +- drivers/crypto/qat/qat_sym_capabilities.h | 504 +++++++++--------- .../scheduler/rte_cryptodev_scheduler.c | 20 +- drivers/crypto/snow3g/rte_snow3g_pmd_ops.c | 20 +- .../virtio/virtio_crypto_capabilities.h | 16 +- drivers/crypto/zuc/rte_zuc_pmd_ops.c | 20 +- drivers/net/ixgbe/ixgbe_ipsec.c | 28 +- drivers/net/octeontx2/otx2_ethdev_sec.c | 32 +- drivers/net/txgbe/txgbe_ipsec.c | 28 +- examples/l2fwd-crypto/main.c | 66 +-- lib/cryptodev/rte_cryptodev.c | 14 +- lib/cryptodev/rte_cryptodev.h | 4 +- 32 files changed, 1755 insertions(+), 1755 deletions(-) diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index 847b074a4f..e138ed0890 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -1041,8 +1041,8 @@ static inline void print_asym_capa( case RTE_CRYPTO_ASYM_XFORM_DH: case RTE_CRYPTO_ASYM_XFORM_DSA: printf(" modlen: min %d max %d increment %d", - capa->modlen.min, - capa->modlen.max, + capa->modlen.minimum, + capa->modlen.maximum, capa->modlen.increment); break; case RTE_CRYPTO_ASYM_XFORM_ECDSA: diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 7b848528ff..6d48155b35 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -196,9 +196,6 @@ Deprecation Notices and ``rte_vhost_driver_set_protocol_features`` functions will be removed and the API functions will be made stable in DPDK 21.11. -* cryptodev: ``min`` and ``max`` fields of ``rte_crypto_param_range`` structure - will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers. - * cryptodev: The field ``dataunit_len`` of the ``struct rte_crypto_cipher_xform`` has a limited size ``uint16_t``. It will be moved and extended as ``uint32_t`` in DPDK 21.11. diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index d93790c3b1..3eb30f855c 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -665,6 +665,9 @@ API Changes * compressdev: Renamed ``min`` and ``max`` fields of ``rte_param_log2_range`` structure to ``minimum`` and ``maximum``, respectively. +* cryptodev: Renamed ``min`` and ``max`` fields of ``rte_crypto_param_range`` + structure to ``minimum`` and ``maximum``, respectively. + ABI Changes ----------- diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c index 18dbc4c18c..e75082dd8f 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c @@ -19,18 +19,18 @@ static const struct rte_cryptodev_capabilities aesni_gcm_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -44,23 +44,23 @@ static const struct rte_cryptodev_capabilities aesni_gcm_pmd_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c index fc7fdfec8e..f572ad2da7 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c @@ -22,13 +22,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { 0 } @@ -43,13 +43,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 65535, + .minimum = 1, + .maximum = 65535, .increment = 1 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -64,13 +64,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -85,13 +85,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 65535, + .minimum = 1, + .maximum = 65535, .increment = 1 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -106,13 +106,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -127,13 +127,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 65535, + .minimum = 1, + .maximum = 65535, .increment = 1 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -148,13 +148,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -169,13 +169,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 65535, + .minimum = 1, + .maximum = 65535, .increment = 1 }, .digest_size = { - .min = 1, - .max = 48, + .minimum = 1, + .maximum = 48, .increment = 1 }, .iv_size = { 0 } @@ -190,13 +190,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 1, - .max = 48, + .minimum = 1, + .maximum = 48, .increment = 1 }, .iv_size = { 0 } @@ -211,13 +211,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 65535, + .minimum = 1, + .maximum = 65535, .increment = 1 }, .digest_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .iv_size = { 0 } @@ -232,13 +232,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .iv_size = { 0 } @@ -253,13 +253,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, .iv_size = { 0 } @@ -274,13 +274,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -294,13 +294,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 } }, } @@ -314,18 +314,18 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI, .block_size = 16, .key_size = { - .min = 16, + .minimum = 16, #if IMB_VERSION_NUM >= IMB_VERSION(0, 53, 3) - .max = 32, + .maximum = 32, .increment = 16 #else - .max = 16, + .maximum = 16, .increment = 0 #endif }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -339,13 +339,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -359,13 +359,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 24, + .minimum = 8, + .maximum = 24, .increment = 8 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -379,13 +379,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_DES_DOCSISBPI, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -399,28 +399,28 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_CCM, .block_size = 16, .key_size = { - .min = 16, + .minimum = 16, #if IMB_VERSION(0, 54, 2) <= IMB_VERSION_NUM - .max = 32, + .maximum = 32, .increment = 16 #else - .max = 16, + .maximum = 16, .increment = 0 #endif }, .digest_size = { - .min = 4, - .max = 16, + .minimum = 4, + .maximum = 16, .increment = 2 }, .aad_size = { - .min = 0, - .max = 46, + .minimum = 0, + .maximum = 46, .increment = 1 }, .iv_size = { - .min = 7, - .max = 13, + .minimum = 7, + .maximum = 13, .increment = 1 }, }, } @@ -434,13 +434,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_CMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { 0 } @@ -455,23 +455,23 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -485,18 +485,18 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -511,8 +511,8 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_ECB, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { 0 } @@ -529,18 +529,18 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -554,13 +554,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -574,18 +574,18 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -599,13 +599,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -619,13 +619,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_KASUMI_F9, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { 0 } @@ -640,13 +640,13 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_KASUMI_F8, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -662,23 +662,23 @@ static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = { .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, .block_size = 64, .key_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 240, + .minimum = 0, + .maximum = 240, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } @@ -699,13 +699,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 16 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c index 01ccfb4b23..5d0eae6b45 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c +++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c @@ -20,13 +20,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -41,13 +41,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -62,13 +62,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } diff --git a/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c b/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c index afed7696a6..ec15ca2323 100644 --- a/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c +++ b/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c @@ -17,13 +17,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, .aad_size = { 0 } @@ -39,13 +39,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -60,13 +60,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, .aad_size = { 0 } @@ -82,13 +82,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .aad_size = { 0 } @@ -104,13 +104,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, .aad_size = { 0 } @@ -126,13 +126,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, .aad_size = { 0 } @@ -148,13 +148,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_224, .block_size = 144, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, .aad_size = { 0 } @@ -170,13 +170,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_256, .block_size = 136, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .aad_size = { 0 } @@ -192,13 +192,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_384, .block_size = 104, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, .aad_size = { 0 } @@ -214,13 +214,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_512, .block_size = 72, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, .aad_size = { 0 } @@ -236,13 +236,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, .aad_size = { 0 } @@ -258,13 +258,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { 0 } @@ -280,13 +280,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, .aad_size = { 0 } @@ -302,13 +302,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .aad_size = { 0 } @@ -324,13 +324,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, .aad_size = { 0 } @@ -346,13 +346,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, .aad_size = { 0 } @@ -368,13 +368,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_224_HMAC, .block_size = 144, .key_size = { - .min = 1, - .max = 144, + .minimum = 1, + .maximum = 144, .increment = 1 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, .aad_size = { 0 } @@ -390,13 +390,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_256_HMAC, .block_size = 136, .key_size = { - .min = 1, - .max = 136, + .minimum = 1, + .maximum = 136, .increment = 1 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .aad_size = { 0 } @@ -412,13 +412,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_384_HMAC, .block_size = 104, .key_size = { - .min = 1, - .max = 104, + .minimum = 1, + .maximum = 104, .increment = 1 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, .aad_size = { 0 } @@ -434,13 +434,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA3_512_HMAC, .block_size = 72, .key_size = { - .min = 1, - .max = 72, + .minimum = 1, + .maximum = 72, .increment = 1 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, .aad_size = { 0 } @@ -456,13 +456,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC, .block_size = 16, .key_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { 0 } @@ -478,23 +478,23 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } @@ -509,13 +509,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_CMAC, .block_size = 16, .key_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { 0 } @@ -531,13 +531,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_CBC_MAC, .block_size = 16, .key_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { 0 } @@ -553,13 +553,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_ECB, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, } @@ -574,13 +574,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -595,13 +595,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -616,13 +616,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_XTS, .block_size = 16, .key_size = { - .min = 32, - .max = 64, + .minimum = 32, + .maximum = 64, .increment = 32 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -637,13 +637,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -658,13 +658,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -679,13 +679,13 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_ECB, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, } @@ -700,23 +700,23 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } @@ -731,23 +731,23 @@ static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_CCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 4, - .max = 16, + .minimum = 4, + .maximum = 16, .increment = 2 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 7, - .max = 13, + .minimum = 7, + .maximum = 13, .increment = 1 }, }, } diff --git a/drivers/crypto/caam_jr/caam_jr_capabilities.c b/drivers/crypto/caam_jr/caam_jr_capabilities.c index c51593c4bb..991a3b46ab 100644 --- a/drivers/crypto/caam_jr/caam_jr_capabilities.c +++ b/drivers/crypto/caam_jr/caam_jr_capabilities.c @@ -13,13 +13,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { 0 } @@ -34,13 +34,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -55,13 +55,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -76,13 +76,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -97,13 +97,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 48, + .minimum = 1, + .maximum = 48, .increment = 1 }, .iv_size = { 0 } @@ -118,13 +118,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .iv_size = { 0 } @@ -139,23 +139,23 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 4 }, .aad_size = { - .min = 0, - .max = 240, + .minimum = 0, + .maximum = 240, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } @@ -169,13 +169,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -189,13 +189,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -209,13 +209,13 @@ static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 16, - .max = 24, + .minimum = 16, + .maximum = 24, .increment = 8 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c index 98f964f361..60f3c14d87 100644 --- a/drivers/crypto/ccp/ccp_pmd_ops.c +++ b/drivers/crypto/ccp/ccp_pmd_ops.c @@ -21,13 +21,13 @@ .algo = RTE_CRYPTO_AUTH_SHA1, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 20, \ - .max = 20, \ + .minimum = 20, \ + .maximum = 20, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -42,13 +42,13 @@ .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 20, \ + .minimum = 1, \ + .maximum = 20, \ .increment = 1 \ }, \ .aad_size = { 0 } \ @@ -63,13 +63,13 @@ .algo = RTE_CRYPTO_AUTH_SHA224, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 28, \ - .max = 28, \ + .minimum = 28, \ + .maximum = 28, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -84,13 +84,13 @@ .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 28, \ + .minimum = 1, \ + .maximum = 28, \ .increment = 1 \ }, \ .aad_size = { 0 } \ @@ -105,13 +105,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_224, \ .block_size = 144, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 28, \ - .max = 28, \ + .minimum = 28, \ + .maximum = 28, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -126,13 +126,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_224_HMAC, \ .block_size = 144, \ .key_size = { \ - .min = 1, \ - .max = 144, \ + .minimum = 1, \ + .maximum = 144, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 28, \ - .max = 28, \ + .minimum = 28, \ + .maximum = 28, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -147,13 +147,13 @@ .algo = RTE_CRYPTO_AUTH_SHA256, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 32, \ - .max = 32, \ + .minimum = 32, \ + .maximum = 32, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -168,13 +168,13 @@ .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 32, \ + .minimum = 1, \ + .maximum = 32, \ .increment = 1 \ }, \ .aad_size = { 0 } \ @@ -189,13 +189,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_256, \ .block_size = 136, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 32, \ - .max = 32, \ + .minimum = 32, \ + .maximum = 32, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -210,13 +210,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_256_HMAC, \ .block_size = 136, \ .key_size = { \ - .min = 1, \ - .max = 136, \ + .minimum = 1, \ + .maximum = 136, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 32, \ - .max = 32, \ + .minimum = 32, \ + .maximum = 32, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -231,13 +231,13 @@ .algo = RTE_CRYPTO_AUTH_SHA384, \ .block_size = 128, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 48, \ - .max = 48, \ + .minimum = 48, \ + .maximum = 48, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -252,13 +252,13 @@ .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, \ .block_size = 128, \ .key_size = { \ - .min = 1, \ - .max = 128, \ + .minimum = 1, \ + .maximum = 128, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 48, \ + .minimum = 1, \ + .maximum = 48, \ .increment = 1 \ }, \ .aad_size = { 0 } \ @@ -273,13 +273,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_384, \ .block_size = 104, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 48, \ - .max = 48, \ + .minimum = 48, \ + .maximum = 48, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -294,13 +294,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_384_HMAC, \ .block_size = 104, \ .key_size = { \ - .min = 1, \ - .max = 104, \ + .minimum = 1, \ + .maximum = 104, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 48, \ - .max = 48, \ + .minimum = 48, \ + .maximum = 48, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -315,13 +315,13 @@ .algo = RTE_CRYPTO_AUTH_SHA512, \ .block_size = 128, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 64, \ - .max = 64, \ + .minimum = 64, \ + .maximum = 64, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -336,13 +336,13 @@ .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, \ .block_size = 128, \ .key_size = { \ - .min = 1, \ - .max = 128, \ + .minimum = 1, \ + .maximum = 128, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .aad_size = { 0 } \ @@ -357,13 +357,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_512, \ .block_size = 72, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 64, \ - .max = 64, \ + .minimum = 64, \ + .maximum = 64, \ .increment = 0 \ }, \ .aad_size = { 0 } \ @@ -378,13 +378,13 @@ .algo = RTE_CRYPTO_AUTH_SHA3_512_HMAC, \ .block_size = 72, \ .key_size = { \ - .min = 1, \ - .max = 72, \ + .minimum = 1, \ + .maximum = 72, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .aad_size = { 0 } \ @@ -399,13 +399,13 @@ .algo = RTE_CRYPTO_AUTH_AES_CMAC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .digest_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ }, } \ @@ -419,13 +419,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_ECB, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ } \ }, } \ @@ -439,13 +439,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_CBC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -459,13 +459,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_CTR, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -479,13 +479,13 @@ .algo = RTE_CRYPTO_CIPHER_3DES_CBC, \ .block_size = 8, \ .key_size = { \ - .min = 16, \ - .max = 24, \ + .minimum = 16, \ + .maximum = 24, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ } \ }, } \ @@ -499,23 +499,23 @@ .algo = RTE_CRYPTO_AEAD_AES_GCM, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .digest_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .aad_size = { \ - .min = 0, \ - .max = 65535, \ + .minimum = 0, \ + .maximum = 65535, \ .increment = 1 \ }, \ .iv_size = { \ - .min = 12, \ - .max = 16, \ + .minimum = 12, \ + .maximum = 16, \ .increment = 4 \ }, \ }, } \ @@ -531,13 +531,13 @@ .algo = RTE_CRYPTO_AUTH_MD5_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 16, \ + .minimum = 1, \ + .maximum = 16, \ .increment = 1 \ }, \ .aad_size = { 0 } \ diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c index c4f7824332..a2903116f9 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c @@ -39,8 +39,8 @@ static const struct rte_cryptodev_capabilities caps_mul[] = { (1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) | (1 << RTE_CRYPTO_ASYM_OP_DECRYPT)), {.modlen = { - .min = 17, - .max = 1024, + .minimum = 17, + .maximum = 1024, .increment = 1 }, } } @@ -53,8 +53,8 @@ static const struct rte_cryptodev_capabilities caps_mul[] = { .xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX, .op_types = 0, {.modlen = { - .min = 17, - .max = 1024, + .minimum = 17, + .maximum = 1024, .increment = 1 }, } } @@ -92,13 +92,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, }, } @@ -112,13 +112,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 12, - .max = 20, + .minimum = 12, + .maximum = 20, .increment = 8 }, }, } @@ -132,13 +132,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, }, } @@ -152,13 +152,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, }, } @@ -172,13 +172,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, }, } @@ -192,13 +192,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 16 }, }, } @@ -212,13 +212,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, }, } @@ -232,13 +232,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 24, - .max = 48, + .minimum = 24, + .maximum = 48, .increment = 24 }, }, } @@ -252,13 +252,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, }, } @@ -272,13 +272,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 32, - .max = 64, + .minimum = 32, + .maximum = 64, .increment = 32 }, }, } @@ -292,13 +292,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_MD5, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -312,13 +312,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 8, - .max = 64, + .minimum = 8, + .maximum = 64, .increment = 8 }, .digest_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } @@ -335,23 +335,23 @@ static const struct rte_cryptodev_capabilities caps_chacha20[] = { .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, .block_size = 64, .key_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 1024, + .minimum = 0, + .maximum = 1024, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } @@ -368,13 +368,13 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -388,13 +388,13 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -408,18 +408,18 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -433,18 +433,18 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -461,18 +461,18 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 4 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -486,13 +486,13 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -506,13 +506,13 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 } }, } @@ -526,13 +526,13 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_CIPHER_AES_XTS, .block_size = 16, .key_size = { - .min = 32, - .max = 64, + .minimum = 32, + .maximum = 64, .increment = 32 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -546,23 +546,23 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 4, - .max = 16, + .minimum = 4, + .maximum = 16, .increment = 1 }, .aad_size = { - .min = 0, - .max = 1024, + .minimum = 0, + .maximum = 1024, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -579,13 +579,13 @@ static const struct rte_cryptodev_capabilities caps_kasumi[] = { .algo = RTE_CRYPTO_CIPHER_KASUMI_F8, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -599,13 +599,13 @@ static const struct rte_cryptodev_capabilities caps_kasumi[] = { .algo = RTE_CRYPTO_AUTH_KASUMI_F9, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, }, } @@ -622,13 +622,13 @@ static const struct rte_cryptodev_capabilities caps_des[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 8 } }, } @@ -642,13 +642,13 @@ static const struct rte_cryptodev_capabilities caps_des[] = { .algo = RTE_CRYPTO_CIPHER_3DES_ECB, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, } @@ -662,13 +662,13 @@ static const struct rte_cryptodev_capabilities caps_des[] = { .algo = RTE_CRYPTO_CIPHER_DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -685,13 +685,13 @@ static const struct rte_cryptodev_capabilities caps_null[] = { .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, }, }, @@ -705,13 +705,13 @@ static const struct rte_cryptodev_capabilities caps_null[] = { .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -732,23 +732,23 @@ static const struct rte_cryptodev_capabilities sec_caps_aes[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 8, - .max = 12, + .minimum = 8, + .maximum = 12, .increment = 4 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -762,13 +762,13 @@ static const struct rte_cryptodev_capabilities sec_caps_aes[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -785,13 +785,13 @@ static const struct rte_cryptodev_capabilities sec_caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 20, - .max = 64, + .minimum = 20, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h index 7dbc69f6cb..7bd6f89fd5 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h @@ -209,13 +209,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { 0 } @@ -230,13 +230,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { 0 } @@ -251,13 +251,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { 0 } @@ -272,13 +272,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, .iv_size = { 0 } @@ -293,13 +293,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -314,13 +314,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, .iv_size = { 0 } @@ -335,13 +335,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -356,13 +356,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .iv_size = { 0 } @@ -377,13 +377,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -398,13 +398,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, .iv_size = { 0 } @@ -419,13 +419,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 48, + .minimum = 1, + .maximum = 48, .increment = 1 }, .iv_size = { 0 } @@ -440,13 +440,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, .iv_size = { 0 } @@ -461,13 +461,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .iv_size = { 0 } @@ -482,23 +482,23 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 4 }, .aad_size = { - .min = 0, - .max = 240, + .minimum = 0, + .maximum = 240, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } @@ -512,13 +512,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC, .block_size = 16, .key_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .digest_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, .aad_size = { 0 }, @@ -534,13 +534,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_CMAC, .block_size = 16, .key_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .digest_size = { - .min = 4, - .max = 16, + .minimum = 4, + .maximum = 16, .increment = 4 }, .aad_size = { 0 } @@ -555,13 +555,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -575,13 +575,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -595,13 +595,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -615,13 +615,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -635,13 +635,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 16, - .max = 24, + .minimum = 16, + .maximum = 24, .increment = 8 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -655,18 +655,18 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -680,13 +680,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -700,13 +700,13 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -720,18 +720,18 @@ static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -751,18 +751,18 @@ static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -776,13 +776,13 @@ static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -796,13 +796,13 @@ static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -816,13 +816,13 @@ static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { 0 } @@ -837,13 +837,13 @@ static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -857,13 +857,13 @@ static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -877,18 +877,18 @@ static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h index 368699678b..ff15708e10 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec.h @@ -227,13 +227,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { 0 } @@ -248,13 +248,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { 0 } @@ -269,13 +269,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -290,13 +290,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -311,13 +311,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -332,13 +332,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 48, + .minimum = 1, + .maximum = 48, .increment = 1 }, .iv_size = { 0 } @@ -353,13 +353,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .iv_size = { 0 } @@ -374,23 +374,23 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 4 }, .aad_size = { - .min = 0, - .max = 240, + .minimum = 0, + .maximum = 240, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } @@ -404,13 +404,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -424,13 +424,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -444,13 +444,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -464,13 +464,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 16, - .max = 24, + .minimum = 16, + .maximum = 24, .increment = 8 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -484,18 +484,18 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -509,13 +509,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -529,13 +529,13 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -549,18 +549,18 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -579,18 +579,18 @@ static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -604,13 +604,13 @@ static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -624,13 +624,13 @@ static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -644,13 +644,13 @@ static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { 0 } @@ -665,13 +665,13 @@ static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -685,13 +685,13 @@ static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -705,18 +705,18 @@ static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c index 43376c1aa0..51d1f97407 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c @@ -19,13 +19,13 @@ static const struct rte_cryptodev_capabilities kasumi_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_KASUMI_F9, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { 0 } @@ -40,13 +40,13 @@ static const struct rte_cryptodev_capabilities kasumi_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_KASUMI_F8, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c index e01be15ade..d5b83e8fdd 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.c +++ b/drivers/crypto/mlx5/mlx5_crypto.c @@ -48,13 +48,13 @@ const struct rte_cryptodev_capabilities mlx5_crypto_caps[] = { .algo = RTE_CRYPTO_CIPHER_AES_XTS, .block_size = 16, .key_size = { - .min = 32, - .max = 64, + .minimum = 32, + .maximum = 64, .increment = 32 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .dataunit_set = diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c index fa36461276..3c22c48c24 100644 --- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c @@ -26,13 +26,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } @@ -46,13 +46,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_MD5, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } @@ -66,13 +66,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 12, - .max = 20, + .minimum = 12, + .maximum = 20, .increment = 4 }, }, } @@ -86,13 +86,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 12, - .max = 20, + .minimum = 12, + .maximum = 20, .increment = 4 }, }, } @@ -107,13 +107,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 12, - .max = 28, + .minimum = 12, + .maximum = 28, .increment = 0 }, }, } @@ -127,13 +127,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 12, - .max = 28, + .minimum = 12, + .maximum = 28, .increment = 4 }, }, } @@ -147,13 +147,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 12, - .max = 32, + .minimum = 12, + .maximum = 32, .increment = 4 }, }, } @@ -167,13 +167,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 12, - .max = 32, + .minimum = 12, + .maximum = 32, .increment = 4 }, }, } @@ -187,13 +187,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 12, - .max = 48, + .minimum = 12, + .maximum = 48, .increment = 4 }, }, } @@ -207,13 +207,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 12, - .max = 48, + .minimum = 12, + .maximum = 48, .increment = 4 }, }, } @@ -227,13 +227,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 12, - .max = 64, + .minimum = 12, + .maximum = 64, .increment = 4 }, }, } @@ -247,13 +247,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 12, - .max = 64, + .minimum = 12, + .maximum = 64, .increment = 0 }, }, } @@ -267,13 +267,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -287,13 +287,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -307,13 +307,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_AES_ECB, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, } @@ -327,23 +327,23 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 64, + .minimum = 0, + .maximum = 64, .increment = 1 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 } }, } @@ -357,18 +357,18 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 8, - .max = 65532, + .minimum = 8, + .maximum = 65532, .increment = 4 } }, } @@ -382,13 +382,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -402,13 +402,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_3DES_CTR, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -422,13 +422,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_3DES_ECB, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, } @@ -442,18 +442,18 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -467,13 +467,13 @@ static const struct rte_cryptodev_capabilities .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, diff --git a/drivers/crypto/nitrox/nitrox_sym_capabilities.c b/drivers/crypto/nitrox/nitrox_sym_capabilities.c index a30cd9f8fa..510e5c74eb 100644 --- a/drivers/crypto/nitrox/nitrox_sym_capabilities.c +++ b/drivers/crypto/nitrox/nitrox_sym_capabilities.c @@ -13,13 +13,13 @@ static const struct rte_cryptodev_capabilities nitrox_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -34,13 +34,13 @@ static const struct rte_cryptodev_capabilities nitrox_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -55,13 +55,13 @@ static const struct rte_cryptodev_capabilities nitrox_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -76,13 +76,13 @@ static const struct rte_cryptodev_capabilities nitrox_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -96,13 +96,13 @@ static const struct rte_cryptodev_capabilities nitrox_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -116,23 +116,23 @@ static const struct rte_cryptodev_capabilities nitrox_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .aad_size = { - .min = 0, - .max = 512, + .minimum = 0, + .maximum = 512, .increment = 1 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } diff --git a/drivers/crypto/null/null_crypto_pmd_ops.c b/drivers/crypto/null/null_crypto_pmd_ops.c index d67892a1bb..55526f2e6d 100644 --- a/drivers/crypto/null/null_crypto_pmd_ops.c +++ b/drivers/crypto/null/null_crypto_pmd_ops.c @@ -19,13 +19,13 @@ static const struct rte_cryptodev_capabilities null_crypto_pmd_capabilities[] = .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { 0 } @@ -40,8 +40,8 @@ static const struct rte_cryptodev_capabilities null_crypto_pmd_capabilities[] = .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { 0 } diff --git a/drivers/crypto/octeontx/otx_cryptodev_capabilities.c b/drivers/crypto/octeontx/otx_cryptodev_capabilities.c index 3f734b232c..88f02b07ad 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_capabilities.c +++ b/drivers/crypto/octeontx/otx_cryptodev_capabilities.c @@ -16,13 +16,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, }, }, @@ -36,18 +36,18 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 4 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -61,13 +61,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_KASUMI_F9, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, }, } @@ -81,13 +81,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -101,13 +101,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 8, - .max = 64, + .minimum = 8, + .maximum = 64, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -121,13 +121,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, }, } @@ -141,13 +141,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, }, } @@ -161,13 +161,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, }, } @@ -181,13 +181,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, }, } @@ -201,13 +201,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, }, } @@ -221,13 +221,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, }, } @@ -241,13 +241,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, }, } @@ -261,13 +261,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, }, } @@ -281,13 +281,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, }, } @@ -301,13 +301,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, }, } @@ -321,18 +321,18 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -346,18 +346,18 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -371,13 +371,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -391,13 +391,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 8 } }, } @@ -411,13 +411,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_ECB, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, } @@ -431,13 +431,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -451,13 +451,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 } }, } @@ -471,13 +471,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_XTS, .block_size = 16, .key_size = { - .min = 32, - .max = 64, + .minimum = 32, + .maximum = 64, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -491,13 +491,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -511,13 +511,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_KASUMI_F8, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -531,13 +531,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -551,13 +551,13 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -571,23 +571,23 @@ static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 4 }, .aad_size = { - .min = 0, - .max = 1024, + .minimum = 0, + .maximum = 1024, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -609,8 +609,8 @@ static const struct rte_cryptodev_capabilities otx_asym_capabilities[] = { (1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) | (1 << RTE_CRYPTO_ASYM_OP_DECRYPT)), {.modlen = { - .min = 17, - .max = 1024, + .minimum = 17, + .maximum = 1024, .increment = 1 }, } } @@ -623,8 +623,8 @@ static const struct rte_cryptodev_capabilities otx_asym_capabilities[] = { .xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX, .op_types = 0, {.modlen = { - .min = 17, - .max = 1024, + .minimum = 17, + .maximum = 1024, .increment = 1 }, } } diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c b/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c index 80f3729995..b4a03f3913 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c +++ b/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c @@ -52,8 +52,8 @@ static const struct rte_cryptodev_capabilities caps_mul[] = { (1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) | (1 << RTE_CRYPTO_ASYM_OP_DECRYPT)), {.modlen = { - .min = 17, - .max = 1024, + .minimum = 17, + .maximum = 1024, .increment = 1 }, } } @@ -66,8 +66,8 @@ static const struct rte_cryptodev_capabilities caps_mul[] = { .xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX, .op_types = 0, {.modlen = { - .min = 17, - .max = 1024, + .minimum = 17, + .maximum = 1024, .increment = 1 }, } } @@ -105,13 +105,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, }, } @@ -125,13 +125,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 12, - .max = 20, + .minimum = 12, + .maximum = 20, .increment = 8 }, }, } @@ -145,13 +145,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, }, } @@ -165,13 +165,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 28, - .max = 28, + .minimum = 28, + .maximum = 28, .increment = 0 }, }, } @@ -185,13 +185,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, }, } @@ -205,13 +205,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 16 }, }, } @@ -225,13 +225,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, }, } @@ -245,13 +245,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 24, - .max = 48, + .minimum = 24, + .maximum = 48, .increment = 24 }, }, } @@ -265,13 +265,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, }, } @@ -285,13 +285,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 1024, + .minimum = 1, + .maximum = 1024, .increment = 1 }, .digest_size = { - .min = 32, - .max = 64, + .minimum = 32, + .maximum = 64, .increment = 32 }, }, } @@ -305,13 +305,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_MD5, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } @@ -325,13 +325,13 @@ static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 8, - .max = 64, + .minimum = 8, + .maximum = 64, .increment = 8 }, .digest_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } @@ -348,23 +348,23 @@ static const struct rte_cryptodev_capabilities caps_chacha20[] = { .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, .block_size = 64, .key_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 1024, + .minimum = 0, + .maximum = 1024, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } @@ -381,13 +381,13 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -401,13 +401,13 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -421,18 +421,18 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -446,18 +446,18 @@ static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -474,18 +474,18 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 4 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -499,13 +499,13 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -519,13 +519,13 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 } }, } @@ -539,13 +539,13 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_CIPHER_AES_XTS, .block_size = 16, .key_size = { - .min = 32, - .max = 64, + .minimum = 32, + .maximum = 64, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -559,23 +559,23 @@ static const struct rte_cryptodev_capabilities caps_aes[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 4, - .max = 16, + .minimum = 4, + .maximum = 16, .increment = 1 }, .aad_size = { - .min = 0, - .max = 1024, + .minimum = 0, + .maximum = 1024, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -592,13 +592,13 @@ static const struct rte_cryptodev_capabilities caps_kasumi[] = { .algo = RTE_CRYPTO_CIPHER_KASUMI_F8, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -612,13 +612,13 @@ static const struct rte_cryptodev_capabilities caps_kasumi[] = { .algo = RTE_CRYPTO_AUTH_KASUMI_F9, .block_size = 8, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, }, } @@ -635,13 +635,13 @@ static const struct rte_cryptodev_capabilities caps_des[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 8, - .max = 16, + .minimum = 8, + .maximum = 16, .increment = 8 } }, } @@ -655,13 +655,13 @@ static const struct rte_cryptodev_capabilities caps_des[] = { .algo = RTE_CRYPTO_CIPHER_3DES_ECB, .block_size = 8, .key_size = { - .min = 24, - .max = 24, + .minimum = 24, + .maximum = 24, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, } @@ -675,13 +675,13 @@ static const struct rte_cryptodev_capabilities caps_des[] = { .algo = RTE_CRYPTO_CIPHER_DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -698,13 +698,13 @@ static const struct rte_cryptodev_capabilities caps_null[] = { .algo = RTE_CRYPTO_AUTH_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, }, }, @@ -718,13 +718,13 @@ static const struct rte_cryptodev_capabilities caps_null[] = { .algo = RTE_CRYPTO_CIPHER_NULL, .block_size = 1, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .iv_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 } }, }, @@ -745,23 +745,23 @@ static const struct rte_cryptodev_capabilities sec_caps_aes[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 8, - .max = 12, + .minimum = 8, + .maximum = 12, .increment = 4 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index ed75877581..71d918ec83 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -21,13 +21,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 16, + .minimum = 1, + .maximum = 16, .increment = 1 }, .iv_size = { 0 } @@ -42,13 +42,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_MD5, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { 0 } @@ -63,13 +63,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 20, + .minimum = 1, + .maximum = 20, .increment = 1 }, .iv_size = { 0 } @@ -84,13 +84,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA1, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 20, - .max = 20, + .minimum = 20, + .maximum = 20, .increment = 0 }, .iv_size = { 0 } @@ -105,13 +105,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -126,13 +126,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA224, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 1, - .max = 28, + .minimum = 1, + .maximum = 28, .increment = 1 }, .iv_size = { 0 } @@ -147,13 +147,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, .block_size = 64, .key_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 1, - .max = 32, + .minimum = 1, + .maximum = 32, .increment = 1 }, .iv_size = { 0 } @@ -168,13 +168,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA256, .block_size = 64, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 32, - .max = 32, + .minimum = 32, + .maximum = 32, .increment = 0 }, .iv_size = { 0 } @@ -189,13 +189,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 48, + .minimum = 1, + .maximum = 48, .increment = 1 }, .iv_size = { 0 } @@ -210,13 +210,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA384, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 48, - .max = 48, + .minimum = 48, + .maximum = 48, .increment = 0 }, .iv_size = { 0 } @@ -231,13 +231,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, .block_size = 128, .key_size = { - .min = 1, - .max = 128, + .minimum = 1, + .maximum = 128, .increment = 1 }, .digest_size = { - .min = 1, - .max = 64, + .minimum = 1, + .maximum = 64, .increment = 1 }, .iv_size = { 0 } @@ -252,13 +252,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SHA512, .block_size = 128, .key_size = { - .min = 0, - .max = 0, + .minimum = 0, + .maximum = 0, .increment = 0 }, .digest_size = { - .min = 64, - .max = 64, + .minimum = 64, + .maximum = 64, .increment = 0 }, .iv_size = { 0 } @@ -273,13 +273,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -293,13 +293,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_AES_CTR, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -313,23 +313,23 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 }, }, } @@ -343,23 +343,23 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AEAD_AES_CCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 4, - .max = 16, + .minimum = 4, + .maximum = 16, .increment = 2 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 7, - .max = 13, + .minimum = 7, + .maximum = 13, .increment = 1 }, }, } @@ -373,18 +373,18 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 12, - .max = 16, + .minimum = 12, + .maximum = 16, .increment = 4 } }, } @@ -398,13 +398,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 24, + .minimum = 8, + .maximum = 24, .increment = 8 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -418,13 +418,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_3DES_CTR, .block_size = 8, .key_size = { - .min = 16, - .max = 24, + .minimum = 16, + .maximum = 24, .increment = 8 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -438,13 +438,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_DES_CBC, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -458,13 +458,13 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_DES_DOCSISBPI, .block_size = 8, .key_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 }, .iv_size = { - .min = 8, - .max = 8, + .minimum = 8, + .maximum = 8, .increment = 0 } }, } @@ -482,9 +482,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { { .modlen = { /* min length is based on openssl rsa keygen */ - .min = 30, + .minimum = 30, /* value 0 symbolizes no limit on max length */ - .max = 0, + .maximum = 0, .increment = 1 }, } } @@ -500,9 +500,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { { .modlen = { /* value 0 symbolizes no limit on min length */ - .min = 0, + .minimum = 0, /* value 0 symbolizes no limit on max length */ - .max = 0, + .maximum = 0, .increment = 1 }, } } @@ -518,9 +518,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { { .modlen = { /* value 0 symbolizes no limit on min length */ - .min = 0, + .minimum = 0, /* value 0 symbolizes no limit on max length */ - .max = 0, + .maximum = 0, .increment = 1 }, } } @@ -540,9 +540,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { { .modlen = { /* value 0 symbolizes no limit on min length */ - .min = 0, + .minimum = 0, /* value 0 symbolizes no limit on max length */ - .max = 0, + .maximum = 0, .increment = 1 }, } } @@ -560,9 +560,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { { .modlen = { /* value 0 symbolizes no limit on min length */ - .min = 0, + .minimum = 0, /* value 0 symbolizes no limit on max length */ - .max = 0, + .maximum = 0, .increment = 1 }, } } diff --git a/drivers/crypto/qat/qat_asym_capabilities.h b/drivers/crypto/qat/qat_asym_capabilities.h index 523b4da6d3..f4e5573a98 100644 --- a/drivers/crypto/qat/qat_asym_capabilities.h +++ b/drivers/crypto/qat/qat_asym_capabilities.h @@ -14,8 +14,8 @@ .op_types = 0, \ { \ .modlen = { \ - .min = 1, \ - .max = 512, \ + .minimum = 1, \ + .maximum = 512, \ .increment = 1 \ }, } \ } \ @@ -30,8 +30,8 @@ .op_types = 0, \ { \ .modlen = { \ - .min = 1, \ - .max = 512, \ + .minimum = 1, \ + .maximum = 512, \ .increment = 1 \ }, } \ } \ @@ -50,9 +50,9 @@ { \ .modlen = { \ /* min length is based on openssl rsa keygen */ \ - .min = 64, \ + .minimum = 64, \ /* value 0 symbolizes no limit on max length */ \ - .max = 512, \ + .maximum = 512, \ .increment = 64 \ }, } \ } \ diff --git a/drivers/crypto/qat/qat_sym_capabilities.h b/drivers/crypto/qat/qat_sym_capabilities.h index cfb176ca94..05b2083d96 100644 --- a/drivers/crypto/qat/qat_sym_capabilities.h +++ b/drivers/crypto/qat/qat_sym_capabilities.h @@ -14,13 +14,13 @@ .algo = RTE_CRYPTO_AUTH_SHA1, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 20, \ + .minimum = 1, \ + .maximum = 20, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -35,13 +35,13 @@ .algo = RTE_CRYPTO_AUTH_SHA224, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 28, \ + .minimum = 1, \ + .maximum = 28, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -56,13 +56,13 @@ .algo = RTE_CRYPTO_AUTH_SHA256, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 32, \ + .minimum = 1, \ + .maximum = 32, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -77,13 +77,13 @@ .algo = RTE_CRYPTO_AUTH_SHA384, \ .block_size = 128, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 48, \ + .minimum = 1, \ + .maximum = 48, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -98,13 +98,13 @@ .algo = RTE_CRYPTO_AUTH_SHA512, \ .block_size = 128, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -119,13 +119,13 @@ .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 20, \ + .minimum = 1, \ + .maximum = 20, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -140,13 +140,13 @@ .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 28, \ + .minimum = 1, \ + .maximum = 28, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -161,13 +161,13 @@ .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 32, \ + .minimum = 1, \ + .maximum = 32, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -182,13 +182,13 @@ .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, \ .block_size = 128, \ .key_size = { \ - .min = 1, \ - .max = 128, \ + .minimum = 1, \ + .maximum = 128, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 48, \ + .minimum = 1, \ + .maximum = 48, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -203,13 +203,13 @@ .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, \ .block_size = 128, \ .key_size = { \ - .min = 1, \ - .max = 128, \ + .minimum = 1, \ + .maximum = 128, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -224,13 +224,13 @@ .algo = RTE_CRYPTO_AUTH_MD5_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 16, \ + .minimum = 1, \ + .maximum = 16, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -245,13 +245,13 @@ .algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 12, \ - .max = 12, \ + .minimum = 12, \ + .maximum = 12, \ .increment = 0 \ }, \ .aad_size = { 0 }, \ @@ -267,13 +267,13 @@ .algo = RTE_CRYPTO_AUTH_AES_CMAC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 4, \ - .max = 16, \ + .minimum = 4, \ + .maximum = 16, \ .increment = 4 \ } \ }, } \ @@ -287,23 +287,23 @@ .algo = RTE_CRYPTO_AEAD_AES_CCM, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 4, \ - .max = 16, \ + .minimum = 4, \ + .maximum = 16, \ .increment = 2 \ }, \ .aad_size = { \ - .min = 0, \ - .max = 224, \ + .minimum = 0, \ + .maximum = 224, \ .increment = 1 \ }, \ .iv_size = { \ - .min = 7, \ - .max = 13, \ + .minimum = 7, \ + .maximum = 13, \ .increment = 1 \ }, \ }, } \ @@ -317,23 +317,23 @@ .algo = RTE_CRYPTO_AEAD_AES_GCM, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .digest_size = { \ - .min = 8, \ - .max = 16, \ + .minimum = 8, \ + .maximum = 16, \ .increment = 4 \ }, \ .aad_size = { \ - .min = 0, \ - .max = 240, \ + .minimum = 0, \ + .maximum = 240, \ .increment = 1 \ }, \ .iv_size = { \ - .min = 0, \ - .max = 12, \ + .minimum = 0, \ + .maximum = 12, \ .increment = 12 \ }, \ }, } \ @@ -347,18 +347,18 @@ .algo = RTE_CRYPTO_AUTH_AES_GMAC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .digest_size = { \ - .min = 8, \ - .max = 16, \ + .minimum = 8, \ + .maximum = 16, \ .increment = 4 \ }, \ .iv_size = { \ - .min = 0, \ - .max = 12, \ + .minimum = 0, \ + .maximum = 12, \ .increment = 12 \ } \ }, } \ @@ -372,18 +372,18 @@ .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 4, \ - .max = 4, \ + .minimum = 4, \ + .maximum = 4, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -397,13 +397,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_CBC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -417,13 +417,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_XTS, \ .block_size = 16, \ .key_size = { \ - .min = 32, \ - .max = 64, \ + .minimum = 32, \ + .maximum = 64, \ .increment = 32 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -437,13 +437,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,\ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 16 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -457,13 +457,13 @@ .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -477,13 +477,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_CTR, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -497,13 +497,13 @@ .algo = RTE_CRYPTO_AUTH_NULL, \ .block_size = 1, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .iv_size = { 0 } \ @@ -518,13 +518,13 @@ .algo = RTE_CRYPTO_CIPHER_NULL, \ .block_size = 1, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ } \ }, }, \ @@ -538,13 +538,13 @@ .algo = RTE_CRYPTO_CIPHER_KASUMI_F8, \ .block_size = 8, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ } \ }, } \ @@ -558,13 +558,13 @@ .algo = RTE_CRYPTO_AUTH_KASUMI_F9, \ .block_size = 8, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 4, \ - .max = 4, \ + .minimum = 4, \ + .maximum = 4, \ .increment = 0 \ }, \ .iv_size = { 0 } \ @@ -579,13 +579,13 @@ .algo = RTE_CRYPTO_CIPHER_3DES_CBC, \ .block_size = 8, \ .key_size = { \ - .min = 8, \ - .max = 24, \ + .minimum = 8, \ + .maximum = 24, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ } \ }, } \ @@ -599,13 +599,13 @@ .algo = RTE_CRYPTO_CIPHER_3DES_CTR, \ .block_size = 8, \ .key_size = { \ - .min = 16, \ - .max = 24, \ + .minimum = 16, \ + .maximum = 24, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ } \ }, } \ @@ -619,13 +619,13 @@ .algo = RTE_CRYPTO_CIPHER_DES_CBC, \ .block_size = 8, \ .key_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ } \ }, } \ @@ -639,13 +639,13 @@ .algo = RTE_CRYPTO_CIPHER_DES_DOCSISBPI,\ .block_size = 8, \ .key_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 8, \ - .max = 8, \ + .minimum = 8, \ + .maximum = 8, \ .increment = 0 \ } \ }, } \ @@ -661,13 +661,13 @@ .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -681,18 +681,18 @@ .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 4, \ - .max = 4, \ + .minimum = 4, \ + .maximum = 4, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -708,23 +708,23 @@ .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, \ .block_size = 64, \ .key_size = { \ - .min = 32, \ - .max = 32, \ + .minimum = 32, \ + .maximum = 32, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .aad_size = { \ - .min = 0, \ - .max = 240, \ + .minimum = 0, \ + .maximum = 240, \ .increment = 1 \ }, \ .iv_size = { \ - .min = 12, \ - .max = 12, \ + .minimum = 12, \ + .maximum = 12, \ .increment = 0 \ }, \ }, } \ @@ -740,13 +740,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_CBC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -760,13 +760,13 @@ .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 20, \ + .minimum = 1, \ + .maximum = 20, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -781,13 +781,13 @@ .algo = RTE_CRYPTO_AUTH_SHA224_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 28, \ + .minimum = 1, \ + .maximum = 28, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -802,13 +802,13 @@ .algo = RTE_CRYPTO_AUTH_SHA256_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 32, \ + .minimum = 1, \ + .maximum = 32, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -823,13 +823,13 @@ .algo = RTE_CRYPTO_AUTH_SHA384_HMAC, \ .block_size = 128, \ .key_size = { \ - .min = 1, \ - .max = 128, \ + .minimum = 1, \ + .maximum = 128, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 48, \ + .minimum = 1, \ + .maximum = 48, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -844,13 +844,13 @@ .algo = RTE_CRYPTO_AUTH_SHA512_HMAC, \ .block_size = 128, \ .key_size = { \ - .min = 1, \ - .max = 128, \ + .minimum = 1, \ + .maximum = 128, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -865,13 +865,13 @@ .algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 12, \ - .max = 12, \ + .minimum = 12, \ + .maximum = 12, \ .increment = 0 \ }, \ .aad_size = { 0 }, \ @@ -887,13 +887,13 @@ .algo = RTE_CRYPTO_AUTH_AES_CMAC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 4, \ - .max = 16, \ + .minimum = 4, \ + .maximum = 16, \ .increment = 4 \ } \ }, } \ @@ -907,13 +907,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,\ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 16 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -927,13 +927,13 @@ .algo = RTE_CRYPTO_AUTH_NULL, \ .block_size = 1, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .iv_size = { 0 } \ @@ -948,13 +948,13 @@ .algo = RTE_CRYPTO_CIPHER_NULL, \ .block_size = 1, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .iv_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ } \ }, }, \ @@ -968,13 +968,13 @@ .algo = RTE_CRYPTO_AUTH_SHA1, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 20, \ + .minimum = 1, \ + .maximum = 20, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -989,13 +989,13 @@ .algo = RTE_CRYPTO_AUTH_SHA224, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 28, \ + .minimum = 1, \ + .maximum = 28, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -1010,13 +1010,13 @@ .algo = RTE_CRYPTO_AUTH_SHA256, \ .block_size = 64, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 32, \ + .minimum = 1, \ + .maximum = 32, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -1031,13 +1031,13 @@ .algo = RTE_CRYPTO_AUTH_SHA384, \ .block_size = 128, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 48, \ + .minimum = 1, \ + .maximum = 48, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -1052,13 +1052,13 @@ .algo = RTE_CRYPTO_AUTH_SHA512, \ .block_size = 128, \ .key_size = { \ - .min = 0, \ - .max = 0, \ + .minimum = 0, \ + .maximum = 0, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -1073,13 +1073,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_CTR, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ @@ -1093,23 +1093,23 @@ .algo = RTE_CRYPTO_AEAD_AES_GCM, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .digest_size = { \ - .min = 8, \ - .max = 16, \ + .minimum = 8, \ + .maximum = 16, \ .increment = 4 \ }, \ .aad_size = { \ - .min = 0, \ - .max = 240, \ + .minimum = 0, \ + .maximum = 240, \ .increment = 1 \ }, \ .iv_size = { \ - .min = 0, \ - .max = 12, \ + .minimum = 0, \ + .maximum = 12, \ .increment = 12 \ }, \ }, } \ @@ -1123,23 +1123,23 @@ .algo = RTE_CRYPTO_AEAD_AES_CCM, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 4, \ - .max = 16, \ + .minimum = 4, \ + .maximum = 16, \ .increment = 2 \ }, \ .aad_size = { \ - .min = 0, \ - .max = 224, \ + .minimum = 0, \ + .maximum = 224, \ .increment = 1 \ }, \ .iv_size = { \ - .min = 7, \ - .max = 13, \ + .minimum = 7, \ + .maximum = 13, \ .increment = 1 \ }, \ }, } \ @@ -1153,23 +1153,23 @@ .algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, \ .block_size = 64, \ .key_size = { \ - .min = 32, \ - .max = 32, \ + .minimum = 32, \ + .maximum = 32, \ .increment = 0 \ }, \ .digest_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ }, \ .aad_size = { \ - .min = 0, \ - .max = 240, \ + .minimum = 0, \ + .maximum = 240, \ .increment = 1 \ }, \ .iv_size = { \ - .min = 12, \ - .max = 12, \ + .minimum = 12, \ + .maximum = 12, \ .increment = 0 \ }, \ }, } \ @@ -1183,18 +1183,18 @@ .algo = RTE_CRYPTO_AUTH_AES_GMAC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .digest_size = { \ - .min = 8, \ - .max = 16, \ + .minimum = 8, \ + .maximum = 16, \ .increment = 4 \ }, \ .iv_size = { \ - .min = 0, \ - .max = 12, \ + .minimum = 0, \ + .maximum = 12, \ .increment = 12 \ } \ }, } \ @@ -1213,13 +1213,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,\ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 16 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c index 1e0b4df0ca..fe96ca949a 100644 --- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c +++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c @@ -49,16 +49,16 @@ sync_caps(struct rte_cryptodev_capabilities *caps, cap->sym.auth.algo) continue; - cap->sym.auth.digest_size.min = - s_cap->sym.auth.digest_size.min < - cap->sym.auth.digest_size.min ? - s_cap->sym.auth.digest_size.min : - cap->sym.auth.digest_size.min; - cap->sym.auth.digest_size.max = - s_cap->sym.auth.digest_size.max < - cap->sym.auth.digest_size.max ? - s_cap->sym.auth.digest_size.max : - cap->sym.auth.digest_size.max; + cap->sym.auth.digest_size.minimum = + s_cap->sym.auth.digest_size.minimum < + cap->sym.auth.digest_size.minimum ? + s_cap->sym.auth.digest_size.minimum : + cap->sym.auth.digest_size.minimum; + cap->sym.auth.digest_size.maximum = + s_cap->sym.auth.digest_size.maximum < + cap->sym.auth.digest_size.maximum ? + s_cap->sym.auth.digest_size.maximum : + cap->sym.auth.digest_size.maximum; } diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c index 906a0fe60b..6aea6d701f 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c @@ -19,18 +19,18 @@ static const struct rte_cryptodev_capabilities snow3g_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -44,13 +44,13 @@ static const struct rte_cryptodev_capabilities snow3g_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } diff --git a/drivers/crypto/virtio/virtio_crypto_capabilities.h b/drivers/crypto/virtio/virtio_crypto_capabilities.h index 03c30deefd..3624a28ce5 100644 --- a/drivers/crypto/virtio/virtio_crypto_capabilities.h +++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h @@ -14,13 +14,13 @@ .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, \ .block_size = 64, \ .key_size = { \ - .min = 1, \ - .max = 64, \ + .minimum = 1, \ + .maximum = 64, \ .increment = 1 \ }, \ .digest_size = { \ - .min = 1, \ - .max = 20, \ + .minimum = 1, \ + .maximum = 20, \ .increment = 1 \ }, \ .iv_size = { 0 } \ @@ -35,13 +35,13 @@ .algo = RTE_CRYPTO_CIPHER_AES_CBC, \ .block_size = 16, \ .key_size = { \ - .min = 16, \ - .max = 32, \ + .minimum = 16, \ + .maximum = 32, \ .increment = 8 \ }, \ .iv_size = { \ - .min = 16, \ - .max = 16, \ + .minimum = 16, \ + .maximum = 16, \ .increment = 0 \ } \ }, } \ diff --git a/drivers/crypto/zuc/rte_zuc_pmd_ops.c b/drivers/crypto/zuc/rte_zuc_pmd_ops.c index dc9dc25ef8..cb33795462 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd_ops.c +++ b/drivers/crypto/zuc/rte_zuc_pmd_ops.c @@ -19,18 +19,18 @@ static const struct rte_cryptodev_capabilities zuc_pmd_capabilities[] = { .algo = RTE_CRYPTO_AUTH_ZUC_EIA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 4, - .max = 4, + .minimum = 4, + .maximum = 4, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -44,13 +44,13 @@ static const struct rte_cryptodev_capabilities zuc_pmd_capabilities[] = { .algo = RTE_CRYPTO_CIPHER_ZUC_EEA3, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, }, } diff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/ixgbe/ixgbe_ipsec.c index e45c5501e6..8022e9f460 100644 --- a/drivers/net/ixgbe/ixgbe_ipsec.c +++ b/drivers/net/ixgbe/ixgbe_ipsec.c @@ -507,18 +507,18 @@ ixgbe_crypto_capabilities_get(void *device __rte_unused) .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -532,23 +532,23 @@ ixgbe_crypto_capabilities_get(void *device __rte_unused) .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.c b/drivers/net/octeontx2/otx2_ethdev_sec.c index c2a36883cb..0cb6b88641 100644 --- a/drivers/net/octeontx2/otx2_ethdev_sec.c +++ b/drivers/net/octeontx2/otx2_ethdev_sec.c @@ -45,23 +45,23 @@ static struct rte_cryptodev_capabilities otx2_eth_sec_crypto_caps[] = { .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 8, - .max = 12, + .minimum = 8, + .maximum = 12, .increment = 4 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -75,13 +75,13 @@ static struct rte_cryptodev_capabilities otx2_eth_sec_crypto_caps[] = { .algo = RTE_CRYPTO_CIPHER_AES_CBC, .block_size = 16, .key_size = { - .min = 16, - .max = 32, + .minimum = 16, + .maximum = 32, .increment = 8 }, .iv_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 } }, } @@ -95,13 +95,13 @@ static struct rte_cryptodev_capabilities otx2_eth_sec_crypto_caps[] = { .algo = RTE_CRYPTO_AUTH_SHA1_HMAC, .block_size = 64, .key_size = { - .min = 20, - .max = 64, + .minimum = 20, + .maximum = 64, .increment = 1 }, .digest_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 }, }, } diff --git a/drivers/net/txgbe/txgbe_ipsec.c b/drivers/net/txgbe/txgbe_ipsec.c index ccd747973b..a82b4ce2d1 100644 --- a/drivers/net/txgbe/txgbe_ipsec.c +++ b/drivers/net/txgbe/txgbe_ipsec.c @@ -486,18 +486,18 @@ txgbe_crypto_capabilities_get(void *device __rte_unused) .algo = RTE_CRYPTO_AUTH_AES_GMAC, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } @@ -511,23 +511,23 @@ txgbe_crypto_capabilities_get(void *device __rte_unused) .algo = RTE_CRYPTO_AEAD_AES_GCM, .block_size = 16, .key_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .digest_size = { - .min = 16, - .max = 16, + .minimum = 16, + .maximum = 16, .increment = 0 }, .aad_size = { - .min = 0, - .max = 65535, + .minimum = 0, + .maximum = 65535, .increment = 1 }, .iv_size = { - .min = 12, - .max = 12, + .minimum = 12, + .maximum = 12, .increment = 0 } }, } diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index 5f539c458c..b6bc371bd2 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -1996,8 +1996,8 @@ check_iv_param(const struct rte_crypto_param_range *iv_range_size, */ if (iv_param) { if (check_supported_size(iv_length, - iv_range_size->min, - iv_range_size->max, + iv_range_size->minimum, + iv_range_size->maximum, iv_range_size->increment) != 0) return -1; @@ -2007,8 +2007,8 @@ check_iv_param(const struct rte_crypto_param_range *iv_range_size, */ } else if (iv_random_size != -1) { if (check_supported_size(iv_random_size, - iv_range_size->min, - iv_range_size->max, + iv_range_size->minimum, + iv_range_size->maximum, iv_range_size->increment) != 0) return -1; @@ -2050,8 +2050,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) if (options->aead_key_param) { if (check_supported_size( options->aead_xform.aead.key.length, - cap->sym.aead.key_size.min, - cap->sym.aead.key_size.max, + cap->sym.aead.key_size.minimum, + cap->sym.aead.key_size.maximum, cap->sym.aead.key_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2066,8 +2066,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) */ } else if (options->aead_key_random_size != -1) { if (check_supported_size(options->aead_key_random_size, - cap->sym.aead.key_size.min, - cap->sym.aead.key_size.max, + cap->sym.aead.key_size.minimum, + cap->sym.aead.key_size.maximum, cap->sym.aead.key_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2085,8 +2085,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) */ if (options->aad_param) { if (check_supported_size(options->aad.length, - cap->sym.aead.aad_size.min, - cap->sym.aead.aad_size.max, + cap->sym.aead.aad_size.minimum, + cap->sym.aead.aad_size.maximum, cap->sym.aead.aad_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2101,8 +2101,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) */ } else if (options->aad_random_size != -1) { if (check_supported_size(options->aad_random_size, - cap->sym.aead.aad_size.min, - cap->sym.aead.aad_size.max, + cap->sym.aead.aad_size.minimum, + cap->sym.aead.aad_size.maximum, cap->sym.aead.aad_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2116,8 +2116,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) /* Check if digest size is supported by the algorithm. */ if (options->digest_size != -1) { if (check_supported_size(options->digest_size, - cap->sym.aead.digest_size.min, - cap->sym.aead.digest_size.max, + cap->sym.aead.digest_size.minimum, + cap->sym.aead.digest_size.maximum, cap->sym.aead.digest_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2160,8 +2160,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) if (options->ckey_param) { if (check_supported_size( options->cipher_xform.cipher.key.length, - cap->sym.cipher.key_size.min, - cap->sym.cipher.key_size.max, + cap->sym.cipher.key_size.minimum, + cap->sym.cipher.key_size.maximum, cap->sym.cipher.key_size.increment) != 0) { if (dev_info.feature_flags & @@ -2185,8 +2185,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) */ } else if (options->ckey_random_size != -1) { if (check_supported_size(options->ckey_random_size, - cap->sym.cipher.key_size.min, - cap->sym.cipher.key_size.max, + cap->sym.cipher.key_size.minimum, + cap->sym.cipher.key_size.maximum, cap->sym.cipher.key_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2262,8 +2262,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) if (options->akey_param) { if (check_supported_size( options->auth_xform.auth.key.length, - cap->sym.auth.key_size.min, - cap->sym.auth.key_size.max, + cap->sym.auth.key_size.minimum, + cap->sym.auth.key_size.maximum, cap->sym.auth.key_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2278,8 +2278,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) */ } else if (options->akey_random_size != -1) { if (check_supported_size(options->akey_random_size, - cap->sym.auth.key_size.min, - cap->sym.auth.key_size.max, + cap->sym.auth.key_size.minimum, + cap->sym.auth.key_size.maximum, cap->sym.auth.key_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2293,8 +2293,8 @@ check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id) /* Check if digest size is supported by the algorithm. */ if (options->digest_size != -1) { if (check_supported_size(options->digest_size, - cap->sym.auth.digest_size.min, - cap->sym.auth.digest_size.max, + cap->sym.auth.digest_size.minimum, + cap->sym.auth.digest_size.maximum, cap->sym.auth.digest_size.increment) != 0) { RTE_LOG(DEBUG, USER1, @@ -2448,7 +2448,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->aead_iv.length = - cap->sym.aead.iv_size.min; + cap->sym.aead.iv_size.minimum; } /* Set key if not provided from command line */ @@ -2459,7 +2459,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->aead_xform.aead.key.length = - cap->sym.aead.key_size.min; + cap->sym.aead.key_size.minimum; generate_random_key(options->aead_key, options->aead_xform.aead.key.length); @@ -2473,7 +2473,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->aad.length = - cap->sym.auth.aad_size.min; + cap->sym.auth.aad_size.minimum; } options->aead_xform.aead.aad_length = @@ -2486,7 +2486,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->aead_xform.aead.digest_length = - cap->sym.aead.digest_size.min; + cap->sym.aead.digest_size.minimum; } /* Set cipher parameters */ @@ -2505,7 +2505,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->cipher_iv.length = - cap->sym.cipher.iv_size.min; + cap->sym.cipher.iv_size.minimum; } /* Set key if not provided from command line */ @@ -2516,7 +2516,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->cipher_xform.cipher.key.length = - cap->sym.cipher.key_size.min; + cap->sym.cipher.key_size.minimum; generate_random_key(options->cipher_key, options->cipher_xform.cipher.key.length); @@ -2538,7 +2538,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->auth_iv.length = - cap->sym.auth.iv_size.min; + cap->sym.auth.iv_size.minimum; } /* Set key if not provided from command line */ @@ -2549,7 +2549,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->auth_xform.auth.key.length = - cap->sym.auth.key_size.min; + cap->sym.auth.key_size.minimum; generate_random_key(options->auth_key, options->auth_xform.auth.key.length); @@ -2562,7 +2562,7 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, /* No size provided, use minimum size. */ else options->auth_xform.auth.digest_length = - cap->sym.auth.digest_size.min; + cap->sym.auth.digest_size.minimum; } retval = rte_cryptodev_configure(cdev_id, &conf); diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index 447aa9d519..9db1b86426 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -320,10 +320,10 @@ param_range_check(uint16_t size, const struct rte_crypto_param_range *range) unsigned int next_size; /* Check lower/upper bounds */ - if (size < range->min) + if (size < range->minimum) return -1; - if (size > range->max) + if (size > range->maximum) return -1; /* If range is actually only one value, size is correct */ @@ -331,7 +331,7 @@ param_range_check(uint16_t size, const struct rte_crypto_param_range *range) return 0; /* Check if value is one of the supported sizes */ - for (next_size = range->min; next_size <= range->max; + for (next_size = range->minimum; next_size <= range->maximum; next_size += range->increment) if (size == next_size) return 0; @@ -429,13 +429,13 @@ rte_cryptodev_asym_xform_capability_check_modlen( uint16_t modlen) { /* no need to check for limits, if min or max = 0 */ - if (capability->modlen.min != 0) { - if (modlen < capability->modlen.min) + if (capability->modlen.minimum != 0) { + if (modlen < capability->modlen.minimum) return -1; } - if (capability->modlen.max != 0) { - if (modlen > capability->modlen.max) + if (capability->modlen.maximum != 0) { + if (modlen > capability->modlen.maximum) return -1; } diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index 11f4e6fdbf..63ce4d0530 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -85,8 +85,8 @@ extern const char **rte_cyptodev_names; * Crypto parameters range description */ struct rte_crypto_param_range { - uint16_t min; /**< minimum size */ - uint16_t max; /**< maximum size */ + uint16_t minimum; /**< minimum size */ + uint16_t maximum; /**< maximum size */ uint16_t increment; /**< if a range of sizes are supported, * this parameter is used to indicate From patchwork Wed Sep 15 21:40:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 98958 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 10DD6A0C41; Wed, 15 Sep 2021 23:41:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B800341101; Wed, 15 Sep 2021 23:41:06 +0200 (CEST) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mails.dpdk.org (Postfix) with ESMTP id 738F1410E7 for ; Wed, 15 Sep 2021 23:41:04 +0200 (CEST) Received: by mail-lf1-f42.google.com with SMTP id m3so8158216lfu.2 for ; Wed, 15 Sep 2021 14:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vvh3Z8/6vet8mwgRC32NjQPRRQQE2PcFMPTh18sHPkA=; b=YmmFLqVSFAJ7YfaLH1VG9AnDYNMpHoIs5saOf+VeJzZNtQelF1Izbr/DNxbcEEbQbI Uk9UuiczWQmx+cZ/ioV3diSsFHQTM6ZisKDyLpd5zZXP4JhtMYKDfVvmr5LY480utXIz 2XQai8w2Hjo2bav16hCjWU/LQ2kl6Cqhf6TfNdUJPezAeYz0kIyHrSDI3IPn7HBidygU QwJjN9ZvlVB15mInCBV4cCj7jkyy6gkhz32DrUht/XFu1j/rVzfcHg2dLAMTX2l8MCVL 7n7StxucRrjLc1pLWZFZsQuITbnvGO5ojmkHmWIVOq5rfoxVAnPP9eXtydPx0lXAISoe AF0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vvh3Z8/6vet8mwgRC32NjQPRRQQE2PcFMPTh18sHPkA=; b=P79YE/rMkYv3cyrL9W4ilcgJh2EuYmHDrcnrkYg/c6BDnk//n/+s6tEhbVFabhapGx 7nsfBGNIbezyA4H97YwNI7DtIEixhi+NzeSCbnTOcWKIz7Fvw0aRM+bToPRxXWujLuOt K8Bgq63YAmiIKeTrDttHL2k1OLXaf2RCLc9MBXFJ+Ig1jv9dleN2RnT6ejK/UGs4BmMe J1ocg5MZc7JXsm7yVApuHwvKOEEDWbrnP97Zr3DB8lqaa0i1HZjTsnBRmrkyrfcQVnct wbIozdHYDCs1GGVLD/Z+mMLts5bLe0wNx3+rqLHisMrHk+t0T4qX3NjBADyfYNg/9ZV5 UfcA== X-Gm-Message-State: AOAM532T+UDhuSrWMOlDZQ5PIevD/wNgqiob06Aa8J4/gqk2tPOZcMLf cpix/2XfJysRKs4t9SPdV4LxV+aHdzZEcw== X-Google-Smtp-Source: ABdhPJwiDTjqUQqPTbmCC0WEuES23diaWqoFm55ll9Rd15nxG9eQ/ghjeERnSBMlIsMRJp08qf08rw== X-Received: by 2002:ac2:4f8f:: with SMTP id z15mr1531529lfs.361.1631742063773; Wed, 15 Sep 2021 14:41:03 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:41:03 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk , Cristian Dumitrescu Date: Thu, 16 Sep 2021 00:40:50 +0300 Message-Id: <20210915214052.143098-4-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> References: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/5] table: rename local variable for Windows compatibility X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Windows SDK headers define `min` macro which breaks the definition of `min` variable in `f_lru_pos()` inline function. Rename the variable to allow inclusion of both DPDK and Windows headers in the same file. Signed-off-by: Dmitry Kozlyuk --- lib/table/rte_lru_x86.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/table/rte_lru_x86.h b/lib/table/rte_lru_x86.h index 38476d956e..b4f54113df 100644 --- a/lib/table/rte_lru_x86.h +++ b/lib/table/rte_lru_x86.h @@ -79,8 +79,8 @@ static inline int f_lru_pos(uint64_t lru_list) { __m128i lst = _mm_set_epi64x((uint64_t)-1, lru_list); - __m128i min = _mm_minpos_epu16(lst); - return _mm_extract_epi16(min, 1); + __m128i minimum = _mm_minpos_epu16(lst); + return _mm_extract_epi16(minimum, 1); } #define lru_pos(bucket) f_lru_pos(bucket->lru_list) From patchwork Wed Sep 15 21:40:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 98959 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D246DA0C41; Wed, 15 Sep 2021 23:41:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9E9F410E7; Wed, 15 Sep 2021 23:41:08 +0200 (CEST) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by mails.dpdk.org (Postfix) with ESMTP id 13B4E41109 for ; Wed, 15 Sep 2021 23:41:07 +0200 (CEST) Received: by mail-lf1-f54.google.com with SMTP id y28so10088977lfb.0 for ; Wed, 15 Sep 2021 14:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qQ68Ik6DTrBmJa8/GbTD2ABGc9AIBAKgl+SNiDC/JDY=; b=SlPsz159D49XvhYU0EtJXdcdXPoJTD7TLuFtGodfmDoabwGBvtUpOjzh1BFt+Yx5wg AxyyAn1wRPT1RQcgth+Hf8SzUT5K5qtwNORQ3ejiKre5LsZTKuRWeN9k7Pzh6hzNRzEs 9BYgHVxV0ERsrdB5R36to6iNonJbflYJR7PgqL+zaLEelfjJt1ZrLyQKfuzDs9HGRukB eFSkFA6TAxunRDoXoBjkpf22b6ojI8kZ2Bk2/MXq8CIDUkzEG0zmHhxHLmGa2X+cjIs6 XvtmYfRPd+mBHQTjnILAhELisrTwgqBf2aQrRGpSGtbGeYuKxKjukR8w13Rmq3e3sDXR 56Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qQ68Ik6DTrBmJa8/GbTD2ABGc9AIBAKgl+SNiDC/JDY=; b=YotK5X7QBX721zI7Px9JvthbQPpMVTfUDNWN+rwdsmniCTGNSF6E31rOl95E3OPd6I LgsaA0RVxEV/29junh27Z7gNhNElZz/cTs5htLz6BrcWgU+5rJceh70z97t3lRoIPqoy +clRvJN7DHidf+PGme6EZokH3FX4h+0qxusqAlNL2wuruoes8caB5/WUUuEW5v7wk8ZV OJbsO0AqbO7wMTlQ5ZzyHaBRSbJ9rVlhXfGpRrfvJjUO0tYjOoBQW8BcbIZryq7Z7idR oA9QM3BORfcq5mG1zdzqEjy+9GkOr7M1wG6Kfxwte8rC7niiEy1LZ/afu6A/YqiT//OG o9fQ== X-Gm-Message-State: AOAM531jea+SnIRTbAf2kb2x9Q7KPLIc30oL7ISXUfbeXhNwZeTLpKBM 2gV9dxwitDKJIShNa7Grvkq1bPGmyt2uQQ== X-Google-Smtp-Source: ABdhPJxynYl7sHGHh9YQE75DikS0vlZx5QvKEsvGrrEWbG0510qUXuo1u3RlipKi7k3T4oiyT4ldIw== X-Received: by 2002:a2e:b4a5:: with SMTP id q5mr1824066ljm.11.1631742066328; Wed, 15 Sep 2021 14:41:06 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:41:04 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk , Honnappa Nagarahalli , Konstantin Ananyev Date: Thu, 16 Sep 2021 00:40:51 +0300 Message-Id: <20210915214052.143098-5-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> References: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 4/5] ring: rename local variables for Windows compatibility X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Windows SDK headers define `max` macro which breaks the definitions of `max` variable inside inline functions. Rename the variables to allow inclusion of both DPDK and Windows headers in the same file. Signed-off-by: Dmitry Kozlyuk Reviewed-by: Honnappa Nagarahalli --- lib/ring/rte_ring_c11_pvt.h | 8 ++++---- lib/ring/rte_ring_generic_pvt.h | 8 ++++---- lib/ring/rte_ring_rts_elem_pvt.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h index 37e0b2afd6..ec6be12154 100644 --- a/lib/ring/rte_ring_c11_pvt.h +++ b/lib/ring/rte_ring_c11_pvt.h @@ -58,13 +58,13 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, { const uint32_t capacity = r->capacity; uint32_t cons_tail; - unsigned int max = n; + unsigned int maximum = n; int success; *old_head = __atomic_load_n(&r->prod.head, __ATOMIC_RELAXED); do { /* Reset n to the initial burst count */ - n = max; + n = maximum; /* Ensure the head is read before tail */ __atomic_thread_fence(__ATOMIC_ACQUIRE); @@ -132,7 +132,7 @@ __rte_ring_move_cons_head(struct rte_ring *r, int is_sc, uint32_t *old_head, uint32_t *new_head, uint32_t *entries) { - unsigned int max = n; + unsigned int maximum = n; uint32_t prod_tail; int success; @@ -140,7 +140,7 @@ __rte_ring_move_cons_head(struct rte_ring *r, int is_sc, *old_head = __atomic_load_n(&r->cons.head, __ATOMIC_RELAXED); do { /* Restore n as it may change every loop */ - n = max; + n = maximum; /* Ensure the head is read before tail */ __atomic_thread_fence(__ATOMIC_ACQUIRE); diff --git a/lib/ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h index c95ad7e12c..beb3140e78 100644 --- a/lib/ring/rte_ring_generic_pvt.h +++ b/lib/ring/rte_ring_generic_pvt.h @@ -58,12 +58,12 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, uint32_t *free_entries) { const uint32_t capacity = r->capacity; - unsigned int max = n; + unsigned int maximum = n; int success; do { /* Reset n to the initial burst count */ - n = max; + n = maximum; *old_head = r->prod.head; @@ -127,13 +127,13 @@ __rte_ring_move_cons_head(struct rte_ring *r, unsigned int is_sc, uint32_t *old_head, uint32_t *new_head, uint32_t *entries) { - unsigned int max = n; + unsigned int maximum = n; int success; /* move cons.head atomically */ do { /* Restore n as it may change every loop */ - n = max; + n = maximum; *old_head = r->cons.head; diff --git a/lib/ring/rte_ring_rts_elem_pvt.h b/lib/ring/rte_ring_rts_elem_pvt.h index 7164213ee0..6241f28dc0 100644 --- a/lib/ring/rte_ring_rts_elem_pvt.h +++ b/lib/ring/rte_ring_rts_elem_pvt.h @@ -53,11 +53,11 @@ static __rte_always_inline void __rte_ring_rts_head_wait(const struct rte_ring_rts_headtail *ht, union __rte_ring_rts_poscnt *h) { - uint32_t max; + uint32_t maximum; - max = ht->htd_max; + maximum = ht->htd_max; - while (h->val.pos - ht->tail.val.pos > max) { + while (h->val.pos - ht->tail.val.pos > maximum) { rte_pause(); h->raw = __atomic_load_n(&ht->head.raw, __ATOMIC_ACQUIRE); } From patchwork Wed Sep 15 21:40:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 98960 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2851CA0C41; Wed, 15 Sep 2021 23:41:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDDAF410F8; Wed, 15 Sep 2021 23:41:12 +0200 (CEST) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by mails.dpdk.org (Postfix) with ESMTP id DA5A84111D for ; Wed, 15 Sep 2021 23:41:10 +0200 (CEST) Received: by mail-lf1-f49.google.com with SMTP id m3so8159192lfu.2 for ; Wed, 15 Sep 2021 14:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NeJZuZMQ3VtmJG5aHSijKuU+maODocVqNfZ3VrWHGCI=; b=XZgetonG7oWKWCvkjtaLqqLrWgCmrN7ZgPYd+6RpsxmwwM2z9tBzLPrDBb2t0/GTeq oDyZr4NRKRZhXgCg8F5qB9+kh6KVJk9x47BDxMMnV8j1w8Whhx5znGrxHQzYNkf9z9aX B9poEL60HVkmpmr5j9pqll+ujeeTJYqbsOvHAeFRFTPqAdEaLM37wPMoH3pj/2nWL/PL fYF7ZkYlwCPt4CqQ8/JKN/CzfQ19Z2Yt6YUPTTYfGKp/mt0heo1r/RthFXiz5rdSX+I/ vkO3sp3M3Y5tI4bM+w4ykZEY9gxhf/eLQTvDOZYkltnyhLdmLsajCGK91/wkroly3wId 00FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NeJZuZMQ3VtmJG5aHSijKuU+maODocVqNfZ3VrWHGCI=; b=gI2jGeNmPFDHXL8CgVVwvHK9oVKMFTc3FqnckmpOkhmcUrVOFS4G85lTeAsUZOqmK7 36iQ9or01AcNrqv2fnHEJIvDENf9NuzqWs2HJGImkhBblabY8S4GXZ7rIpnDJHmK36GI qH5/tQvTEcjI7+jHhODUWK1C1qHqurcwc/vBFEZ95eJvV4H0KT2d1nXhas0Qk56VgSNj rQwvGKxBxGv7goCPvd2Z+kVLWiDHullT15SFzeUTcPNDCNmXYNIWn4bDvI6JS8wijRMf k+H445kSJtNOHrFBzL5HTQLTFL52L1tEYFizhl/azTrdDUQokFPE+jgWzVAM6lCHBrId 9cVw== X-Gm-Message-State: AOAM533WnMnZXEXgrV4QrOlxzDdCo9dVkoDbZ6IS3Sn3YHHt7Xy4ghHy qgInrf28ptoP0l3Q+/Xq7dCLYLLAI9eTGg== X-Google-Smtp-Source: ABdhPJythBPVclnismDL0vpbFN2usEBpFfnWEI5nfFoGbcbEuhASqMmeLKICy50K55RnxoZ74dmglA== X-Received: by 2002:a05:6512:c12:: with SMTP id z18mr1512005lfu.335.1631742069018; Wed, 15 Sep 2021 14:41:09 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:41:06 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk , Ferruh Yigit , Narcisa Ana Maria Vasile , Olivier Matz , Pallavi Kadam , Ray Kinsella , Tyler Retzlaff Date: Thu, 16 Sep 2021 00:40:52 +0300 Message-Id: <20210915214052.143098-6-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> References: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 5/5] net: rename Ethernet header fields X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Definition of `rte_ether_addr` structure used a workaround allowing DPDK and Windows SDK headers to be used in the same file, because Windows SDK defines `s_addr` as a macro. Rename `s_addr` to `src_addr` and `d_addr` to `dst_addr` to avoid the conflict and remove the workaround. Deprecation notice: https://mails.dpdk.org/archives/dev/2021-July/215270.html Signed-off-by: Dmitry Kozlyuk --- app/test-pmd/5tswap.c | 6 +-- app/test-pmd/csumonly.c | 4 +- app/test-pmd/flowgen.c | 4 +- app/test-pmd/icmpecho.c | 16 ++++---- app/test-pmd/ieee1588fwd.c | 6 +-- app/test-pmd/macfwd.c | 4 +- app/test-pmd/macswap.h | 4 +- app/test-pmd/txonly.c | 4 +- app/test-pmd/util.c | 4 +- app/test/packet_burst_generator.c | 4 +- app/test/test_bpf.c | 4 +- app/test/test_link_bonding_mode4.c | 15 +++---- doc/guides/rel_notes/deprecation.rst | 3 -- doc/guides/rel_notes/release_20_11.rst | 3 ++ drivers/net/avp/avp_ethdev.c | 6 +-- drivers/net/bnx2x/bnx2x.c | 16 ++++---- drivers/net/bonding/rte_eth_bond_8023ad.c | 6 +-- drivers/net/bonding/rte_eth_bond_alb.c | 4 +- drivers/net/bonding/rte_eth_bond_pmd.c | 22 +++++----- drivers/net/enic/enic_flow.c | 8 ++-- drivers/net/mlx5/mlx5_txpp.c | 4 +- examples/bond/main.c | 14 ++++--- examples/ethtool/ethtool-app/main.c | 4 +- examples/eventdev_pipeline/pipeline_common.h | 4 +- examples/flow_filtering/main.c | 4 +- examples/ioat/ioatfwd.c | 4 +- examples/ip_fragmentation/main.c | 4 +- examples/ip_reassembly/main.c | 4 +- examples/ipsec-secgw/ipsec-secgw.c | 4 +- examples/ipsec-secgw/ipsec_worker.c | 4 +- examples/ipv4_multicast/main.c | 4 +- examples/l2fwd-crypto/main.c | 4 +- examples/l2fwd-event/l2fwd_common.h | 4 +- examples/l2fwd-jobstats/main.c | 4 +- examples/l2fwd-keepalive/main.c | 4 +- examples/l2fwd/main.c | 4 +- examples/l3fwd-acl/main.c | 19 +++++---- examples/l3fwd-power/main.c | 6 +-- examples/l3fwd/l3fwd_em.h | 4 +- examples/l3fwd/l3fwd_fib.c | 2 +- examples/l3fwd/l3fwd_lpm.c | 2 +- examples/l3fwd/l3fwd_lpm.h | 4 +- examples/link_status_interrupt/main.c | 4 +- .../performance-thread/l3fwd-thread/main.c | 40 +++++++++---------- examples/ptpclient/ptpclient.c | 16 ++++---- examples/vhost/main.c | 10 ++--- examples/vmdq/main.c | 4 +- examples/vmdq_dcb/main.c | 4 +- lib/ethdev/rte_flow.h | 4 +- lib/gro/gro_tcp4.c | 4 +- lib/gro/gro_udp4.c | 4 +- lib/gro/gro_vxlan_tcp4.c | 8 ++-- lib/gro/gro_vxlan_udp4.c | 8 ++-- lib/net/rte_arp.c | 4 +- lib/net/rte_ether.h | 22 +--------- lib/pipeline/rte_table_action.c | 40 +++++++++---------- 56 files changed, 207 insertions(+), 219 deletions(-) diff --git a/app/test-pmd/5tswap.c b/app/test-pmd/5tswap.c index e8cef9623b..629d3e0d31 100644 --- a/app/test-pmd/5tswap.c +++ b/app/test-pmd/5tswap.c @@ -27,9 +27,9 @@ swap_mac(struct rte_ether_hdr *eth_hdr) struct rte_ether_addr addr; /* Swap dest and src mac addresses. */ - rte_ether_addr_copy(ð_hdr->d_addr, &addr); - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->dst_addr, &addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->dst_addr); + rte_ether_addr_copy(&addr, ð_hdr->src_addr); } static inline void diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 38cc256533..090797318a 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -873,9 +873,9 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], - ð_hdr->d_addr); + ð_hdr->dst_addr); rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, - ð_hdr->s_addr); + ð_hdr->src_addr); parse_ethernet(eth_hdr, &info); l3_hdr = (char *)eth_hdr + info.l2_len; diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 9348618d0f..3f3378a444 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -123,8 +123,8 @@ pkt_burst_flow_gen(struct fwd_stream *fs) /* Initialize Ethernet header. */ eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->d_addr); - rte_ether_addr_copy(&cfg_ether_src, ð_hdr->s_addr); + rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->dst_addr); + rte_ether_addr_copy(&cfg_ether_src, ð_hdr->src_addr); eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); /* Initialize IP header. */ diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c index 8948f28eb5..8f1d68a83a 100644 --- a/app/test-pmd/icmpecho.c +++ b/app/test-pmd/icmpecho.c @@ -319,8 +319,8 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) if (verbose_level > 0) { printf("\nPort %d pkt-len=%u nb-segs=%u\n", fs->rx_port, pkt->pkt_len, pkt->nb_segs); - ether_addr_dump(" ETH: src=", ð_h->s_addr); - ether_addr_dump(" dst=", ð_h->d_addr); + ether_addr_dump(" ETH: src=", ð_h->src_addr); + ether_addr_dump(" dst=", ð_h->dst_addr); } if (eth_type == RTE_ETHER_TYPE_VLAN) { vlan_h = (struct rte_vlan_hdr *) @@ -385,17 +385,17 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) */ /* Use source MAC address as destination MAC address. */ - rte_ether_addr_copy(ð_h->s_addr, ð_h->d_addr); + rte_ether_addr_copy(ð_h->src_addr, ð_h->dst_addr); /* Set source MAC address with MAC address of TX port */ rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, - ð_h->s_addr); + ð_h->src_addr); arp_h->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY); rte_ether_addr_copy(&arp_h->arp_data.arp_tha, ð_addr); rte_ether_addr_copy(&arp_h->arp_data.arp_sha, &arp_h->arp_data.arp_tha); - rte_ether_addr_copy(ð_h->s_addr, + rte_ether_addr_copy(ð_h->src_addr, &arp_h->arp_data.arp_sha); /* Swap IP addresses in ARP payload */ @@ -453,9 +453,9 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) * ICMP checksum is computed by assuming it is valid in the * echo request and not verified. */ - rte_ether_addr_copy(ð_h->s_addr, ð_addr); - rte_ether_addr_copy(ð_h->d_addr, ð_h->s_addr); - rte_ether_addr_copy(ð_addr, ð_h->d_addr); + rte_ether_addr_copy(ð_h->src_addr, ð_addr); + rte_ether_addr_copy(ð_h->dst_addr, ð_h->src_addr); + rte_ether_addr_copy(ð_addr, ð_h->dst_addr); ip_addr = ip_h->src_addr; if (is_multicast_ipv4_addr(ip_h->dst_addr)) { uint32_t ip_src; diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c index 034f238c34..9cf10c1c50 100644 --- a/app/test-pmd/ieee1588fwd.c +++ b/app/test-pmd/ieee1588fwd.c @@ -178,9 +178,9 @@ ieee1588_packet_fwd(struct fwd_stream *fs) port_ieee1588_rx_timestamp_check(fs->rx_port, timesync_index); /* Swap dest and src mac addresses. */ - rte_ether_addr_copy(ð_hdr->d_addr, &addr); - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->dst_addr, &addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->dst_addr); + rte_ether_addr_copy(&addr, ð_hdr->src_addr); /* Forward PTP packet with hardware TX timestamp */ mb->ol_flags |= PKT_TX_IEEE1588_TMST; diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c index 0568ea794d..ee76df7f03 100644 --- a/app/test-pmd/macfwd.c +++ b/app/test-pmd/macfwd.c @@ -85,9 +85,9 @@ pkt_burst_mac_forward(struct fwd_stream *fs) mb = pkts_burst[i]; eth_hdr = rte_pktmbuf_mtod(mb, struct rte_ether_hdr *); rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], - ð_hdr->d_addr); + ð_hdr->dst_addr); rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, - ð_hdr->s_addr); + ð_hdr->src_addr); mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF; mb->ol_flags |= ol_flags; mb->l2_len = sizeof(struct rte_ether_hdr); diff --git a/app/test-pmd/macswap.h b/app/test-pmd/macswap.h index 0138441566..20823b9b8c 100644 --- a/app/test-pmd/macswap.h +++ b/app/test-pmd/macswap.h @@ -30,8 +30,8 @@ do_macswap(struct rte_mbuf *pkts[], uint16_t nb, /* Swap dest and src mac addresses. */ rte_ether_addr_copy(ð_hdr->d_addr, &addr); - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->d_addr); + rte_ether_addr_copy(&addr, ð_hdr->src_addr); mbuf_field_set(mb, ol_flags); } diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c index aed820f5d3..40655801cc 100644 --- a/app/test-pmd/txonly.c +++ b/app/test-pmd/txonly.c @@ -362,8 +362,8 @@ pkt_burst_transmit(struct fwd_stream *fs) /* * Initialize Ethernet header. */ - rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], ð_hdr.d_addr); - rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, ð_hdr.s_addr); + rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr], ð_hdr.dst_addr); + rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, ð_hdr.src_addr); eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); if (rte_mempool_get_bulk(mbp, (void **)pkts_burst, diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 14a9a251fb..51506e4940 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -142,9 +142,9 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], " - no miss group"); MKDUMPSTR(print_buf, buf_size, cur_len, "\n"); } - print_ether_addr(" src=", ð_hdr->s_addr, + print_ether_addr(" src=", ð_hdr->src_addr, print_buf, buf_size, &cur_len); - print_ether_addr(" - dst=", ð_hdr->d_addr, + print_ether_addr(" - dst=", ð_hdr->dst_addr, print_buf, buf_size, &cur_len); MKDUMPSTR(print_buf, buf_size, cur_len, " - type=0x%04x - length=%u - nb_segs=%d", diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c index 0fd7290b0e..8ac24577ba 100644 --- a/app/test/packet_burst_generator.c +++ b/app/test/packet_burst_generator.c @@ -56,8 +56,8 @@ initialize_eth_header(struct rte_ether_hdr *eth_hdr, struct rte_ether_addr *dst_mac, uint16_t ether_type, uint8_t vlan_enabled, uint16_t van_id) { - rte_ether_addr_copy(dst_mac, ð_hdr->d_addr); - rte_ether_addr_copy(src_mac, ð_hdr->s_addr); + rte_ether_addr_copy(dst_mac, ð_hdr->dst_addr); + rte_ether_addr_copy(src_mac, ð_hdr->src_addr); if (vlan_enabled) { struct rte_vlan_hdr *vhdr = (struct rte_vlan_hdr *)( diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index 527c06b807..8118a1849b 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -1008,9 +1008,9 @@ test_jump2_prepare(void *arg) * Initialize ether header. */ rte_ether_addr_copy((struct rte_ether_addr *)dst_mac, - &dn->eth_hdr.d_addr); + &dn->eth_hdr.dst_addr); rte_ether_addr_copy((struct rte_ether_addr *)src_mac, - &dn->eth_hdr.s_addr); + &dn->eth_hdr.src_addr); dn->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); /* diff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c index 2c835fa7ad..f120b2e3be 100644 --- a/app/test/test_link_bonding_mode4.c +++ b/app/test/test_link_bonding_mode4.c @@ -502,8 +502,8 @@ make_lacp_reply(struct slave_conf *slave, struct rte_mbuf *pkt) slow_hdr = rte_pktmbuf_mtod(pkt, struct slow_protocol_frame *); /* Change source address to partner address */ - rte_ether_addr_copy(&parnter_mac_default, &slow_hdr->eth_hdr.s_addr); - slow_hdr->eth_hdr.s_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = + rte_ether_addr_copy(&parnter_mac_default, &slow_hdr->eth_hdr.src_addr); + slow_hdr->eth_hdr.src_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = slave->port_id; lacp = (struct lacpdu *) &slow_hdr->slow_protocol; @@ -870,7 +870,7 @@ test_mode4_rx(void) for (i = 0; i < expected_pkts_cnt; i++) { hdr = rte_pktmbuf_mtod(pkts[i], struct rte_ether_hdr *); - cnt[rte_is_same_ether_addr(&hdr->d_addr, + cnt[rte_is_same_ether_addr(&hdr->dst_addr, &bonded_mac)]++; } @@ -918,7 +918,7 @@ test_mode4_rx(void) for (i = 0; i < expected_pkts_cnt; i++) { hdr = rte_pktmbuf_mtod(pkts[i], struct rte_ether_hdr *); - eq_cnt += rte_is_same_ether_addr(&hdr->d_addr, + eq_cnt += rte_is_same_ether_addr(&hdr->dst_addr, &bonded_mac); } @@ -1163,11 +1163,12 @@ init_marker(struct rte_mbuf *pkt, struct slave_conf *slave) /* Copy multicast destination address */ rte_ether_addr_copy(&slow_protocol_mac_addr, - &marker_hdr->eth_hdr.d_addr); + &marker_hdr->eth_hdr.dst_addr); /* Init source address */ - rte_ether_addr_copy(&parnter_mac_default, &marker_hdr->eth_hdr.s_addr); - marker_hdr->eth_hdr.s_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = + rte_ether_addr_copy(&parnter_mac_default, + &marker_hdr->eth_hdr.src_addr); + marker_hdr->eth_hdr.src_addr.addr_bytes[RTE_ETHER_ADDR_LEN - 1] = slave->port_id; marker_hdr->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_SLOW); diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 6d48155b35..3ae713edae 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -172,9 +172,6 @@ Deprecation Notices can still be used if users specify the devarg "driver=i40evf". I40evf will be deleted in DPDK 21.11. -* net: ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure - will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers. - * net: The structure ``rte_ipv4_hdr`` will have two unions. The first union is for existing ``version_ihl`` byte and new bitfield for version and IHL. diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index 3eb30f855c..51e85a7279 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -668,6 +668,9 @@ API Changes * cryptodev: Renamed ``min`` and ``max`` fields of ``rte_crypto_param_range`` structure to ``minimum`` and ``maximum``, respectively. +* net: Renamed ``s_addr`` and ``d_addr`` fields of ``rte_ether_hdr`` structure + to ``src_addr`` and ``dst_addr``, respectively. + ABI Changes ----------- diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c index 623fa5e5ff..b5fafd32b0 100644 --- a/drivers/net/avp/avp_ethdev.c +++ b/drivers/net/avp/avp_ethdev.c @@ -1205,17 +1205,17 @@ _avp_mac_filter(struct avp_dev *avp, struct rte_mbuf *m) { struct rte_ether_hdr *eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (likely(_avp_cmp_ether_addr(&avp->ethaddr, ð->d_addr) == 0)) { + if (likely(_avp_cmp_ether_addr(&avp->ethaddr, ð->dst_addr) == 0)) { /* allow all packets destined to our address */ return 0; } - if (likely(rte_is_broadcast_ether_addr(ð->d_addr))) { + if (likely(rte_is_broadcast_ether_addr(ð->dst_addr))) { /* allow all broadcast packets */ return 0; } - if (likely(rte_is_multicast_ether_addr(ð->d_addr))) { + if (likely(rte_is_multicast_ether_addr(ð->dst_addr))) { /* allow all multicast packets */ return 0; } diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 7ee805bd0d..2d0403e593 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -2233,8 +2233,8 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0) tx_parse_bd = &txq->tx_ring[TX_BD(bd_prod, txq)].parse_bd_e2; - if (rte_is_multicast_ether_addr(&eh->d_addr)) { - if (rte_is_broadcast_ether_addr(&eh->d_addr)) + if (rte_is_multicast_ether_addr(&eh->dst_addr)) { + if (rte_is_broadcast_ether_addr(&eh->dst_addr)) mac_type = BROADCAST_ADDRESS; else mac_type = MULTICAST_ADDRESS; @@ -2243,17 +2243,17 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0) (mac_type << ETH_TX_PARSE_BD_E2_ETH_ADDR_TYPE_SHIFT); rte_memcpy(&tx_parse_bd->data.mac_addr.dst_hi, - &eh->d_addr.addr_bytes[0], 2); + &eh->dst_addr.addr_bytes[0], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.dst_mid, - &eh->d_addr.addr_bytes[2], 2); + &eh->dst_addr.addr_bytes[2], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.dst_lo, - &eh->d_addr.addr_bytes[4], 2); + &eh->dst_addr.addr_bytes[4], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.src_hi, - &eh->s_addr.addr_bytes[0], 2); + &eh->src_addr.addr_bytes[0], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.src_mid, - &eh->s_addr.addr_bytes[2], 2); + &eh->src_addr.addr_bytes[2], 2); rte_memcpy(&tx_parse_bd->data.mac_addr.src_lo, - &eh->s_addr.addr_bytes[4], 2); + &eh->src_addr.addr_bytes[4], 2); tx_parse_bd->data.mac_addr.dst_hi = rte_cpu_to_be_16(tx_parse_bd->data.mac_addr.dst_hi); diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 128754f459..ce911f0f90 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -587,8 +587,8 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id) hdr = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *); /* Source and destination MAC */ - rte_ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.d_addr); - rte_eth_macaddr_get(slave_id, &hdr->eth_hdr.s_addr); + rte_ether_addr_copy(&lacp_mac_addr, &hdr->eth_hdr.dst_addr); + rte_eth_macaddr_get(slave_id, &hdr->eth_hdr.src_addr); hdr->eth_hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_SLOW); lacpdu = &hdr->lacpdu; @@ -1346,7 +1346,7 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals, } while (unlikely(retval == 0)); m_hdr->marker.tlv_type_marker = MARKER_TLV_TYPE_RESP; - rte_eth_macaddr_get(slave_id, &m_hdr->eth_hdr.s_addr); + rte_eth_macaddr_get(slave_id, &m_hdr->eth_hdr.src_addr); if (internals->mode4.dedicated_queues.enabled == 0) { if (rte_ring_enqueue(port->tx_ring, pkt) != 0) { diff --git a/drivers/net/bonding/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c index 1d36a4a4a2..86335a7971 100644 --- a/drivers/net/bonding/rte_eth_bond_alb.c +++ b/drivers/net/bonding/rte_eth_bond_alb.c @@ -213,8 +213,8 @@ bond_mode_alb_arp_upd(struct client_data *client_info, rte_spinlock_lock(&internals->mode6.lock); eth_h = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(&client_info->app_mac, ð_h->s_addr); - rte_ether_addr_copy(&client_info->cli_mac, ð_h->d_addr); + rte_ether_addr_copy(&client_info->app_mac, ð_h->src_addr); + rte_ether_addr_copy(&client_info->cli_mac, ð_h->dst_addr); if (client_info->vlan_count > 0) eth_h->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); else diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index a6755661c4..b7f9cfcfa3 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -342,11 +342,11 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, bufs[j])) || !collecting || (!promisc && - ((rte_is_unicast_ether_addr(&hdr->d_addr) && + ((rte_is_unicast_ether_addr(&hdr->dst_addr) && !rte_is_same_ether_addr(bond_mac, - &hdr->d_addr)) || + &hdr->dst_addr)) || (!allmulti && - rte_is_multicast_ether_addr(&hdr->d_addr)))))) { + rte_is_multicast_ether_addr(&hdr->dst_addr)))))) { if (hdr->ether_type == ether_type_slow_be) { bond_mode_8023ad_handle_slow_pkt( @@ -477,9 +477,9 @@ update_client_stats(uint32_t addr, uint16_t port, uint32_t *TXorRXindicator) "DstMAC:%02X:%02X:%02X:%02X:%02X:%02X DstIP:%s %s %d\n", \ info, \ port, \ - eth_h->s_addr.addr_bytes[0], eth_h->s_addr.addr_bytes[1], \ - eth_h->s_addr.addr_bytes[2], eth_h->s_addr.addr_bytes[3], \ - eth_h->s_addr.addr_bytes[4], eth_h->s_addr.addr_bytes[5], \ + eth_h->src_addr.addr_bytes[0], eth_h->src_addr.addr_bytes[1], \ + eth_h->src_addr.addr_bytes[2], eth_h->src_addr.addr_bytes[3], \ + eth_h->src_addr.addr_bytes[4], eth_h->src_addr.addr_bytes[5], \ src_ip, \ eth_h->d_addr.addr_bytes[0], eth_h->d_addr.addr_bytes[1], \ eth_h->d_addr.addr_bytes[2], eth_h->d_addr.addr_bytes[3], \ @@ -647,9 +647,9 @@ static inline uint16_t ether_hash(struct rte_ether_hdr *eth_hdr) { unaligned_uint16_t *word_src_addr = - (unaligned_uint16_t *)eth_hdr->s_addr.addr_bytes; + (unaligned_uint16_t *)eth_hdr->src_addr.addr_bytes; unaligned_uint16_t *word_dst_addr = - (unaligned_uint16_t *)eth_hdr->d_addr.addr_bytes; + (unaligned_uint16_t *)eth_hdr->dst_addr.addr_bytes; return (word_src_addr[0] ^ word_dst_addr[0]) ^ (word_src_addr[1] ^ word_dst_addr[1]) ^ @@ -946,10 +946,10 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) ether_hdr = rte_pktmbuf_mtod(bufs[j], struct rte_ether_hdr *); - if (rte_is_same_ether_addr(ðer_hdr->s_addr, + if (rte_is_same_ether_addr(ðer_hdr->src_addr, &primary_slave_addr)) rte_ether_addr_copy(&active_slave_addr, - ðer_hdr->s_addr); + ðer_hdr->src_addr); #if defined(RTE_LIBRTE_BOND_DEBUG_ALB) || defined(RTE_LIBRTE_BOND_DEBUG_ALB_L1) mode6_debug("TX IPv4:", ether_hdr, slaves[i], &burstnumberTX); #endif @@ -1021,7 +1021,7 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) slave_idx = bond_mode_alb_arp_xmit(eth_h, offset, internals); /* Change src mac in eth header */ - rte_eth_macaddr_get(slave_idx, ð_h->s_addr); + rte_eth_macaddr_get(slave_idx, ð_h->src_addr); /* Add packet to slave tx buffer */ slave_bufs[slave_idx][slave_bufs_pkts[slave_idx]] = bufs[i]; diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c index cdfdc904a6..33147169ba 100644 --- a/drivers/net/enic/enic_flow.c +++ b/drivers/net/enic/enic_flow.c @@ -656,14 +656,14 @@ enic_copy_item_eth_v2(struct copy_item_args *arg) if (!mask) mask = &rte_flow_item_eth_mask; - memcpy(enic_spec.d_addr.addr_bytes, spec->dst.addr_bytes, + memcpy(enic_spec.dst_addr.addr_bytes, spec->dst.addr_bytes, RTE_ETHER_ADDR_LEN); - memcpy(enic_spec.s_addr.addr_bytes, spec->src.addr_bytes, + memcpy(enic_spec.src_addr.addr_bytes, spec->src.addr_bytes, RTE_ETHER_ADDR_LEN); - memcpy(enic_mask.d_addr.addr_bytes, mask->dst.addr_bytes, + memcpy(enic_mask.dst_addr.addr_bytes, mask->dst.addr_bytes, RTE_ETHER_ADDR_LEN); - memcpy(enic_mask.s_addr.addr_bytes, mask->src.addr_bytes, + memcpy(enic_mask.src_addr.addr_bytes, mask->src.addr_bytes, RTE_ETHER_ADDR_LEN); enic_spec.ether_type = spec->type; enic_mask.ether_type = mask->type; diff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c index 4f6da9f2d1..2be7e71f89 100644 --- a/drivers/net/mlx5/mlx5_txpp.c +++ b/drivers/net/mlx5/mlx5_txpp.c @@ -333,8 +333,8 @@ mlx5_txpp_fill_wqe_clock_queue(struct mlx5_dev_ctx_shared *sh) /* Build test packet L2 header (Ethernet). */ dst = (uint8_t *)&es->inline_data; eth_hdr = (struct rte_ether_hdr *)dst; - rte_eth_random_addr(ð_hdr->d_addr.addr_bytes[0]); - rte_eth_random_addr(ð_hdr->s_addr.addr_bytes[0]); + rte_eth_random_addr(ð_hdr->dst_addr.addr_bytes[0]); + rte_eth_random_addr(ð_hdr->src_addr.addr_bytes[0]); eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); /* Build test packet L3 header (IP v4). */ dst += sizeof(struct rte_ether_hdr); diff --git a/examples/bond/main.c b/examples/bond/main.c index f48400e211..c51892b6f0 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -423,8 +423,8 @@ static int lcore_main(__rte_unused void *arg1) if (arp_hdr->arp_opcode == rte_cpu_to_be_16(RTE_ARP_OP_REQUEST)) { arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY); /* Switch src and dst data and set bonding MAC */ - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&bond_mac_addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->src_addr, ð_hdr->dst_addr); + rte_ether_addr_copy(&bond_mac_addr, ð_hdr->src_addr); rte_ether_addr_copy(&arp_hdr->arp_data.arp_sha, &arp_hdr->arp_data.arp_tha); arp_hdr->arp_data.arp_tip = arp_hdr->arp_data.arp_sip; @@ -444,8 +444,10 @@ static int lcore_main(__rte_unused void *arg1) } ipv4_hdr = (struct rte_ipv4_hdr *)((char *)(eth_hdr + 1) + offset); if (ipv4_hdr->dst_addr == bond_ip) { - rte_ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - rte_ether_addr_copy(&bond_mac_addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_hdr->src_addr, + ð_hdr->dst_addr); + rte_ether_addr_copy(&bond_mac_addr, + ð_hdr->src_addr); ipv4_hdr->dst_addr = ipv4_hdr->src_addr; ipv4_hdr->src_addr = bond_ip; rte_eth_tx_burst(BOND_PORT, 0, &pkts[i], 1); @@ -520,8 +522,8 @@ static void cmd_obj_send_parsed(void *parsed_result, created_pkt->pkt_len = pkt_size; eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(&bond_mac_addr, ð_hdr->s_addr); - memset(ð_hdr->d_addr, 0xFF, RTE_ETHER_ADDR_LEN); + rte_ether_addr_copy(&bond_mac_addr, ð_hdr->src_addr); + memset(ð_hdr->dst_addr, 0xFF, RTE_ETHER_ADDR_LEN); eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP); arp_hdr = (struct rte_arp_hdr *)( diff --git a/examples/ethtool/ethtool-app/main.c b/examples/ethtool/ethtool-app/main.c index 21ed85c7d6..1bc675962b 100644 --- a/examples/ethtool/ethtool-app/main.c +++ b/examples/ethtool/ethtool-app/main.c @@ -172,8 +172,8 @@ static void process_frame(struct app_port *ptr_port, struct rte_ether_hdr *ptr_mac_hdr; ptr_mac_hdr = rte_pktmbuf_mtod(ptr_frame, struct rte_ether_hdr *); - rte_ether_addr_copy(&ptr_mac_hdr->s_addr, &ptr_mac_hdr->d_addr); - rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr); + rte_ether_addr_copy(&ptr_mac_hdr->src_addr, &ptr_mac_hdr->dst_addr); + rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->src_addr); } static int worker_main(__rte_unused void *ptr_data) diff --git a/examples/eventdev_pipeline/pipeline_common.h b/examples/eventdev_pipeline/pipeline_common.h index 6a4287602e..b12eb281e1 100644 --- a/examples/eventdev_pipeline/pipeline_common.h +++ b/examples/eventdev_pipeline/pipeline_common.h @@ -104,8 +104,8 @@ exchange_mac(struct rte_mbuf *m) /* change mac addresses on packet (to use mbuf data) */ eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - rte_ether_addr_copy(ð->d_addr, &addr); - rte_ether_addr_copy(&addr, ð->d_addr); + rte_ether_addr_copy(ð->dst_addr, &addr); + rte_ether_addr_copy(&addr, ð->dst_addr); } static __rte_always_inline void diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c index 29fb4b3d55..dd8a33d036 100644 --- a/examples/flow_filtering/main.c +++ b/examples/flow_filtering/main.c @@ -75,9 +75,9 @@ main_loop(void) eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); print_ether_addr("src=", - ð_hdr->s_addr); + ð_hdr->src_addr); print_ether_addr(" - dst=", - ð_hdr->d_addr); + ð_hdr->dst_addr); printf(" - queue=0x%x", (unsigned int)i); printf("\n"); diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c index 0c413180f8..7824247d69 100644 --- a/examples/ioat/ioatfwd.c +++ b/examples/ioat/ioatfwd.c @@ -322,11 +322,11 @@ update_mac_addrs(struct rte_mbuf *m, uint32_t dest_portid) /* 02:00:00:00:00:xx - overwriting 2 bytes of source address but * it's acceptable cause it gets overwritten by rte_ether_addr_copy */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); /* src addr */ - rte_ether_addr_copy(&ioat_ports_eth_addr[dest_portid], ð->s_addr); + rte_ether_addr_copy(&ioat_ports_eth_addr[dest_portid], ð->src_addr); } /* Perform packet copy there is a user-defined function. 8< */ diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index f245369720..a7f40970f2 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -362,13 +362,13 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf, m->l2_len = sizeof(struct rte_ether_hdr); /* 02:00:00:00:00:xx */ - d_addr_bytes = ð_hdr->d_addr.addr_bytes[0]; + d_addr_bytes = ð_hdr->dst_addr.addr_bytes[0]; *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)port_out << 40); /* src addr */ rte_ether_addr_copy(&ports_eth_addr[port_out], - ð_hdr->s_addr); + ð_hdr->src_addr); eth_hdr->ether_type = ether_type; } diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 8645ac790b..d611c7d016 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -413,11 +413,11 @@ reassemble(struct rte_mbuf *m, uint16_t portid, uint32_t queue, /* if packet wasn't IPv4 or IPv6, it's forwarded to the port it came from */ /* 02:00:00:00:00:xx */ - d_addr_bytes = ð_hdr->d_addr.addr_bytes[0]; + d_addr_bytes = ð_hdr->dst_addr.addr_bytes[0]; *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&ports_eth_addr[dst_port], ð_hdr->s_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port], ð_hdr->src_addr); send_single_packet(m, dst_port); } diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index f252d34985..61987c513e 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -545,9 +545,9 @@ prepare_tx_pkt(struct rte_mbuf *pkt, uint16_t port, ethhdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); } - memcpy(ðhdr->s_addr, ðaddr_tbl[port].src, + memcpy(ðhdr->src_addr, ðaddr_tbl[port].src, sizeof(struct rte_ether_addr)); - memcpy(ðhdr->d_addr, ðaddr_tbl[port].dst, + memcpy(ðhdr->dst_addr, ðaddr_tbl[port].dst, sizeof(struct rte_ether_addr)); } diff --git a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c index 647e22df59..996b0acd03 100644 --- a/examples/ipsec-secgw/ipsec_worker.c +++ b/examples/ipsec-secgw/ipsec_worker.c @@ -44,8 +44,8 @@ update_mac_addrs(struct rte_mbuf *pkt, uint16_t portid) struct rte_ether_hdr *ethhdr; ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src, RTE_ETHER_ADDR_LEN); - memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst, RTE_ETHER_ADDR_LEN); + memcpy(ðhdr->src_addr, ðaddr_tbl[portid].src, RTE_ETHER_ADDR_LEN); + memcpy(ðhdr->dst_addr, ðaddr_tbl[portid].dst, RTE_ETHER_ADDR_LEN); } static inline void diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index cc527d7f6b..d10de30ddb 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -283,8 +283,8 @@ mcast_send_pkt(struct rte_mbuf *pkt, struct rte_ether_addr *dest_addr, rte_pktmbuf_prepend(pkt, (uint16_t)sizeof(*ethdr)); RTE_ASSERT(ethdr != NULL); - rte_ether_addr_copy(dest_addr, ðdr->d_addr); - rte_ether_addr_copy(&ports_eth_addr[port], ðdr->s_addr); + rte_ether_addr_copy(dest_addr, ðdr->dst_addr); + rte_ether_addr_copy(&ports_eth_addr[port], ðdr->src_addr); ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4); /* Put new packet into the output queue */ diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index b6bc371bd2..96636e84ce 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -617,11 +617,11 @@ l2fwd_mac_updating(struct rte_mbuf *m, uint16_t dest_portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->src_addr); } static void diff --git a/examples/l2fwd-event/l2fwd_common.h b/examples/l2fwd-event/l2fwd_common.h index 939221d45a..cecbd9b70e 100644 --- a/examples/l2fwd-event/l2fwd_common.h +++ b/examples/l2fwd-event/l2fwd_common.h @@ -92,11 +92,11 @@ l2fwd_mac_updating(struct rte_mbuf *m, uint32_t dest_port_id, eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_port_id << 40); /* src addr */ - rte_ether_addr_copy(addr, ð->s_addr); + rte_ether_addr_copy(addr, ð->src_addr); } static __rte_always_inline struct l2fwd_resources * diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c index bbb4a27a6d..117e06d712 100644 --- a/examples/l2fwd-jobstats/main.c +++ b/examples/l2fwd-jobstats/main.c @@ -351,11 +351,11 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->src_addr); buffer = tx_buffer[dst_port]; sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c index 4e1a17cfe4..efdfa4d89c 100644 --- a/examples/l2fwd-keepalive/main.c +++ b/examples/l2fwd-keepalive/main.c @@ -177,11 +177,11 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], ð->src_addr); buffer = tx_buffer[dst_port]; sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 911e40c66e..48c2a3da12 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -170,11 +170,11 @@ l2fwd_mac_updating(struct rte_mbuf *m, unsigned dest_portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); /* src addr */ - rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->s_addr); + rte_ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->src_addr); } /* Simple forward. 8< */ diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index a1f457b564..60545f3059 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -1375,7 +1375,8 @@ send_single_packet(struct rte_mbuf *m, uint16_t port) /* update src and dst mac*/ eh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - memcpy(eh, &port_l2hdr[port], sizeof(eh->d_addr) + sizeof(eh->s_addr)); + memcpy(eh, &port_l2hdr[port], + sizeof(eh->dst_addr) + sizeof(eh->src_addr)); qconf = &lcore_conf[lcore_id]; rte_eth_tx_buffer(port, qconf->tx_queue_id[port], @@ -1743,8 +1744,9 @@ parse_eth_dest(const char *optarg) return "port value exceeds RTE_MAX_ETHPORTS(" RTE_STR(RTE_MAX_ETHPORTS) ")"; - if (cmdline_parse_etheraddr(NULL, port_end, &port_l2hdr[portid].d_addr, - sizeof(port_l2hdr[portid].d_addr)) < 0) + if (cmdline_parse_etheraddr(NULL, port_end, + &port_l2hdr[portid].dst_addr, + sizeof(port_l2hdr[portid].dst_addr)) < 0) return "Invalid ethernet address"; return NULL; } @@ -2002,8 +2004,9 @@ set_default_dest_mac(void) uint32_t i; for (i = 0; i != RTE_DIM(port_l2hdr); i++) { - port_l2hdr[i].d_addr.addr_bytes[0] = RTE_ETHER_LOCAL_ADMIN_ADDR; - port_l2hdr[i].d_addr.addr_bytes[5] = i; + port_l2hdr[i].dst_addr.addr_bytes[0] = + RTE_ETHER_LOCAL_ADMIN_ADDR; + port_l2hdr[i].dst_addr.addr_bytes[5] = i; } } @@ -2109,14 +2112,14 @@ main(int argc, char **argv) "rte_eth_dev_adjust_nb_rx_tx_desc: err=%d, port=%d\n", ret, portid); - ret = rte_eth_macaddr_get(portid, &port_l2hdr[portid].s_addr); + ret = rte_eth_macaddr_get(portid, &port_l2hdr[portid].src_addr); if (ret < 0) rte_exit(EXIT_FAILURE, "rte_eth_macaddr_get: err=%d, port=%d\n", ret, portid); - print_ethaddr("Dst MAC:", &port_l2hdr[portid].d_addr); - print_ethaddr(", Src MAC:", &port_l2hdr[portid].s_addr); + print_ethaddr("Dst MAC:", &port_l2hdr[portid].dst_addr); + print_ethaddr(", Src MAC:", &port_l2hdr[portid].src_addr); printf(", "); /* init memory */ diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index aa7b8db44a..90456f8f33 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -717,7 +717,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, dst_port = portid; /* 02:00:00:00:00:xx */ - d_addr_bytes = ð_hdr->d_addr.addr_bytes[0]; + d_addr_bytes = ð_hdr->dst_addr.addr_bytes[0]; *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)dst_port << 40); @@ -729,7 +729,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { @@ -755,7 +755,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); #else diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h index b992a21da4..1eff591b48 100644 --- a/examples/l3fwd/l3fwd_em.h +++ b/examples/l3fwd/l3fwd_em.h @@ -40,7 +40,7 @@ l3fwd_em_handle_ipv4(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); return dst_port; } @@ -68,7 +68,7 @@ l3fwd_em_handle_ipv6(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); return dst_port; } diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c index f8d6a3ac39..c594877d96 100644 --- a/examples/l3fwd/l3fwd_fib.c +++ b/examples/l3fwd/l3fwd_fib.c @@ -94,7 +94,7 @@ fib_send_single(int nb_tx, struct lcore_conf *qconf, struct rte_ether_hdr *); *(uint64_t *)ð_hdr->d_addr = dest_eth_addr[hops[j]]; rte_ether_addr_copy(&ports_eth_addr[hops[j]], - ð_hdr->s_addr); + ð_hdr->src_addr); /* Send single packet. */ send_single_packet(qconf, pkts_burst[j], hops[j]); diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index 7200160164..227a6d7fa5 100644 --- a/examples/l3fwd/l3fwd_lpm.c +++ b/examples/l3fwd/l3fwd_lpm.c @@ -260,7 +260,7 @@ lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf) /* src addr */ rte_ether_addr_copy(&ports_eth_addr[mbuf->port], - ð_hdr->s_addr); + ð_hdr->src_addr); #endif return mbuf->port; } diff --git a/examples/l3fwd/l3fwd_lpm.h b/examples/l3fwd/l3fwd_lpm.h index d730d72a20..dd2eae18b8 100644 --- a/examples/l3fwd/l3fwd_lpm.h +++ b/examples/l3fwd/l3fwd_lpm.h @@ -44,7 +44,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(qconf, m, dst_port); } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { @@ -66,7 +66,7 @@ l3fwd_lpm_simple_forward(struct rte_mbuf *m, uint16_t portid, /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(qconf, m, dst_port); } else { diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c index 7470aa539a..903bf8c8e8 100644 --- a/examples/link_status_interrupt/main.c +++ b/examples/link_status_interrupt/main.c @@ -182,11 +182,11 @@ lsi_simple_forward(struct rte_mbuf *m, unsigned portid) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], ð->src_addr); buffer = tx_buffer[dst_port]; sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 2f593abf26..b3024a40e6 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -1078,14 +1078,14 @@ simple_ipv4_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid) *(uint64_t *)ð_hdr[7]->d_addr = dest_eth_addr[dst_port[7]]; /* src addr */ - rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->s_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->src_addr); send_single_packet(m[0], (uint8_t)dst_port[0]); send_single_packet(m[1], (uint8_t)dst_port[1]); @@ -1213,14 +1213,14 @@ simple_ipv6_fwd_8pkts(struct rte_mbuf *m[8], uint16_t portid) *(uint64_t *)ð_hdr[7]->d_addr = dest_eth_addr[dst_port[7]]; /* src addr */ - rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->s_addr); - rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->s_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[0]], ð_hdr[0]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[1]], ð_hdr[1]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[2]], ð_hdr[2]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[3]], ð_hdr[3]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[4]], ð_hdr[4]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[5]], ð_hdr[5]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[6]], ð_hdr[6]->src_addr); + rte_ether_addr_copy(&ports_eth_addr[dst_port[7]], ð_hdr[7]->src_addr); send_single_packet(m[0], dst_port[0]); send_single_packet(m[1], dst_port[1]); @@ -1268,11 +1268,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid) ++(ipv4_hdr->hdr_checksum); #endif /* dst addr */ - *(uint64_t *)ð_hdr->d_addr = dest_eth_addr[dst_port]; + *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[dst_port]; /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) { @@ -1290,11 +1290,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint16_t portid) dst_port = portid; /* dst addr */ - *(uint64_t *)ð_hdr->d_addr = dest_eth_addr[dst_port]; + *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[dst_port]; /* src addr */ rte_ether_addr_copy(&ports_eth_addr[dst_port], - ð_hdr->s_addr); + ð_hdr->src_addr); send_single_packet(m, dst_port); } else diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index 4f32ade7fb..61e4ee0ea1 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -426,10 +426,10 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) created_pkt->data_len = pkt_size; created_pkt->pkt_len = pkt_size; eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(ð_addr, ð_hdr->s_addr); + rte_ether_addr_copy(ð_addr, ð_hdr->src_addr); /* Set multicast address 01-1B-19-00-00-00. */ - rte_ether_addr_copy(ð_multicast, ð_hdr->d_addr); + rte_ether_addr_copy(ð_multicast, ð_hdr->dst_addr); eth_hdr->ether_type = htons(PTP_PROTOCOL); ptp_msg = (struct ptp_message *) @@ -449,14 +449,14 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) client_clkid = &ptp_msg->delay_req.hdr.source_port_id.clock_id; - client_clkid->id[0] = eth_hdr->s_addr.addr_bytes[0]; - client_clkid->id[1] = eth_hdr->s_addr.addr_bytes[1]; - client_clkid->id[2] = eth_hdr->s_addr.addr_bytes[2]; + client_clkid->id[0] = eth_hdr->src_addr.addr_bytes[0]; + client_clkid->id[1] = eth_hdr->src_addr.addr_bytes[1]; + client_clkid->id[2] = eth_hdr->src_addr.addr_bytes[2]; client_clkid->id[3] = 0xFF; client_clkid->id[4] = 0xFE; - client_clkid->id[5] = eth_hdr->s_addr.addr_bytes[3]; - client_clkid->id[6] = eth_hdr->s_addr.addr_bytes[4]; - client_clkid->id[7] = eth_hdr->s_addr.addr_bytes[5]; + client_clkid->id[5] = eth_hdr->src_addr.addr_bytes[3]; + client_clkid->id[6] = eth_hdr->src_addr.addr_bytes[4]; + client_clkid->id[7] = eth_hdr->src_addr.addr_bytes[5]; rte_memcpy(&ptp_data->client_clock_id, client_clkid, diff --git a/examples/vhost/main.c b/examples/vhost/main.c index bc3d71c898..ba339076a5 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -763,7 +763,7 @@ link_vmdq(struct vhost_dev *vdev, struct rte_mbuf *m) /* Learn MAC address of guest device from packet */ pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (find_vhost_dev(&pkt_hdr->s_addr)) { + if (find_vhost_dev(&pkt_hdr->src_addr)) { RTE_LOG(ERR, VHOST_DATA, "(%d) device is using a registered MAC!\n", vdev->vid); @@ -771,7 +771,7 @@ link_vmdq(struct vhost_dev *vdev, struct rte_mbuf *m) } for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) - vdev->mac_address.addr_bytes[i] = pkt_hdr->s_addr.addr_bytes[i]; + vdev->mac_address.addr_bytes[i] = pkt_hdr->src_addr.addr_bytes[i]; /* vlan_tag currently uses the device_id. */ vdev->vlan_tag = vlan_tags[vdev->vid]; @@ -960,7 +960,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m) uint16_t lcore_id = rte_lcore_id(); pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - dst_vdev = find_vhost_dev(&pkt_hdr->d_addr); + dst_vdev = find_vhost_dev(&pkt_hdr->dst_addr); if (!dst_vdev) return -1; @@ -1008,7 +1008,7 @@ find_local_dest(struct vhost_dev *vdev, struct rte_mbuf *m, struct rte_ether_hdr *pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - dst_vdev = find_vhost_dev(&pkt_hdr->d_addr); + dst_vdev = find_vhost_dev(&pkt_hdr->dst_addr); if (!dst_vdev) return 0; @@ -1091,7 +1091,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag) nh = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (unlikely(rte_is_broadcast_ether_addr(&nh->d_addr))) { + if (unlikely(rte_is_broadcast_ether_addr(&nh->dst_addr))) { struct vhost_dev *vdev2; TAILQ_FOREACH(vdev2, &vhost_dev_list, global_vdev_entry) { diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c index d3bc19f78e..cbf6883a01 100644 --- a/examples/vmdq/main.c +++ b/examples/vmdq/main.c @@ -469,11 +469,11 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->src_addr); } /* When we receive a HUP signal, print out our stats */ diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c index 685a03bdd1..6a444508df 100644 --- a/examples/vmdq_dcb/main.c +++ b/examples/vmdq_dcb/main.c @@ -520,11 +520,11 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port) eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; + tmp = ð->dst_addr.addr_bytes[0]; *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40); /* src addr */ - rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->s_addr); + rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], ð->src_addr); } /* When we receive a HUP signal, print out our stats */ diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 70f455d47d..3ce72ff198 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -784,8 +784,8 @@ struct rte_flow_item_eth { /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */ #ifndef __cplusplus static const struct rte_flow_item_eth rte_flow_item_eth_mask = { - .hdr.d_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .hdr.s_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", .hdr.ether_type = RTE_BE16(0x0000), }; #endif diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index feb5855144..aff22178e3 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -243,8 +243,8 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt, ip_id = is_atomic ? 0 : rte_be_to_cpu_16(ipv4_hdr->packet_id); sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq); - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.eth_daddr)); key.ip_src_addr = ipv4_hdr->src_addr; key.ip_dst_addr = ipv4_hdr->dst_addr; key.src_port = tcp_hdr->src_port; diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c index b8301296df..e78dda7874 100644 --- a/lib/gro/gro_udp4.c +++ b/lib/gro/gro_udp4.c @@ -238,8 +238,8 @@ gro_udp4_reassemble(struct rte_mbuf *pkt, is_last_frag = ((frag_offset & RTE_IPV4_HDR_MF_FLAG) == 0) ? 1 : 0; frag_offset = (uint16_t)(frag_offset & RTE_IPV4_HDR_OFFSET_MASK) << 3; - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.eth_daddr)); key.ip_src_addr = ipv4_hdr->src_addr; key.ip_dst_addr = ipv4_hdr->dst_addr; key.ip_id = ip_id; diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index f3b6e603b9..2005899afe 100644 --- a/lib/gro/gro_vxlan_tcp4.c +++ b/lib/gro/gro_vxlan_tcp4.c @@ -358,8 +358,8 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt, sent_seq = rte_be_to_cpu_32(tcp_hdr->sent_seq); - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.inner_key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.inner_key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.inner_key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.inner_key.eth_daddr)); key.inner_key.ip_src_addr = ipv4_hdr->src_addr; key.inner_key.ip_dst_addr = ipv4_hdr->dst_addr; key.inner_key.recv_ack = tcp_hdr->recv_ack; @@ -368,8 +368,8 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt, key.vxlan_hdr.vx_flags = vxlan_hdr->vx_flags; key.vxlan_hdr.vx_vni = vxlan_hdr->vx_vni; - rte_ether_addr_copy(&(outer_eth_hdr->s_addr), &(key.outer_eth_saddr)); - rte_ether_addr_copy(&(outer_eth_hdr->d_addr), &(key.outer_eth_daddr)); + rte_ether_addr_copy(&(outer_eth_hdr->src_addr), &(key.outer_eth_saddr)); + rte_ether_addr_copy(&(outer_eth_hdr->dst_addr), &(key.outer_eth_daddr)); key.outer_ip_src_addr = outer_ipv4_hdr->src_addr; key.outer_ip_dst_addr = outer_ipv4_hdr->dst_addr; key.outer_src_port = udp_hdr->src_port; diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c index 37476361d5..4767c910bb 100644 --- a/lib/gro/gro_vxlan_udp4.c +++ b/lib/gro/gro_vxlan_udp4.c @@ -338,16 +338,16 @@ gro_vxlan_udp4_reassemble(struct rte_mbuf *pkt, is_last_frag = ((frag_offset & RTE_IPV4_HDR_MF_FLAG) == 0) ? 1 : 0; frag_offset = (uint16_t)(frag_offset & RTE_IPV4_HDR_OFFSET_MASK) << 3; - rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.inner_key.eth_saddr)); - rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.inner_key.eth_daddr)); + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.inner_key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.inner_key.eth_daddr)); key.inner_key.ip_src_addr = ipv4_hdr->src_addr; key.inner_key.ip_dst_addr = ipv4_hdr->dst_addr; key.inner_key.ip_id = ip_id; key.vxlan_hdr.vx_flags = vxlan_hdr->vx_flags; key.vxlan_hdr.vx_vni = vxlan_hdr->vx_vni; - rte_ether_addr_copy(&(outer_eth_hdr->s_addr), &(key.outer_eth_saddr)); - rte_ether_addr_copy(&(outer_eth_hdr->d_addr), &(key.outer_eth_daddr)); + rte_ether_addr_copy(&(outer_eth_hdr->src_addr), &(key.outer_eth_saddr)); + rte_ether_addr_copy(&(outer_eth_hdr->dst_addr), &(key.outer_eth_daddr)); key.outer_ip_src_addr = outer_ipv4_hdr->src_addr; key.outer_ip_dst_addr = outer_ipv4_hdr->dst_addr; /* Note: It is unnecessary to save outer_src_port here because it can diff --git a/lib/net/rte_arp.c b/lib/net/rte_arp.c index 5c1e27b8c0..9f7eb6b375 100644 --- a/lib/net/rte_arp.c +++ b/lib/net/rte_arp.c @@ -29,8 +29,8 @@ rte_net_make_rarp_packet(struct rte_mempool *mpool, } /* Ethernet header. */ - memset(eth_hdr->d_addr.addr_bytes, 0xff, RTE_ETHER_ADDR_LEN); - rte_ether_addr_copy(mac, ð_hdr->s_addr); + memset(eth_hdr->dst_addr.addr_bytes, 0xff, RTE_ETHER_ADDR_LEN); + rte_ether_addr_copy(mac, ð_hdr->src_addr); eth_hdr->ether_type = RTE_BE16(RTE_ETHER_TYPE_RARP); /* RARP header. */ diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h index 7ee5e9a292..ff9829a3a3 100644 --- a/lib/net/rte_ether.h +++ b/lib/net/rte_ether.h @@ -253,34 +253,16 @@ __rte_experimental int rte_ether_unformat_addr(const char *str, struct rte_ether_addr *eth_addr); -/* Windows Sockets headers contain `#define s_addr S_un.S_addr`. - * Temporarily disable this macro to avoid conflict at definition. - * Place source MAC address in both `s_addr` and `S_un.S_addr` fields, - * so that access works either directly or through the macro. - */ -#pragma push_macro("s_addr") -#ifdef s_addr -#undef s_addr -#endif - /** * Ethernet header: Contains the destination address, source address * and frame type. */ struct rte_ether_hdr { - struct rte_ether_addr d_addr; /**< Destination address. */ - RTE_STD_C11 - union { - struct rte_ether_addr s_addr; /**< Source address. */ - struct { - struct rte_ether_addr S_addr; - } S_un; /**< Do not use directly; use s_addr instead.*/ - }; + struct rte_ether_addr dst_addr; /**< Destination address. */ + struct rte_ether_addr src_addr; /**< Source address. */ rte_be16_t ether_type; /**< Frame type. */ } __rte_aligned(2); -#pragma pop_macro("s_addr") - /** * Ethernet VLAN Header. * Contains the 16-bit VLAN Tag Control Identifier and the Ethernet type diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c index 98f3438774..8c010763c7 100644 --- a/lib/pipeline/rte_table_action.c +++ b/lib/pipeline/rte_table_action.c @@ -615,8 +615,8 @@ encap_ether_apply(void *data, RTE_ETHER_TYPE_IPV6; /* Ethernet */ - rte_ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->ether.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->ether.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->ether.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(ethertype); return 0; @@ -633,8 +633,8 @@ encap_vlan_apply(void *data, RTE_ETHER_TYPE_IPV6; /* Ethernet */ - rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->vlan.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->vlan.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* VLAN */ @@ -657,8 +657,8 @@ encap_qinq_apply(void *data, RTE_ETHER_TYPE_IPV6; /* Ethernet */ - rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_QINQ); /* SVLAN */ @@ -683,8 +683,8 @@ encap_qinq_pppoe_apply(void *data, struct encap_qinq_pppoe_data *d = data; /* Ethernet */ - rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->qinq.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* SVLAN */ @@ -719,8 +719,8 @@ encap_mpls_apply(void *data, uint32_t i; /* Ethernet */ - rte_ether_addr_copy(&p->mpls.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->mpls.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->mpls.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->mpls.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(ethertype); /* MPLS */ @@ -746,8 +746,8 @@ encap_pppoe_apply(void *data, struct encap_pppoe_data *d = data; /* Ethernet */ - rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr); - rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr); + rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.dst_addr); + rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION); /* PPPoE and PPP*/ @@ -777,9 +777,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* VLAN */ @@ -818,9 +818,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV4); /* IPv4*/ @@ -855,9 +855,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_VLAN); /* VLAN */ @@ -896,9 +896,9 @@ encap_vxlan_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->vxlan.ether.da, - &d->ether.d_addr); + &d->ether.dst_addr); rte_ether_addr_copy(&p->vxlan.ether.sa, - &d->ether.s_addr); + &d->ether.src_addr); d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IPV6); /* IPv6*/