Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/115616 _apply patch failure_ Submitter: Fan Zhang Date: Monday, August 29 2022 16:06:45 Applied on: CommitID:09521b1cbeffc81c85ef64564719a4b7e1d10e85 Apply patch set 115616-115619 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... 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 -19 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... 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... Checking patch lib/cryptodev/cryptodev_trace_points.c... Checking patch lib/cryptodev/rte_cryptodev.c... 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. 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/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,14 @@ 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; - 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 Checking patch app/test/test_cryptodev.c... error: app/test/test_cryptodev.c: does not match index 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... Checking patch doc/guides/rel_notes/release_22_11.rst... Hunk #1 succeeded at 84 (offset -5 lines). 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_raw_dp.c... error: drivers/crypto/dpaa_sec/dpaa_sec_raw_dp.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 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_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. Applied patch doc/guides/rel_notes/release_22_11.rst cleanly. Applied patch lib/ipsec/rte_ipsec_group.h cleanly. Applied patch lib/ipsec/ses.c cleanly. https://lab.dpdk.org/results/dashboard/patchsets/23343/ UNH-IOL DPDK Community Lab