|WARNING| pw116872-116874 [PATCH] [v2, 3/3] crypto/cnxk: add vectorization for event crypto
dpdklab at iol.unh.edu
dpdklab at iol.unh.edu
Mon Sep 26 14:00:04 CEST 2022
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/116872
_apply patch failure_
Submitter: Volodymyr Fialko <vfialko at marvell.com>
Date: Monday, September 26 2022 11:36:07
Applied on: CommitID:abea8974c7a6647585596348245ed7011d0a5104
Apply patch set 116872-116874 failed:
Checking patch app/test-eventdev/test_perf_common.c...
Checking patch app/test/test_event_crypto_adapter.c...
Checking patch doc/guides/prog_guide/event_crypto_adapter.rst...
Checking patch drivers/event/cnxk/cn10k_eventdev.c...
Hunk #1 succeeded at 891 (offset -138 lines).
Checking patch drivers/event/cnxk/cn9k_eventdev.c...
Hunk #1 succeeded at 1118 (offset -2 lines).
Checking patch drivers/event/dpaa/dpaa_eventdev.c...
Checking patch drivers/event/dpaa2/dpaa2_eventdev.c...
error: while searching for:
#include <rte_bus_vdev.h>
#include <ethdev_driver.h>
#include <cryptodev_pmd.h>
#include <rte_event_eth_rx_adapter.h>
#include <rte_event_eth_tx_adapter.h>
error: patch failed: drivers/event/dpaa2/dpaa2_eventdev.c:26
Hunk #2 succeeded at 865 (offset -1 lines).
Hunk #3 succeeded at 876 (offset -1 lines).
Checking patch drivers/event/octeontx/ssovf_evdev.c...
Hunk #1 succeeded at 746 (offset 1 line).
Checking patch lib/eventdev/eventdev_pmd.h...
Hunk #1 succeeded at 907 (offset -3 lines).
Hunk #2 succeeded at 962 (offset -3 lines).
Hunk #3 succeeded at 1075 (offset -3 lines).
Hunk #4 succeeded at 1361 (offset -24 lines).
Checking patch lib/eventdev/eventdev_trace.h...
Checking patch lib/eventdev/rte_event_crypto_adapter.c...
Hunk #3 succeeded at 1028 (offset -1 lines).
Hunk #4 succeeded at 1068 (offset -1 lines).
Hunk #5 succeeded at 1327 (offset -2 lines).
Checking patch lib/eventdev/rte_event_crypto_adapter.h...
Checking patch lib/eventdev/rte_eventdev.h...
Hunk #1 succeeded at 1203 (offset -16 lines).
Hunk #2 succeeded at 1423 (offset -16 lines).
Applied patch app/test-eventdev/test_perf_common.c cleanly.
Applied patch app/test/test_event_crypto_adapter.c cleanly.
Applied patch doc/guides/prog_guide/event_crypto_adapter.rst cleanly.
Applied patch drivers/event/cnxk/cn10k_eventdev.c cleanly.
Applied patch drivers/event/cnxk/cn9k_eventdev.c cleanly.
Applied patch drivers/event/dpaa/dpaa_eventdev.c cleanly.
Applying patch drivers/event/dpaa2/dpaa2_eventdev.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Applied patch drivers/event/octeontx/ssovf_evdev.c cleanly.
Applied patch lib/eventdev/eventdev_pmd.h cleanly.
Applied patch lib/eventdev/eventdev_trace.h cleanly.
Applied patch lib/eventdev/rte_event_crypto_adapter.c cleanly.
Applied patch lib/eventdev/rte_event_crypto_adapter.h cleanly.
Applied patch lib/eventdev/rte_eventdev.h cleanly.
diff a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c (rejected hunks)
@@ -26,6 +26,7 @@
#include <rte_bus_vdev.h>
#include <ethdev_driver.h>
#include <cryptodev_pmd.h>
+#include <rte_event_crypto_adapter.h>
#include <rte_event_eth_rx_adapter.h>
#include <rte_event_eth_tx_adapter.h>
Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c...
Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.h...
Checking patch drivers/crypto/cnxk/meson.build...
Checking patch drivers/event/cnxk/cn10k_eventdev.c...
error: drivers/event/cnxk/cn10k_eventdev.c: does not match index
Checking patch drivers/event/cnxk/cn10k_worker.c...
Checking patch drivers/event/cnxk/cn10k_worker.h...
Hunk #1 succeeded at 371 (offset 18 lines).
Applied patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c cleanly.
Applied patch drivers/crypto/cnxk/cn10k_cryptodev_ops.h cleanly.
Applied patch drivers/crypto/cnxk/meson.build cleanly.
Applied patch drivers/event/cnxk/cn10k_worker.c cleanly.
Applied patch drivers/event/cnxk/cn10k_worker.h cleanly.
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_cryptodev_ops.h...
error: drivers/crypto/cnxk/cn10k_cryptodev_ops.h: does not match index
Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h...
Checking patch drivers/crypto/cnxk/version.map...
Checking patch drivers/event/cnxk/cn10k_eventdev.c...
error: drivers/event/cnxk/cn10k_eventdev.c: does not match index
Checking patch drivers/event/cnxk/cn10k_worker.h...
error: drivers/event/cnxk/cn10k_worker.h: does not match index
Checking patch drivers/event/cnxk/cn9k_eventdev.c...
error: drivers/event/cnxk/cn9k_eventdev.c: does not match index
Checking patch drivers/event/cnxk/cnxk_eventdev.h...
error: while searching for:
int cnxk_sso_tx_adapter_stop(uint8_t id, const struct rte_eventdev *event_dev);
int cnxk_sso_tx_adapter_free(uint8_t id, const struct rte_eventdev *event_dev);
int cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
const struct rte_cryptodev *cdev, int32_t queue_pair_id);
int cnxk_crypto_adapter_qp_del(const struct rte_cryptodev *cdev, int32_t queue_pair_id);
#endif /* __CNXK_EVENTDEV_H__ */
error: patch failed: drivers/event/cnxk/cnxk_eventdev.h:303
Checking patch drivers/event/cnxk/cnxk_eventdev_adptr.c...
error: while searching for:
}
static int
crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qp)
{
char name[RTE_MEMPOOL_NAMESIZE];
uint32_t cache_size, nb_req;
error: patch failed: drivers/event/cnxk/cnxk_eventdev_adptr.c:631
error: while searching for:
if (qp->ca.req_mp == NULL)
return -ENOMEM;
qp->ca.enabled = true;
return 0;
error: patch failed: drivers/event/cnxk/cnxk_eventdev_adptr.c:664
error: while searching for:
int
cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev,
int32_t queue_pair_id)
{
struct cnxk_sso_evdev *sso_evdev = cnxk_sso_pmd_priv(event_dev);
uint32_t adptr_xae_cnt = 0;
error: patch failed: drivers/event/cnxk/cnxk_eventdev_adptr.c:671
error: while searching for:
for (qp_id = 0; qp_id < cdev->data->nb_queue_pairs; qp_id++) {
qp = cdev->data->queue_pairs[qp_id];
ret = crypto_adapter_qp_setup(cdev, qp);
if (ret) {
cnxk_crypto_adapter_qp_del(cdev, -1);
return ret;
error: patch failed: drivers/event/cnxk/cnxk_eventdev_adptr.c:683
error: while searching for:
}
} else {
qp = cdev->data->queue_pairs[queue_pair_id];
ret = crypto_adapter_qp_setup(cdev, qp);
if (ret)
return ret;
adptr_xae_cnt = qp->ca.req_mp->size;
error: patch failed: drivers/event/cnxk/cnxk_eventdev_adptr.c:692
error: while searching for:
}
int
cnxk_crypto_adapter_qp_del(const struct rte_cryptodev *cdev, int32_t queue_pair_id)
{
struct cnxk_cpt_qp *qp;
error: patch failed: drivers/event/cnxk/cnxk_eventdev_adptr.c:723
Applied patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h cleanly.
Applied patch drivers/crypto/cnxk/version.map cleanly.
Applying patch drivers/event/cnxk/cnxk_eventdev.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applying patch drivers/event/cnxk/cnxk_eventdev_adptr.c with 6 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
Rejected hunk #5.
Rejected hunk #6.
diff a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h (rejected hunks)
@@ -303,7 +304,8 @@ int cnxk_sso_tx_adapter_start(uint8_t id, const struct rte_eventdev *event_dev);
int cnxk_sso_tx_adapter_stop(uint8_t id, const struct rte_eventdev *event_dev);
int cnxk_sso_tx_adapter_free(uint8_t id, const struct rte_eventdev *event_dev);
int cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
- const struct rte_cryptodev *cdev, int32_t queue_pair_id);
+ const struct rte_cryptodev *cdev, int32_t queue_pair_id,
+ const struct rte_event_crypto_adapter_queue_conf *conf);
int cnxk_crypto_adapter_qp_del(const struct rte_cryptodev *cdev, int32_t queue_pair_id);
#endif /* __CNXK_EVENTDEV_H__ */
diff a/drivers/event/cnxk/cnxk_eventdev_adptr.c b/drivers/event/cnxk/cnxk_eventdev_adptr.c (rejected hunks)
@@ -631,7 +631,8 @@ cnxk_sso_tx_adapter_free(uint8_t id __rte_unused,
}
static int
-crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qp)
+crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qp,
+ const struct rte_event_crypto_adapter_queue_conf *conf)
{
char name[RTE_MEMPOOL_NAMESIZE];
uint32_t cache_size, nb_req;
@@ -664,6 +665,10 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qp
if (qp->ca.req_mp == NULL)
return -ENOMEM;
+ if (conf != NULL) {
+ qp->ca.vector_sz = conf->vector_sz;
+ qp->ca.vector_mp = conf->vector_mp;
+ }
qp->ca.enabled = true;
return 0;
@@ -671,7 +676,8 @@ crypto_adapter_qp_setup(const struct rte_cryptodev *cdev, struct cnxk_cpt_qp *qp
int
cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev,
- int32_t queue_pair_id)
+ int32_t queue_pair_id,
+ const struct rte_event_crypto_adapter_queue_conf *conf)
{
struct cnxk_sso_evdev *sso_evdev = cnxk_sso_pmd_priv(event_dev);
uint32_t adptr_xae_cnt = 0;
@@ -683,7 +689,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rt
for (qp_id = 0; qp_id < cdev->data->nb_queue_pairs; qp_id++) {
qp = cdev->data->queue_pairs[qp_id];
- ret = crypto_adapter_qp_setup(cdev, qp);
+ ret = crypto_adapter_qp_setup(cdev, qp, conf);
if (ret) {
cnxk_crypto_adapter_qp_del(cdev, -1);
return ret;
@@ -692,7 +698,7 @@ cnxk_crypto_adapter_qp_add(const struct rte_eventdev *event_dev, const struct rt
}
} else {
qp = cdev->data->queue_pairs[queue_pair_id];
- ret = crypto_adapter_qp_setup(cdev, qp);
+ ret = crypto_adapter_qp_setup(cdev, qp, conf);
if (ret)
return ret;
adptr_xae_cnt = qp->ca.req_mp->size;
@@ -723,7 +729,8 @@ crypto_adapter_qp_free(struct cnxk_cpt_qp *qp)
}
int
-cnxk_crypto_adapter_qp_del(const struct rte_cryptodev *cdev, int32_t queue_pair_id)
+cnxk_crypto_adapter_qp_del(const struct rte_cryptodev *cdev,
+ int32_t queue_pair_id)
{
struct cnxk_cpt_qp *qp;
https://lab.dpdk.org/results/dashboard/patchsets/23634/
UNH-IOL DPDK Community Lab
More information about the test-report
mailing list