diff options
| author |   Damjan Marion <damarion@cisco.com> | 2022-01-11 23:21:08 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2022-01-12 19:52:05 +0100 |
| commit | 6c75cd2242c26819b6456578497db3e3eccf7ef6 (patch) | |
| tree | f4c3ae7870096e9bc4d62556216bee0e8b7af714 /src/plugins/dpdk/cryptodev | |
| parent | 65105c95fe039d5fb1d3baec0affe1cd7be32505 (diff) | |
dpdk: bump to DPDK v21.11
Type: feature
This patch bumps dpdk version from 21.08 to 21.11
Change-Id: Id37fdba75f1ea4f4eac3c92226f3b1c539e1daca
Signed-off-by: Dastin Wilski <dastin.wilski@gmail.com>
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/dpdk/cryptodev')
| -rw-r--r-- | src/plugins/dpdk/cryptodev/cryptodev.c | 11 | ||||
| -rw-r--r-- | src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c | 1 | ||||
| -rw-r--r-- | src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/dpdk/cryptodev/cryptodev.c b/src/plugins/dpdk/cryptodev/cryptodev.c index ab07e60519a..f9e986f9867 100644 --- a/src/plugins/dpdk/cryptodev/cryptodev.c +++ b/src/plugins/dpdk/cryptodev/cryptodev.c @@ -29,7 +29,6 @@ #include <rte_cryptodev.h> #include <rte_crypto_sym.h> #include <rte_crypto.h> -#include <rte_cryptodev_pmd.h> #include <rte_config.h> #include "cryptodev.h" @@ -380,6 +379,7 @@ cryptodev_session_create (vlib_main_t *vm, vnet_crypto_key_index_t idx, struct rte_crypto_sym_xform xforms_enc[2] = { { 0 } }; struct rte_crypto_sym_xform xforms_dec[2] = { { 0 } }; struct rte_cryptodev_sym_session *sessions[CRYPTODEV_N_OP_TYPES] = { 0 }; + struct rte_cryptodev_info dev_info; u32 numa_node = vm->numa_node; clib_error_t *error; int ret = 0; @@ -447,8 +447,8 @@ cryptodev_session_create (vlib_main_t *vm, vnet_crypto_key_index_t idx, vec_foreach (dev_inst, cmt->cryptodev_inst) { u32 dev_id = dev_inst->dev_id; - struct rte_cryptodev *cdev = rte_cryptodev_pmd_get_dev (dev_id); - u32 driver_id = cdev->driver_id; + rte_cryptodev_info_get (dev_id, &dev_info); + u32 driver_id = dev_info.driver_id; /* if the session is already configured for the driver type, avoid configuring it again to increase the session data's refcnt */ @@ -1117,6 +1117,7 @@ dpdk_cryptodev_init (vlib_main_t * vm) cryptodev_engine_thread_t *cet; cryptodev_numa_data_t *numa_data; cryptodev_inst_t *dev_inst; + struct rte_cryptodev_info dev_info; u32 node; u8 nodes = 0; u32 skip_master = vlib_num_workers () > 0; @@ -1150,8 +1151,8 @@ dpdk_cryptodev_init (vlib_main_t * vm) vec_foreach (dev_inst, cmt->cryptodev_inst) { u32 dev_id = dev_inst->dev_id; - struct rte_cryptodev *cdev = rte_cryptodev_pmd_get_dev (dev_id); - u32 driver_id = cdev->driver_id; + rte_cryptodev_info_get (dev_id, &dev_info); + u32 driver_id = dev_info.driver_id; is_drv_unique (driver_id, &unique_drivers); u32 sess_sz = diff --git a/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c b/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c index 9b5746723a9..47cc15aaaff 100644 --- a/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c +++ b/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c @@ -27,7 +27,6 @@ #include <rte_cryptodev.h> #include <rte_crypto_sym.h> #include <rte_crypto.h> -#include <rte_cryptodev_pmd.h> #include <rte_ring_peek_zc.h> #include <rte_config.h> diff --git a/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c b/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c index 6793b9a589f..a7743133247 100644 --- a/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c +++ b/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c @@ -29,7 +29,7 @@ #include <rte_cryptodev.h> #include <rte_crypto_sym.h> #include <rte_crypto.h> -#include <rte_cryptodev_pmd.h> +#include <rte_malloc.h> #include <rte_config.h> #include "cryptodev.h" |