Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/117247 _apply patch failure_ Submitter: Akhil Goyal Date: Sunday, October 02 2022 18:55:11 Applied on: CommitID:8ae946970ed36f6f8795ea056350a500007c91d8 Apply patch set 117247-117252 failed: Checking patch app/test-crypto-perf/cperf_ops.c... Checking patch app/test-crypto-perf/cperf_test_latency.c... Checking patch app/test-crypto-perf/cperf_test_pmd_cyclecount.c... Checking patch app/test-crypto-perf/cperf_test_throughput.c... Checking patch app/test-crypto-perf/cperf_test_verify.c... Checking patch app/test-crypto-perf/main.c... Checking patch app/test-eventdev/test_perf_common.c... Hunk #1 succeeded at 864 (offset 1 line). Hunk #2 succeeded at 1377 (offset 1 line). Hunk #3 succeeded at 1387 (offset 1 line). Hunk #4 succeeded at 1431 (offset 1 line). Hunk #5 succeeded at 1451 (offset 1 line). Hunk #6 succeeded at 1475 (offset 1 line). Hunk #7 succeeded at 1491 (offset 1 line). Checking patch app/test-eventdev/test_perf_common.h... Checking patch app/test/test_cryptodev.c... Checking patch app/test/test_cryptodev_blockcipher.c... Checking patch app/test/test_event_crypto_adapter.c... Hunk #7 succeeded at 1390 (offset -8 lines). Checking patch app/test/test_ipsec.c... 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... Checking patch drivers/crypto/ccp/ccp_crypto.c... 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... Hunk #1 succeeded at 22 (offset -19 lines). Hunk #2 succeeded at 110 (offset -19 lines). Hunk #3 succeeded at 126 (offset -19 lines). Hunk #4 succeeded at 293 (offset -16 lines). Hunk #5 succeeded at 332 (offset -16 lines). Hunk #6 succeeded at 540 (offset -275 lines). Hunk #7 succeeded at 616 (offset -275 lines). Checking patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c... Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.c... Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h... Hunk #1 succeeded at 78 (offset -7 lines). Hunk #2 succeeded at 102 (offset -7 lines). Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c... Checking patch drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c... Checking patch drivers/crypto/dpaa_sec/dpaa_sec.c... Checking patch drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c... Checking patch drivers/crypto/ipsec_mb/ipsec_mb_ops.c... Checking patch drivers/crypto/ipsec_mb/ipsec_mb_private.h... Checking patch drivers/crypto/ipsec_mb/pmd_aesni_gcm.c... Checking patch drivers/crypto/ipsec_mb/pmd_aesni_mb.c... Checking patch drivers/crypto/ipsec_mb/pmd_chacha_poly.c... Checking patch drivers/crypto/ipsec_mb/pmd_kasumi.c... Checking patch drivers/crypto/ipsec_mb/pmd_snow3g.c... Checking patch drivers/crypto/ipsec_mb/pmd_zuc.c... Checking patch drivers/crypto/mlx5/mlx5_crypto.c... Checking patch drivers/crypto/mvsam/rte_mrvl_pmd.c... Checking patch drivers/crypto/mvsam/rte_mrvl_pmd_ops.c... 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/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.c... Checking patch drivers/crypto/qat/qat_sym.h... Checking patch drivers/crypto/qat/qat_sym_session.c... Hunk #1 succeeded at 219 (offset -7 lines). Hunk #2 succeeded at 496 (offset -19 lines). Hunk #3 succeeded at 522 (offset -19 lines). Hunk #4 succeeded at 532 (offset -19 lines). Checking patch drivers/crypto/qat/qat_sym_session.h... Checking patch drivers/crypto/scheduler/scheduler_pmd_ops.c... Checking patch drivers/crypto/virtio/virtio_cryptodev.c... Checking patch drivers/crypto/virtio/virtio_rxtx.c... 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 #2 succeeded at 2521 (offset 22 lines). Checking patch examples/ipsec-secgw/ipsec.c... Checking patch examples/l2fwd-crypto/main.c... Checking patch examples/vhost_crypto/main.c... Checking patch lib/cryptodev/cryptodev_pmd.h... error: while searching for: void * rte_cryptodev_session_event_mdata_get(struct rte_crypto_op *op); static inline void * get_sym_session_private_data(const struct rte_cryptodev_sym_session *sess, uint8_t driver_id) { if (unlikely(sess->nb_drivers <= driver_id)) return NULL; return sess->sess_data[driver_id].data; } static inline void set_sym_session_private_data(struct rte_cryptodev_sym_session *sess, uint8_t driver_id, void *private_data) { if (unlikely(sess->nb_drivers <= driver_id)) { CDEV_LOG_ERR("Set private data for driver %u not allowed", driver_id); return; } sess->sess_data[driver_id].data = private_data; } /** * @internal * Cryptodev asymmetric crypto session. error: patch failed: lib/cryptodev/cryptodev_pmd.h:638 Checking patch lib/cryptodev/cryptodev_trace_points.c... Checking patch lib/cryptodev/rte_cryptodev.c... Hunk #1 succeeded at 199 (offset -4 lines). error: while searching for: return ret; } int rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, const struct rte_cryptodev_qp_conf *qp_conf, int socket_id) error: patch failed: lib/cryptodev/rte_cryptodev.c:1332 error: while searching for: return -EINVAL; } if ((qp_conf->mp_session && !qp_conf->mp_session_private) || (!qp_conf->mp_session && qp_conf->mp_session_private)) { CDEV_LOG_ERR("Invalid mempools"); return -EINVAL; } if (qp_conf->mp_session) { struct rte_cryptodev_sym_session_pool_private_data *pool_priv; uint32_t obj_size = qp_conf->mp_session->elt_size; uint32_t obj_priv_size = qp_conf->mp_session_private->elt_size; struct rte_cryptodev_sym_session s = {0}; pool_priv = rte_mempool_get_priv(qp_conf->mp_session); if (!pool_priv || qp_conf->mp_session->private_data_size < error: patch failed: lib/cryptodev/rte_cryptodev.c:1355 error: while searching for: return -EINVAL; } s.nb_drivers = pool_priv->nb_drivers; s.user_data_sz = pool_priv->user_data_sz; if ((rte_cryptodev_sym_get_existing_header_session_size(&s) > obj_size) || (s.nb_drivers <= dev->driver_id) || rte_cryptodev_sym_get_private_session_size(dev_id) > obj_priv_size) { CDEV_LOG_ERR("Invalid mempool"); return -EINVAL; } error: patch failed: lib/cryptodev/rte_cryptodev.c:1374 Hunk #5 succeeded at 1725 (offset -138 lines). error: while searching for: struct rte_cryptodev_sym_session_pool_private_data *pool_priv; uint32_t obj_sz; obj_sz = rte_cryptodev_sym_get_header_session_size() + user_data_size; if (obj_sz > elt_size) CDEV_LOG_INFO("elt_size %u is expanded to %u", elt_size, obj_sz); else obj_sz = elt_size; mp = rte_mempool_create(name, nb_elts, obj_sz, cache_size, (uint32_t)(sizeof(*pool_priv)), NULL, NULL, NULL, NULL, socket_id, 0); if (mp == NULL) { CDEV_LOG_ERR("%s(name=%s) failed, rte_errno=%d", error: patch failed: lib/cryptodev/rte_cryptodev.c:1919 Hunk #7 succeeded at 1759 (offset -134 lines). error: while searching for: return mp; } static unsigned int rte_cryptodev_sym_session_data_size(struct rte_cryptodev_sym_session *sess) { return (sizeof(sess->sess_data[0]) * sess->nb_drivers) + sess->user_data_sz; } static uint8_t rte_cryptodev_sym_is_valid_session_pool(struct rte_mempool *mp) { struct rte_cryptodev_sym_session_pool_private_data *pool_priv; if (!mp) return 0; pool_priv = rte_mempool_get_priv(mp); if (!pool_priv || mp->private_data_size < sizeof(*pool_priv) || pool_priv->nb_drivers != nb_drivers || mp->elt_size < rte_cryptodev_sym_get_header_session_size() + pool_priv->user_data_sz) return 0; return 1; } struct rte_cryptodev_sym_session * rte_cryptodev_sym_session_create(struct rte_mempool *mp) { struct rte_cryptodev_sym_session *sess; struct rte_cryptodev_sym_session_pool_private_data *pool_priv; if (!rte_cryptodev_sym_is_valid_session_pool(mp)) { CDEV_LOG_ERR("Invalid mempool"); return NULL; } pool_priv = rte_mempool_get_priv(mp); /* Allocate a session structure from the session pool */ if (rte_mempool_get(mp, (void **)&sess)) { CDEV_LOG_ERR("couldn't get object from session mempool"); return NULL; } sess->nb_drivers = pool_priv->nb_drivers; sess->user_data_sz = pool_priv->user_data_sz; sess->opaque_data = 0; /* Clear device session pointer. * Include the flag indicating presence of user data */ memset(sess->sess_data, 0, rte_cryptodev_sym_session_data_size(sess)); rte_cryptodev_trace_sym_session_create(mp, sess); return sess; } int error: patch failed: lib/cryptodev/rte_cryptodev.c:2002 Hunk #9 succeeded at 1954 (offset -141 lines). Hunk #10 succeeded at 1974 (offset -141 lines). Hunk #11 succeeded at 2030 (offset -141 lines). Hunk #12 succeeded at 2076 (offset -147 lines). error: while searching for: if (sess->user_data_sz < size) return -ENOMEM; rte_memcpy(sess->sess_data + sess->nb_drivers, data, size); rte_cryptodev_trace_sym_session_set_user_data(sess, data, size); error: patch failed: lib/cryptodev/rte_cryptodev.c:2313 error: while searching for: } void * rte_cryptodev_sym_session_get_user_data( struct rte_cryptodev_sym_session *sess) { void *data = NULL; if (sess == NULL || sess->user_data_sz == 0) return NULL; data = (void *)(sess->sess_data + sess->nb_drivers); rte_cryptodev_trace_sym_session_get_user_data(sess, data); error: patch failed: lib/cryptodev/rte_cryptodev.c:2321 Checking patch lib/cryptodev/rte_cryptodev.h... Checking patch lib/cryptodev/rte_cryptodev_trace.h... error: while searching for: rte_trace_point_emit_ptr(sess); ) RTE_TRACE_POINT( rte_cryptodev_trace_sym_session_init, RTE_TRACE_POINT_ARGS(uint8_t dev_id, struct rte_cryptodev_sym_session *sess, void *xforms, void *mempool), rte_trace_point_emit_u8(dev_id); rte_trace_point_emit_ptr(sess); rte_trace_point_emit_u64(sess->opaque_data); rte_trace_point_emit_u16(sess->nb_drivers); rte_trace_point_emit_u16(sess->user_data_sz); rte_trace_point_emit_ptr(xforms); rte_trace_point_emit_ptr(mempool); ) RTE_TRACE_POINT( rte_cryptodev_trace_sym_session_clear, RTE_TRACE_POINT_ARGS(uint8_t dev_id, void *sess), rte_trace_point_emit_u8(dev_id); rte_trace_point_emit_ptr(sess); ) RTE_TRACE_POINT( rte_cryptodev_trace_callback_register, RTE_TRACE_POINT_ARGS(uint8_t dev_id, error: patch failed: lib/cryptodev/rte_cryptodev_trace.h:117 Checking patch lib/cryptodev/version.map... Checking patch lib/pipeline/rte_table_action.c... Checking patch lib/vhost/rte_vhost_crypto.h... Checking patch lib/vhost/vhost_crypto.c... Applied patch app/test-crypto-perf/cperf_ops.c cleanly. Applied patch app/test-crypto-perf/cperf_test_latency.c cleanly. Applied patch app/test-crypto-perf/cperf_test_pmd_cyclecount.c cleanly. Applied patch app/test-crypto-perf/cperf_test_throughput.c cleanly. Applied patch app/test-crypto-perf/cperf_test_verify.c cleanly. Applied patch app/test-crypto-perf/main.c cleanly. Applied patch app/test-eventdev/test_perf_common.c cleanly. Applied patch app/test-eventdev/test_perf_common.h cleanly. Applied patch app/test/test_cryptodev.c cleanly. Applied patch app/test/test_cryptodev_blockcipher.c cleanly. Applied patch app/test/test_event_crypto_adapter.c cleanly. Applied patch app/test/test_ipsec.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/caam_jr/caam_jr.c cleanly. Applied patch drivers/crypto/ccp/ccp_crypto.c 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/cn10k_cryptodev_ops.c cleanly. Applied patch drivers/crypto/cnxk/cn9k_cryptodev_ops.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/dpaa2_sec/dpaa2_sec_dpseci.c cleanly. Applied patch drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.c cleanly. Applied patch drivers/crypto/dpaa_sec/dpaa_sec.c cleanly. Applied patch drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.c cleanly. Applied patch drivers/crypto/ipsec_mb/ipsec_mb_ops.c cleanly. Applied patch drivers/crypto/ipsec_mb/ipsec_mb_private.h cleanly. Applied patch drivers/crypto/ipsec_mb/pmd_aesni_gcm.c cleanly. Applied patch drivers/crypto/ipsec_mb/pmd_aesni_mb.c cleanly. Applied patch drivers/crypto/ipsec_mb/pmd_chacha_poly.c cleanly. Applied patch drivers/crypto/ipsec_mb/pmd_kasumi.c cleanly. Applied patch drivers/crypto/ipsec_mb/pmd_snow3g.c cleanly. Applied patch drivers/crypto/ipsec_mb/pmd_zuc.c cleanly. Applied patch drivers/crypto/mlx5/mlx5_crypto.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/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/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/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/crypto/scheduler/scheduler_pmd_ops.c cleanly. Applied patch drivers/crypto/virtio/virtio_cryptodev.c cleanly. Applied patch drivers/crypto/virtio/virtio_rxtx.c 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.c cleanly. Applied patch examples/l2fwd-crypto/main.c cleanly. Applied patch examples/vhost_crypto/main.c cleanly. Applying patch lib/cryptodev/cryptodev_pmd.h with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. Applied patch lib/cryptodev/cryptodev_trace_points.c cleanly. Applying patch lib/cryptodev/rte_cryptodev.c with 7 rejects... Hunk #1 applied cleanly. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. Hunk #5 applied cleanly. Rejected hunk #6. Hunk #7 applied cleanly. Rejected hunk #8. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Rejected hunk #13. Rejected hunk #14. Applied patch lib/cryptodev/rte_cryptodev.h cleanly. Applying patch lib/cryptodev/rte_cryptodev_trace.h with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. Applied patch lib/cryptodev/version.map cleanly. Applied patch lib/pipeline/rte_table_action.c cleanly. Applied patch lib/vhost/rte_vhost_crypto.h cleanly. Applied patch lib/vhost/vhost_crypto.c cleanly. diff a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h (rejected hunks) @@ -638,28 +638,6 @@ __rte_internal void * rte_cryptodev_session_event_mdata_get(struct rte_crypto_op *op); -static inline void * -get_sym_session_private_data(const struct rte_cryptodev_sym_session *sess, - uint8_t driver_id) { - if (unlikely(sess->nb_drivers <= driver_id)) - return NULL; - - return sess->sess_data[driver_id].data; -} - -static inline void -set_sym_session_private_data(struct rte_cryptodev_sym_session *sess, - uint8_t driver_id, void *private_data) -{ - if (unlikely(sess->nb_drivers <= driver_id)) { - CDEV_LOG_ERR("Set private data for driver %u not allowed", - driver_id); - return; - } - - sess->sess_data[driver_id].data = private_data; -} - /** * @internal * Cryptodev asymmetric crypto session. diff a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c (rejected hunks) @@ -1332,6 +1329,24 @@ rte_cryptodev_get_qp_status(uint8_t dev_id, uint16_t queue_pair_id) return ret; } +static uint8_t +rte_cryptodev_sym_is_valid_session_pool(struct rte_mempool *mp, + uint32_t sess_priv_size) +{ + struct rte_cryptodev_sym_session_pool_private_data *pool_priv; + + if (!mp) + return 0; + + pool_priv = rte_mempool_get_priv(mp); + + if (!pool_priv || mp->private_data_size < sizeof(*pool_priv) || + pool_priv->sess_data_sz < sess_priv_size) + return 0; + + return 1; +} + int rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, const struct rte_cryptodev_qp_conf *qp_conf, int socket_id) @@ -1355,17 +1370,8 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - if ((qp_conf->mp_session && !qp_conf->mp_session_private) || - (!qp_conf->mp_session && qp_conf->mp_session_private)) { - CDEV_LOG_ERR("Invalid mempools"); - return -EINVAL; - } - if (qp_conf->mp_session) { struct rte_cryptodev_sym_session_pool_private_data *pool_priv; - uint32_t obj_size = qp_conf->mp_session->elt_size; - uint32_t obj_priv_size = qp_conf->mp_session_private->elt_size; - struct rte_cryptodev_sym_session s = {0}; pool_priv = rte_mempool_get_priv(qp_conf->mp_session); if (!pool_priv || qp_conf->mp_session->private_data_size < @@ -1374,13 +1380,8 @@ rte_cryptodev_queue_pair_setup(uint8_t dev_id, uint16_t queue_pair_id, return -EINVAL; } - s.nb_drivers = pool_priv->nb_drivers; - s.user_data_sz = pool_priv->user_data_sz; - - if ((rte_cryptodev_sym_get_existing_header_session_size(&s) > - obj_size) || (s.nb_drivers <= dev->driver_id) || - rte_cryptodev_sym_get_private_session_size(dev_id) > - obj_priv_size) { + if (!rte_cryptodev_sym_is_valid_session_pool(qp_conf->mp_session, + rte_cryptodev_sym_get_private_session_size(dev_id))) { CDEV_LOG_ERR("Invalid mempool"); return -EINVAL; } @@ -1919,16 +1872,12 @@ rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts, struct rte_cryptodev_sym_session_pool_private_data *pool_priv; uint32_t obj_sz; - obj_sz = rte_cryptodev_sym_get_header_session_size() + user_data_size; - if (obj_sz > elt_size) - CDEV_LOG_INFO("elt_size %u is expanded to %u", elt_size, - obj_sz); - else - obj_sz = elt_size; + obj_sz = sizeof(struct rte_cryptodev_sym_session) + elt_size + user_data_size; + obj_sz = RTE_ALIGN_CEIL(obj_sz, RTE_CACHE_LINE_SIZE); mp = rte_mempool_create(name, nb_elts, obj_sz, cache_size, - (uint32_t)(sizeof(*pool_priv)), - NULL, NULL, NULL, NULL, + (uint32_t)(sizeof(*pool_priv)), NULL, NULL, + NULL, NULL, socket_id, 0); if (mp == NULL) { CDEV_LOG_ERR("%s(name=%s) failed, rte_errno=%d", @@ -2002,64 +1951,71 @@ rte_cryptodev_asym_session_pool_create(const char *name, uint32_t nb_elts, return mp; } -static unsigned int -rte_cryptodev_sym_session_data_size(struct rte_cryptodev_sym_session *sess) -{ - return (sizeof(sess->sess_data[0]) * sess->nb_drivers) + - sess->user_data_sz; -} - -static uint8_t -rte_cryptodev_sym_is_valid_session_pool(struct rte_mempool *mp) -{ - struct rte_cryptodev_sym_session_pool_private_data *pool_priv; - - if (!mp) - return 0; - - pool_priv = rte_mempool_get_priv(mp); - - if (!pool_priv || mp->private_data_size < sizeof(*pool_priv) || - pool_priv->nb_drivers != nb_drivers || - mp->elt_size < - rte_cryptodev_sym_get_header_session_size() - + pool_priv->user_data_sz) - return 0; - - return 1; -} - -struct rte_cryptodev_sym_session * -rte_cryptodev_sym_session_create(struct rte_mempool *mp) +void * +rte_cryptodev_sym_session_create(uint8_t dev_id, + struct rte_crypto_sym_xform *xforms, + struct rte_mempool *mp) { + struct rte_cryptodev *dev; struct rte_cryptodev_sym_session *sess; struct rte_cryptodev_sym_session_pool_private_data *pool_priv; + uint32_t sess_priv_sz; + int ret; - if (!rte_cryptodev_sym_is_valid_session_pool(mp)) { + if (!rte_cryptodev_is_valid_dev(dev_id)) { + CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); + rte_errno = EINVAL; + return NULL; + } + + if (xforms == NULL) { + CDEV_LOG_ERR("Invalid xform\n"); + rte_errno = EINVAL; + return NULL; + } + + sess_priv_sz = rte_cryptodev_sym_get_private_session_size(dev_id); + if (!rte_cryptodev_sym_is_valid_session_pool(mp, sess_priv_sz)) { CDEV_LOG_ERR("Invalid mempool"); + rte_errno = EINVAL; return NULL; } - pool_priv = rte_mempool_get_priv(mp); + dev = rte_cryptodev_pmd_get_dev(dev_id); /* Allocate a session structure from the session pool */ if (rte_mempool_get(mp, (void **)&sess)) { CDEV_LOG_ERR("couldn't get object from session mempool"); + rte_errno = ENOMEM; return NULL; } - sess->nb_drivers = pool_priv->nb_drivers; + pool_priv = rte_mempool_get_priv(mp); + sess->driver_id = dev->driver_id; + sess->sess_data_sz = pool_priv->sess_data_sz; sess->user_data_sz = pool_priv->user_data_sz; - sess->opaque_data = 0; + sess->driver_priv_data_iova = rte_mempool_virt2iova(sess) + + offsetof(struct rte_cryptodev_sym_session, driver_priv_data); - /* Clear device session pointer. - * Include the flag indicating presence of user data - */ - memset(sess->sess_data, 0, - rte_cryptodev_sym_session_data_size(sess)); + if (dev->dev_ops->sym_session_configure == NULL) { + rte_errno = ENOTSUP; + goto error_exit; + } + memset(sess->driver_priv_data, 0, pool_priv->sess_data_sz + pool_priv->user_data_sz); - rte_cryptodev_trace_sym_session_create(mp, sess); - return sess; + ret = dev->dev_ops->sym_session_configure(dev, xforms, sess); + if (ret < 0) { + rte_errno = -ret; + goto error_exit; + } + sess->driver_id = dev->driver_id; + + rte_cryptodev_trace_sym_session_create(dev_id, sess, xforms, mp); + + return (void *)sess; +error_exit: + rte_mempool_put(mp, (void *)sess); + return NULL; } int @@ -2313,7 +2232,7 @@ rte_cryptodev_sym_session_set_user_data( if (sess->user_data_sz < size) return -ENOMEM; - rte_memcpy(sess->sess_data + sess->nb_drivers, data, size); + rte_memcpy(sess->driver_priv_data + sess->sess_data_sz, data, size); rte_cryptodev_trace_sym_session_set_user_data(sess, data, size); @@ -2321,15 +2240,14 @@ rte_cryptodev_sym_session_set_user_data( } void * -rte_cryptodev_sym_session_get_user_data( - struct rte_cryptodev_sym_session *sess) +rte_cryptodev_sym_session_get_user_data(struct rte_cryptodev_sym_session *sess) { void *data = NULL; if (sess == NULL || sess->user_data_sz == 0) return NULL; - data = (void *)(sess->sess_data + sess->nb_drivers); + data = (void *)(sess->driver_priv_data + sess->sess_data_sz); rte_cryptodev_trace_sym_session_get_user_data(sess, data); diff a/lib/cryptodev/rte_cryptodev_trace.h b/lib/cryptodev/rte_cryptodev_trace.h (rejected hunks) @@ -117,27 +120,6 @@ RTE_TRACE_POINT( rte_trace_point_emit_ptr(sess); ) -RTE_TRACE_POINT( - rte_cryptodev_trace_sym_session_init, - RTE_TRACE_POINT_ARGS(uint8_t dev_id, - struct rte_cryptodev_sym_session *sess, void *xforms, - void *mempool), - rte_trace_point_emit_u8(dev_id); - rte_trace_point_emit_ptr(sess); - rte_trace_point_emit_u64(sess->opaque_data); - rte_trace_point_emit_u16(sess->nb_drivers); - rte_trace_point_emit_u16(sess->user_data_sz); - rte_trace_point_emit_ptr(xforms); - rte_trace_point_emit_ptr(mempool); -) - -RTE_TRACE_POINT( - rte_cryptodev_trace_sym_session_clear, - RTE_TRACE_POINT_ARGS(uint8_t dev_id, void *sess), - rte_trace_point_emit_u8(dev_id); - rte_trace_point_emit_ptr(sess); -) - RTE_TRACE_POINT( rte_cryptodev_trace_callback_register, RTE_TRACE_POINT_ARGS(uint8_t dev_id, Checking patch drivers/crypto/scheduler/scheduler_failover.c... Checking patch drivers/crypto/scheduler/scheduler_multicore.c... Checking patch drivers/crypto/scheduler/scheduler_pkt_size_distr.c... 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/scheduler/scheduler_pmd_private.h... Checking patch drivers/crypto/scheduler/scheduler_roundrobin.c... Applied patch drivers/crypto/scheduler/scheduler_failover.c cleanly. Applied patch drivers/crypto/scheduler/scheduler_multicore.c cleanly. Applied patch drivers/crypto/scheduler/scheduler_pkt_size_distr.c cleanly. Applied patch drivers/crypto/scheduler/scheduler_pmd_private.h cleanly. Applied patch drivers/crypto/scheduler/scheduler_roundrobin.c cleanly. 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... Checking patch app/test-crypto-perf/cperf_test_latency.c... error: app/test-crypto-perf/cperf_test_latency.c: does not match index 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_throughput.c... error: app/test-crypto-perf/cperf_test_throughput.c: does not match index Checking patch app/test-crypto-perf/cperf_test_verify.c... error: app/test-crypto-perf/cperf_test_verify.c: does not match index Checking patch app/test-eventdev/test_perf_common.c... error: app/test-eventdev/test_perf_common.c: does not match index Checking patch app/test/test_cryptodev.c... error: app/test/test_cryptodev.c: does not match index Checking patch app/test/test_cryptodev_blockcipher.c... error: app/test/test_cryptodev_blockcipher.c: does not match index Checking patch app/test/test_event_crypto_adapter.c... error: app/test/test_event_crypto_adapter.c: does not match index Checking patch app/test/test_ipsec.c... error: app/test/test_ipsec.c: does not match index 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: ``RTE_ETH_EVENT_IPSEC_SA_BYTE_HARD_EXPIRY`` and ``RTE_ETH_EVENT_IPSEC_SA_PKT_HARD_EXPIRY`` in DPDK 22.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``. * cryptodev: The function ``rte_cryptodev_cb_fn`` will be updated to have another parameter ``qp_id`` to return the queue pair ID which got error interrupt to the application, error: patch failed: doc/guides/rel_notes/deprecation.rst:124 Checking patch doc/guides/rel_notes/release_22_11.rst... Hunk #1 succeeded at 228 (offset -21 lines). 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/caam_jr/caam_jr.c... error: drivers/crypto/caam_jr/caam_jr.c: does not match index Checking patch drivers/crypto/ccp/ccp_crypto.c... error: drivers/crypto/ccp/ccp_crypto.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/ccp/rte_ccp_pmd.c... error: drivers/crypto/ccp/rte_ccp_pmd.c: does not match index 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... 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/dpaa2_sec/dpaa2_sec_raw_dp.c... error: drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.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/dpaa_sec/dpaa_sec_raw_dp.c... error: drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.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 match index Checking patch drivers/crypto/ipsec_mb/ipsec_mb_private.h... error: drivers/crypto/ipsec_mb/ipsec_mb_private.h: does not match index Checking patch drivers/crypto/ipsec_mb/pmd_aesni_gcm.c... error: drivers/crypto/ipsec_mb/pmd_aesni_gcm.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 match index Checking patch drivers/crypto/ipsec_mb/pmd_kasumi.c... error: drivers/crypto/ipsec_mb/pmd_kasumi.c: does not match index Checking patch drivers/crypto/ipsec_mb/pmd_snow3g.c... error: drivers/crypto/ipsec_mb/pmd_snow3g.c: does not match index Checking patch drivers/crypto/mlx5/mlx5_crypto.c... error: drivers/crypto/mlx5/mlx5_crypto.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.c... error: drivers/crypto/null/null_crypto_pmd.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/openssl/rte_openssl_pmd.c... error: drivers/crypto/openssl/rte_openssl_pmd.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.c... error: drivers/crypto/qat/qat_sym.c: does not match index Checking patch drivers/crypto/qat/qat_sym.h... error: drivers/crypto/qat/qat_sym.h: 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/scheduler/scheduler_pkt_size_distr.c... error: drivers/crypto/scheduler/scheduler_pkt_size_distr.c: 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/scheduler/scheduler_pmd_private.h... error: drivers/crypto/scheduler/scheduler_pmd_private.h: 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 drivers/crypto/virtio/virtio_rxtx.c... error: drivers/crypto/virtio/virtio_rxtx.c: does not match index Checking patch examples/fips_validation/fips_dev_self_test.c... error: examples/fips_validation/fips_dev_self_test.c: does not match index Checking patch examples/fips_validation/main.c... error: examples/fips_validation/main.c: does not match index Checking patch examples/l2fwd-crypto/main.c... error: examples/l2fwd-crypto/main.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/cryptodev_trace_points.c... error: lib/cryptodev/cryptodev_trace_points.c: does not match index Checking patch lib/cryptodev/rte_crypto.h... Checking patch lib/cryptodev/rte_crypto_sym.h... Hunk #1 succeeded at 580 (offset -9 lines). Hunk #2 succeeded at 616 (offset -9 lines). Hunk #3 succeeded at 921 (offset -9 lines). 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/cryptodev/version.map... error: lib/cryptodev/version.map: does not match index Checking patch lib/ipsec/rte_ipsec_group.h... Checking patch lib/ipsec/ses.c... Applied patch app/test-crypto-perf/cperf_ops.h cleanly. 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. Applied patch doc/guides/rel_notes/release_22_11.rst cleanly. Applied patch lib/cryptodev/rte_crypto.h cleanly. Applied patch lib/cryptodev/rte_crypto_sym.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) @@ -124,11 +124,6 @@ Deprecation Notices ``RTE_ETH_EVENT_IPSEC_SA_BYTE_HARD_EXPIRY`` and ``RTE_ETH_EVENT_IPSEC_SA_PKT_HARD_EXPIRY`` in DPDK 22.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``. - * cryptodev: The function ``rte_cryptodev_cb_fn`` will be updated to have another parameter ``qp_id`` to return the queue pair ID which got error interrupt to the application, 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_test_latency.c... error: app/test-crypto-perf/cperf_test_latency.c: does not match index 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... error: app/test-crypto-perf/cperf_test_throughput.c: does not match index Checking patch app/test-crypto-perf/cperf_test_throughput.h... Checking patch app/test-crypto-perf/cperf_test_verify.c... error: app/test-crypto-perf/cperf_test_verify.c: does not match index Checking patch app/test-crypto-perf/cperf_test_verify.h... Checking patch app/test-crypto-perf/main.c... error: app/test-crypto-perf/main.c: does not match index Checking patch app/test/test_cryptodev.c... error: app/test/test_cryptodev.c: does not match index Checking patch app/test/test_ipsec.c... error: app/test/test_ipsec.c: does not match index Checking patch app/test/test_security.c... Hunk #4 succeeded at 501 (offset 38 lines). Hunk #5 succeeded at 526 (offset 38 lines). Hunk #6 succeeded at 548 (offset 38 lines). Hunk #7 succeeded at 562 (offset 38 lines). Hunk #8 succeeded at 659 (offset 40 lines). Hunk #9 succeeded at 704 (offset 40 lines). Hunk #10 succeeded at 728 (offset 40 lines). Hunk #11 succeeded at 752 (offset 40 lines). Hunk #12 succeeded at 773 (offset 40 lines). Hunk #13 succeeded at 791 (offset 40 lines). Hunk #14 succeeded at 813 (offset 40 lines). Hunk #15 succeeded at 823 (offset 40 lines). Hunk #16 succeeded at 858 (offset 40 lines). Hunk #17 succeeded at 884 (offset 40 lines). Hunk #18 succeeded at 896 (offset 40 lines). Hunk #19 succeeded at 1281 (offset 40 lines). Hunk #20 succeeded at 1288 (offset 40 lines). Hunk #21 succeeded at 1304 (offset 40 lines). Hunk #22 succeeded at 1312 (offset 40 lines). Hunk #23 succeeded at 1328 (offset 40 lines). Hunk #24 succeeded at 1336 (offset 40 lines). Hunk #25 succeeded at 1350 (offset 40 lines). Hunk #26 succeeded at 1357 (offset 40 lines). Hunk #27 succeeded at 1376 (offset 40 lines). Hunk #28 succeeded at 1384 (offset 40 lines). Hunk #29 succeeded at 1401 (offset 40 lines). Hunk #30 succeeded at 1409 (offset 40 lines). Hunk #31 succeeded at 2375 (offset 155 lines). Checking patch app/test/test_security_inline_proto.c... 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_cryptodev_ops.c... error: drivers/crypto/cnxk/cn10k_cryptodev_ops.c: does not match index Checking patch drivers/crypto/cnxk/cn10k_ipsec.c... 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/cn9k_ipsec.c... 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/dpaa2_sec/dpaa2_sec_raw_dp.c... error: drivers/crypto/dpaa2_sec/dpaa2_sec_raw_dp.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/dpaa_sec/dpaa_sec_raw_dp.c... error: drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.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 match index Checking patch drivers/crypto/mvsam/rte_mrvl_pmd.c... error: drivers/crypto/mvsam/rte_mrvl_pmd.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/qat/qat_sym.c... error: drivers/crypto/qat/qat_sym.c: does not match index Checking patch drivers/crypto/qat/qat_sym.h... error: drivers/crypto/qat/qat_sym.h: 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... Checking patch drivers/net/cnxk/cn9k_ethdev_sec.c... Checking patch drivers/net/iavf/iavf_ipsec_crypto.c... Checking patch drivers/net/ixgbe/ixgbe_ipsec.c... Checking patch drivers/net/txgbe/txgbe_ipsec.c... Checking patch examples/ipsec-secgw/ipsec-secgw.c... error: examples/ipsec-secgw/ipsec-secgw.c: does not match index 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 lib/cryptodev/rte_cryptodev.h... error: lib/cryptodev/rte_cryptodev.h: does not match index Checking patch lib/security/rte_security.c... Checking patch lib/security/rte_security.h... Hunk #1 succeeded at 677 (offset 3 lines). Hunk #2 succeeded at 696 (offset 3 lines). Hunk #3 succeeded at 703 (offset 3 lines). Hunk #4 succeeded at 893 (offset 3 lines). Hunk #5 succeeded at 950 (offset 37 lines). Checking patch lib/security/rte_security_driver.h... Applied patch app/test-crypto-perf/cperf.h 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.h cleanly. Applied patch app/test-crypto-perf/cperf_test_verify.h cleanly. Applied patch app/test/test_security.c cleanly. Applied patch app/test/test_security_inline_proto.c cleanly. Applied patch drivers/crypto/cnxk/cn10k_ipsec.c cleanly. Applied patch drivers/crypto/cnxk/cn9k_ipsec.c cleanly. Applied patch drivers/net/cnxk/cn10k_ethdev_sec.c cleanly. Applied patch drivers/net/cnxk/cn9k_ethdev_sec.c cleanly. Applied patch drivers/net/iavf/iavf_ipsec_crypto.c cleanly. Applied patch drivers/net/ixgbe/ixgbe_ipsec.c cleanly. Applied patch drivers/net/txgbe/txgbe_ipsec.c cleanly. Applied patch examples/ipsec-secgw/ipsec.h cleanly. Applied patch lib/security/rte_security.c cleanly. Applied patch lib/security/rte_security.h cleanly. Applied patch lib/security/rte_security_driver.h cleanly. 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 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/qat/dev/qat_sym_pmd_gen1.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/dev/qat_sym_pmd_gen1.c cleanly. 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_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_throughput.c... error: app/test-crypto-perf/cperf_test_throughput.c: does not match index Checking patch app/test/test_cryptodev.c... error: app/test/test_cryptodev.c: does not match index Checking patch app/test/test_cryptodev_security_ipsec.c... Checking patch app/test/test_cryptodev_security_ipsec.h... Checking patch app/test/test_security.c... error: app/test/test_security.c: does not match index Checking patch app/test/test_security_inline_proto.c... error: app/test/test_security_inline_proto.c: does not match index Checking patch doc/guides/rel_notes/deprecation.rst... error: while searching for: which got error interrupt to the application, so that application can reset that particular queue pair. * 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 function pointer declaration ``eventdev_stop_flush_t`` will be renamed to ``rte_eventdev_stop_flush_t`` in DPDK 22.11. error: patch failed: doc/guides/rel_notes/deprecation.rst:129 Checking patch doc/guides/rel_notes/release_22_11.rst... error: doc/guides/rel_notes/release_22_11.rst: 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_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/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 match index Checking patch drivers/crypto/qat/qat_sym.c... error: drivers/crypto/qat/qat_sym.c: does not match index Checking patch drivers/crypto/qat/qat_sym.h... error: drivers/crypto/qat/qat_sym.h: does not match index Checking patch drivers/net/iavf/iavf_ipsec_crypto.h... Checking patch examples/ipsec-secgw/ipsec_worker.c... Checking patch lib/cryptodev/rte_crypto_sym.h... error: lib/cryptodev/rte_crypto_sym.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 Checking patch lib/security/rte_security.c... error: lib/security/rte_security.c: does not match index 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 app/test/test_cryptodev_security_ipsec.c cleanly. Applied patch app/test/test_cryptodev_security_ipsec.h cleanly. Applying patch doc/guides/rel_notes/deprecation.rst with 1 reject... Rejected hunk #1. Applied patch drivers/net/iavf/iavf_ipsec_crypto.h cleanly. Applied patch examples/ipsec-secgw/ipsec_worker.c cleanly. diff a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst (rejected hunks) @@ -129,10 +129,6 @@ Deprecation Notices which got error interrupt to the application, so that application can reset that particular queue pair. -* 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 function pointer declaration ``eventdev_stop_flush_t`` will be renamed to ``rte_eventdev_stop_flush_t`` in DPDK 22.11. https://lab.dpdk.org/results/dashboard/patchsets/23738/ UNH-IOL DPDK Community Lab