Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/116824 _apply patch failure_ Submitter: Akhil Goyal Date: Saturday, September 24 2022 16:35:42 Applied on: CommitID:fa7723b5e32f0eb8c513a5c51ab131a7bf159446 Apply patch set 116824-116829 failed: Checking patch app/test-crypto-perf/cperf_ops.c... Hunk #1 succeeded at 928 (offset 16 lines). Hunk #2 succeeded at 952 (offset 16 lines). Hunk #3 succeeded at 980 (offset 16 lines). Hunk #4 succeeded at 1039 (offset 16 lines). Hunk #5 succeeded at 1065 (offset 16 lines). 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... Checking patch app/test-eventdev/test_perf_common.h... Checking patch app/test/test_cryptodev.c... Hunk #5 succeeded at 1371 (offset -11 lines). Hunk #6 succeeded at 1430 (offset -11 lines). Hunk #7 succeeded at 1586 (offset -11 lines). Hunk #8 succeeded at 2130 (offset -11 lines). Hunk #9 succeeded at 2174 (offset -11 lines). Hunk #10 succeeded at 2407 (offset -11 lines). Hunk #11 succeeded at 2426 (offset -11 lines). Hunk #12 succeeded at 2443 (offset -11 lines). Hunk #13 succeeded at 2462 (offset -11 lines). Hunk #14 succeeded at 2545 (offset -11 lines). Hunk #15 succeeded at 2579 (offset -11 lines). Hunk #16 succeeded at 2598 (offset -11 lines). Hunk #17 succeeded at 2637 (offset -11 lines). Hunk #18 succeeded at 2667 (offset -11 lines). Hunk #19 succeeded at 2697 (offset -11 lines). Hunk #20 succeeded at 8140 (offset -11 lines). Hunk #21 succeeded at 8161 (offset -11 lines). Hunk #22 succeeded at 8610 (offset -11 lines). Hunk #23 succeeded at 11960 (offset -11 lines). Hunk #24 succeeded at 11974 (offset -11 lines). Hunk #25 succeeded at 12186 (offset -11 lines). Hunk #26 succeeded at 12215 (offset -11 lines). Hunk #27 succeeded at 12253 (offset -11 lines). Hunk #28 succeeded at 12306 (offset -11 lines). Hunk #29 succeeded at 12327 (offset -11 lines). Hunk #30 succeeded at 12336 (offset -11 lines). Hunk #31 succeeded at 12383 (offset -11 lines). Hunk #32 succeeded at 12402 (offset -11 lines). Hunk #33 succeeded at 12415 (offset -11 lines). Hunk #34 succeeded at 12429 (offset -11 lines). Hunk #35 succeeded at 12447 (offset -11 lines). Hunk #36 succeeded at 12472 (offset -11 lines). Hunk #37 succeeded at 12590 (offset -11 lines). Hunk #38 succeeded at 12689 (offset -11 lines). Hunk #39 succeeded at 12875 (offset -11 lines). Hunk #40 succeeded at 12893 (offset -11 lines). Hunk #41 succeeded at 13528 (offset -11 lines). Hunk #42 succeeded at 13541 (offset -11 lines). Hunk #43 succeeded at 13560 (offset -11 lines). Hunk #44 succeeded at 13591 (offset -11 lines). Hunk #45 succeeded at 14055 (offset -11 lines). Hunk #46 succeeded at 14105 (offset -11 lines). Hunk #47 succeeded at 14234 (offset -11 lines). Hunk #48 succeeded at 14986 (offset -11 lines). Hunk #49 succeeded at 15010 (offset -11 lines). Checking patch app/test/test_cryptodev_blockcipher.c... Checking patch app/test/test_event_crypto_adapter.c... Checking patch app/test/test_ipsec.c... Hunk #1 succeeded at 368 (offset -2 lines). Hunk #2 succeeded at 415 (offset -2 lines). Hunk #3 succeeded at 628 (offset -3 lines). Hunk #4 succeeded at 642 (offset -3 lines). Hunk #5 succeeded at 1166 (offset -3 lines). 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 21 (offset -1 lines). Hunk #2 succeeded at 128 (offset 18 lines). Hunk #3 succeeded at 144 (offset 18 lines). Hunk #4 succeeded at 311 (offset 18 lines). Hunk #5 succeeded at 350 (offset 18 lines). Hunk #6 succeeded at 502 (offset -38 lines). Hunk #7 succeeded at 578 (offset -38 lines). Checking patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c... Hunk #1 succeeded at 76 (offset 20 lines). error: while searching for: if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { sym_op = op->sym; sess = get_sym_session_private_data( sym_op->session, cn9k_cryptodev_driver_id); ret = cpt_sym_inst_fill(qp, op, sess, infl_req, inst); inst->w7.u64 = sess->cpt_inst_w7; } else if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) error: patch failed: drivers/crypto/cnxk/cn9k_cryptodev_ops.c:95 error: while searching for: ret = cpt_sym_inst_fill(qp, op, sess, infl_req, inst); if (unlikely(ret)) { sym_session_clear(cn9k_cryptodev_driver_id, op->sym->session); rte_mempool_put(qp->sess_mp, op->sym->session); } inst->w7.u64 = sess->cpt_inst_w7; error: patch failed: drivers/crypto/cnxk/cn9k_cryptodev_ops.c:110 Hunk #4 succeeded at 368 (offset 24 lines). Hunk #5 succeeded at 407 (offset 24 lines). Hunk #6 succeeded at 601 (offset 23 lines). Hunk #7 succeeded at 661 (offset 23 lines). Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.c... Hunk #1 succeeded at 405 (offset -1 lines). error: while searching for: } int sym_session_configure(struct roc_cpt *roc_cpt, int driver_id, struct rte_crypto_sym_xform *xform, struct rte_cryptodev_sym_session *sess, struct rte_mempool *pool) { enum cpt_dp_thread_type thr_type; struct cnxk_se_sess *sess_priv; void *priv; int ret; if (unlikely(rte_mempool_get(pool, &priv))) { plt_dp_err("Could not allocate session private data"); return -ENOMEM; } memset(priv, 0, sizeof(struct cnxk_se_sess)); sess_priv = priv; ret = cnxk_sess_fill(roc_cpt, xform, sess_priv); if (ret) goto priv_put; error: patch failed: drivers/crypto/cnxk/cnxk_cryptodev_ops.c:620 Hunk #3 succeeded at 653 (offset -20 lines). Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h... 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... Hunk #1 succeeded at 131 (offset -5 lines). Hunk #2 succeeded at 392 (offset -5 lines). Hunk #3 succeeded at 403 (offset -5 lines). 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... Hunk #1 succeeded at 68 (offset -2 lines). Checking patch drivers/crypto/openssl/rte_openssl_pmd.c... Hunk #1 succeeded at 835 (offset -52 lines). Hunk #2 succeeded at 847 (offset -52 lines). Hunk #3 succeeded at 2768 (offset -124 lines). Checking patch drivers/crypto/openssl/rte_openssl_pmd_ops.c... Hunk #1 succeeded at 744 (offset -20 lines). Hunk #2 succeeded at 773 (offset -20 lines). Hunk #3 succeeded at 783 (offset -20 lines). Hunk #4 succeeded at 1296 (offset -20 lines). 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 186 (offset -33 lines). error: while searching for: int qat_sym_session_configure(struct rte_cryptodev *dev, struct rte_crypto_sym_xform *xform, struct rte_cryptodev_sym_session *sess, struct rte_mempool *mempool) { void *sess_private_data; int ret; if (rte_mempool_get(mempool, &sess_private_data)) { CDEV_LOG_ERR( "Couldn't get object from session mempool"); return -ENOMEM; } #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) if (ossl_legacy_provider_load()) return -EINVAL; #endif ret = qat_sym_session_set_parameters(dev, xform, sess_private_data); if (ret != 0) { QAT_LOG(ERR, "Crypto QAT PMD: failed to configure session parameters"); /* Return session to mempool */ rte_mempool_put(mempool, sess_private_data); return ret; } set_sym_session_private_data(sess, dev->driver_id, sess_private_data); # if (OPENSSL_VERSION_NUMBER >= 0x30000000L) ossl_legacy_provider_unload(); # endif error: patch failed: drivers/crypto/qat/qat_sym_session.c:505 Hunk #3 succeeded at 512 (offset -10 lines). Hunk #4 succeeded at 522 (offset -10 lines). Checking patch drivers/crypto/qat/qat_sym_session.h... Checking patch drivers/crypto/scheduler/scheduler_pmd_ops.c... Hunk #1 succeeded at 470 (offset 2 lines). 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 2527 (offset 6 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... Hunk #1 succeeded at 302 (offset 1 line). Hunk #2 succeeded at 311 (offset 1 line). Hunk #3 succeeded at 337 (offset 1 line). Hunk #4 succeeded at 638 (offset 1 line). Checking patch lib/cryptodev/cryptodev_trace_points.c... Checking patch lib/cryptodev/rte_cryptodev.c... Hunk #1 succeeded at 190 (offset -9 lines). Hunk #2 succeeded at 1204 (offset -4 lines). Hunk #3 succeeded at 1245 (offset -4 lines). Hunk #4 succeeded at 1255 (offset -4 lines). error: while searching for: rte_spinlock_unlock(&rte_cryptodev_cb_lock); } int rte_cryptodev_sym_session_init(uint8_t dev_id, struct rte_cryptodev_sym_session *sess, struct rte_crypto_sym_xform *xforms, struct rte_mempool *mp) { struct rte_cryptodev *dev; uint32_t sess_priv_sz = rte_cryptodev_sym_get_private_session_size( dev_id); uint8_t index; int ret; if (!rte_cryptodev_is_valid_dev(dev_id)) { CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); return -EINVAL; } dev = rte_cryptodev_pmd_get_dev(dev_id); if (sess == NULL || xforms == NULL || dev == NULL || mp == NULL) return -EINVAL; if (mp->elt_size < sess_priv_sz) return -EINVAL; index = dev->driver_id; if (index >= sess->nb_drivers) return -EINVAL; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_configure, -ENOTSUP); if (sess->sess_data[index].refcnt == 0) { ret = dev->dev_ops->sym_session_configure(dev, xforms, sess, mp); if (ret < 0) { CDEV_LOG_ERR( "dev_id %d failed to configure session details", dev_id); return ret; } } rte_cryptodev_trace_sym_session_init(dev_id, sess, xforms, mp); sess->sess_data[index].refcnt++; return 0; } struct rte_mempool * rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts, uint32_t elt_size, uint32_t cache_size, uint16_t user_data_size, error: patch failed: lib/cryptodev/rte_cryptodev.c:1719 Hunk #6 succeeded at 1778 (offset 48 lines). Hunk #7 succeeded at 1800 (offset 48 lines). Hunk #8 succeeded at 1858 (offset 48 lines). Hunk #9 succeeded at 1999 (offset 49 lines). error: while searching for: if (dev == NULL || sess == NULL) return -EINVAL; driver_id = dev->driver_id; if (sess->sess_data[driver_id].refcnt == 0) return 0; if (--sess->sess_data[driver_id].refcnt != 0) return -EBUSY; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_clear, -ENOTSUP); dev->dev_ops->sym_session_clear(dev, sess); rte_cryptodev_trace_sym_session_clear(dev_id, sess); return 0; } int rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess) { uint8_t i; struct rte_mempool *sess_mp; if (sess == NULL) return -EINVAL; /* Check that all device private data has been freed */ for (i = 0; i < sess->nb_drivers; i++) { if (sess->sess_data[i].refcnt != 0) return -EBUSY; } /* Return session to mempool */ sess_mp = rte_mempool_from_obj(sess); rte_mempool_put(sess_mp, sess); rte_cryptodev_trace_sym_session_free(sess); error: patch failed: lib/cryptodev/rte_cryptodev.c:2010 Hunk #11 succeeded at 2088 (offset 64 lines). Hunk #12 succeeded at 2134 (offset 64 lines). Hunk #13 succeeded at 2143 (offset 64 lines). Checking patch lib/cryptodev/rte_cryptodev.h... Checking patch lib/cryptodev/rte_cryptodev_trace.h... 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/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. Applying patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c with 2 rejects... Hunk #1 applied cleanly. Rejected hunk #2. Rejected hunk #3. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Applying patch drivers/crypto/cnxk/cnxk_cryptodev_ops.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied 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. Applying patch drivers/crypto/qat/qat_sym_session.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied 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. Applied patch lib/cryptodev/cryptodev_pmd.h cleanly. Applied patch lib/cryptodev/cryptodev_trace_points.c cleanly. Applying patch lib/cryptodev/rte_cryptodev.c with 2 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Rejected hunk #5. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Rejected hunk #10. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. Applied patch lib/cryptodev/rte_cryptodev.h cleanly. Applied patch lib/cryptodev/rte_cryptodev_trace.h cleanly. 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/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c (rejected hunks) @@ -95,8 +92,7 @@ cn9k_cpt_inst_prep(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op, if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { sym_op = op->sym; - sess = get_sym_session_private_data( - sym_op->session, cn9k_cryptodev_driver_id); + sess = (void *)sym_op->session->driver_priv_data; ret = cpt_sym_inst_fill(qp, op, sess, infl_req, inst); inst->w7.u64 = sess->cpt_inst_w7; } else if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) @@ -110,8 +106,7 @@ cn9k_cpt_inst_prep(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op, ret = cpt_sym_inst_fill(qp, op, sess, infl_req, inst); if (unlikely(ret)) { - sym_session_clear(cn9k_cryptodev_driver_id, - op->sym->session); + sym_session_clear(op->sym->session); rte_mempool_put(qp->sess_mp, op->sym->session); } inst->w7.u64 = sess->cpt_inst_w7; diff a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c (rejected hunks) @@ -620,25 +619,15 @@ cnxk_cpt_inst_w7_get(struct cnxk_se_sess *sess, struct roc_cpt *roc_cpt) } int -sym_session_configure(struct roc_cpt *roc_cpt, int driver_id, +sym_session_configure(struct roc_cpt *roc_cpt, struct rte_crypto_sym_xform *xform, - struct rte_cryptodev_sym_session *sess, - struct rte_mempool *pool) + struct rte_cryptodev_sym_session *sess) { enum cpt_dp_thread_type thr_type; - struct cnxk_se_sess *sess_priv; - void *priv; + struct cnxk_se_sess *sess_priv = (void *)sess->driver_priv_data; int ret; - if (unlikely(rte_mempool_get(pool, &priv))) { - plt_dp_err("Could not allocate session private data"); - return -ENOMEM; - } - - memset(priv, 0, sizeof(struct cnxk_se_sess)); - - sess_priv = priv; - + memset(sess_priv, 0, sizeof(struct cnxk_se_sess)); ret = cnxk_sess_fill(roc_cpt, xform, sess_priv); if (ret) goto priv_put; diff a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c (rejected hunks) @@ -505,35 +496,24 @@ qat_sym_session_configure_cipher(struct rte_cryptodev *dev, int qat_sym_session_configure(struct rte_cryptodev *dev, struct rte_crypto_sym_xform *xform, - struct rte_cryptodev_sym_session *sess, - struct rte_mempool *mempool) + struct rte_cryptodev_sym_session *sess) { - void *sess_private_data; int ret; - if (rte_mempool_get(mempool, &sess_private_data)) { - CDEV_LOG_ERR( - "Couldn't get object from session mempool"); - return -ENOMEM; - } - #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) if (ossl_legacy_provider_load()) return -EINVAL; #endif - ret = qat_sym_session_set_parameters(dev, xform, sess_private_data); + ret = qat_sym_session_set_parameters(dev, xform, + (void *)sess->driver_priv_data, + sess->driver_priv_data_iova); if (ret != 0) { QAT_LOG(ERR, "Crypto QAT PMD: failed to configure session parameters"); - /* Return session to mempool */ - rte_mempool_put(mempool, sess_private_data); return ret; } - set_sym_session_private_data(sess, dev->driver_id, - sess_private_data); - # if (OPENSSL_VERSION_NUMBER >= 0x30000000L) ossl_legacy_provider_unload(); # endif diff a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c (rejected hunks) @@ -1719,53 +1721,6 @@ rte_cryptodev_pmd_callback_process(struct rte_cryptodev *dev, rte_spinlock_unlock(&rte_cryptodev_cb_lock); } -int -rte_cryptodev_sym_session_init(uint8_t dev_id, - struct rte_cryptodev_sym_session *sess, - struct rte_crypto_sym_xform *xforms, - struct rte_mempool *mp) -{ - struct rte_cryptodev *dev; - uint32_t sess_priv_sz = rte_cryptodev_sym_get_private_session_size( - dev_id); - uint8_t index; - int ret; - - if (!rte_cryptodev_is_valid_dev(dev_id)) { - CDEV_LOG_ERR("Invalid dev_id=%" PRIu8, dev_id); - return -EINVAL; - } - - dev = rte_cryptodev_pmd_get_dev(dev_id); - - if (sess == NULL || xforms == NULL || dev == NULL || mp == NULL) - return -EINVAL; - - if (mp->elt_size < sess_priv_sz) - return -EINVAL; - - index = dev->driver_id; - if (index >= sess->nb_drivers) - return -EINVAL; - - RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_configure, -ENOTSUP); - - if (sess->sess_data[index].refcnt == 0) { - ret = dev->dev_ops->sym_session_configure(dev, xforms, - sess, mp); - if (ret < 0) { - CDEV_LOG_ERR( - "dev_id %d failed to configure session details", - dev_id); - return ret; - } - } - - rte_cryptodev_trace_sym_session_init(dev_id, sess, xforms, mp); - sess->sess_data[index].refcnt++; - return 0; -} - struct rte_mempool * rte_cryptodev_sym_session_pool_create(const char *name, uint32_t nb_elts, uint32_t elt_size, uint32_t cache_size, uint16_t user_data_size, @@ -2010,37 +1970,24 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id, if (dev == NULL || sess == NULL) return -EINVAL; - driver_id = dev->driver_id; - if (sess->sess_data[driver_id].refcnt == 0) - return 0; - if (--sess->sess_data[driver_id].refcnt != 0) - return -EBUSY; + sess_mp = rte_mempool_from_obj(sess); + if (!sess_mp) + return -EINVAL; + pool_priv = rte_mempool_get_priv(sess_mp); + + if (sess->driver_id != dev->driver_id) { + CDEV_LOG_ERR("Session created by driver %u but freed by %u", + sess->driver_id, dev->driver_id); + return -EINVAL; + } RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->sym_session_clear, -ENOTSUP); dev->dev_ops->sym_session_clear(dev, sess); - - rte_cryptodev_trace_sym_session_clear(dev_id, sess); - return 0; -} - -int -rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess) -{ - uint8_t i; - struct rte_mempool *sess_mp; - - if (sess == NULL) - return -EINVAL; - - /* Check that all device private data has been freed */ - for (i = 0; i < sess->nb_drivers; i++) { - if (sess->sess_data[i].refcnt != 0) - return -EBUSY; - } + memset(sess->driver_priv_data, 0, pool_priv->sess_data_sz + + pool_priv->user_data_sz); /* Return session to mempool */ - sess_mp = rte_mempool_from_obj(sess); rte_mempool_put(sess_mp, sess); rte_cryptodev_trace_sym_session_free(sess); 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/test_ipsec_perf.c... Checking patch doc/guides/prog_guide/cryptodev_lib.rst... Checking patch doc/guides/rel_notes/deprecation.rst... Hunk #1 succeeded at 152 (offset -9 lines). Checking patch doc/guides/rel_notes/release_22_11.rst... error: while searching for: Also, make sure to start the actual text at the margin. ======================================================= ABI Changes ----------- error: patch failed: doc/guides/rel_notes/release_22_11.rst:89 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 lib/cryptodev/cryptodev_pmd.h... error: lib/cryptodev/cryptodev_pmd.h: does not match index Checking patch lib/cryptodev/rte_crypto.h... Checking patch lib/cryptodev/rte_crypto_sym.h... 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_group.h... Checking patch lib/ipsec/ses.c... Applied patch app/test/test_ipsec_perf.c cleanly. Applied patch doc/guides/prog_guide/cryptodev_lib.rst cleanly. Applied patch doc/guides/rel_notes/deprecation.rst cleanly. Applying patch doc/guides/rel_notes/release_22_11.rst with 1 reject... Rejected hunk #1. 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/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst (rejected hunks) @@ -89,6 +89,15 @@ API Changes Also, make sure to start the actual text at the margin. ======================================================= +* cryptodev: The structure ``rte_cryptodev_sym_session`` was made internal. + The API ``rte_cryptodev_sym_session_init`` and ``rte_cryptodev_sym_session_clear`` + were removed and user would only need to call ``rte_cryptodev_sym_session_create`` + and ``rte_cryptodev_sym_session_free`` to create/destroy sessions. + The API ``rte_cryptodev_sym_session_create`` was updated to take a single mempool + with element size big enough to hold session data and session private data. + All sample applications were updated to attach an opaque pointer for the session + to the ``rte_crypto_op`` while enqueuing. + ABI Changes ----------- 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... 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... Checking patch app/test/test_security_inline_proto.c... Hunk #3 succeeded at 480 (offset -14 lines). Checking patch drivers/common/cnxk/roc_cpt.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... Hunk #1 succeeded at 256 (offset -2 lines). 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... Checking patch lib/security/rte_security_driver.h... Applied patch app/test-crypto-perf/cperf.h cleanly. Applied patch app/test-crypto-perf/cperf_ops.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/common/cnxk/roc_cpt.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... Hunk #1 succeeded at 1123 (offset -3 lines). Checking patch app/test/test_cryptodev_security_ipsec.h... Hunk #1 succeeded at 272 (offset -5 lines). 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: doc/guides/rel_notes/deprecation.rst: does not match index Checking patch doc/guides/rel_notes/release_22_11.rst... error: while searching for: All sample applications were updated to attach an opaque pointer for the session to the ``rte_crypto_op`` while enqueuing. ABI Changes ----------- error: patch failed: doc/guides/rel_notes/release_22_11.rst:98 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/release_22_11.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/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst (rejected hunks) @@ -98,6 +98,11 @@ API Changes 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 made internal and corresponding + APIs were updated to take/return an opaque session pointer. The API + ``rte_security_session_create`` was updated to take only one mempool which has enough + space to hold session and driver private data. + ABI Changes ----------- https://lab.dpdk.org/results/dashboard/patchsets/23618/ UNH-IOL DPDK Community Lab