mbox series

[pull-request] next-crypto 21.08 rc1

Message ID 20210707193058.1035564-1-gakhil@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [pull-request] next-crypto 21.08 rc1 |

Pull-request

http://dpdk.org/git/next/dpdk-next-crypto

Checks

Context Check Description
ci/Intel-compilation warning apply issues
ci/github-robot success github build: passed

Message

Akhil Goyal July 7, 2021, 7:30 p.m. UTC
  The following changes since commit 71f8bd4e60eacbaadfe568293620367bb7a0468f:

  net/tap: define offload capabilities constants (2021-07-02 19:03:03 +0200)

are available in the Git repository at:

  http://dpdk.org/git/next/dpdk-next-crypto 

for you to fetch changes up to 2d61d4b60f4ca2b6b2b1de210ec685e5a5bbcc55:

  crypto/octeontx2: clear session priv mem upon destroy (2021-07-08 00:58:39 +0530)

----------------------------------------------------------------
Aakash Sasidharan (2):
      common/cnxk: add CPT diagnostics
      common/cnxk: add CPT LF flush

Ankur Dwivedi (6):
      common/cnxk: add SE set key
      crypto/cnxk: add driver skeleton
      crypto/cnxk: add probe and remove
      crypto/cnxk: add device control ops
      crypto/cnxk: add queue pair ops
      crypto/cnxk: add symmetric capabilities

Anoob Joseph (15):
      common/cnxk: add CPT dev config routines
      common/cnxk: add idev CPT set - get
      common/cnxk: add lmtline init
      crypto/cnxk: add session ops framework
      crypto/cnxk: add enqueue burst
      crypto/cnxk: add dequeue burst
      crypto/cnxk: add cipher operation in session
      crypto/cnxk: add auth operation in session
      crypto/cnxk: add security capabilities
      crypto/cnxk: add asymmetric capabilities
      crypto/octeontx2: increase metabuf pool
      crypto/octeontx: increase metabuf pool
      common/cpt: add checks for offset overflow
      crypto/octeontx2: reset feature flags during config
      crypto/octeontx2: clear session priv mem upon destroy

Archana Muniganti (6):
      common/cnxk: add CPT LF config
      crypto/cnxk: add aead operation in session
      crypto/cnxk: add chained operation in session
      crypto/cnxk: add flexi cipher encryption
      crypto/cnxk: add flexi cipher decryption
      crypto/cnxk: add ZUC and SNOW3G encryption

Dana Vardi (3):
      crypto/mvsam: fix AES-GCM session params
      crypto/mvsam: fix memset of sess private data
      crypto/mvsam: fix input args parsing

Fan Zhang (1):
      doc: update dependencies for SW crypto PMDs

Feifei Wang (1):
      crypto/qat: fix uninitialized GCC compiler warning

Kai Ji (2):
      app/crypto-perf: fix out-of-place mempool alloc
      crypto/aesni_gcm: fix performance issue

Kiran Kumar Kokkilagadda (7):
      common/cnxk: add SE microcode defines
      common/cnxk: add AE microcode defines
      common/cnxk: add FPM tables
      common/cnxk: add EC grp static vectors
      crypto/cnxk: add asymmetric session
      crypto/cnxk: add asymmetric datapath
      test/crypto: add cnxk for asymmetric cases

Michael Shamis (2):
      crypto/mvsam: fix capabilities for crypto algorithms
      crypto/mvsam: update comments for qp mapping

Rebecca Troy (5):
      test/crypto: fix autotest function parameters
      test/crypto: rename slave to worker
      test/crypto: fix typo
      test/crypto: fix typo in ESN case
      test/crypto: use formal array size macro

Shijith Thotton (2):
      drivers: add octeontx crypto adapter framework
      drivers: add octeontx crypto adapter data path

Srujana Challa (4):
      common/cnxk: update Rx inline IPsec mbox format
      common/cnxk: add IE microcode defines
      common/cnxk: add IPsec common code
      crypto/cnxk: add security ctx skeleton

