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

_apply patch failure_

Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: Sunday, April 10 2022 22:56:02 
Applied on: CommitID:1e230b9be8866939ef7ce9f7f16b8c8369b7bc28
Apply patch set 109561 failed:

Checking patch drivers/event/dlb2/dlb2.c...
error: while searching for:
		dlb2->ev_ports[q].cq_weight = cq_weight[q];
}

static int
dlb2_hw_query_resources(struct dlb2_eventdev *dlb2)
{

error: patch failed: drivers/event/dlb2/dlb2.c:116
Hunk #2 succeeded at 286 (offset -66 lines).
Hunk #3 succeeded at 482 (offset -113 lines).
Hunk #4 succeeded at 600 (offset -113 lines).
Hunk #5 succeeded at 632 (offset -113 lines).
Hunk #6 succeeded at 826 (offset -113 lines).
Hunk #7 succeeded at 1383 (offset -120 lines).
Hunk #8 succeeded at 4526 (offset -192 lines).
Hunk #9 succeeded at 4556 (offset -193 lines).
error: while searching for:
	dlb2_init_cq_weight(dlb2,
			    dlb2_args->cq_weight.limit);

	return 0;
}


error: patch failed: drivers/event/dlb2/dlb2.c:4730
error: while searching for:
					     DLB2_VECTOR_OPTS_ENAB_ARG,
					     DLB2_MAX_CQ_DEPTH,
					     DLB2_CQ_WEIGHT,
					     NULL };

	if (params != NULL && params[0] != '\0') {

error: patch failed: drivers/event/dlb2/dlb2.c:4785
Hunk #12 succeeded at 4729 (offset -206 lines).
Hunk #13 succeeded at 4782 (offset -228 lines).
Checking patch drivers/event/dlb2/dlb2_iface.c...
error: while searching for:
int (*dlb2_iface_enable_cq_weight)(struct dlb2_hw_dev *handle,
				   struct dlb2_enable_cq_weight_args *args);


error: patch failed: drivers/event/dlb2/dlb2_iface.c:76
Checking patch drivers/event/dlb2/dlb2_iface.h...
error: while searching for:
extern int (*dlb2_iface_enable_cq_weight)(struct dlb2_hw_dev *handle,
					  struct dlb2_enable_cq_weight_args *args);

#endif /* _DLB2_IFACE_H_ */

error: patch failed: drivers/event/dlb2/dlb2_iface.h:75
Checking patch drivers/event/dlb2/dlb2_priv.h...
error: while searching for:
#define DLB2_VECTOR_OPTS_ENAB_ARG "vector_opts_enable"
#define DLB2_MAX_CQ_DEPTH "max_cq_depth"
#define DLB2_CQ_WEIGHT "cq_weight"

/* Begin HW related defines and structs */


error: patch failed: drivers/event/dlb2/dlb2_priv.h:45
Hunk #2 succeeded at 409 (offset -8 lines).
Hunk #3 succeeded at 418 (offset -8 lines).
error: while searching for:
	bool enq_configured;
	uint8_t implicit_release; /* release events before dequeuing */
	uint32_t cq_weight; /* DLB2.5 and above ldb ports only */
}  __rte_cache_aligned;

struct dlb2_queue {

error: patch failed: drivers/event/dlb2/dlb2_priv.h:527
Hunk #5 succeeded at 613 (offset -11 lines).
error: while searching for:
	int limit[DLB2_MAX_NUM_LDB_PORTS];
};

struct dlb2_devargs {
	int socket_id;
	int max_num_events;
	int num_dir_credits_override;
	int dev_id;
	struct dlb2_qid_depth_thresholds qid_depth_thresholds;
	enum dlb2_cos cos_id;
	int poll_interval;
	int sw_credit_quanta;
	int hw_credit_quanta;

error: patch failed: drivers/event/dlb2/dlb2_priv.h:632
error: while searching for:
	bool vector_opts_enabled;
	int max_cq_depth;
	struct dlb2_cq_weight cq_weight;
};

/* End Eventdev related defines and structs */

error: patch failed: drivers/event/dlb2/dlb2_priv.h:646
Checking patch drivers/event/dlb2/pf/base/dlb2_resource.c...
Hunk #1 succeeded at 6246 (offset -221 lines).
Checking patch drivers/event/dlb2/pf/dlb2_pf.c...
Hunk #1 succeeded at 578 (offset -67 lines).
error: while searching for:
	dlb2_iface_set_sn_allocation = dlb2_pf_set_sn_allocation;
	dlb2_iface_get_sn_occupancy = dlb2_pf_get_sn_occupancy;
	dlb2_iface_enable_cq_weight = dlb2_pf_enable_cq_weight;
}

/* PCI DEV HOOKS */

error: patch failed: drivers/event/dlb2/pf/dlb2_pf.c:670
Hunk #3 succeeded at 634 (offset -69 lines).
Applying patch drivers/event/dlb2/dlb2.c with 3 rejects...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Rejected hunk #10.
Rejected hunk #11.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Applying patch drivers/event/dlb2/dlb2_iface.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/event/dlb2/dlb2_iface.h with 1 reject...
Rejected hunk #1.
Applying patch drivers/event/dlb2/dlb2_priv.h with 4 rejects...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Rejected hunk #6.
Rejected hunk #7.
Applied patch drivers/event/dlb2/pf/base/dlb2_resource.c cleanly.
Applying patch drivers/event/dlb2/pf/dlb2_pf.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
diff a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c	(rejected hunks)
@@ -116,6 +116,28 @@ dlb2_init_cq_weight(struct dlb2_eventdev *dlb2, int *cq_weight)
 		dlb2->ev_ports[q].cq_weight = cq_weight[q];
 }
 
