|WARNING| pw113406-113411 [PATCH] [V5, 7/7] app/testpmd: remove duplicated flow type to string table

|WARNING| pw113406-113411 [PATCH] [V5, 7/7] app/testpmd: remove duplicated flow type to string table

[dpdklab]

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

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

_apply patch failure_

Submitter: lihuisong (C) <lihuisong@huawei.com>
Date: Friday, June 24 2022 07:24:01 
Applied on: CommitID:42fbb8e85d1f0b6c1d397d4e7559bc5877ba985e
Apply patch set 113406-113411 failed:

Checking patch app/test-pmd/config.c...
error: while searching for:
}

static void
rss_types_display(uint64_t rss_types)
{
	uint16_t i;

	if (rss_types == 0)

error: patch failed: app/test-pmd/config.c:1570
error: while searching for:
	for (i = 0; rss_type_table[i].str; i++) {
		if (rss_type_table[i].rss_type == 0)
			continue;
		if ((rss_types & rss_type_table[i].rss_type) ==
						rss_type_table[i].rss_type)
			printf("  %s", rss_type_table[i].str);
	}
}


error: patch failed: app/test-pmd/config.c:1580
error: while searching for:
		printf("  none\n");
		return;
	}
	rss_types_display(rss_conf->types);
}

static struct port_indirect_action *

error: patch failed: app/test-pmd/config.c:1628
error: while searching for:
		return;
	}
	printf("RSS functions:\n");
	rss_types_display(rss_hf);
	printf("\n");
	if (!show_rss_key)
		return;

error: patch failed: app/test-pmd/config.c:3859
Checking patch app/test-pmd/testpmd.h...
Applying patch app/test-pmd/config.c with 4 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Rejected hunk #4.
Rejected hunk #5.
Rejected hunk #6.
Applied patch app/test-pmd/testpmd.h cleanly.
diff a/app/test-pmd/config.c b/app/test-pmd/config.c	(rejected hunks)
@@ -1570,8 +1591,10 @@ port_flow_complain(struct rte_flow_error *error)
 }
 
 static void
-rss_types_display(uint64_t rss_types)
+rss_types_display(uint64_t rss_types, uint16_t char_num_per_line)
 {
+	uint16_t total_len = 0;
+	uint16_t str_len;
 	uint16_t i;
 
 	if (rss_types == 0)
@@ -1580,9 +1603,18 @@ rss_types_display(uint64_t rss_types)
 	for (i = 0; rss_type_table[i].str; i++) {
 		if (rss_type_table[i].rss_type == 0)
 			continue;
+
 		if ((rss_types & rss_type_table[i].rss_type) ==
-						rss_type_table[i].rss_type)
+					rss_type_table[i].rss_type) {
+			/* contain two spces */
+			str_len = strlen(rss_type_table[i].str) + 2;
+			if (total_len + str_len > char_num_per_line) {
+				printf("\n");
+				total_len = 0;
+			}
 			printf("  %s", rss_type_table[i].str);
+			total_len += str_len;
+		}
 	}
 }
 
@@ -1628,7 +1660,7 @@ rss_config_display(struct rte_flow_action_rss *rss_conf)
 		printf("  none\n");
 		return;
 	}
-	rss_types_display(rss_conf->types);
+	rss_types_display(rss_conf->types, TESTPMD_RSS_TYPES_CHAR_NUM_PER_LINE);
 }
 
 static struct port_indirect_action *
@@ -3859,7 +3891,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key)
 		return;
 	}
 	printf("RSS functions:\n");
-	rss_types_display(rss_hf);
+	rss_types_display(rss_hf, TESTPMD_RSS_TYPES_CHAR_NUM_PER_LINE);
 	printf("\n");
 	if (!show_rss_key)
 		return;
Checking patch app/test-pmd/config.c...
error: app/test-pmd/config.c: does not match index
Checking patch app/test-pmd/config.c...
error: app/test-pmd/config.c: does not match index
Checking patch app/test-pmd/testpmd.h...
error: app/test-pmd/testpmd.h: does not match index
Checking patch drivers/net/i40e/i40e_testpmd.c...
Applied patch drivers/net/i40e/i40e_testpmd.c cleanly.

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

UNH-IOL DPDK Community Lab