Tejasree Kondoj (7):
      crypto/cnxk: add ZUC and SNOW3G decryption
      crypto/cnxk: add KASUMI encryption
      crypto/cnxk: add KASUMI decryption
      crypto/cnxk: add digest support
      test/crypto: enable cnxk crypto PMDs
      crypto/cnxk: add security session ops
      crypto/cnxk: add IPsec datapath

Thierry Herbelot (1):
      test/crypto: fix usage of possibly null pointer

Vidya Sagar Velumuri (3):
      common/cnxk: add CPT HW defines
      common/cnxk: add mbox to configure RXC
      common/cnxk: add inline IPsec configuration mbox

 MAINTAINERS                                        |    9 +
 app/test-crypto-perf/cperf_test_common.c           |    2 +-
 app/test/meson.build                               |    2 +
 app/test/test_cryptodev.c                          |   71 +-
 app/test/test_cryptodev.h                          |    2 +
 app/test/test_cryptodev_aes_test_vectors.h         |    2 +-
 app/test/test_cryptodev_asym.c                     |   30 +
 doc/guides/cryptodevs/aesni_gcm.rst                |    3 +-
 doc/guides/cryptodevs/aesni_mb.rst                 |    3 +-
 doc/guides/cryptodevs/cnxk.rst                     |  239 ++
 doc/guides/cryptodevs/features/cn10k.ini           |   80 +
 doc/guides/cryptodevs/features/cn9k.ini            |   79 +
 doc/guides/cryptodevs/index.rst                    |    1 +
 doc/guides/cryptodevs/kasumi.rst                   |    3 +-
 doc/guides/cryptodevs/snow3g.rst                   |    3 +-
 doc/guides/cryptodevs/zuc.rst                      |    3 +-
 doc/guides/rel_notes/release_21_08.rst             |   12 +
 drivers/common/cnxk/cnxk_security.c                |  468 ++++
 drivers/common/cnxk/cnxk_security.h                |   49 +
 drivers/common/cnxk/hw/cpt.h                       |  291 +++
 drivers/common/cnxk/meson.build                    |   11 +-
 drivers/common/cnxk/roc_ae.c                       |  142 ++
 drivers/common/cnxk/roc_ae.h                       |   63 +
 drivers/common/cnxk/roc_ae_fpm_tables.c            | 1140 +++++++++
 drivers/common/cnxk/roc_ae_fpm_tables.h            |   13 +
 drivers/common/cnxk/roc_api.h                      |   16 +
 drivers/common/cnxk/roc_cpt.c                      |  828 ++++++
 drivers/common/cnxk/roc_cpt.h                      |  145 ++
 drivers/common/cnxk/roc_cpt_debug.c                |  167 ++
 drivers/common/cnxk/roc_cpt_priv.h                 |   41 +
 drivers/common/cnxk/roc_dev.c                      |    2 +
 drivers/common/cnxk/roc_dev_priv.h                 |    1 +
 drivers/common/cnxk/roc_idev.c                     |   21 +
 drivers/common/cnxk/roc_idev.h                     |    3 +
 drivers/common/cnxk/roc_idev_priv.h                |    2 +
 drivers/common/cnxk/roc_ie.h                       |   19 +
 drivers/common/cnxk/roc_ie_on.h                    |  152 ++
 drivers/common/cnxk/roc_ie_ot.h                    |  534 ++++
 drivers/common/cnxk/roc_mbox.h                     |    3 +
 drivers/common/cnxk/roc_platform.c                 |    1 +
 drivers/common/cnxk/roc_platform.h                 |    9 +
 drivers/common/cnxk/roc_priv.h                     |    3 +
 drivers/common/cnxk/roc_se.c                       |  342 +++
 drivers/common/cnxk/roc_se.h                       |  275 ++
 drivers/common/cnxk/version.map                    |   32 +
 drivers/common/cpt/cpt_common.h                    |    2 +-
 drivers/common/cpt/cpt_ucode.h                     |   59 +
 drivers/crypto/aesni_gcm/aesni_gcm_pmd.c           |   10 +-
 drivers/crypto/cnxk/cn10k_cryptodev.c              |  166 ++
 drivers/crypto/cnxk/cn10k_cryptodev.h              |   13 +
 drivers/crypto/cnxk/cn10k_cryptodev_ops.c          |  460 ++++
 drivers/crypto/cnxk/cn10k_cryptodev_ops.h          |   15 +
 drivers/crypto/cnxk/cn10k_ipsec.c                  |  275 ++
 drivers/crypto/cnxk/cn10k_ipsec.h                  |   36 +
 drivers/crypto/cnxk/cn10k_ipsec_la_ops.h           |   74 +
 drivers/crypto/cnxk/cn9k_cryptodev.c               |  152 ++
 drivers/crypto/cnxk/cn9k_cryptodev.h               |   13 +
 drivers/crypto/cnxk/cn9k_cryptodev_ops.c           |  344 +++
 drivers/crypto/cnxk/cn9k_cryptodev_ops.h           |   14 +
 drivers/crypto/cnxk/cnxk_ae.h                      |  836 ++++++
 drivers/crypto/cnxk/cnxk_cryptodev.c               |   33 +
 drivers/crypto/cnxk/cnxk_cryptodev.h               |   32 +
 drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c  |  869 +++++++
 drivers/crypto/cnxk/cnxk_cryptodev_capabilities.h  |   32 +
 drivers/crypto/cnxk/cnxk_cryptodev_ops.c           |  657 +++++
 drivers/crypto/cnxk/cnxk_cryptodev_ops.h           |  116 +
 drivers/crypto/cnxk/cnxk_cryptodev_sec.c           |   48 +
 drivers/crypto/cnxk/cnxk_cryptodev_sec.h           |   14 +
 drivers/crypto/cnxk/cnxk_ipsec.h                   |   20 +
 drivers/crypto/cnxk/cnxk_se.h                      | 2675 ++++++++++++++++++++
 drivers/crypto/cnxk/meson.build                    |   25 +
 drivers/crypto/cnxk/version.map                    |    3 +
 drivers/crypto/meson.build                         |    1 +
 drivers/crypto/mvsam/rte_mrvl_pmd.c                |   12 +-
 drivers/crypto/mvsam/rte_mrvl_pmd_ops.c            |   32 +-
 drivers/crypto/octeontx/meson.build                |    6 +
 drivers/crypto/octeontx/otx_cryptodev.c            |    4 +
 drivers/crypto/octeontx/otx_cryptodev.h            |    4 -
 drivers/crypto/octeontx/otx_cryptodev_hw_access.c  |    7 +-
 drivers/crypto/octeontx/otx_cryptodev_hw_access.h  |    1 +
 drivers/crypto/octeontx/otx_cryptodev_ops.c        |  268 +-
 drivers/crypto/octeontx/otx_cryptodev_ops.h        |    8 +
 drivers/crypto/octeontx/version.map                |    9 +
 drivers/crypto/octeontx2/otx2_cryptodev.c          |   30 +-
 drivers/crypto/octeontx2/otx2_cryptodev.h          |    1 +
 drivers/crypto/octeontx2/otx2_cryptodev_ops.c      |   12 +-
 drivers/crypto/octeontx2/otx2_cryptodev_sec.c      |    2 +
 drivers/crypto/qat/qat_sym_session.c               |    3 +
 drivers/event/octeontx/meson.build                 |    1 +
 drivers/event/octeontx/ssovf_evdev.c               |   68 +
 drivers/event/octeontx/ssovf_worker.c              |   11 +
 drivers/event/octeontx/ssovf_worker.h              |   25 +-
 .../event/octeontx2/otx2_evdev_crypto_adptr_rx.h   |    6 +-
 93 files changed, 12661 insertions(+), 160 deletions(-)
 create mode 100644 doc/guides/cryptodevs/cnxk.rst
 create mode 100644 doc/guides/cryptodevs/features/cn10k.ini
 create mode 100644 doc/guides/cryptodevs/features/cn9k.ini
 create mode 100644 drivers/common/cnxk/cnxk_security.c
 create mode 100644 drivers/common/cnxk/cnxk_security.h
 create mode 100644 drivers/common/cnxk/hw/cpt.h
 create mode 100644 drivers/common/cnxk/roc_ae.c
 create mode 100644 drivers/common/cnxk/roc_ae.h
 create mode 100644 drivers/common/cnxk/roc_ae_fpm_tables.c
 create mode 100644 drivers/common/cnxk/roc_ae_fpm_tables.h
 create mode 100644 drivers/common/cnxk/roc_cpt.c
 create mode 100644 drivers/common/cnxk/roc_cpt.h
 create mode 100644 drivers/common/cnxk/roc_cpt_debug.c
 create mode 100644 drivers/common/cnxk/roc_cpt_priv.h
 create mode 100644 drivers/common/cnxk/roc_ie.h
 create mode 100644 drivers/common/cnxk/roc_ie_on.h
 create mode 100644 drivers/common/cnxk/roc_ie_ot.h
 create mode 100644 drivers/common/cnxk/roc_se.c
 create mode 100644 drivers/common/cnxk/roc_se.h
 create mode 100644 drivers/crypto/cnxk/cn10k_cryptodev.c
 create mode 100644 drivers/crypto/cnxk/cn10k_cryptodev.h
 create mode 100644 drivers/crypto/cnxk/cn10k_cryptodev_ops.c
 create mode 100644 drivers/crypto/cnxk/cn10k_cryptodev_ops.h
 create mode 100644 drivers/crypto/cnxk/cn10k_ipsec.c
 create mode 100644 drivers/crypto/cnxk/cn10k_ipsec.h
 create mode 100644 drivers/crypto/cnxk/cn10k_ipsec_la_ops.h
 create mode 100644 drivers/crypto/cnxk/cn9k_cryptodev.c
 create mode 100644 drivers/crypto/cnxk/cn9k_cryptodev.h
 create mode 100644 drivers/crypto/cnxk/cn9k_cryptodev_ops.c
 create mode 100644 drivers/crypto/cnxk/cn9k_cryptodev_ops.h
 create mode 100644 drivers/crypto/cnxk/cnxk_ae.h
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev.c
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev.h
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev_capabilities.h
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev_ops.c
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev_ops.h
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev_sec.c
 create mode 100644 drivers/crypto/cnxk/cnxk_cryptodev_sec.h
 create mode 100644 drivers/crypto/cnxk/cnxk_ipsec.h
 create mode 100644 drivers/crypto/cnxk/cnxk_se.h
 create mode 100644 drivers/crypto/cnxk/meson.build
 create mode 100644 drivers/crypto/cnxk/version.map
  

