|WARNING| pw117483-117486 [PATCH] [v3, 4/4] ethdev: add trace points for tm

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Ankur Dwivedi <adwivedi at marvell.com>
Date: Thursday, October 06 2022 15:18:44 
Applied on: CommitID:4ed890495594a71e618d62fd975c5868915eb4a1
Apply patch set 117483-117486 failed:

Checking patch lib/ethdev/ethdev_trace_points.c...
Checking patch lib/ethdev/rte_ethdev_trace.h...
Checking patch lib/ethdev/rte_mtr.c...
Hunk #2 succeeded at 64 (offset -19 lines).
Hunk #3 succeeded at 77 (offset -19 lines).
Hunk #4 succeeded at 89 (offset -19 lines).
Hunk #5 succeeded at 101 (offset -30 lines).
Hunk #6 succeeded at 117 (offset -30 lines).
Hunk #7 succeeded at 133 (offset -30 lines).
Hunk #8 succeeded at 147 (offset -41 lines).
Hunk #9 succeeded at 159 (offset -41 lines).
Hunk #10 succeeded at 171 (offset -41 lines).
Hunk #11 succeeded at 183 (offset -41 lines).
Hunk #12 succeeded at 196 (offset -41 lines).
Hunk #13 succeeded at 209 (offset -41 lines).
error: while searching for:
	struct rte_mtr_error *error)
{
	struct rte_eth_dev *dev = &rte_eth_devices[port_id];
	return RTE_MTR_FUNC(port_id, meter_dscp_table_update)(dev,
		mtr_id, proto, dscp_table, error);
}

error: patch failed: lib/ethdev/rte_mtr.c:243
error: while searching for:
	struct rte_mtr_error *error)
{
	struct rte_eth_dev *dev = &rte_eth_devices[port_id];
	return RTE_MTR_FUNC(port_id, meter_vlan_table_update)(dev,
		mtr_id, proto, vlan_table, error);
}

error: patch failed: lib/ethdev/rte_mtr.c:255
Hunk #16 succeeded at 247 (offset -43 lines).
Hunk #17 succeeded at 260 (offset -43 lines).
Hunk #18 succeeded at 274 (offset -43 lines).
Hunk #19 succeeded at 287 (offset -43 lines).
Hunk #20 succeeded at 302 (offset -43 lines).
Checking patch lib/ethdev/version.map...
Hunk #1 succeeded at 500 (offset -2 lines).
Applied patch lib/ethdev/ethdev_trace_points.c cleanly.
Applied patch lib/ethdev/rte_ethdev_trace.h cleanly.
Applying patch lib/ethdev/rte_mtr.c with 2 rejects...
Hunk #1 applied cleanly.
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.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Rejected hunk #14.
Rejected hunk #15.
Hunk #16 applied cleanly.
Hunk #17 applied cleanly.
Hunk #18 applied cleanly.
Hunk #19 applied cleanly.
Hunk #20 applied cleanly.
Applied patch lib/ethdev/version.map cleanly.
diff a/lib/ethdev/rte_mtr.c b/lib/ethdev/rte_mtr.c	(rejected hunks)
@@ -243,6 +263,7 @@ rte_mtr_meter_dscp_table_update(uint16_t port_id,
 	struct rte_mtr_error *error)
 {
 	struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+	rte_mtr_trace_meter_dscp_table_update(port_id, mtr_id, dscp_table);
 	return RTE_MTR_FUNC(port_id, meter_dscp_table_update)(dev,
 		mtr_id, proto, dscp_table, error);
 }
@@ -255,6 +276,7 @@ rte_mtr_meter_vlan_table_update(uint16_t port_id,
 	struct rte_mtr_error *error)
 {
 	struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+	rte_mtr_trace_meter_vlan_table_update(port_id, mtr_id, vlan_table);
 	return RTE_MTR_FUNC(port_id, meter_vlan_table_update)(dev,
 		mtr_id, proto, vlan_table, error);
 }
Checking patch lib/ethdev/ethdev_trace_points.c...
error: lib/ethdev/ethdev_trace_points.c: does not match index
Checking patch lib/ethdev/rte_ethdev_trace.h...
error: lib/ethdev/rte_ethdev_trace.h: does not match index
Checking patch lib/ethdev/rte_tm.c...
Checking patch lib/ethdev/version.map...
error: lib/ethdev/version.map: does not match index
Applied patch lib/ethdev/rte_tm.c cleanly.

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

UNH-IOL DPDK Community Lab