diff options
| author |   Fan Zhang <roy.fan.zhang@intel.com> | 2020-12-01 15:10:43 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2020-12-11 23:34:48 +0000 |
| commit | f0419a0c85606d9c07da3a972adc9f5f7d53337b (patch) | |
| tree | b306293149707b99c573910181c69eacbb55d998 /src/plugins/dpdk/ipsec | |
| parent | 938af5e2710a789da2e7a5eb26ecdedcb68c508e (diff) | |
dpdk: bump to dpdk 20.11
Type: feature
This patch bumps DPDK to 20.11. In addtion a few changes are
made:
- Changed dynamic rx offload flag display.
- Updated deprecating options.
Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
Change-Id: I6e4399d551a7eb8e1a9fc9ef6e39e74266450ad4
Diffstat (limited to 'src/plugins/dpdk/ipsec')
| -rw-r--r-- | src/plugins/dpdk/ipsec/cli.c | 2 | ||||
| -rw-r--r-- | src/plugins/dpdk/ipsec/esp_decrypt.c | 3 | ||||
| -rw-r--r-- | src/plugins/dpdk/ipsec/esp_encrypt.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/dpdk/ipsec/cli.c b/src/plugins/dpdk/ipsec/cli.c index fb98d2789c6..8fdda020a77 100644 --- a/src/plugins/dpdk/ipsec/cli.c +++ b/src/plugins/dpdk/ipsec/cli.c @@ -592,7 +592,7 @@ format_dpdk_mempool (u8 * s, va_list * args) count, mp->size - count, mp->size); s = format (s, "%Uphys_addr %p, flags %08x, nb_mem_chunks %u\n", format_white_space, indent + 2, - mp->mz->phys_addr, mp->flags, mp->nb_mem_chunks); + mp->mz->iova, mp->flags, mp->nb_mem_chunks); s = format (s, "%Uelt_size %4u, header_size %3u, trailer_size %u\n", format_white_space, indent + 2, mp->elt_size, mp->header_size, mp->trailer_size); diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c index dcf7fda915c..4981de33457 100644 --- a/src/plugins/dpdk/ipsec/esp_decrypt.c +++ b/src/plugins/dpdk/ipsec/esp_decrypt.c @@ -308,8 +308,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm, cipher_len = payload_len; u8 *digest = vlib_buffer_get_tail (b0) - trunc_size; - u64 digest_paddr = - mb0->buf_physaddr + digest - ((u8 *) mb0->buf_addr); + u64 digest_paddr = mb0->buf_iova + digest - ((u8 *) mb0->buf_addr); if (!is_aead && cipher_alg->alg == RTE_CRYPTO_CIPHER_AES_CBC) clib_memcpy_fast (icb, iv, 16); diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c index 8becb820ff1..984bb64d1ef 100644 --- a/src/plugins/dpdk/ipsec/esp_encrypt.c +++ b/src/plugins/dpdk/ipsec/esp_encrypt.c @@ -514,8 +514,7 @@ dpdk_esp_encrypt_inline (vlib_main_t * vm, u32 *aad = NULL; u8 *digest = vlib_buffer_get_tail (b0) - trunc_size; - u64 digest_paddr = - mb0->buf_physaddr + digest - ((u8 *) mb0->buf_addr); + u64 digest_paddr = mb0->buf_iova + digest - ((u8 *) mb0->buf_addr); if (!is_aead && (cipher_alg->alg == RTE_CRYPTO_CIPHER_AES_CBC || cipher_alg->alg == RTE_CRYPTO_CIPHER_NULL)) |