+/* override defaults with value(s) provided on command line */
+static void
+dlb2_init_port_cos(struct dlb2_eventdev *dlb2, int *port_cos)
+{
+	int q;
+
+	for (q = 0; q < DLB2_MAX_NUM_PORTS_ALL; q++) {
+		dlb2->ev_ports[q].cos_id = port_cos[q];
+		dlb2->cos_ports[port_cos[q]]++;
+	}
+}
+
+static void
+dlb2_init_cos_bw(struct dlb2_eventdev *dlb2,
+		 struct dlb2_cos_bw *cos_bw)
+{
+	int q;
+	for (q = 0; q < DLB2_COS_NUM_VALS; q++)
+		dlb2->cos_bw[q] = cos_bw->val[q];
+
+}
+
 static int
 dlb2_hw_query_resources(struct dlb2_eventdev *dlb2)
 {
@@ -4730,6 +4800,12 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev,
 	dlb2_init_cq_weight(dlb2,
 			    dlb2_args->cq_weight.limit);
 
+	dlb2_init_port_cos(dlb2,
+			   dlb2_args->port_cos.cos_id);
+
+	dlb2_init_cos_bw(dlb2,
+			 &dlb2_args->cos_bw);
+
 	return 0;
 }
 
@@ -4785,6 +4861,8 @@ dlb2_parse_params(const char *params,
 					     DLB2_VECTOR_OPTS_ENAB_ARG,
 					     DLB2_MAX_CQ_DEPTH,
 					     DLB2_CQ_WEIGHT,
+					     DLB2_PORT_COS,
+					     DLB2_COS_BW,
 					     NULL };
 
 	if (params != NULL && params[0] != '\0') {
diff a/drivers/event/dlb2/dlb2_iface.c b/drivers/event/dlb2/dlb2_iface.c	(rejected hunks)
@@ -76,3 +76,6 @@ int (*dlb2_iface_get_dir_queue_depth)(struct dlb2_hw_dev *handle,
 int (*dlb2_iface_enable_cq_weight)(struct dlb2_hw_dev *handle,
 				   struct dlb2_enable_cq_weight_args *args);
 
+int (*dlb2_iface_set_cos_bw)(struct dlb2_hw_dev *handle,
+			     struct dlb2_set_cos_bw_args *args);
+
diff a/drivers/event/dlb2/dlb2_iface.h b/drivers/event/dlb2/dlb2_iface.h	(rejected hunks)
@@ -75,4 +75,7 @@ extern int (*dlb2_iface_get_dir_queue_depth)(struct dlb2_hw_dev *handle,
 extern int (*dlb2_iface_enable_cq_weight)(struct dlb2_hw_dev *handle,
 					  struct dlb2_enable_cq_weight_args *args);
 
+extern int (*dlb2_iface_set_cos_bw)(struct dlb2_hw_dev *handle,
+				    struct dlb2_set_cos_bw_args *args);
+
 #endif /* _DLB2_IFACE_H_ */
diff a/drivers/event/dlb2/dlb2_priv.h b/drivers/event/dlb2/dlb2_priv.h	(rejected hunks)
@@ -45,6 +45,8 @@
 #define DLB2_VECTOR_OPTS_ENAB_ARG "vector_opts_enable"
 #define DLB2_MAX_CQ_DEPTH "max_cq_depth"
 #define DLB2_CQ_WEIGHT "cq_weight"
+#define DLB2_PORT_COS "port_cos"
+#define DLB2_COS_BW "cos_bw"
 
 /* Begin HW related defines and structs */
 
@@ -527,6 +529,7 @@ struct dlb2_eventdev_port {
 	bool enq_configured;
 	uint8_t implicit_release; /* release events before dequeuing */
 	uint32_t cq_weight; /* DLB2.5 and above ldb ports only */
+	int cos_id; /*ldb port class of service */
 }  __rte_cache_aligned;
 
 struct dlb2_queue {
@@ -632,13 +637,20 @@ struct dlb2_cq_weight {
 	int limit[DLB2_MAX_NUM_LDB_PORTS];
 };
 
+struct dlb2_port_cos {
+	int cos_id[DLB2_MAX_NUM_LDB_PORTS];
+};
+
+struct dlb2_cos_bw {
+	int val[DLB2_COS_NUM_VALS];
+};
+
 struct dlb2_devargs {
 	int socket_id;
 	int max_num_events;
 	int num_dir_credits_override;
 	int dev_id;
 	struct dlb2_qid_depth_thresholds qid_depth_thresholds;
-	enum dlb2_cos cos_id;
 	int poll_interval;
 	int sw_credit_quanta;
 	int hw_credit_quanta;
@@ -646,6 +658,8 @@ struct dlb2_devargs {
 	bool vector_opts_enabled;
 	int max_cq_depth;
 	struct dlb2_cq_weight cq_weight;
+	struct dlb2_port_cos port_cos;
+	struct dlb2_cos_bw cos_bw;
 };
 
 /* End Eventdev related defines and structs */
diff a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c	(rejected hunks)
@@ -670,6 +689,7 @@ dlb2_pf_iface_fn_ptrs_init(void)
 	dlb2_iface_set_sn_allocation = dlb2_pf_set_sn_allocation;
 	dlb2_iface_get_sn_occupancy = dlb2_pf_get_sn_occupancy;
 	dlb2_iface_enable_cq_weight = dlb2_pf_enable_cq_weight;
+	dlb2_iface_set_cos_bw = dlb2_pf_set_cos_bandwidth;
 }
 
 /* PCI DEV HOOKS */

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

UNH-IOL DPDK Community Lab