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

_apply patch failure_

Submitter: Ivan Malov <Ivan.Malov@oktetlabs.ru>
Date: Wednesday, July 07 2021 10:56:28 
Applied on: CommitID:a09268cb16feaab6798f596a47191cc7d67872fa
Apply patch set 95489-95490 failed:

Checking patch drivers/net/sfc/sfc_mae.c...
error: while searching for:

	for (ethertype_idx = 0;
	     ethertype_idx < pdata->nb_vlan_tags; ++ethertype_idx) {
		unsigned int tpid_idx;

		/*

error: patch failed: drivers/net/sfc/sfc_mae.c:752
error: while searching for:
		}

		/* Exact match is supported only. */
		if (ethertypes[ethertype_idx].mask != RTE_BE16(0xffff)) {
			rc = EINVAL;
			goto fail;
		}

		for (tpid_idx = pdata->nb_vlan_tags - ethertype_idx - 1;
		     tpid_idx < nb_supported_tpids; ++tpid_idx) {
			if (ethertypes[ethertype_idx].value ==
			    supported_tpids[tpid_idx])
				break;
		}

		if (tpid_idx == nb_supported_tpids) {
			rc = EINVAL;
			goto fail;
		}

error: patch failed: drivers/net/sfc/sfc_mae.c:771
Hunk #3 succeeded at 776 (offset -22 lines).
Hunk #4 succeeded at 808 (offset -22 lines).
Hunk #5 succeeded at 2287 (offset -101 lines).
Hunk #6 succeeded at 2507 (offset -101 lines).
Hunk #7 succeeded at 2545 (offset -101 lines).
Hunk #8 succeeded at 2578 (offset -101 lines).
Hunk #9 succeeded at 2609 (offset -104 lines).
Hunk #10 succeeded at 2681 (offset -104 lines).
Applying patch drivers/net/sfc/sfc_mae.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
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.
diff a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c	(rejected hunks)
@@ -752,6 +752,8 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx,
 
 	for (ethertype_idx = 0;
 	     ethertype_idx < pdata->nb_vlan_tags; ++ethertype_idx) {
+		rte_be16_t tpid_v = ethertypes[ethertype_idx].value;
+		rte_be16_t tpid_m = ethertypes[ethertype_idx].mask;
 		unsigned int tpid_idx;
 
 		/*
@@ -771,19 +773,22 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx,
 		}
 
 		/* Exact match is supported only. */
-		if (ethertypes[ethertype_idx].mask != RTE_BE16(0xffff)) {
+		if (tpid_m != RTE_BE16(0xffff)) {
+			sfc_info(ctx->sa, "TPID mask must be 0x0 or 0xffff; got 0x%04x",
+				 rte_be_to_cpu_16(tpid_m));
 			rc = EINVAL;
 			goto fail;
 		}
 
 		for (tpid_idx = pdata->nb_vlan_tags - ethertype_idx - 1;
 		     tpid_idx < nb_supported_tpids; ++tpid_idx) {
-			if (ethertypes[ethertype_idx].value ==
-			    supported_tpids[tpid_idx])
+			if (tpid_v == supported_tpids[tpid_idx])
 				break;
 		}
 
 		if (tpid_idx == nb_supported_tpids) {
+			sfc_info(ctx->sa, "TPID 0x%04x is unsupported",
+				 rte_be_to_cpu_16(tpid_v));
 			rc = EINVAL;
 			goto fail;
 		}
Checking patch drivers/net/sfc/sfc_flow.c...
Checking patch drivers/net/sfc/sfc_flow.h...
Checking patch drivers/net/sfc/sfc_mae.c...
error: drivers/net/sfc/sfc_mae.c: does not match index
Applied patch drivers/net/sfc/sfc_flow.c cleanly.
Applied patch drivers/net/sfc/sfc_flow.h cleanly.

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

UNH-IOL DPDK Community Lab