|WARNING| pw116430-116431 [PATCH] [3/3] net/cnxk: support congestion management ops

|WARNING| pw116430-116431 [PATCH] [3/3] net/cnxk: support congestion management ops

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 5154 bytes --]

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

_apply patch failure_

Submitter: Sunil Kumar Kori <skori@marvell.com>
Date: Monday, September 19 2022 12:41:17 
Applied on: CommitID:f8f6b1c1744e12d8d6877464a613acd1231db1a1
Apply patch set 116430-116431 failed:

Checking patch drivers/common/cnxk/roc_nix.h...
Hunk #1 succeeded at 306 (offset -9 lines).
Hunk #2 succeeded at 859 (offset -14 lines).
Checking patch drivers/common/cnxk/roc_nix_queue.c...
error: while searching for:
	return 0;
}

int
nix_rq_cn9k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints,
		bool cfg, bool ena)

error: patch failed: drivers/common/cnxk/roc_nix_queue.c:235
Hunk #2 succeeded at 434 (offset -135 lines).
Hunk #3 succeeded at 538 (offset -158 lines).
Checking patch drivers/common/cnxk/version.map...
Hunk #1 succeeded at 222 (offset -6 lines).
Applied patch drivers/common/cnxk/roc_nix.h cleanly.
Applying patch drivers/common/cnxk/roc_nix_queue.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Applied patch drivers/common/cnxk/version.map cleanly.
diff a/drivers/common/cnxk/roc_nix_queue.c b/drivers/common/cnxk/roc_nix_queue.c	(rejected hunks)
@@ -235,6 +235,46 @@ nix_rq_aura_buf_type_update(struct roc_nix_rq *rq, bool set)
 	return 0;
 }
 
+static int
+nix_rq_cn9k_cman_cfg(struct dev *dev, struct roc_nix_rq *rq)
+{
+	struct mbox *mbox = dev->mbox;
+	struct nix_aq_enq_req *aq;
+
+	aq = mbox_alloc_msg_nix_aq_enq(mbox);
+	if (!aq)
+		return -ENOSPC;
+
+	aq->qidx = rq->qid;
+	aq->ctype = NIX_AQ_CTYPE_RQ;
+	aq->op = NIX_AQ_INSTOP_WRITE;
+
+	if (rq->red_pass && (rq->red_pass >= rq->red_drop)) {
+		aq->rq.lpb_pool_pass = rq->red_pass;
+		aq->rq.lpb_pool_drop = rq->red_drop;
+		aq->rq_mask.lpb_pool_pass = ~(aq->rq_mask.lpb_pool_pass);
+		aq->rq_mask.lpb_pool_drop = ~(aq->rq_mask.lpb_pool_drop);
+
+	}
+
+	if (rq->spb_red_pass && (rq->spb_red_pass >= rq->spb_red_drop)) {
+		aq->rq.spb_pool_pass = rq->spb_red_pass;
+		aq->rq.spb_pool_drop = rq->spb_red_drop;
+		aq->rq_mask.spb_pool_pass = ~(aq->rq_mask.spb_pool_pass);
+		aq->rq_mask.spb_pool_drop = ~(aq->rq_mask.spb_pool_drop);
+
+	}
+
+	if (rq->xqe_red_pass && (rq->xqe_red_pass >= rq->xqe_red_drop)) {
+		aq->rq.xqe_pass = rq->xqe_red_pass;
+		aq->rq.xqe_drop = rq->xqe_red_drop;
+		aq->rq_mask.xqe_drop = ~(aq->rq_mask.xqe_drop);
+		aq->rq_mask.xqe_pass = ~(aq->rq_mask.xqe_pass);
+	}
+
+	return mbox_process(mbox);
+}
+
 int
 nix_rq_cn9k_cfg(struct dev *dev, struct roc_nix_rq *rq, uint16_t qints,
 		bool cfg, bool ena)
Checking patch doc/guides/nics/features/cnxk.ini...
Checking patch drivers/net/cnxk/cnxk_ethdev.c...
error: while searching for:
	.tm_ops_get = cnxk_nix_tm_ops_get,
	.mtr_ops_get = cnxk_nix_mtr_ops_get,
	.eth_dev_priv_dump  = cnxk_nix_eth_dev_priv_dump,
};

static int

error: patch failed: drivers/net/cnxk/cnxk_ethdev.c:1678
Checking patch drivers/net/cnxk/cnxk_ethdev.h...
Hunk #1 succeeded at 413 (offset -4 lines).
error: while searching for:
int cnxk_nix_inl_meta_pool_cb(uint64_t *aura_handle, uint32_t buf_sz, uint32_t nb_bufs,
			      bool destroy);

/* Other private functions */
int nix_recalc_mtu(struct rte_eth_dev *eth_dev);
int nix_mtr_validate(struct rte_eth_dev *dev, uint32_t id);

error: patch failed: drivers/net/cnxk/cnxk_ethdev.h:649
Checking patch drivers/net/cnxk/cnxk_ethdev_cman.c...
Checking patch drivers/net/cnxk/meson.build...
Applied patch doc/guides/nics/features/cnxk.ini cleanly.
Applying patch drivers/net/cnxk/cnxk_ethdev.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/cnxk/cnxk_ethdev.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch drivers/net/cnxk/cnxk_ethdev_cman.c cleanly.
Applied patch drivers/net/cnxk/meson.build cleanly.
diff a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c	(rejected hunks)
@@ -1678,6 +1678,10 @@ struct eth_dev_ops cnxk_eth_dev_ops = {
 	.tm_ops_get = cnxk_nix_tm_ops_get,
 	.mtr_ops_get = cnxk_nix_mtr_ops_get,
 	.eth_dev_priv_dump  = cnxk_nix_eth_dev_priv_dump,
+	.cman_info_get = cnxk_nix_cman_info_get,
+	.cman_config_init = cnxk_nix_cman_config_init,
+	.cman_config_set = cnxk_nix_cman_config_set,
+	.cman_config_get = cnxk_nix_cman_config_get,
 };
 
 static int
diff a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h	(rejected hunks)
@@ -649,6 +652,15 @@ cnxk_eth_sec_sess_get_by_sess(struct cnxk_eth_dev *dev,
 int cnxk_nix_inl_meta_pool_cb(uint64_t *aura_handle, uint32_t buf_sz, uint32_t nb_bufs,
 			      bool destroy);
 
+/* Congestion Management */
+int cnxk_nix_cman_info_get(struct rte_eth_dev *dev, struct rte_eth_cman_info *info);
+
+int cnxk_nix_cman_config_init(struct rte_eth_dev *dev, struct rte_eth_cman_config *config);
+
+int cnxk_nix_cman_config_set(struct rte_eth_dev *dev, struct rte_eth_cman_config *config);
+
+int cnxk_nix_cman_config_get(struct rte_eth_dev *dev, struct rte_eth_cman_config *config);
+
 /* Other private functions */
 int nix_recalc_mtu(struct rte_eth_dev *eth_dev);
 int nix_mtr_validate(struct rte_eth_dev *dev, uint32_t id);

https://lab.dpdk.org/results/dashboard/patchsets/23539/

UNH-IOL DPDK Community Lab