|WARNING| pw124130-124131 [PATCH] [v7, 2/2] ethdev: add flow matching of aggregated port

|WARNING| pw124130-124131 [PATCH] [v7, 2/2] ethdev: add flow matching of aggregated port

[dpdklab]

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

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

_apply patch failure_

Submitter: Jiawei Wang <jiaweiw@nvidia.com>
Date: Friday, February 17 2023 15:47:47 
Applied on: CommitID:8a3ef4b89e6dd0247355fdf3a77ff7ec1db28d8d
Apply patch set 124130-124131 failed:

Checking patch app/test-pmd/cmdline.c...
Checking patch doc/guides/rel_notes/release_23_03.rst...
Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst...
Checking patch lib/ethdev/ethdev_driver.h...
Checking patch lib/ethdev/ethdev_trace.h...
Checking patch lib/ethdev/ethdev_trace_points.c...
Checking patch lib/ethdev/rte_ethdev.c...
Checking patch lib/ethdev/rte_ethdev.h...
Checking patch lib/ethdev/version.map...
error: while searching for:
	rte_mtr_meter_profile_get;

	# added in 23.03
	rte_flow_action_handle_query_update;
	rte_flow_async_action_handle_query_update;
	rte_flow_async_create_by_index;

error: patch failed: lib/ethdev/version.map:300
Applied patch app/test-pmd/cmdline.c cleanly.
Applied patch doc/guides/rel_notes/release_23_03.rst cleanly.
Applied patch doc/guides/testpmd_app_ug/testpmd_funcs.rst cleanly.
Applied patch lib/ethdev/ethdev_driver.h cleanly.
Applied patch lib/ethdev/ethdev_trace.h cleanly.
Applied patch lib/ethdev/ethdev_trace_points.c cleanly.
Applied patch lib/ethdev/rte_ethdev.c cleanly.
Applied patch lib/ethdev/rte_ethdev.h cleanly.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -300,6 +300,8 @@ EXPERIMENTAL {
 	rte_mtr_meter_profile_get;
 
 	# added in 23.03
+	rte_eth_dev_count_aggr_ports;
+	rte_eth_dev_map_aggr_tx_affinity;
 	rte_flow_action_handle_query_update;
 	rte_flow_async_action_handle_query_update;
 	rte_flow_async_create_by_index;
Checking patch app/test-pmd/cmdline_flow.c...
error: while searching for:
	ITEM_QUOTA,
	ITEM_QUOTA_STATE,
	ITEM_QUOTA_STATE_NAME,

	/* Validate/create actions. */
	ACTIONS,

error: patch failed: app/test-pmd/cmdline_flow.c:494
error: while searching for:
	ITEM_PPP,
	ITEM_METER,
	ITEM_QUOTA,
	END_SET,
	ZERO,
};

error: patch failed: app/test-pmd/cmdline_flow.c:1449
Hunk #3 succeeded at 1892 (offset -55 lines).
Hunk #4 succeeded at 6700 (offset -229 lines).
Hunk #5 succeeded at 11446 (offset -400 lines).
Checking patch doc/guides/prog_guide/rte_flow.rst...
error: while searching for:

- ``state``: Flow quota state

Actions
~~~~~~~


error: patch failed: doc/guides/prog_guide/rte_flow.rst:1543
Checking patch doc/guides/rel_notes/release_23_03.rst...
error: doc/guides/rel_notes/release_23_03.rst: does not match index
Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst...
error: doc/guides/testpmd_app_ug/testpmd_funcs.rst: does not match index
Checking patch lib/ethdev/rte_flow.c...
error: while searching for:
	MK_FLOW_ITEM(METER_COLOR, sizeof(struct rte_flow_item_meter_color)),
	MK_FLOW_ITEM(IPV6_ROUTING_EXT, sizeof(struct rte_flow_item_ipv6_routing_ext)),
	MK_FLOW_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)),
};

/** Generate flow_action[] entry. */

error: patch failed: lib/ethdev/rte_flow.c:163
Checking patch lib/ethdev/rte_flow.h...
error: while searching for:
	 * @see struct rte_flow_item_quota
	 */
	 RTE_FLOW_ITEM_TYPE_QUOTA,
};

/**

error: patch failed: lib/ethdev/rte_flow.h:663
Hunk #2 succeeded at 2187 (offset -47 lines).
Applying patch app/test-pmd/cmdline_flow.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Applying patch doc/guides/prog_guide/rte_flow.rst with 1 reject...
Rejected hunk #1.
Applying patch lib/ethdev/rte_flow.c with 1 reject...
Rejected hunk #1.
Applying patch lib/ethdev/rte_flow.h with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
diff a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c	(rejected hunks)
@@ -494,6 +494,8 @@ enum index {
 	ITEM_QUOTA,
 	ITEM_QUOTA_STATE,
 	ITEM_QUOTA_STATE_NAME,
+	ITEM_AGGR_AFFINITY,
+	ITEM_AGGR_AFFINITY_VALUE,
 
 	/* Validate/create actions. */
 	ACTIONS,
@@ -1449,6 +1451,7 @@ static const enum index next_item[] = {
 	ITEM_PPP,
 	ITEM_METER,
 	ITEM_QUOTA,
+	ITEM_AGGR_AFFINITY,
 	END_SET,
 	ZERO,
 };
diff a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst	(rejected hunks)
@@ -1543,6 +1543,14 @@ Matches flow quota state set by quota action.
 
 - ``state``: Flow quota state
 
+Item: ``AGGR_AFFINITY``
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Matches on the aggregated port of the received packet.
+In case of multiple aggregated ports, the affinity numbering starts from 1.
+
+- ``affinity``: Aggregated affinity.
+
 Actions
 ~~~~~~~
 
diff a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c	(rejected hunks)
@@ -163,6 +163,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {
 	MK_FLOW_ITEM(METER_COLOR, sizeof(struct rte_flow_item_meter_color)),
 	MK_FLOW_ITEM(IPV6_ROUTING_EXT, sizeof(struct rte_flow_item_ipv6_routing_ext)),
 	MK_FLOW_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)),
+	MK_FLOW_ITEM(AGGR_AFFINITY, sizeof(struct rte_flow_item_aggr_affinity)),
 };
 
 /** Generate flow_action[] entry. */
diff a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h	(rejected hunks)
@@ -663,6 +663,15 @@ enum rte_flow_item_type {
 	 * @see struct rte_flow_item_quota
 	 */
 	 RTE_FLOW_ITEM_TYPE_QUOTA,
+
+	/**
+	 * Matches on the aggregated port of the received packet.
+	 * Used in case multiple ports are aggregated to the a DPDK port.
+	 * First port is number 1.
+	 *
+	 * @see struct rte_flow_item_aggr_affinity.
+	 */
+	RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY,
 };
 
 /**

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

UNH-IOL DPDK Community Lab