Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/100464 _apply patch failure_ Submitter: Ivan Malov Date: Monday, October 04 2021 23:55:58 Applied on: CommitID:086d426406bd3f6fac96a15bbd871c7fe714bc2d Apply patch set 100464-100472 failed: Checking patch drivers/net/sfc/meson.build... Checking patch drivers/net/sfc/sfc_dp_rx.h... Checking patch drivers/net/sfc/sfc_ef100_rx.c... Hunk #2 succeeded at 75 (offset -1 lines). Hunk #3 succeeded at 412 (offset -11 lines). Hunk #4 succeeded at 740 (offset -11 lines). Checking patch drivers/net/sfc/sfc_ethdev.c... error: while searching for: if ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_MARK) != 0) supported |= RTE_ETH_RX_METADATA_USER_MARK; sa->negotiated_rx_metadata = supported & *features; *features = sa->negotiated_rx_metadata; error: patch failed: drivers/net/sfc/sfc_ethdev.c:1873 Checking patch drivers/net/sfc/sfc_flow.c... Checking patch drivers/net/sfc/sfc_flow_tunnel.c... Checking patch drivers/net/sfc/sfc_flow_tunnel.h... Checking patch drivers/net/sfc/sfc_mae.c... Checking patch drivers/net/sfc/sfc_rx.c... error: while searching for: if ((sa->negotiated_rx_metadata & RTE_ETH_RX_METADATA_USER_FLAG) != 0) rxq_info->type_flags |= EFX_RXQ_FLAG_USER_FLAG; if ((sa->negotiated_rx_metadata & RTE_ETH_RX_METADATA_USER_MARK) != 0) rxq_info->type_flags |= EFX_RXQ_FLAG_USER_MARK; rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index, error: patch failed: drivers/net/sfc/sfc_rx.c:1181 Hunk #3 succeeded at 1226 (offset -7 lines). Applied patch drivers/net/sfc/meson.build cleanly. Applied patch drivers/net/sfc/sfc_dp_rx.h cleanly. Applied patch drivers/net/sfc/sfc_ef100_rx.c cleanly. Applying patch drivers/net/sfc/sfc_ethdev.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applied patch drivers/net/sfc/sfc_flow.c cleanly. Applied patch drivers/net/sfc/sfc_flow_tunnel.c cleanly. Applied patch drivers/net/sfc/sfc_flow_tunnel.h cleanly. Applied patch drivers/net/sfc/sfc_mae.c cleanly. Applying patch drivers/net/sfc/sfc_rx.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. diff a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c (rejected hunks) @@ -1873,6 +1874,9 @@ sfc_rx_metadata_negotiate(struct rte_eth_dev *dev, uint64_t *features) if ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_MARK) != 0) supported |= RTE_ETH_RX_METADATA_USER_MARK; + if (sfc_flow_tunnel_is_supported(sa)) + supported |= RTE_ETH_RX_METADATA_TUNNEL_ID; + sa->negotiated_rx_metadata = supported & *features; *features = sa->negotiated_rx_metadata; diff a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c (rejected hunks) @@ -1181,7 +1182,8 @@ sfc_rx_qinit(struct sfc_adapter *sa, sfc_sw_index_t sw_index, if ((sa->negotiated_rx_metadata & RTE_ETH_RX_METADATA_USER_FLAG) != 0) rxq_info->type_flags |= EFX_RXQ_FLAG_USER_FLAG; - if ((sa->negotiated_rx_metadata & RTE_ETH_RX_METADATA_USER_MARK) != 0) + if ((sa->negotiated_rx_metadata & RTE_ETH_RX_METADATA_USER_MARK) != 0 || + sfc_flow_tunnel_is_active(sa)) rxq_info->type_flags |= EFX_RXQ_FLAG_USER_MARK; rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index, Checking patch drivers/net/sfc/sfc.h... Checking patch drivers/net/sfc/sfc_flow.c... error: drivers/net/sfc/sfc_flow.c: does not match index Checking patch drivers/net/sfc/sfc_flow.h... Checking patch drivers/net/sfc/sfc_flow_tunnel.c... error: drivers/net/sfc/sfc_flow_tunnel.c: does not exist in index Checking patch drivers/net/sfc/sfc_flow_tunnel.h... error: drivers/net/sfc/sfc_flow_tunnel.h: does not exist in index Checking patch drivers/net/sfc/sfc_mae.c... error: drivers/net/sfc/sfc_mae.c: does not match index Checking patch drivers/net/sfc/sfc_mae.h... Applied patch drivers/net/sfc/sfc.h cleanly. Applied patch drivers/net/sfc/sfc_flow.h cleanly. Applied patch drivers/net/sfc/sfc_mae.h cleanly. Checking patch drivers/net/sfc/sfc_flow.h... error: drivers/net/sfc/sfc_flow.h: does not match index Checking patch drivers/net/sfc/sfc_flow_tunnel.h... error: drivers/net/sfc/sfc_flow_tunnel.h: does not exist in index Checking patch drivers/net/sfc/sfc_mae.c... error: drivers/net/sfc/sfc_mae.c: does not match index Checking patch drivers/net/sfc/sfc_dp.c... Checking patch drivers/net/sfc/sfc_dp.h... Checking patch drivers/net/sfc/sfc_ef100_rx.c... error: drivers/net/sfc/sfc_ef100_rx.c: does not match index Checking patch drivers/net/sfc/sfc_flow.c... error: drivers/net/sfc/sfc_flow.c: does not match index Checking patch drivers/net/sfc/sfc_flow_tunnel.c... error: drivers/net/sfc/sfc_flow_tunnel.c: does not exist in index Checking patch drivers/net/sfc/sfc_flow_tunnel.h... error: drivers/net/sfc/sfc_flow_tunnel.h: does not exist in index Applied patch drivers/net/sfc/sfc_dp.c cleanly. Applied patch drivers/net/sfc/sfc_dp.h cleanly. Checking patch drivers/net/sfc/sfc_mae.c... error: drivers/net/sfc/sfc_mae.c: does not match index Checking patch drivers/net/sfc/sfc_flow.c... error: drivers/net/sfc/sfc_flow.c: does not match index Checking patch drivers/net/sfc/sfc_mae.c... error: drivers/net/sfc/sfc_mae.c: does not match index Checking patch drivers/net/sfc/sfc_flow.c... error: drivers/net/sfc/sfc_flow.c: does not match index Checking patch drivers/net/sfc/sfc_flow_tunnel.c... error: drivers/net/sfc/sfc_flow_tunnel.c: does not exist in index Checking patch drivers/net/sfc/sfc_flow_tunnel.h... error: drivers/net/sfc/sfc_flow_tunnel.h: does not exist in index Checking patch drivers/net/sfc/sfc_mae.c... error: drivers/net/sfc/sfc_mae.c: does not match index Checking patch drivers/net/sfc/sfc_mae.h... error: drivers/net/sfc/sfc_mae.h: does not match index Checking patch drivers/net/sfc/sfc_mae_counter.c... Checking patch drivers/net/sfc/sfc_mae_counter.h... Applied patch drivers/net/sfc/sfc_mae_counter.c cleanly. Applied patch drivers/net/sfc/sfc_mae_counter.h cleanly. Checking patch drivers/net/sfc/sfc_mae.c... error: drivers/net/sfc/sfc_mae.c: does not match index Checking patch drivers/net/sfc/sfc_mae.h... error: drivers/net/sfc/sfc_mae.h: does not match index https://lab.dpdk.org/results/dashboard/patchsets/19160/ UNH-IOL DPDK Community Lab