|WARNING| pw127320-127322 [PATCH] [v2, 3/3] net/mlx5/hws: add support for infiniband BTH match

[dpdklab@iol.unh.edu]

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

_apply patch failure_

Submitter: Dong Zhou <dongzhou@nvidia.com>
Date: Wednesday, May 24 2023 10:08:05 
Applied on: CommitID:c41a103c961ded5a0966652f4daf0a661a947352
Apply patch set 127320-127322 failed:

Checking patch app/test-pmd/cmdline_flow.c...
error: while searching for:
	ITEM_AGGR_AFFINITY_VALUE,
	ITEM_TX_QUEUE,
	ITEM_TX_QUEUE_VALUE,

	/* Validate/create actions. */
	ACTIONS,

error: patch failed: app/test-pmd/cmdline_flow.c:498
error: while searching for:
	ITEM_QUOTA,
	ITEM_AGGR_AFFINITY,
	ITEM_TX_QUEUE,
	END_SET,
	ZERO,
};

error: patch failed: app/test-pmd/cmdline_flow.c:1455
Hunk #3 succeeded at 1953 (offset -15 lines).
Hunk #4 succeeded at 5532 (offset -15 lines).
error: while searching for:
	case RTE_FLOW_ITEM_TYPE_TX_QUEUE:
		mask = &rte_flow_item_tx_queue_mask;
		break;
	default:
		break;
	}

error: patch failed: app/test-pmd/cmdline_flow.c:11877
Checking patch devtools/words-case.txt...
Checking patch doc/guides/nics/features/default.ini...
Checking patch doc/guides/prog_guide/rte_flow.rst...
Hunk #1 succeeded at 1551 (offset -7 lines).
Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst...
Hunk #1 succeeded at 3781 (offset -4 lines).
Checking patch lib/ethdev/rte_flow.c...
error: while searching for:
	MK_FLOW_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)),
	MK_FLOW_ITEM(AGGR_AFFINITY, sizeof(struct rte_flow_item_aggr_affinity)),
	MK_FLOW_ITEM(TX_QUEUE, sizeof(struct rte_flow_item_tx_queue)),
};

/** Generate flow_action[] entry. */

error: patch failed: lib/ethdev/rte_flow.c:165
Checking patch lib/ethdev/rte_flow.h...
error: while searching for:
	 * @see struct rte_flow_item_tx_queue
	 */
	 RTE_FLOW_ITEM_TYPE_TX_QUEUE,
};

/**

error: patch failed: lib/ethdev/rte_flow.h:679
Hunk #3 succeeded at 2261 (offset -33 lines).
Checking patch lib/net/meson.build...
Checking patch lib/net/rte_ib.h...
Applying patch app/test-pmd/cmdline_flow.c with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Rejected hunk #5.
Applied patch devtools/words-case.txt cleanly.
Applied patch doc/guides/nics/features/default.ini cleanly.
Applied patch doc/guides/prog_guide/rte_flow.rst cleanly.
Applied patch doc/guides/testpmd_app_ug/testpmd_funcs.rst cleanly.
Applying patch lib/ethdev/rte_flow.c with 1 reject...
Rejected hunk #1.
Applying patch lib/ethdev/rte_flow.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Applied patch lib/net/meson.build cleanly.
Applied patch lib/net/rte_ib.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c	(rejected hunks)
@@ -498,6 +498,11 @@ enum index {
 	ITEM_AGGR_AFFINITY_VALUE,
 	ITEM_TX_QUEUE,
 	ITEM_TX_QUEUE_VALUE,
+	ITEM_IB_BTH,
+	ITEM_IB_BTH_OPCODE,
+	ITEM_IB_BTH_PKEY,
+	ITEM_IB_BTH_DST_QPN,
+	ITEM_IB_BTH_PSN,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -1455,6 +1460,7 @@ static const enum index next_item[] = {
 	ITEM_QUOTA,
 	ITEM_AGGR_AFFINITY,
 	ITEM_TX_QUEUE,
+	ITEM_IB_BTH,
 	END_SET,
 	ZERO,
 };
@@ -11877,6 +11932,9 @@ flow_item_default_mask(const struct rte_flow_item *item)
 	case RTE_FLOW_ITEM_TYPE_TX_QUEUE:
 		mask = &rte_flow_item_tx_queue_mask;
 		break;
+	case RTE_FLOW_ITEM_TYPE_IB_BTH:
+		mask = &rte_flow_item_ib_bth_mask;
+		break;
 	default:
 		break;
 	}
diff a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c	(rejected hunks)
@@ -165,6 +165,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
 	MK_FLOW_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)),
 	MK_FLOW_ITEM(AGGR_AFFINITY, sizeof(struct rte_flow_item_aggr_affinity)),
 	MK_FLOW_ITEM(TX_QUEUE, sizeof(struct rte_flow_item_tx_queue)),
+	MK_FLOW_ITEM(IB_BTH, sizeof(struct rte_flow_item_ib_bth)),
 };
 
 /** Generate flow_action[] entry. */
diff a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h	(rejected hunks)
@@ -679,6 +680,13 @@ enum rte_flow_item_type {
 	 * @see struct rte_flow_item_tx_queue
 	 */
 	 RTE_FLOW_ITEM_TYPE_TX_QUEUE,
+
+	/**
+	 * Matches an InfiniBand base transport header in RoCE packet.
+	 *
+	 * See struct rte_flow_item_ib_bth.
+	 */
+	RTE_FLOW_ITEM_TYPE_IB_BTH,
 };
 
 /**

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

UNH-IOL DPDK Community Lab