[dpdk-dev] [PATCH 07/10] net/sfc: override match on ETH in tunnel offload JUMP rules

[Ivan Malov]

The current HW/FW doesn't allow to match on MAC addresses in outer rules.
One day this will change for sure, but right now a workaround is needed.

Match on VLAN presence in outer rules is also unsupported. Ignore it.

Signed-off-by: Ivan Malov <ivan.ma...@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybche...@oktetlabs.ru>
---
 drivers/net/sfc/sfc_mae.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 63ec2b02b3..374ef29d71 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -1395,6 +1395,7 @@ sfc_mae_rule_parse_item_eth(const struct rte_flow_item 
*item,
                            struct rte_flow_error *error)
 {
        struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+       struct rte_flow_item_eth override_mask;
        struct rte_flow_item_eth supp_mask;
        const uint8_t *spec = NULL;
        const uint8_t *mask = NULL;
@@ -1412,6 +1413,22 @@ sfc_mae_rule_parse_item_eth(const struct rte_flow_item 
*item,
        if (rc != 0)
                return rc;
 
+       if (ctx_mae->ft_rule_type == SFC_FT_RULE_JUMP && mask != NULL) {
+               /*
+                * The HW/FW hasn't got support for match on MAC addresses in
+                * outer rules yet (this will change). Match on VLAN presence
+                * isn't supported either. Ignore these match criteria.
+                */
+               memcpy(&override_mask, mask, sizeof(override_mask));
+               memset(&override_mask.hdr.d_addr, 0,
+                      sizeof(override_mask.hdr.d_addr));
+               memset(&override_mask.hdr.s_addr, 0,
+                      sizeof(override_mask.hdr.s_addr));
+               override_mask.has_vlan = 0;
+
+               mask = (const uint8_t *)&override_mask;
+       }
+
        if (spec != NULL) {
                struct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data;
                struct sfc_mae_ethertype *ethertypes = pdata->ethertypes;
-- 
2.20.1