Comments

Thomas Monjalon July 7, 2021, 9:57 p.m. UTC | #1
07/07/2021 21:30, Akhil Goyal:
> Shijith Thotton (2):
>       drivers: add octeontx crypto adapter framework
>       drivers: add octeontx crypto adapter data path

It seems there is an ABI breakage:

devtools/check-abi.sh: line 38: 958581 Segmentation fault
(core dumped) abidiff $ABIDIFF_OPTIONS $dump $dump2
Error: ABI issue reported for 'abidiff --suppr devtools/libabigail.abignore --no-added-syms --headers-dir1 v21.05/build-gcc-shared/usr/local/include --headers-dir2 build-gcc-shared/install/usr/local/include v21.05/build-gcc-shared/dump/librte_crypto_octeontx.dump build-gcc-shared/install/dump/librte_crypto_octeontx.dump'

Without this series, the ABI check is passing.
  
Akhil Goyal July 8, 2021, 7:39 a.m. UTC | #2
> 07/07/2021 21:30, Akhil Goyal:
> > Shijith Thotton (2):
> >       drivers: add octeontx crypto adapter framework
> >       drivers: add octeontx crypto adapter data path
> 
> It seems there is an ABI breakage:
> 
> devtools/check-abi.sh: line 38: 958581 Segmentation fault
> (core dumped) abidiff $ABIDIFF_OPTIONS $dump $dump2
> Error: ABI issue reported for 'abidiff --suppr devtools/libabigail.abignore --
> no-added-syms --headers-dir1 v21.05/build-gcc-shared/usr/local/include --
> headers-dir2 build-gcc-shared/install/usr/local/include v21.05/build-gcc-
> shared/dump/librte_crypto_octeontx.dump build-gcc-
> shared/install/dump/librte_crypto_octeontx.dump'
> 
> Without this series, the ABI check is passing.
> 

