Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102096 _apply patch failure_ Submitter: Akhil Goyal Date: Monday, October 18 2021 21:34:52 Applied on: CommitID:9942ebb9c698a53b86e2bbd450f3e24238771fe5 Apply patch set 102096-102103 failed: Checking patch app/test-crypto-perf/cperf_ops.c... Hunk #1 succeeded at 49 (offset -18 lines). Hunk #2 succeeded at 56 (offset -18 lines). error: while searching for: static struct rte_cryptodev_sym_session * create_ipsec_session(struct rte_mempool *sess_mp, struct rte_mempool *priv_mp, uint8_t dev_id, const struct cperf_options *options, const struct cperf_test_vector *test_vector, error: patch failed: app/test-crypto-perf/cperf_ops.c:608 error: while searching for: /* Create security session */ return (void *)rte_security_session_create(ctx, &sess_conf, sess_mp, priv_mp); } static struct rte_cryptodev_sym_session * error: patch failed: app/test-crypto-perf/cperf_ops.c:720 error: while searching for: /* Create security session */ return (void *)rte_security_session_create(ctx, &sess_conf, sess_mp, priv_mp); } if (options->op_type == CPERF_IPSEC) { return create_ipsec_session(sess_mp, priv_mp, dev_id, options, test_vector, iv_offset); } error: patch failed: app/test-crypto-perf/cperf_ops.c:831 Hunk #6 succeeded at 714 (offset -163 lines). Checking patch app/test-crypto-perf/cperf_test_pmd_cyclecount.c... Checking patch app/test/test_cryptodev.c... Hunk #2 succeeded at 8278 (offset -125 lines). Hunk #3 succeeded at 8538 (offset -136 lines). Hunk #4 succeeded at 9022 (offset -151 lines). Hunk #5 succeeded at 9619 (offset 25 lines). Hunk #6 succeeded at 9443 (offset -326 lines). Checking patch app/test/test_ipsec.c... Checking patch app/test/test_security.c... Checking patch drivers/crypto/caam_jr/caam_jr.c... Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c... Checking patch drivers/crypto/cnxk/cn10k_ipsec.c... Checking patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c... Checking patch drivers/crypto/cnxk/cn9k_ipsec.c... Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c... Hunk #1 succeeded at 1358 (offset 7 lines). Hunk #2 succeeded at 1531 (offset 7 lines). Hunk #3 succeeded at 1544 (offset 7 lines). Hunk #4 succeeded at 3393 (offset 7 lines). Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c... error: drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c: does not exist in index Checking patch drivers/crypto/dpaa_sec/dpaa_sec.c... Hunk #1 succeeded at 1793 (offset 3 lines). Hunk #2 succeeded at 2571 (offset 3 lines). Hunk #3 succeeded at 2580 (offset 3 lines). Hunk #4 succeeded at 3114 (offset 3 lines). Hunk #5 succeeded at 3133 (offset 3 lines). Checking patch drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c... error: drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/pmd_aesni_mb.c... error: drivers/crypto/ipsec_mb/pmd_aesni_mb.c: does not exist in index Checking patch drivers/crypto/mvsam/rte_mrvl_pmd.c... Checking patch drivers/crypto/mvsam/rte_mrvl_pmd_ops.c... Checking patch drivers/crypto/octeontx2/otx2_cryptodev_ops.c... Checking patch drivers/crypto/octeontx2/otx2_cryptodev_sec.c... Checking patch drivers/crypto/qat/qat_sym.c... Checking patch drivers/crypto/qat/qat_sym.h... Checking patch drivers/crypto/qat/qat_sym_session.c... Checking patch drivers/crypto/qat/qat_sym_session.h... Checking patch drivers/net/ixgbe/ixgbe_ipsec.c... Checking patch drivers/net/meson.build... Checking patch drivers/net/octeontx2/otx2_ethdev_sec.c... Checking patch drivers/net/octeontx2/otx2_ethdev_sec_tx.h... Checking patch drivers/net/txgbe/txgbe_ipsec.c... Checking patch examples/ipsec-secgw/ipsec.c... Checking patch lib/security/rte_security.c... Checking patch lib/security/rte_security.h... Hunk #1 succeeded at 485 (offset -24 lines). Hunk #2 succeeded at 504 (offset -24 lines). Hunk #3 succeeded at 522 (offset -24 lines). Hunk #4 succeeded at 553 (offset -24 lines). Hunk #5 succeeded at 599 (offset -24 lines). Hunk #6 succeeded at 617 (offset -24 lines). Hunk #7 succeeded at 673 (offset -24 lines). Hunk #8 succeeded at 690 (offset -24 lines). Hunk #9 succeeded at 752 (offset -24 lines). Checking patch lib/security/rte_security_driver.h... error: while searching for: * - Returns -EINVAL if session parameters are invalid. */ typedef int (*security_session_stats_get_t)(void *device, struct rte_security_session *sess, struct rte_security_stats *stats); __rte_internal int rte_security_dynfield_register(void); error: patch failed: lib/security/rte_security_driver.h:86 Hunk #5 succeeded at 93 (offset 1 line). Hunk #6 succeeded at 102 (offset 1 line). Applying patch app/test-crypto-perf/cperf_ops.c with 3 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. Hunk #6 applied cleanly. Applied patch app/test-crypto-perf/cperf_test_pmd_cyclecount.c cleanly. Applied patch app/test/test_cryptodev.c cleanly. Applied patch app/test/test_ipsec.c cleanly. Applied patch app/test/test_security.c cleanly. Applied patch drivers/crypto/caam_jr/caam_jr.c cleanly. Applied patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c cleanly. Applied patch drivers/crypto/cnxk/cn10k_ipsec.c cleanly. Applied patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c cleanly. Applied patch drivers/crypto/cnxk/cn9k_ipsec.c cleanly. Applied patch drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c cleanly. Applied patch drivers/crypto/dpaa_sec/dpaa_sec.c cleanly. Applied patch drivers/crypto/mvsam/rte_mrvl_pmd.c cleanly. Applied patch drivers/crypto/mvsam/rte_mrvl_pmd_ops.c cleanly. Applied patch drivers/crypto/octeontx2/otx2_cryptodev_ops.c cleanly. Applied patch drivers/crypto/octeontx2/otx2_cryptodev_sec.c cleanly. Applied patch drivers/crypto/qat/qat_sym.c cleanly. Applied patch drivers/crypto/qat/qat_sym.h cleanly. Applied patch drivers/crypto/qat/qat_sym_session.c cleanly. Applied patch drivers/crypto/qat/qat_sym_session.h cleanly. Applied patch drivers/net/ixgbe/ixgbe_ipsec.c cleanly. Applied patch drivers/net/meson.build cleanly. Applied patch drivers/net/octeontx2/otx2_ethdev_sec.c cleanly. Applied patch drivers/net/octeontx2/otx2_ethdev_sec_tx.h cleanly. Applied patch drivers/net/txgbe/txgbe_ipsec.c cleanly. Applied patch examples/ipsec-secgw/ipsec.c cleanly. Applied patch lib/security/rte_security.c cleanly. Applied patch lib/security/rte_security.h cleanly. Applying patch lib/security/rte_security_driver.h with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. Hunk #5 applied cleanly. Hunk #6 applied cleanly. diff a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c (rejected hunks) @@ -608,7 +606,6 @@ cperf_set_ops_aead(struct rte_crypto_op **ops, static struct rte_cryptodev_sym_session * create_ipsec_session(struct rte_mempool *sess_mp, - struct rte_mempool *priv_mp, uint8_t dev_id, const struct cperf_options *options, const struct cperf_test_vector *test_vector, @@ -720,7 +717,7 @@ create_ipsec_session(struct rte_mempool *sess_mp, /* Create security session */ return (void *)rte_security_session_create(ctx, - &sess_conf, sess_mp, priv_mp); + &sess_conf, sess_mp); } static struct rte_cryptodev_sym_session * @@ -831,11 +828,11 @@ cperf_create_session(struct rte_mempool *sess_mp, /* Create security session */ return (void *)rte_security_session_create(ctx, - &sess_conf, sess_mp, priv_mp); + &sess_conf, sess_mp); } if (options->op_type == CPERF_IPSEC) { - return create_ipsec_session(sess_mp, priv_mp, dev_id, + return create_ipsec_session(sess_mp, dev_id, options, test_vector, iv_offset); } diff a/lib/security/rte_security_driver.h b/lib/security/rte_security_driver.h (rejected hunks) @@ -86,8 +83,7 @@ typedef unsigned int (*security_session_get_size)(void *device); * - Returns -EINVAL if session parameters are invalid. */ typedef int (*security_session_stats_get_t)(void *device, - struct rte_security_session *sess, - struct rte_security_stats *stats); + void *sess, struct rte_security_stats *stats); __rte_internal int rte_security_dynfield_register(void); Checking patch doc/guides/prog_guide/rte_security.rst... Checking patch doc/guides/rel_notes/deprecation.rst... error: while searching for: session and the private data of session. An opaque pointer can be exposed directly to application which can be attached to the ``rte_crypto_op``. * security: Hide structure ``rte_security_session`` and expose an opaque pointer for the private data to the application which can be attached to the packet while enqueuing. * eventdev: The file ``rte_eventdev_pmd.h`` will be renamed to ``eventdev_driver.h`` to make the driver interface as internal and the structures ``rte_eventdev_data``, ``rte_eventdev`` and ``rte_eventdevs`` will be moved to a new file named error: patch failed: doc/guides/rel_notes/deprecation.rst:179 Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * cryptodev: The structure ``rte_crypto_sym_vec`` was updated to add ``dest_sgl`` to support out of place processing. * bbdev: Added device info related to data byte endianness processing. error: patch failed: doc/guides/rel_notes/release_21_11.rst:281 Checking patch lib/ipsec/rte_ipsec.h... Checking patch lib/ipsec/rte_ipsec_group.h... Checking patch lib/ipsec/ses.c... Checking patch lib/security/rte_security.h... error: lib/security/rte_security.h: does not match index Checking patch lib/security/rte_security_driver.h... error: lib/security/rte_security_driver.h: does not match index Applied patch doc/guides/prog_guide/rte_security.rst cleanly. Applying patch doc/guides/rel_notes/deprecation.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applied patch lib/ipsec/rte_ipsec.h cleanly. Applied patch lib/ipsec/rte_ipsec_group.h cleanly. Applied patch lib/ipsec/ses.c cleanly. diff a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst (rejected hunks) @@ -179,10 +179,6 @@ Deprecation Notices session and the private data of session. An opaque pointer can be exposed directly to application which can be attached to the ``rte_crypto_op``. -* security: Hide structure ``rte_security_session`` and expose an opaque - pointer for the private data to the application which can be attached - to the packet while enqueuing. - * eventdev: The file ``rte_eventdev_pmd.h`` will be renamed to ``eventdev_driver.h`` to make the driver interface as internal and the structures ``rte_eventdev_data``, ``rte_eventdev`` and ``rte_eventdevs`` will be moved to a new file named diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -281,6 +281,13 @@ API Changes * cryptodev: The structure ``rte_crypto_sym_vec`` was updated to add ``dest_sgl`` to support out of place processing. +* security: The structure ``rte_security_session`` was moved to rte_security_driver.h + and was hidden from the application. The APIs to create and destroy session were + updated to take a single mempool with element size enough to hold session data + and session private data. Inline APIs are created to get and set the session data. + All sample applications were updated to attach an opaque pointer for the session + to the ``rte_crypto_op`` while enqueuing. + * bbdev: Added device info related to data byte endianness processing. Checking patch drivers/net/cnxk/cn10k_ethdev_sec.c... Checking patch drivers/net/cnxk/cn9k_ethdev_sec.c... Checking patch drivers/net/cnxk/cnxk_ethdev.c... Checking patch drivers/net/cnxk/cnxk_ethdev.h... Checking patch drivers/net/cnxk/cnxk_ethdev_sec.c... Checking patch drivers/net/meson.build... error: drivers/net/meson.build: does not match index Applied patch drivers/net/cnxk/cn10k_ethdev_sec.c cleanly. Applied patch drivers/net/cnxk/cn9k_ethdev_sec.c cleanly. Applied patch drivers/net/cnxk/cnxk_ethdev.c cleanly. Applied patch drivers/net/cnxk/cnxk_ethdev.h cleanly. Applied patch drivers/net/cnxk/cnxk_ethdev_sec.c cleanly. Checking patch app/test/test_ipsec.c... error: app/test/test_ipsec.c: does not match index Checking patch app/test/test_security.c... error: app/test/test_security.c: does not match index Checking patch drivers/crypto/caam_jr/caam_jr.c... error: drivers/crypto/caam_jr/caam_jr.c: does not match index Checking patch drivers/crypto/cnxk/cn10k_ipsec.c... error: drivers/crypto/cnxk/cn10k_ipsec.c: does not match index Checking patch drivers/crypto/cnxk/cn9k_ipsec.c... error: drivers/crypto/cnxk/cn9k_ipsec.c: does not match index Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c... error: drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c: does not match index Checking patch drivers/crypto/dpaa_sec/dpaa_sec.c... error: drivers/crypto/dpaa_sec/dpaa_sec.c: does not match index Checking patch drivers/crypto/ipsec_mb/pmd_aesni_mb.c... error: drivers/crypto/ipsec_mb/pmd_aesni_mb.c: does not exist in index Checking patch drivers/crypto/octeontx2/otx2_cryptodev_sec.c... error: drivers/crypto/octeontx2/otx2_cryptodev_sec.c: does not match index Checking patch drivers/crypto/qat/qat_sym_session.c... error: drivers/crypto/qat/qat_sym_session.c: does not match index Checking patch drivers/crypto/qat/qat_sym_session.h... error: drivers/crypto/qat/qat_sym_session.h: does not match index Checking patch drivers/net/cnxk/cn10k_ethdev_sec.c... error: drivers/net/cnxk/cn10k_ethdev_sec.c: does not match index Checking patch drivers/net/cnxk/cn9k_ethdev_sec.c... error: drivers/net/cnxk/cn9k_ethdev_sec.c: does not match index Checking patch drivers/net/ixgbe/ixgbe_ipsec.c... error: drivers/net/ixgbe/ixgbe_ipsec.c: does not match index Checking patch drivers/net/octeontx2/otx2_ethdev_sec.c... error: drivers/net/octeontx2/otx2_ethdev_sec.c: does not match index Checking patch drivers/net/txgbe/txgbe_ipsec.c... error: drivers/net/txgbe/txgbe_ipsec.c: does not match index Checking patch lib/security/rte_security.c... error: lib/security/rte_security.c: does not match index Checking patch lib/security/rte_security_driver.h... error: lib/security/rte_security_driver.h: does not match index Checking patch drivers/crypto/caam_jr/caam_jr.c... error: drivers/crypto/caam_jr/caam_jr.c: does not match index Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c... error: drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c: does not match index Checking patch drivers/crypto/dpaa_sec/dpaa_sec.c... error: drivers/crypto/dpaa_sec/dpaa_sec.c: does not match index Checking patch drivers/crypto/ipsec_mb/pmd_aesni_mb.c... error: drivers/crypto/ipsec_mb/pmd_aesni_mb.c: does not exist in index Checking patch drivers/crypto/mvsam/rte_mrvl_pmd_ops.c... error: drivers/crypto/mvsam/rte_mrvl_pmd_ops.c: does not match index Checking patch drivers/crypto/qat/qat_sym_pmd.c... Checking patch drivers/crypto/qat/qat_sym_session.c... error: drivers/crypto/qat/qat_sym_session.c: does not match index Checking patch drivers/crypto/qat/qat_sym_session.h... error: drivers/crypto/qat/qat_sym_session.h: does not match index Applied patch drivers/crypto/qat/qat_sym_pmd.c cleanly. .git/rebase-apply/patch:1641: trailing whitespace. void *sess) Checking patch app/test-crypto-perf/cperf.h... Checking patch app/test-crypto-perf/cperf_ops.c... error: app/test-crypto-perf/cperf_ops.c: does not match index Checking patch app/test-crypto-perf/cperf_ops.h... error: while searching for: #include "cperf_test_vectors.h" typedef struct rte_cryptodev_sym_session *(*cperf_sessions_create_t)( struct rte_mempool *sess_mp, struct rte_mempool *sess_priv_mp, uint8_t dev_id, const struct cperf_options *options, const struct cperf_test_vector *test_vector, uint16_t iv_offset); typedef int (*cperf_populate_ops_t)(struct rte_crypto_op **ops, uint32_t src_buf_offset, uint32_t dst_buf_offset, uint16_t nb_ops, struct rte_cryptodev_sym_session *sess, const struct cperf_options *options, const struct cperf_test_vector *test_vector, uint16_t iv_offset, uint32_t *imix_idx, error: patch failed: app/test-crypto-perf/cperf_ops.h:12 Checking patch app/test-crypto-perf/cperf_test_latency.c... Checking patch app/test-crypto-perf/cperf_test_latency.h... Checking patch app/test-crypto-perf/cperf_test_pmd_cyclecount.c... error: app/test-crypto-perf/cperf_test_pmd_cyclecount.c: does not match index Checking patch app/test-crypto-perf/cperf_test_pmd_cyclecount.h... Checking patch app/test-crypto-perf/cperf_test_throughput.c... Hunk #2 succeeded at 64 (offset -1 lines). Hunk #3 succeeded at 86 (offset -1 lines). Checking patch app/test-crypto-perf/cperf_test_throughput.h... Checking patch app/test-crypto-perf/cperf_test_verify.c... Checking patch app/test-crypto-perf/cperf_test_verify.h... Checking patch app/test-crypto-perf/main.c... Hunk #1 succeeded at 118 (offset -1 lines). Hunk #2 succeeded at 323 (offset -1 lines). Hunk #3 succeeded at 680 (offset -1 lines). Checking patch app/test/test_cryptodev.c... error: app/test/test_cryptodev.c: does not match index Checking patch app/test/test_cryptodev.h... Hunk #1 succeeded at 89 (offset -1 lines). Checking patch app/test/test_cryptodev_asym.c... Checking patch app/test/test_cryptodev_blockcipher.c... Checking patch app/test/test_event_crypto_adapter.c... Checking patch app/test/test_ipsec.c... error: app/test/test_ipsec.c: does not match index Checking patch drivers/crypto/armv8/armv8_pmd_private.h... Checking patch drivers/crypto/armv8/rte_armv8_pmd.c... Checking patch drivers/crypto/armv8/rte_armv8_pmd_ops.c... Checking patch drivers/crypto/bcmfs/bcmfs_sym_session.c... Checking patch drivers/crypto/bcmfs/bcmfs_sym_session.h... Checking patch drivers/crypto/caam_jr/caam_jr.c... error: drivers/crypto/caam_jr/caam_jr.c: does not match index Checking patch drivers/crypto/ccp/ccp_pmd_ops.c... Checking patch drivers/crypto/ccp/ccp_pmd_private.h... Checking patch drivers/crypto/ccp/rte_ccp_pmd.c... Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c... error: drivers/crypto/cnxk/cn10k_cryptodev_ops.c: does not match index Checking patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c... error: drivers/crypto/cnxk/cn9k_cryptodev_ops.c: does not match index Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.c... Hunk #1 succeeded at 379 (offset -3 lines). Hunk #2 succeeded at 492 (offset -3 lines). Hunk #3 succeeded at 539 (offset -3 lines). Hunk #4 succeeded at 549 (offset -3 lines). Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h... Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c... error: drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c: does not match index Checking patch drivers/crypto/dpaa_sec/dpaa_sec.c... error: drivers/crypto/dpaa_sec/dpaa_sec.c: does not match index Checking patch drivers/crypto/ipsec_mb/ipsec_mb_ops.c... error: drivers/crypto/ipsec_mb/ipsec_mb_ops.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/ipsec_mb_private.h... error: drivers/crypto/ipsec_mb/ipsec_mb_private.h: does not exist in index Checking patch drivers/crypto/ipsec_mb/pmd_aesni_gcm.c... error: drivers/crypto/ipsec_mb/pmd_aesni_gcm.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/pmd_aesni_mb.c... error: drivers/crypto/ipsec_mb/pmd_aesni_mb.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/pmd_chacha_poly.c... error: drivers/crypto/ipsec_mb/pmd_chacha_poly.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/pmd_kasumi.c... error: drivers/crypto/ipsec_mb/pmd_kasumi.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/pmd_snow3g.c... error: drivers/crypto/ipsec_mb/pmd_snow3g.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/pmd_zuc.c... error: drivers/crypto/ipsec_mb/pmd_zuc.c: does not exist in index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... Checking patch drivers/crypto/mvsam/mrvl_pmd_private.h... Checking patch drivers/crypto/mvsam/rte_mrvl_pmd_ops.c... error: drivers/crypto/mvsam/rte_mrvl_pmd_ops.c: does not match index Checking patch drivers/crypto/nitrox/nitrox_sym.c... Checking patch drivers/crypto/null/null_crypto_pmd.c... Checking patch drivers/crypto/null/null_crypto_pmd_ops.c... Checking patch drivers/crypto/null/null_crypto_pmd_private.h... Checking patch drivers/crypto/octeontx/otx_cryptodev_hw_access.h... Checking patch drivers/crypto/octeontx/otx_cryptodev_ops.c... Checking patch drivers/crypto/octeontx2/otx2_cryptodev_ops.c... error: drivers/crypto/octeontx2/otx2_cryptodev_ops.c: does not match index Checking patch drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h... Checking patch drivers/crypto/octeontx2/otx2_cryptodev_qp.h... Checking patch drivers/crypto/openssl/openssl_pmd_private.h... Checking patch drivers/crypto/openssl/rte_openssl_pmd.c... Checking patch drivers/crypto/openssl/rte_openssl_pmd_ops.c... Checking patch drivers/crypto/qat/qat_sym_session.c... error: drivers/crypto/qat/qat_sym_session.c: does not match index Checking patch drivers/crypto/qat/qat_sym_session.h... error: drivers/crypto/qat/qat_sym_session.h: does not match index Checking patch drivers/crypto/scheduler/scheduler_pmd_ops.c... Checking patch drivers/crypto/virtio/virtio_cryptodev.c... Hunk #2 succeeded at 926 (offset -2 lines). Hunk #3 succeeded at 1289 (offset -2 lines). Hunk #4 succeeded at 1306 (offset -2 lines). Hunk #5 succeeded at 1320 (offset -2 lines). Hunk #6 succeeded at 1389 (offset -2 lines). Checking patch drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h... Checking patch examples/fips_validation/fips_dev_self_test.c... Checking patch examples/fips_validation/main.c... Checking patch examples/ipsec-secgw/ipsec-secgw.c... Hunk #1 succeeded at 1216 (offset 10 lines). Hunk #2 succeeded at 2138 (offset 10 lines). Hunk #3 succeeded at 2399 (offset 10 lines). Hunk #4 succeeded at 2900 (offset 10 lines). Checking patch examples/ipsec-secgw/ipsec.c... error: examples/ipsec-secgw/ipsec.c: does not match index Checking patch examples/ipsec-secgw/ipsec.h... Checking patch examples/ipsec-secgw/ipsec_worker.c... Checking patch examples/l2fwd-crypto/main.c... Checking patch examples/vhost_crypto/main.c... Checking patch lib/cryptodev/cryptodev_pmd.h... Hunk #1 succeeded at 260 (offset -41 lines). Hunk #2 succeeded at 251 (offset -58 lines). Hunk #3 succeeded at 276 (offset -59 lines). Checking patch lib/cryptodev/rte_crypto.h... Checking patch lib/cryptodev/rte_crypto_sym.h... Hunk #1 succeeded at 932 (offset 8 lines). Checking patch lib/cryptodev/rte_cryptodev.c... Hunk #1 succeeded at 198 (offset -3 lines). Hunk #2 succeeded at 1224 (offset 4 lines). Hunk #3 succeeded at 1238 (offset 4 lines). Hunk #4 succeeded at 1704 (offset 4 lines). Hunk #5 succeeded at 1721 (offset 4 lines). Hunk #6 succeeded at 1734 (offset 4 lines). Hunk #7 succeeded at 1747 (offset 4 lines). Hunk #8 succeeded at 1792 (offset 4 lines). Hunk #9 succeeded at 1816 (offset 4 lines). Hunk #10 succeeded at 1844 (offset 4 lines). Hunk #11 succeeded at 1878 (offset 4 lines). Hunk #12 succeeded at 1899 (offset 4 lines). Hunk #13 succeeded at 1909 (offset 4 lines). Hunk #14 succeeded at 1947 (offset 4 lines). Hunk #15 succeeded at 1971 (offset 4 lines). Hunk #16 succeeded at 2002 (offset 4 lines). Checking patch lib/cryptodev/rte_cryptodev.h... Hunk #2 succeeded at 1126 (offset 218 lines). Hunk #3 succeeded at 1179 (offset 218 lines). Hunk #4 succeeded at 1211 (offset 218 lines). Hunk #5 succeeded at 1231 (offset 218 lines). Hunk #6 succeeded at 1286 (offset 218 lines). Checking patch lib/cryptodev/rte_cryptodev_trace.h... Checking patch lib/pipeline/rte_table_action.c... Checking patch lib/pipeline/rte_table_action.h... Checking patch lib/vhost/rte_vhost_crypto.h... Checking patch lib/vhost/vhost_crypto.c... Applied patch app/test-crypto-perf/cperf.h cleanly. Applying patch app/test-crypto-perf/cperf_ops.h with 1 reject... Rejected hunk #1. Applied patch app/test-crypto-perf/cperf_test_latency.c cleanly. Applied patch app/test-crypto-perf/cperf_test_latency.h cleanly. Applied patch app/test-crypto-perf/cperf_test_pmd_cyclecount.h cleanly. Applied patch app/test-crypto-perf/cperf_test_throughput.c cleanly. Applied patch app/test-crypto-perf/cperf_test_throughput.h cleanly. Applied patch app/test-crypto-perf/cperf_test_verify.c cleanly. Applied patch app/test-crypto-perf/cperf_test_verify.h cleanly. Applied patch app/test-crypto-perf/main.c cleanly. Applied patch app/test/test_cryptodev.h cleanly. Applied patch app/test/test_cryptodev_asym.c cleanly. Applied patch app/test/test_cryptodev_blockcipher.c cleanly. Applied patch app/test/test_event_crypto_adapter.c cleanly. Applied patch drivers/crypto/armv8/armv8_pmd_private.h cleanly. Applied patch drivers/crypto/armv8/rte_armv8_pmd.c cleanly. Applied patch drivers/crypto/armv8/rte_armv8_pmd_ops.c cleanly. Applied patch drivers/crypto/bcmfs/bcmfs_sym_session.c cleanly. Applied patch drivers/crypto/bcmfs/bcmfs_sym_session.h cleanly. Applied patch drivers/crypto/ccp/ccp_pmd_ops.c cleanly. Applied patch drivers/crypto/ccp/ccp_pmd_private.h cleanly. Applied patch drivers/crypto/ccp/rte_ccp_pmd.c cleanly. Applied patch drivers/crypto/cnxk/cnxk_cryptodev_ops.c cleanly. Applied patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h cleanly. Applied patch drivers/crypto/mlx5/mlx5_crypto.c cleanly. Applied patch drivers/crypto/mvsam/mrvl_pmd_private.h cleanly. Applied patch drivers/crypto/nitrox/nitrox_sym.c cleanly. Applied patch drivers/crypto/null/null_crypto_pmd.c cleanly. Applied patch drivers/crypto/null/null_crypto_pmd_ops.c cleanly. Applied patch drivers/crypto/null/null_crypto_pmd_private.h cleanly. Applied patch drivers/crypto/octeontx/otx_cryptodev_hw_access.h cleanly. Applied patch drivers/crypto/octeontx/otx_cryptodev_ops.c cleanly. Applied patch drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h cleanly. Applied patch drivers/crypto/octeontx2/otx2_cryptodev_qp.h cleanly. Applied patch drivers/crypto/openssl/openssl_pmd_private.h cleanly. Applied patch drivers/crypto/openssl/rte_openssl_pmd.c cleanly. Applied patch drivers/crypto/openssl/rte_openssl_pmd_ops.c cleanly. Applied patch drivers/crypto/scheduler/scheduler_pmd_ops.c cleanly. Applied patch drivers/crypto/virtio/virtio_cryptodev.c cleanly. Applied patch drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h cleanly. Applied patch examples/fips_validation/fips_dev_self_test.c cleanly. Applied patch examples/fips_validation/main.c cleanly. Applied patch examples/ipsec-secgw/ipsec-secgw.c cleanly. Applied patch examples/ipsec-secgw/ipsec.h cleanly. Applied patch examples/ipsec-secgw/ipsec_worker.c cleanly. Applied patch examples/l2fwd-crypto/main.c cleanly. Applied patch examples/vhost_crypto/main.c cleanly. Applied patch lib/cryptodev/cryptodev_pmd.h cleanly. Applied patch lib/cryptodev/rte_crypto.h cleanly. Applied patch lib/cryptodev/rte_crypto_sym.h cleanly. Applied patch lib/cryptodev/rte_cryptodev.c cleanly. Applied patch lib/cryptodev/rte_cryptodev.h cleanly. Applied patch lib/cryptodev/rte_cryptodev_trace.h cleanly. Applied patch lib/pipeline/rte_table_action.c cleanly. Applied patch lib/pipeline/rte_table_action.h cleanly. Applied patch lib/vhost/rte_vhost_crypto.h cleanly. Applied patch lib/vhost/vhost_crypto.c cleanly. diff a/app/test-crypto-perf/cperf_ops.h b/app/test-crypto-perf/cperf_ops.h (rejected hunks) @@ -12,15 +12,15 @@ #include "cperf_test_vectors.h" -typedef struct rte_cryptodev_sym_session *(*cperf_sessions_create_t)( - struct rte_mempool *sess_mp, struct rte_mempool *sess_priv_mp, +typedef void *(*cperf_sessions_create_t)( + struct rte_mempool *sess_mp, uint8_t dev_id, const struct cperf_options *options, const struct cperf_test_vector *test_vector, uint16_t iv_offset); typedef int (*cperf_populate_ops_t)(struct rte_crypto_op **ops, uint32_t src_buf_offset, uint32_t dst_buf_offset, - uint16_t nb_ops, struct rte_cryptodev_sym_session *sess, + uint16_t nb_ops, void *sess, const struct cperf_options *options, const struct cperf_test_vector *test_vector, uint16_t iv_offset, uint32_t *imix_idx, Checking patch app/test/test_ipsec_perf.c... Checking patch doc/guides/prog_guide/cryptodev_lib.rst... Checking patch doc/guides/rel_notes/deprecation.rst... error: while searching for: and ``rte_vhost_driver_set_protocol_features`` functions will be removed and the API functions will be made stable in DPDK 21.11. * cryptodev: Hide structures ``rte_cryptodev_sym_session`` and ``rte_cryptodev_asym_session`` to remove unnecessary indirection between session and the private data of session. An opaque pointer can be exposed directly to application which can be attached to the ``rte_crypto_op``. * eventdev: The file ``rte_eventdev_pmd.h`` will be renamed to ``eventdev_driver.h`` to make the driver interface as internal and the structures ``rte_eventdev_data``, ``rte_eventdev`` and ``rte_eventdevs`` will be moved to a new file named error: patch failed: doc/guides/rel_notes/deprecation.rst:174 Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: * cryptodev: The structure ``rte_crypto_sym_vec`` was updated to add ``dest_sgl`` to support out of place processing. * security: The structure ``rte_security_session`` was moved to rte_security_driver.h and was hidden from the application. The APIs to create and destroy session were updated to take a single mempool with element size enough to hold session data error: patch failed: doc/guides/rel_notes/release_21_11.rst:281 Checking patch lib/cryptodev/cryptodev_pmd.h... error: lib/cryptodev/cryptodev_pmd.h: does not match index Checking patch lib/cryptodev/rte_cryptodev.c... error: lib/cryptodev/rte_cryptodev.c: does not match index Checking patch lib/cryptodev/rte_cryptodev.h... error: lib/cryptodev/rte_cryptodev.h: does not match index Checking patch lib/cryptodev/rte_cryptodev_trace.h... error: lib/cryptodev/rte_cryptodev_trace.h: does not match index Checking patch lib/ipsec/rte_ipsec.h... error: lib/ipsec/rte_ipsec.h: does not match index Checking patch lib/ipsec/rte_ipsec_group.h... error: lib/ipsec/rte_ipsec_group.h: does not match index Checking patch lib/ipsec/ses.c... error: lib/ipsec/ses.c: does not match index Applied patch app/test/test_ipsec_perf.c cleanly. Applied patch doc/guides/prog_guide/cryptodev_lib.rst cleanly. Applying patch doc/guides/rel_notes/deprecation.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. diff a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst (rejected hunks) @@ -174,11 +174,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: Hide structures ``rte_cryptodev_sym_session`` and - ``rte_cryptodev_asym_session`` to remove unnecessary indirection between - session and the private data of session. An opaque pointer can be exposed - directly to application which can be attached to the ``rte_crypto_op``. - * eventdev: The file ``rte_eventdev_pmd.h`` will be renamed to ``eventdev_driver.h`` to make the driver interface as internal and the structures ``rte_eventdev_data``, ``rte_eventdev`` and ``rte_eventdevs`` will be moved to a new file named diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -281,6 +281,13 @@ API Changes * cryptodev: The structure ``rte_crypto_sym_vec`` was updated to add ``dest_sgl`` to support out of place processing. +* cryptodev: The structure ``rte_cryptodev_sym_session`` was moved to + cryptodev_pmd.h and was hidden from the application. The APIs to create/init and + destroy sym crypto session were updated to take a single mempool with element size + enough to hold session data and session private data. Inline APIs was created to + get and set the session data. All sample applications were updated to attach an + opaque pointer for the session to the ``rte_crypto_op`` while enqueuing. + * security: The structure ``rte_security_session`` was moved to rte_security_driver.h and was hidden from the application. The APIs to create and destroy session were updated to take a single mempool with element size enough to hold session data Checking patch drivers/crypto/armv8/rte_armv8_pmd_ops.c... error: drivers/crypto/armv8/rte_armv8_pmd_ops.c: does not match index Checking patch drivers/crypto/bcmfs/bcmfs_sym_session.c... error: drivers/crypto/bcmfs/bcmfs_sym_session.c: does not match index Checking patch drivers/crypto/bcmfs/bcmfs_sym_session.h... error: drivers/crypto/bcmfs/bcmfs_sym_session.h: does not match index Checking patch drivers/crypto/caam_jr/caam_jr.c... error: drivers/crypto/caam_jr/caam_jr.c: does not match index Checking patch drivers/crypto/ccp/ccp_pmd_ops.c... error: drivers/crypto/ccp/ccp_pmd_ops.c: does not match index Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.c... error: drivers/crypto/cnxk/cnxk_cryptodev_ops.c: does not match index Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h... error: drivers/crypto/cnxk/cnxk_cryptodev_ops.h: does not match index Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c... error: drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c: does not match index Checking patch drivers/crypto/dpaa_sec/dpaa_sec.c... error: drivers/crypto/dpaa_sec/dpaa_sec.c: does not match index Checking patch drivers/crypto/ipsec_mb/ipsec_mb_ops.c... error: drivers/crypto/ipsec_mb/ipsec_mb_ops.c: does not exist in index Checking patch drivers/crypto/ipsec_mb/ipsec_mb_private.h... error: drivers/crypto/ipsec_mb/ipsec_mb_private.h: does not exist in index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.c: does not match index Checking patch drivers/crypto/mvsam/rte_mrvl_pmd_ops.c... error: drivers/crypto/mvsam/rte_mrvl_pmd_ops.c: does not match index Checking patch drivers/crypto/nitrox/nitrox_sym.c... error: drivers/crypto/nitrox/nitrox_sym.c: does not match index Checking patch drivers/crypto/null/null_crypto_pmd_ops.c... error: drivers/crypto/null/null_crypto_pmd_ops.c: does not match index Checking patch drivers/crypto/octeontx/otx_cryptodev_ops.c... error: drivers/crypto/octeontx/otx_cryptodev_ops.c: does not match index Checking patch drivers/crypto/octeontx2/otx2_cryptodev_ops.c... error: drivers/crypto/octeontx2/otx2_cryptodev_ops.c: does not match index Checking patch drivers/crypto/openssl/rte_openssl_pmd_ops.c... error: drivers/crypto/openssl/rte_openssl_pmd_ops.c: does not match index Checking patch drivers/crypto/qat/qat_sym_session.c... error: drivers/crypto/qat/qat_sym_session.c: does not match index Checking patch drivers/crypto/qat/qat_sym_session.h... error: drivers/crypto/qat/qat_sym_session.h: does not match index Checking patch drivers/crypto/scheduler/scheduler_pmd_ops.c... error: drivers/crypto/scheduler/scheduler_pmd_ops.c: does not match index Checking patch drivers/crypto/virtio/virtio_cryptodev.c... error: drivers/crypto/virtio/virtio_cryptodev.c: does not match index Checking patch lib/cryptodev/cryptodev_pmd.h... error: lib/cryptodev/cryptodev_pmd.h: does not match index Checking patch lib/cryptodev/rte_cryptodev.c... error: lib/cryptodev/rte_cryptodev.c: does not match index https://lab.dpdk.org/results/dashboard/patchsets/19520/ UNH-IOL DPDK Community Lab