* [dpdk-stable] [PATCH] net/sfc: fix outer match in MAE backend of RTE flow support
@ 2021-07-06 12:37 Ivan Malov
2021-07-07 10:03 ` David Marchand
0 siblings, 1 reply; 2+ messages in thread
From: Ivan Malov @ 2021-07-06 12:37 UTC (permalink / raw)
To: dev; +Cc: stable, Andrew Rybchenko, Andy Moreton
The current code doesn't use match on invalid outer rule ID
in action rules of non-encap. flows. This is wrong and must
be fixed. Do that and explain correct behaviour in the code.
Fixes: dadff137931c ("net/sfc: support encap flow items in transfer rules")
Cc: stable@dpdk.org
Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
---
drivers/net/sfc/sfc_mae.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index a2c0aa143..89f719648 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -1838,12 +1838,12 @@ sfc_mae_rule_process_outer(struct sfc_adapter *sa,
struct sfc_mae_outer_rule **rulep,
struct rte_flow_error *error)
{
- struct sfc_mae_outer_rule *rule;
+ efx_mae_rule_id_t invalid_rule_id = { .id = EFX_MAE_RSRC_ID_INVALID };
int rc;
if (ctx->encap_type == EFX_TUNNEL_PROTOCOL_NONE) {
*rulep = NULL;
- return 0;
+ goto no_or_id;
}
SFC_ASSERT(ctx->match_spec_outer != NULL);
@@ -1871,21 +1871,27 @@ sfc_mae_rule_process_outer(struct sfc_adapter *sa,
/* The spec has now been tracked by the outer rule entry. */
ctx->match_spec_outer = NULL;
+no_or_id:
/*
- * Depending on whether we reuse an existing outer rule or create a
- * new one (see above), outer rule ID is either a valid value or
- * EFX_MAE_RSRC_ID_INVALID. Set it in the action rule match
- * specification (and the full mask, too) in order to have correct
- * class comparisons of the new rule with existing ones.
- * Also, action rule match specification will be validated shortly,
- * and having the full mask set for outer rule ID indicates that we
- * will use this field, and support for this field has to be checked.
+ * In MAE, lookup sequence comprises outer parse, outer rule lookup,
+ * inner parse (when some outer rule is hit) and action rule lookup.
+ * If the currently processed flow does not come with an outer rule,
+ * its action rule must be available only for packets which miss in
+ * outer rule table. Set OR_ID match field to 0xffffffff/0xffffffff
+ * in the action rule specification; this ensures correct behaviour.
+ *
+ * If, on the other hand, this flow does have an outer rule, its ID
+ * may be unknown at the moment (not yet allocated), but OR_ID mask
+ * has to be set to 0xffffffff anyway for correct class comparisons.
+ * When the outer rule has been allocated, this match field will be
+ * overridden by sfc_mae_outer_rule_enable() to use the right value.
*/
- rule = *rulep;
rc = efx_mae_match_spec_outer_rule_id_set(ctx->match_spec_action,
- &rule->fw_rsrc.rule_id);
+ &invalid_rule_id);
if (rc != 0) {
- sfc_mae_outer_rule_del(sa, *rulep);
+ if (*rulep != NULL)
+ sfc_mae_outer_rule_del(sa, *rulep);
+
*rulep = NULL;
return rte_flow_error_set(error, rc,
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-stable] [PATCH] net/sfc: fix outer match in MAE backend of RTE flow support
2021-07-06 12:37 [dpdk-stable] [PATCH] net/sfc: fix outer match in MAE backend of RTE flow support Ivan Malov
@ 2021-07-07 10:03 ` David Marchand
0 siblings, 0 replies; 2+ messages in thread
From: David Marchand @ 2021-07-07 10:03 UTC (permalink / raw)
To: Ivan Malov; +Cc: dev, dpdk stable, Andrew Rybchenko, Andy Moreton
On Tue, Jul 6, 2021 at 2:37 PM Ivan Malov <ivan.malov@oktetlabs.ru> wrote:
>
> The current code doesn't use match on invalid outer rule ID
> in action rules of non-encap. flows. This is wrong and must
> be fixed. Do that and explain correct behaviour in the code.
>
> Fixes: dadff137931c ("net/sfc: support encap flow items in transfer rules")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
> Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Reviewed-by: Andy Moreton <amoreton@xilinx.com>
Applied, thanks.
--
David Marchand
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-07 10:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 12:37 [dpdk-stable] [PATCH] net/sfc: fix outer match in MAE backend of RTE flow support Ivan Malov
2021-07-07 10:03 ` David Marchand
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).