I do not see this error at my end + there is no such issue reported on CI.
On CI it failed only on FreeBSD, and that too was a false report.

Can you paste the output of
'abidiff --suppr devtools/libabigail.abignore --no-added-syms --headers-dir1 v21.05/build-gcc-shared/usr/local/include --headers-dir2 build-gcc-shared/install/usr/local/include v21.05/build-gcc-shared/dump/librte_crypto_octeontx.dump build-gcc-shared/install/dump/librte_crypto_octeontx.dump'

Regards,
Akhil
  
Thomas Monjalon July 8, 2021, 7:41 a.m. UTC | #3
07/07/2021 23:57, Thomas Monjalon:
> 07/07/2021 21:30, Akhil Goyal:
> > Shijith Thotton (2):
> >       drivers: add octeontx crypto adapter framework
> >       drivers: add octeontx crypto adapter data path
> 
> It seems there is an ABI breakage:
> 
> devtools/check-abi.sh: line 38: 958581 Segmentation fault
> (core dumped) abidiff $ABIDIFF_OPTIONS $dump $dump2
> Error: ABI issue reported for 'abidiff --suppr devtools/libabigail.abignore --no-added-syms --headers-dir1 v21.05/build-gcc-shared/usr/local/include --headers-dir2 build-gcc-shared/install/usr/local/include v21.05/build-gcc-shared/dump/librte_crypto_octeontx.dump build-gcc-shared/install/dump/librte_crypto_octeontx.dump'
> 
> Without this series, the ABI check is passing.

