|WARNING| pw127803-127805 [PATCH] [3/3] net/sfc: support VLAN stripping offload

[dpdklab@iol.unh.edu]

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

_apply patch failure_

Submitter: Artemii Morozov <Artemii.Morozov@arknetworks.am>
Date: Wednesday, May 31 2023 13:41:22 
Applied on: CommitID:c9df59bcc9bec67783de98486879594e52bdc418
Apply patch set 127803-127805 failed:

Checking patch drivers/common/sfc_efx/base/ef10_nic.c...
Hunk #1 succeeded at 1227 (offset -89 lines).
Checking patch drivers/common/sfc_efx/base/efx.h...
Hunk #1 succeeded at 1638 (offset -12 lines).
Checking patch drivers/common/sfc_efx/base/siena_nic.c...
error: while searching for:
	encp->enc_rx_include_fcs_supported = B_FALSE;
	encp->enc_rx_es_super_buffer_supported = B_FALSE;
	encp->enc_fw_subvariant_no_tx_csum_supported = B_FALSE;

	/* Siena supports two 10G ports, and 8 lanes of PCIe Gen2 */
	encp->enc_required_pcie_bandwidth_mbps = 2 * 10000;

error: patch failed: drivers/common/sfc_efx/base/siena_nic.c:190
Applied patch drivers/common/sfc_efx/base/ef10_nic.c cleanly.
Applied patch drivers/common/sfc_efx/base/efx.h cleanly.
Applying patch drivers/common/sfc_efx/base/siena_nic.c with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/common/sfc_efx/base/siena_nic.c b/drivers/common/sfc_efx/base/siena_nic.c	(rejected hunks)
@@ -190,6 +190,7 @@ siena_board_cfg(
 	encp->enc_rx_include_fcs_supported = B_FALSE;
 	encp->enc_rx_es_super_buffer_supported = B_FALSE;
 	encp->enc_fw_subvariant_no_tx_csum_supported = B_FALSE;
+	encp->enc_rx_vlan_stripping = B_FALSE;
 
 	/* Siena supports two 10G ports, and 8 lanes of PCIe Gen2 */
 	encp->enc_required_pcie_bandwidth_mbps = 2 * 10000;
Checking patch drivers/common/sfc_efx/base/ef10_filter.c...
error: while searching for:
		    FILTER_OP_V3_IN_MATCH_SET_FLAG, 1);
	}

	efx_mcdi_execute(enp, &req);

	if (req.emr_rc != 0) {

error: patch failed: drivers/common/sfc_efx/base/ef10_filter.c:338
Hunk #2 succeeded at 852 (offset -5 lines).
Hunk #3 succeeded at 2020 (offset -5 lines).
Hunk #4 succeeded at 2155 (offset -5 lines).
Hunk #5 succeeded at 2168 (offset -5 lines).
Checking patch drivers/common/sfc_efx/base/ef10_impl.h...
Checking patch drivers/common/sfc_efx/base/efx.h...
error: drivers/common/sfc_efx/base/efx.h: does not match index
Checking patch drivers/common/sfc_efx/base/efx_filter.c...
Checking patch drivers/common/sfc_efx/base/efx_impl.h...
Hunk #1 succeeded at 1045 (offset -1 lines).
Checking patch drivers/common/sfc_efx/base/efx_rx.c...
error: while searching for:
		}
	}

	enp->en_rx_qcount++;
	*erpp = erp;

	return (0);

fail5:
	EFSYS_PROBE(fail5);


error: patch failed: drivers/common/sfc_efx/base/efx_rx.c:943
Checking patch drivers/common/sfc_efx/base/rhead_rx.c...
Applying patch drivers/common/sfc_efx/base/ef10_filter.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Applied patch drivers/common/sfc_efx/base/ef10_impl.h cleanly.
Applied patch drivers/common/sfc_efx/base/efx_filter.c cleanly.
Applied patch drivers/common/sfc_efx/base/efx_impl.h cleanly.
Applying patch drivers/common/sfc_efx/base/efx_rx.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch drivers/common/sfc_efx/base/rhead_rx.c cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/common/sfc_efx/base/ef10_filter.c b/drivers/common/sfc_efx/base/ef10_filter.c	(rejected hunks)
@@ -338,6 +338,11 @@ efx_mcdi_filter_op_add(
 		    FILTER_OP_V3_IN_MATCH_SET_FLAG, 1);
 	}
 
+	if (spec->efs_flags & EFX_FILTER_FLAG_VLAN_STRIP) {
+		MCDI_IN_SET_DWORD_FIELD(req, FILTER_OP_V3_IN_MATCH_ACTION_FLAGS,
+			FILTER_OP_V3_IN_MATCH_STRIP_VLAN, 1);
+	}
+
 	efx_mcdi_execute(enp, &req);
 
 	if (req.emr_rc != 0) {
diff a/drivers/common/sfc_efx/base/efx_rx.c b/drivers/common/sfc_efx/base/efx_rx.c	(rejected hunks)
@@ -943,11 +944,27 @@ efx_rx_qcreate_internal(
 		}
 	}
 
+	if (flags & EFX_RXQ_FLAG_VLAN_STRIP) {
+		const efx_rx_prefix_layout_t *erplp = &erp->er_prefix_layout;
+		const efx_rx_prefix_field_info_t *vlan_tci_field;
+
+		vlan_tci_field =
+		    &erplp->erpl_fields[EFX_RX_PREFIX_FIELD_VLAN_STRIP_TCI];
+		if (vlan_tci_field->erpfi_width_bits == 0) {
+			rc = ENOTSUP;
+			goto fail6;
+		}
+
+		erp->er_flags |= EFX_RXQ_FLAG_VLAN_STRIP;
+	}
+
 	enp->en_rx_qcount++;
 	*erpp = erp;
 
 	return (0);
 
+fail6:
+	EFSYS_PROBE(fail6);
 fail5:
 	EFSYS_PROBE(fail5);
 
Checking patch doc/guides/nics/sfc_efx.rst...
Hunk #1 succeeded at 118 (offset 38 lines).
Hunk #2 succeeded at 134 (offset 40 lines).
Checking patch drivers/net/sfc/sfc_ef100_rx.c...
Checking patch drivers/net/sfc/sfc_rx.c...
error: while searching for:
	if (encp->enc_rx_include_fcs_supported == 0)
		no_caps |= RTE_ETH_RX_OFFLOAD_KEEP_CRC;

	return ~no_caps;
}


error: patch failed: drivers/net/sfc/sfc_rx.c:942
Hunk #2 succeeded at 1186 (offset -7 lines).
Hunk #3 succeeded at 1698 (offset -7 lines).
Applied patch doc/guides/nics/sfc_efx.rst cleanly.
Applied patch drivers/net/sfc/sfc_ef100_rx.c cleanly.
Applying patch drivers/net/sfc/sfc_rx.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c	(rejected hunks)
@@ -942,6 +942,9 @@ sfc_rx_get_offload_mask(struct sfc_adapter *sa)
 	if (encp->enc_rx_include_fcs_supported == 0)
 		no_caps |= RTE_ETH_RX_OFFLOAD_KEEP_CRC;
 
+	if (encp->enc_rx_vlan_stripping == 0)
+		no_caps |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+
 	return ~no_caps;
 }
 

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

UNH-IOL DPDK Community Lab