|WARNING| pw115409 [PATCH] [v1] net/ice/base: backport FDIR support to 20.11

|WARNING| pw115409 [PATCH] [v1] net/ice/base: backport FDIR support to 20.11

[dpdklab]

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

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

_apply patch failure_

Submitter: Steve Yang <stevex.yang@intel.com>
Date: Thursday, August 25 2022 07:43:14 
Applied on: CommitID:72206323a5dd3182b13f61b25a64abdddfee595c
Apply patch set 115409 failed:

Checking patch drivers/net/ice/base/ice_flow.c...
error: while searching for:
		break;
	case ICE_FLOW_FIELD_IDX_IPV6_TTL:
	case ICE_FLOW_FIELD_IDX_IPV6_PROT:
		prot_id = seg == 0 ? ICE_PROT_IPV6_OF_OR_S : ICE_PROT_IPV6_IL;

		/* TTL and PROT share the same extraction seq. entry.
		 * Each is considered a sibling to the other in terms of sharing

error: patch failed: drivers/net/ice/base/ice_flow.c:1100
error: while searching for:
	flds[fld].xtrct.idx = params->es_cnt;
	flds[fld].xtrct.mask = ice_flds_info[fld].mask;

	/* Adjust the next field-entry index after accommodating the number of
	 * entries this field consumes
	 */

error: patch failed: drivers/net/ice/base/ice_flow.c:1207
Checking patch drivers/net/ice/base/ice_flow.h...
Checking patch drivers/net/ice/base/ice_protocol_type.h...
error: while searching for:
	ICE_PROT_IPV4_IL	= 33,
	ICE_PROT_IPV6_OF_OR_S	= 40,
	ICE_PROT_IPV6_IL	= 41,
	ICE_PROT_IPV6_FRAG	= 47,
	ICE_PROT_TCP_IL		= 49,
	ICE_PROT_UDP_OF		= 52,

error: patch failed: drivers/net/ice/base/ice_protocol_type.h:138
Applying patch drivers/net/ice/base/ice_flow.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applied patch drivers/net/ice/base/ice_flow.h cleanly.
Applying patch drivers/net/ice/base/ice_protocol_type.h with 1 reject...
Rejected hunk #1.
diff a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c	(rejected hunks)
@@ -1100,7 +1100,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,
 		break;
 	case ICE_FLOW_FIELD_IDX_IPV6_TTL:
 	case ICE_FLOW_FIELD_IDX_IPV6_PROT:
-		prot_id = seg == 0 ? ICE_PROT_IPV6_OF_OR_S : ICE_PROT_IPV6_IL;
+		prot_id = seg == 0 ? ICE_PROT_IPV6_NEXT_PROTO : ICE_PROT_IPV6_IL;
 
 		/* TTL and PROT share the same extraction seq. entry.
 		 * Each is considered a sibling to the other in terms of sharing
@@ -1207,6 +1207,10 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,
 	flds[fld].xtrct.idx = params->es_cnt;
 	flds[fld].xtrct.mask = ice_flds_info[fld].mask;
 
+	if (prot_id == ICE_PROT_IPV6_NEXT_PROTO) {
+		flds[fld].xtrct.off = 0;
+		flds[fld].xtrct.disp = 0;
+	}
 	/* Adjust the next field-entry index after accommodating the number of
 	 * entries this field consumes
 	 */
diff a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h	(rejected hunks)
@@ -138,6 +138,7 @@ enum ice_prot_id {
 	ICE_PROT_IPV4_IL	= 33,
 	ICE_PROT_IPV6_OF_OR_S	= 40,
 	ICE_PROT_IPV6_IL	= 41,
+	ICE_PROT_IPV6_NEXT_PROTO = 43,
 	ICE_PROT_IPV6_FRAG	= 47,
 	ICE_PROT_TCP_IL		= 49,
 	ICE_PROT_UDP_OF		= 52,

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

UNH-IOL DPDK Community Lab