After updating libabigail, it passes OK.

Note there was another bug, in PPC toolchain this time.
After upgrading to recent PPC toolchain it is OK.

What a difficult pull request for the tools!
  
David Marchand July 8, 2021, 7:47 a.m. UTC | #4
On Thu, Jul 8, 2021 at 9:41 AM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> 07/07/2021 23:57, Thomas Monjalon:
> > 07/07/2021 21:30, Akhil Goyal:
> > > Shijith Thotton (2):
> > >       drivers: add octeontx crypto adapter framework
> > >       drivers: add octeontx crypto adapter data path
> >
> > It seems there is an ABI breakage:
> >
> > devtools/check-abi.sh: line 38: 958581 Segmentation fault
> > (core dumped) abidiff $ABIDIFF_OPTIONS $dump $dump2
> > Error: ABI issue reported for 'abidiff --suppr devtools/libabigail.abignore --no-added-syms --headers-dir1 v21.05/build-gcc-shared/usr/local/include --headers-dir2 build-gcc-shared/install/usr/local/include v21.05/build-gcc-shared/dump/librte_crypto_octeontx.dump build-gcc-shared/install/dump/librte_crypto_octeontx.dump'
> >
> > Without this series, the ABI check is passing.
>
> After updating libabigail, it passes OK.

And for the record...

- libabigail-1.8.1-1.fc32.x86_64 is fine,
- libabigail freshly compiled from current master is fine too


>
> Note there was another bug, in PPC toolchain this time.
> After upgrading to recent PPC toolchain it is OK.

- bootlin toolchain powerpc64le-power8--glibc--stable-2018.11-1 stalls
when compiling drivers/crypto/cnxk/cn9k_cryptodev_ops.c
- bootlin toolchain powerpc64le-power8--glibc--stable-2020.08-1 is fine

Plus, if someone wants to upgrade their ppc toolchain, don't forget to
regenerate your ABI reference with this toolchain.
  
