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

_apply patch failure_

Submitter: Timothy McDaniel <timothy.mcdaniel@intel.com>
Date: Sunday, April 10 2022 05:37:37 
Applied on: CommitID:1e230b9be8866939ef7ce9f7f16b8c8369b7bc28
Apply patch set 109546 failed:

Checking patch drivers/event/dlb2/dlb2.c...
Hunk #2 succeeded at 522 (offset -34 lines).
Hunk #3 succeeded at 1389 (offset -34 lines).
Hunk #4 succeeded at 1474 (offset -34 lines).
error: while searching for:
			qe[2].data = ev[2].u64;
			qe[3].data = ev[3].u64;
#endif

		break;
	case 3:

error: patch failed: drivers/event/dlb2/dlb2.c:2843
Hunk #6 succeeded at 4636 (offset -91 lines).
error: while searching for:
					     DLB2_DEPTH_THRESH_ARG,
					     DLB2_VECTOR_OPTS_ENAB_ARG,
					     DLB2_MAX_CQ_DEPTH,
					     NULL };

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

error: patch failed: drivers/event/dlb2/dlb2.c:4693
error: while searching for:
					set_max_cq_depth,
					&dlb2_args->max_cq_depth);
			if (ret != 0) {
				DLB2_LOG_ERR("%s: Error parsing vector opts enabled",
					     name);
				rte_kvargs_free(kvlist);
				return ret;

error: patch failed: drivers/event/dlb2/dlb2.c:4833
Checking patch drivers/event/dlb2/dlb2_iface.c...
.git/rebase-apply/patch:193: new blank line at EOF.
+
Checking patch drivers/event/dlb2/dlb2_iface.h...
Checking patch drivers/event/dlb2/dlb2_priv.h...
error: while searching for:
#define DLB2_DEPTH_THRESH_ARG "default_depth_thresh"
#define DLB2_VECTOR_OPTS_ENAB_ARG "vector_opts_enable"
#define DLB2_MAX_CQ_DEPTH "max_cq_depth"

/* Begin HW related defines and structs */


error: patch failed: drivers/event/dlb2/dlb2_priv.h:44
Hunk #2 succeeded at 245 (offset -5 lines).
Hunk #3 succeeded at 373 (offset -5 lines).
Hunk #4 succeeded at 521 (offset -5 lines).
Hunk #5 succeeded at 622 (offset -6 lines).
error: while searching for:
	int default_depth_thresh;
	bool vector_opts_enabled;
	int max_cq_depth;
};

/* End Eventdev related defines and structs */

error: patch failed: drivers/event/dlb2/dlb2_priv.h:638
Checking patch drivers/event/dlb2/dlb2_user.h...
Checking patch drivers/event/dlb2/pf/base/dlb2_resource.c...
.git/rebase-apply/patch:546: new blank line at EOF.
+
Checking patch drivers/event/dlb2/pf/base/dlb2_resource.h...
Checking patch drivers/event/dlb2/pf/dlb2_pf.c...
Applying patch drivers/event/dlb2/dlb2.c with 3 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Rejected hunk #5.
Hunk #6 applied cleanly.
Rejected hunk #7.
Rejected hunk #8.
Applied patch drivers/event/dlb2/dlb2_iface.c cleanly.
Applied patch drivers/event/dlb2/dlb2_iface.h cleanly.
Applying patch drivers/event/dlb2/dlb2_priv.h with 2 rejects...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Applied patch drivers/event/dlb2/dlb2_user.h cleanly.
Applied patch drivers/event/dlb2/pf/base/dlb2_resource.c cleanly.
Applied patch drivers/event/dlb2/pf/base/dlb2_resource.h cleanly.
Applied patch drivers/event/dlb2/pf/dlb2_pf.c cleanly.
diff a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c	(rejected hunks)
@@ -2843,6 +2923,14 @@ dlb2_event_build_hcws(struct dlb2_port *qm_port,
 			qe[2].data = ev[2].u64;
 			qe[3].data = ev[3].u64;
 #endif
+			/* will only be set for DLB 2.5 + */
+			if (qm_port->cq_weight) {
+				qe[0].weight = ev[0].impl_opaque & 3;
+				qe[1].weight = ev[1].impl_opaque & 3;
+				qe[2].weight = ev[2].impl_opaque & 3;
+				qe[3].weight = ev[3].impl_opaque & 3;
+			}
+
 
 		break;
 	case 3:
@@ -4693,6 +4784,7 @@ dlb2_parse_params(const char *params,
 					     DLB2_DEPTH_THRESH_ARG,
 					     DLB2_VECTOR_OPTS_ENAB_ARG,
 					     DLB2_MAX_CQ_DEPTH,
+					     DLB2_CQ_WEIGHT,
 					     NULL };
 
 	if (params != NULL && params[0] != '\0') {
@@ -4833,7 +4925,18 @@ dlb2_parse_params(const char *params,
 					set_max_cq_depth,
 					&dlb2_args->max_cq_depth);
 			if (ret != 0) {
-				DLB2_LOG_ERR("%s: Error parsing vector opts enabled",
+				DLB2_LOG_ERR("%s: Error parsing max cq depth",
+					     name);
+				rte_kvargs_free(kvlist);
+				return ret;
+			}
+
+			ret = rte_kvargs_process(kvlist,
+					DLB2_CQ_WEIGHT,
+					set_cq_weight,
+					&dlb2_args->cq_weight);
+			if (ret != 0) {
+				DLB2_LOG_ERR("%s: Error parsing cq weight on",
 					     name);
 				rte_kvargs_free(kvlist);
 				return ret;
diff a/drivers/event/dlb2/dlb2_priv.h b/drivers/event/dlb2/dlb2_priv.h	(rejected hunks)
@@ -44,6 +44,7 @@
 #define DLB2_DEPTH_THRESH_ARG "default_depth_thresh"
 #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 */
 
@@ -638,6 +645,7 @@ struct dlb2_devargs {
 	int default_depth_thresh;
 	bool vector_opts_enabled;
 	int max_cq_depth;
+	struct dlb2_cq_weight cq_weight;
 };
 
 /* End Eventdev related defines and structs */

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

UNH-IOL DPDK Community Lab