From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: [dpdk-test-report] |WARNING| pw101281-101290 [PATCH] [v3, 10/10] net/sfc: refine pattern of GROUP flows in tunnel offload
Date: Wed, 13 Oct 2021 00:44:12 +0000 (UTC) [thread overview]
Message-ID: <20211013004412.3E46B60096@dpdk-ubuntu.dpdklab.iol.unh.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 10796 bytes --]
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/101281
_apply patch failure_
Submitter: Ivan Malov <Ivan.Malov@oktetlabs.ru>
Date: Wednesday, October 13 2021 00:24:15
Applied on: CommitID:2f3758751b157760ebb6fc51cd92841073bb115c
Apply patch set 101281-101290 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 -2 lines).
error: while searching for:
if (rxq->flags & SFC_EF100_RXQ_USER_MARK) {
uint32_t user_mark;
/* EFX_XWORD_FIELD converts little-endian to CPU */
user_mark = EFX_XWORD_FIELD(rx_prefix[0],
ESF_GZ_RX_PREFIX_USER_MARK);
if (user_mark != SFC_EF100_USER_MARK_INVALID) {
ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
m->hash.fdir.hi = user_mark;
error: patch failed: drivers/net/sfc/sfc_ef100_rx.c:423
Hunk #4 succeeded at 737 (offset -29 lines).
Checking patch drivers/net/sfc/sfc_ethdev.c...
error: while searching for:
#include "sfc_rx.h"
#include "sfc_tx.h"
#include "sfc_flow.h"
#include "sfc_dp.h"
#include "sfc_dp_rx.h"
#include "sfc_repr.h"
error: patch failed: drivers/net/sfc/sfc_ethdev.c:26
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:2332
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...
Hunk #2 succeeded at 2794 (offset -130 lines).
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.
Applying patch drivers/net/sfc/sfc_ef100_rx.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
Applying patch drivers/net/sfc/sfc_ethdev.c with 2 rejects...
Rejected hunk #1.
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_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c (rejected hunks)
@@ -423,10 +426,13 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
if (rxq->flags & SFC_EF100_RXQ_USER_MARK) {
uint32_t user_mark;
+ uint32_t mark;
/* EFX_XWORD_FIELD converts little-endian to CPU */
- user_mark = EFX_XWORD_FIELD(rx_prefix[0],
- ESF_GZ_RX_PREFIX_USER_MARK);
+ mark = EFX_XWORD_FIELD(rx_prefix[0],
+ ESF_GZ_RX_PREFIX_USER_MARK);
+
+ user_mark = mark & rxq->user_mark_mask;
if (user_mark != SFC_EF100_USER_MARK_INVALID) {
ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
m->hash.fdir.hi = user_mark;
diff a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c (rejected hunks)
@@ -26,6 +26,7 @@
#include "sfc_rx.h"
#include "sfc_tx.h"
#include "sfc_flow.h"
+#include "sfc_flow_tunnel.h"
#include "sfc_dp.h"
#include "sfc_dp_rx.h"
#include "sfc_repr.h"
@@ -2332,6 +2333,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/common/sfc_efx/base/efx.h...
Hunk #1 succeeded at 4381 (offset -126 lines).
Checking patch drivers/common/sfc_efx/base/efx_impl.h...
Hunk #1 succeeded at 1727 (offset -6 lines).
Checking patch drivers/common/sfc_efx/base/efx_mae.c...
Hunk #1 succeeded at 1945 (offset -166 lines).
Hunk #2 succeeded at 2044 (offset -166 lines).
Checking patch drivers/common/sfc_efx/version.map...
error: while searching for:
efx_mae_mport_id_by_selector;
efx_mae_mport_invalid;
efx_mae_outer_rule_insert;
efx_mae_outer_rule_remove;
efx_mae_read_mport_journal;
error: patch failed: drivers/common/sfc_efx/version.map:132
Applied patch drivers/common/sfc_efx/base/efx.h cleanly.
Applied patch drivers/common/sfc_efx/base/efx_impl.h cleanly.
Applied patch drivers/common/sfc_efx/base/efx_mae.c cleanly.
Applying patch drivers/common/sfc_efx/version.map with 1 reject...
Rejected hunk #1.
diff a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map (rejected hunks)
@@ -132,6 +132,7 @@ INTERNAL {
efx_mae_mport_id_by_selector;
efx_mae_mport_invalid;
efx_mae_outer_rule_insert;
+ efx_mae_outer_rule_recirc_id_set;
efx_mae_outer_rule_remove;
efx_mae_read_mport_journal;
Checking patch drivers/net/sfc/sfc.h...
error: while searching for:
struct sfc_intr intr;
struct sfc_port port;
struct sfc_sw_stats sw_stats;
struct sfc_filter filter;
struct sfc_mae mae;
struct sfc_repr_proxy repr_proxy;
error: patch failed: drivers/net/sfc/sfc.h:234
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...
Hunk #1 succeeded at 285 (offset -35 lines).
Applying patch drivers/net/sfc/sfc.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch drivers/net/sfc/sfc_flow.h cleanly.
Applied patch drivers/net/sfc/sfc_mae.h cleanly.
diff a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h (rejected hunks)
@@ -234,6 +235,8 @@ struct sfc_adapter {
struct sfc_intr intr;
struct sfc_port port;
struct sfc_sw_stats sw_stats;
+ /* Registry of tunnel offload contexts */
+ struct sfc_flow_tunnel flow_tunnels[SFC_FT_MAX_NTUNNELS];
struct sfc_filter filter;
struct sfc_mae mae;
struct sfc_repr_proxy repr_proxy;
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_mae.c...
error: drivers/common/sfc_efx/base/efx_mae.c: does not match index
Checking patch drivers/common/sfc_efx/version.map...
Applied patch drivers/common/sfc_efx/version.map 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...
Hunk #1 succeeded at 77 (offset -46 lines).
Checking patch drivers/net/sfc/sfc_dp.h...
error: while searching for:
*/
int sfc_dp_mport_register(void);
#ifdef __cplusplus
}
#endif
error: patch failed: drivers/net/sfc/sfc_dp.h:153
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.
Applying patch drivers/net/sfc/sfc_dp.h with 1 reject...
Rejected hunk #1.
diff a/drivers/net/sfc/sfc_dp.h b/drivers/net/sfc/sfc_dp.h (rejected hunks)
@@ -153,6 +153,15 @@ extern int sfc_dp_mport_offset;
*/
int sfc_dp_mport_register(void);
+/** Dynamically registered mbuf "ft_id" validity flag (as a bitmask). */
+extern uint64_t sfc_dp_ft_id_valid;
+
+/** Dynamically registered mbuf field "ft_id" (mbuf byte offset). */
+extern int sfc_dp_ft_id_offset;
+
+/** Register dynamic mbuf field "ft_id" and its validity flag. */
+int sfc_dp_ft_id_register(void);
+
#ifdef __cplusplus
}
#endif
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/19354/
UNH-IOL DPDK Community Lab
reply other threads:[~2021-10-13 0:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013004412.3E46B60096@dpdk-ubuntu.dpdklab.iol.unh.edu \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).