Akhil Goyal July 8, 2021, 7:48 a.m. UTC | #5
> 07/07/2021 23:57, Thomas Monjalon:
> > 07/07/2021 21:30, Akhil Goyal:
> > > Shijith Thotton (2):
> > >       drivers: add octeontx crypto adapter framework
> > >       drivers: add octeontx crypto adapter data path
> >
> > It seems there is an ABI breakage:
> >
> > devtools/check-abi.sh: line 38: 958581 Segmentation fault
> > (core dumped) abidiff $ABIDIFF_OPTIONS $dump $dump2
> > Error: ABI issue reported for 'abidiff --suppr devtools/libabigail.abignore --
> no-added-syms --headers-dir1 v21.05/build-gcc-shared/usr/local/include --
> headers-dir2 build-gcc-shared/install/usr/local/include v21.05/build-gcc-
> shared/dump/librte_crypto_octeontx.dump build-gcc-
> shared/install/dump/librte_crypto_octeontx.dump'
> >
> > Without this series, the ABI check is passing.
> 
> After updating libabigail, it passes OK.
> 
> Note there was another bug, in PPC toolchain this time.
> After upgrading to recent PPC toolchain it is OK.
> 
> What a difficult pull request for the tools!
> 
Ok thanks for the update. Is there anything else in the pull request which I need to look into?

Regards,
Akhil
  
Ali Alnubani July 8, 2021, 5:13 p.m. UTC | #6
Hi,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Akhil Goyal
> Sent: Wednesday, July 7, 2021 10:31 PM
> To: NBU-Contact-Thomas Monjalon <thomas@monjalon.net>
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [pull-request] next-crypto 21.08 rc1
> 

<snip>

>       crypto/cnxk: add IPsec datapath

I don't have this patch in my inbox to reply to, but I think it's causing the following build failure in main (02edbfab1e):
"""
$ meson --werror -Dc_args='-DRTE_ENABLE_ASSERT' --buildtype=debug build && ninja -C build
...
../../root/dpdk/drivers/crypto/cnxk/cn10k_cryptodev_ops.c: In function 'cn10k_cpt_sec_post_process':
../../root/dpdk/drivers/crypto/cnxk/cn10k_cryptodev_ops.c:260:37: error: 'IPV6_VERSION' undeclared (first use in this function); did you mean 'IPVERSION'?
  260 |         RTE_IPV4_IHL_MULTIPLIER) == IPV6_VERSION);
"""

OS: Ubuntu 18.04.5
Meson: 0.58.1
Ninja: 1.8.2
Gcc: 7.5.0

Regards,
Ali
  
David Marchand July 8, 2021, 8:16 p.m. UTC | #7
On Thu, Jul 8, 2021 at 7:14 PM Ali Alnubani <alialnu@oss.nvidia.com> wrote:
> """
> $ meson --werror -Dc_args='-DRTE_ENABLE_ASSERT' --buildtype=debug build && ninja -C build
> ...
> ../../root/dpdk/drivers/crypto/cnxk/cn10k_cryptodev_ops.c: In function 'cn10k_cpt_sec_post_process':
> ../../root/dpdk/drivers/crypto/cnxk/cn10k_cryptodev_ops.c:260:37: error: 'IPV6_VERSION' undeclared (first use in this function); did you mean 'IPVERSION'?
>   260 |         RTE_IPV4_IHL_MULTIPLIER) == IPV6_VERSION);
> """

The simplest fix:

@@ -275,7 +275,7 @@ cn10k_cpt_sec_post_process(struct rte_crypto_op *cop,
                        m_len = rte_be_to_cpu_16(ip->total_length);
                } else {
                        PLT_ASSERT(((ip->version_ihl & 0xf0) >>
-                                   RTE_IPV4_IHL_MULTIPLIER) == IPV6_VERSION);
+                                   RTE_IPV4_IHL_MULTIPLIER) == 6);
                        ip6 = (struct rte_ipv6_hdr *)ip;
                        m_len = rte_be_to_cpu_16(ip6->payload_len) +
                                sizeof(struct rte_ipv6_hdr);
  
Anoob Joseph July 9, 2021, 4:24 a.m. UTC | #8
Hi Ali, David,

