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

_apply patch failure_

Submitter: Sunil Kumar Kori <skori@marvell.com>
Date: Tuesday, August 23 2022 10:22:55 
Applied on: CommitID:72206323a5dd3182b13f61b25a64abdddfee595c
Apply patch set 115357 failed:

Checking patch app/test-pmd/cmdline_mtr.c...
Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst...
Checking patch drivers/net/cnxk/cnxk_ethdev_mtr.c...
Hunk #1 succeeded at 686 (offset -34 lines).
error: while searching for:

	table.count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP;

	switch (dev->proto) {
	case RTE_MTR_COLOR_IN_PROTO_OUTER_IP:
		table.mode = ROC_NIX_BPF_PC_MODE_DSCP_OUTER;
		break;

error: patch failed: drivers/net/cnxk/cnxk_ethdev_mtr.c:750
error: while searching for:
		goto exit;
	}

	for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; i++)
		table.color[i] = nix_dscp_tbl[i];


error: patch failed: drivers/net/cnxk/cnxk_ethdev_mtr.c:764
error: while searching for:

static int
cnxk_nix_mtr_vlan_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
			       enum rte_color *vlan_table,
			       struct rte_mtr_error *error)
{

error: patch failed: drivers/net/cnxk/cnxk_ethdev_mtr.c:784
error: while searching for:

	table.count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN;

	switch (dev->proto) {
	case RTE_MTR_COLOR_IN_PROTO_OUTER_VLAN:
		table.mode = ROC_NIX_BPF_PC_MODE_VLAN_OUTER;
		break;

error: patch failed: drivers/net/cnxk/cnxk_ethdev_mtr.c:814
error: while searching for:
		goto exit;
	}

	for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; i++)
		table.color[i] = nix_vlan_tbl[i];


error: patch failed: drivers/net/cnxk/cnxk_ethdev_mtr.c:828
Checking patch drivers/net/softnic/rte_eth_softnic_meter.c...
Checking patch lib/ethdev/rte_mtr.c...
Checking patch lib/ethdev/rte_mtr.h...
Checking patch lib/ethdev/rte_mtr_driver.h...
Applied patch app/test-pmd/cmdline_mtr.c cleanly.
Applied patch doc/guides/testpmd_app_ug/testpmd_funcs.rst cleanly.
Applying patch drivers/net/cnxk/cnxk_ethdev_mtr.c with 5 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
Rejected hunk #5.
Rejected hunk #6.
Applied patch drivers/net/softnic/rte_eth_softnic_meter.c cleanly.
Applied patch lib/ethdev/rte_mtr.c cleanly.
Applied patch lib/ethdev/rte_mtr.h cleanly.
Applied patch lib/ethdev/rte_mtr_driver.h cleanly.
diff a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c	(rejected hunks)
@@ -750,7 +751,7 @@ cnxk_nix_mtr_dscp_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
 
 	table.count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP;
 
-	switch (dev->proto) {
+	switch (proto) {
 	case RTE_MTR_COLOR_IN_PROTO_OUTER_IP:
 		table.mode = ROC_NIX_BPF_PC_MODE_DSCP_OUTER;
 		break;
@@ -764,6 +765,13 @@ cnxk_nix_mtr_dscp_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
 		goto exit;
 	}
 
+	if (dev->proto != proto) {
+		rc = -rte_mtr_error_set(error, EINVAL,
+			RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+			"input color protocol is not configured");
+		goto exit;
+	}
+
 	for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_DSCP; i++)
 		table.color[i] = nix_dscp_tbl[i];
 
@@ -784,6 +792,7 @@ cnxk_nix_mtr_dscp_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
 
 static int
 cnxk_nix_mtr_vlan_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
+			       enum rte_mtr_color_in_protocol proto,
 			       enum rte_color *vlan_table,
 			       struct rte_mtr_error *error)
 {
@@ -814,7 +823,7 @@ cnxk_nix_mtr_vlan_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
 
 	table.count = ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN;
 
-	switch (dev->proto) {
+	switch (proto) {
 	case RTE_MTR_COLOR_IN_PROTO_OUTER_VLAN:
 		table.mode = ROC_NIX_BPF_PC_MODE_VLAN_OUTER;
 		break;
@@ -828,6 +837,13 @@ cnxk_nix_mtr_vlan_table_update(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
 		goto exit;
 	}
 
+	if (dev->proto != proto) {
+		rc = -rte_mtr_error_set(error, EINVAL,
+			RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+			"input color protocol is not configured");
+		goto exit;
+	}
+
 	for (i = 0; i < ROC_NIX_BPF_PRECOLOR_TBL_SIZE_VLAN; i++)
 		table.color[i] = nix_vlan_tbl[i];
 

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

UNH-IOL DPDK Community Lab