Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/114603

_apply patch failure_

Submitter: Volodymyr Fialko <vfialko@marvell.com>
Date: Thursday, August 04 2022 09:59:07 
Applied on: CommitID:72206323a5dd3182b13f61b25a64abdddfee595c
Apply patch set 114603-114605 failed:

Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c...
Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.h...
Checking patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h...
Checking patch drivers/crypto/cnxk/version.map...
Checking patch drivers/event/cnxk/cn10k_eventdev.c...
Checking patch drivers/event/cnxk/cn10k_worker.h...
Checking patch drivers/event/cnxk/cn9k_eventdev.c...
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:312
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/cn10k_cryptodev_ops.c cleanly.
Applied patch drivers/crypto/cnxk/cn10k_cryptodev_ops.h cleanly.
Applied patch drivers/crypto/cnxk/cnxk_cryptodev_ops.h cleanly.
Applied patch drivers/crypto/cnxk/version.map cleanly.
Applied patch drivers/event/cnxk/cn10k_eventdev.c cleanly.
Applied patch drivers/event/cnxk/cn10k_worker.h cleanly.
Applied patch drivers/event/cnxk/cn9k_eventdev.c 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)
@@ -312,7 +313,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/23142/

UNH-IOL DPDK Community Lab