Thanks for pointing it out. The suggestion from David should do. Should we submit a patch with fix on master? How do you suggest we proceed?

Thanks,
Anoob

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of David Marchand
> Sent: Friday, July 9, 2021 1:46 AM
> To: Ali Alnubani <alialnu@oss.nvidia.com>; Tejasree Kondoj
> <ktejasree@marvell.com>
> Cc: Akhil Goyal <gakhil@marvell.com>; NBU-Contact-Thomas Monjalon
> <thomas@monjalon.net>; dev@dpdk.org
> Subject: [EXT] Re: [dpdk-dev] [pull-request] next-crypto 21.08 rc1
> 
> External Email
> 
> ----------------------------------------------------------------------
> On Thu, Jul 8, 2021 at 7:14 PM Ali Alnubani <alialnu@oss.nvidia.com> wrote:
> > """
> > $ meson --werror -Dc_args='-DRTE_ENABLE_ASSERT' --buildtype=debug
> > build && ninja -C build ...
> > ../../root/dpdk/drivers/crypto/cnxk/cn10k_cryptodev_ops.c: In function
> 'cn10k_cpt_sec_post_process':
> > ../../root/dpdk/drivers/crypto/cnxk/cn10k_cryptodev_ops.c:260:37: error:
> 'IPV6_VERSION' undeclared (first use in this function); did you mean
> 'IPVERSION'?
> >   260 |         RTE_IPV4_IHL_MULTIPLIER) == IPV6_VERSION);
> > """
> 
> The simplest fix:
> 
> @@ -275,7 +275,7 @@ cn10k_cpt_sec_post_process(struct rte_crypto_op
> *cop,
>                         m_len = rte_be_to_cpu_16(ip->total_length);
>                 } else {
>                         PLT_ASSERT(((ip->version_ihl & 0xf0) >>
> -                                   RTE_IPV4_IHL_MULTIPLIER) == IPV6_VERSION);
> +                                   RTE_IPV4_IHL_MULTIPLIER) == 6);
>                         ip6 = (struct rte_ipv6_hdr *)ip;
>                         m_len = rte_be_to_cpu_16(ip6->payload_len) +
>                                 sizeof(struct rte_ipv6_hdr);
> 
> 
> --
> David Marchand
  
David Marchand July 9, 2021, 6:43 a.m. UTC | #9
On Fri, Jul 9, 2021 at 6:25 AM Anoob Joseph <anoobj@marvell.com> wrote:
>
> Hi Ali, David,
>
> Thanks for pointing it out. The suggestion from David should do. Should we submit a patch with fix on master? How do you suggest we proceed?

Yes, please send a patch.

I'll take those three fixes directly in main.
Probably a bit later today.
  
Anoob Joseph July 9, 2021, 9 a.m. UTC | #10
Hi David,

Pushed patches for both issues.

http://patches.dpdk.org/project/dpdk/patch/1625812123-802-1-git-send-email-anoobj@marvell.com/
http://patches.dpdk.org/project/dpdk/patch/20210709094147.12710-1-ktejasree@marvell.com/

Thanks,
Anoob

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Friday, July 9, 2021 12:13 PM
> To: Anoob Joseph <anoobj@marvell.com>
> Cc: Ali Alnubani <alialnu@oss.nvidia.com>; Akhil Goyal
> <gakhil@marvell.com>; NBU-Contact-Thomas Monjalon
> <thomas@monjalon.net>; dev@dpdk.org; Tejasree Kondoj
> <ktejasree@marvell.com>
> Subject: Re: [EXT] Re: [dpdk-dev] [pull-request] next-crypto 21.08 rc1
> 
> On Fri, Jul 9, 2021 at 6:25 AM Anoob Joseph <anoobj@marvell.com> wrote:
> >
> > Hi Ali, David,
> >
> > Thanks for pointing it out. The suggestion from David should do. Should we
> submit a patch with fix on master? How do you suggest we proceed?
> 
> Yes, please send a patch.
> 
> I'll take those three fixes directly in main.
> Probably a bit later today.
> 
> 
> --
> David Marchand