net/mlx5: rewrite MAC address by E-Switch

Offload following modify MAC address actions to E-Switch
via TC-Flower driver

- RTE_FLOW_ACTION_TYPE_SET_MAC_SRC
- RTE_FLOW_ACTION_TYPE_SET_MAC_DST

The corresponding rte_flow_item_eth must be present in
rte_flow pattern

Only support modify outer layer MAC address

The example testpmd command is:

    flow create 0 transfer ingress
         pattern eth / ipv4 / udp dst is 7000 / end
         actions set_mac_dst mac_addr dd:00:aa:11:bb:33 /
         set_mac_src mac_addr bb:00:cc:11:aa:22 /
	 port_id id 1 / end

Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index cccafe5..d45fe8d 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -87,6 +87,8 @@
 #define MLX5_FLOW_ACTION_JUMP (1u << 17)
 #define MLX5_FLOW_ACTION_SET_TTL (1u << 18)
 #define MLX5_FLOW_ACTION_DEC_TTL (1u << 19)
+#define MLX5_FLOW_ACTION_SET_MAC_SRC (1u << 20)
+#define MLX5_FLOW_ACTION_SET_MAC_DST (1u << 21)
 
 #define MLX5_FLOW_FATE_ACTIONS \
        (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)

diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
index 3adcf18..131b62b 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_tcf.c
+++ b/drivers/net/mlx5/mlx5_flow_tcf.c
@@ -324,7 +324,8 @@ struct flow_tcf_ptoi {
        (MLX5_FLOW_ACTION_SET_IPV4_SRC | MLX5_FLOW_ACTION_SET_IPV4_DST | \
         MLX5_FLOW_ACTION_SET_IPV6_SRC | MLX5_FLOW_ACTION_SET_IPV6_DST | \
         MLX5_FLOW_ACTION_SET_TP_SRC | MLX5_FLOW_ACTION_SET_TP_DST | \
-        MLX5_FLOW_ACTION_SET_TTL | MLX5_FLOW_ACTION_DEC_TTL)
+        MLX5_FLOW_ACTION_SET_TTL | MLX5_FLOW_ACTION_DEC_TTL | \
+        MLX5_FLOW_ACTION_SET_MAC_SRC | MLX5_FLOW_ACTION_SET_MAC_DST)
 
 #define MLX5_TCF_CONFIG_ACTIONS \
        (MLX5_FLOW_ACTION_PORT_ID | MLX5_FLOW_ACTION_JUMP | \
@@ -350,6 +351,42 @@ struct pedit_parser {
 };
 
 
+/**
+ * Set pedit key of MAC address
+ *
+ * @param[in] actions
+ *   pointer to action specification
+ * @param[in,out] p_parser
+ *   pointer to pedit_parser
+ */
+static void
+flow_tcf_pedit_key_set_mac(const struct rte_flow_action *actions,
+                          struct pedit_parser *p_parser)
+{
+       int idx = p_parser->sel.nkeys;
+       uint32_t off = actions->type == RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ?
+                                       offsetof(struct ether_hdr, s_addr) :
+                                       offsetof(struct ether_hdr, d_addr);
+       const struct rte_flow_action_set_mac *conf =
+               (const struct rte_flow_action_set_mac *)actions->conf;
+
+       p_parser->keys[idx].off = off;
+       p_parser->keys[idx].mask = ~UINT32_MAX;
+       p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_ETH;
+       p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET;
+       memcpy(&p_parser->keys[idx].val,
+               conf->mac_addr, SZ_PEDIT_KEY_VAL);
+       idx++;
+       p_parser->keys[idx].off = off + SZ_PEDIT_KEY_VAL;
+       p_parser->keys[idx].mask = 0xFFFF0000;
+       p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_ETH;
+       p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET;
+       memcpy(&p_parser->keys[idx].val,
+               conf->mac_addr + SZ_PEDIT_KEY_VAL,
+               ETHER_ADDR_LEN - SZ_PEDIT_KEY_VAL);
+       p_parser->sel.nkeys = (++idx);
+}
+
 /**
  * Set pedit key of decrease/set ttl
  *
@@ -530,6 +567,10 @@ flow_tcf_create_pedit_mnl_msg(struct nlmsghdr *nl,
                        flow_tcf_pedit_key_set_dec_ttl(*actions,
                                                        &p_parser, item_flags);
                        break;
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
+                       flow_tcf_pedit_key_set_mac(*actions, &p_parser);
+                       break;
                default:
                        goto pedit_mnl_msg_done;
                }
@@ -618,6 +659,14 @@ flow_tcf_get_pedit_actions_size(const struct rte_flow_action **actions,
                        keys += NUM_OF_PEDIT_KEYS(TTL_LEN);
                        flags |= MLX5_FLOW_ACTION_DEC_TTL;
                        break;
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+                       keys += NUM_OF_PEDIT_KEYS(ETHER_ADDR_LEN);
+                       flags |= MLX5_FLOW_ACTION_SET_MAC_SRC;
+                       break;
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
+                       keys += NUM_OF_PEDIT_KEYS(ETHER_ADDR_LEN);
+                       flags |= MLX5_FLOW_ACTION_SET_MAC_DST;
+                       break;
                default:
                        goto get_pedit_action_size_done;
                }
@@ -1161,6 +1210,12 @@ flow_tcf_validate(struct rte_eth_dev *dev,
                case RTE_FLOW_ACTION_TYPE_DEC_TTL:
                        current_action_flag = MLX5_FLOW_ACTION_DEC_TTL;
                        break;
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+                       current_action_flag = MLX5_FLOW_ACTION_SET_MAC_SRC;
+                       break;
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
+                       current_action_flag = MLX5_FLOW_ACTION_SET_MAC_DST;
+                       break;
                default:
                        return rte_flow_error_set(error, ENOTSUP,
                                                  RTE_FLOW_ERROR_TYPE_ACTION,
@@ -1273,6 +1328,15 @@ flow_tcf_validate(struct rte_eth_dev *dev,
                                                  actions,
                                                  "no IP found in pattern");
        }
+       if (action_flags &
+           (MLX5_FLOW_ACTION_SET_MAC_SRC | MLX5_FLOW_ACTION_SET_MAC_DST)) {
+               if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L2))
+                       return rte_flow_error_set(error, ENOTSUP,
+                                                 RTE_FLOW_ERROR_TYPE_ACTION,
+                                                 actions,
+                                                 "no ethernet found in"
+                                                 " pattern");
+       }
        return 0;
 }
 
@@ -1434,6 +1498,8 @@ action_of_vlan:
                case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
                case RTE_FLOW_ACTION_TYPE_SET_TTL:
                case RTE_FLOW_ACTION_TYPE_DEC_TTL:
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
                        size += flow_tcf_get_pedit_actions_size(&actions,
                                                                &flags);
                        break;
@@ -2012,6 +2078,8 @@ override_na_vlan_priority:
                case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
                case RTE_FLOW_ACTION_TYPE_SET_TTL:
                case RTE_FLOW_ACTION_TYPE_DEC_TTL:
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
+               case RTE_FLOW_ACTION_TYPE_SET_MAC_DST:
                        na_act_index =
                                mnl_attr_nest_start(nlh, na_act_index_cur++);
                        flow_tcf_create_pedit_mnl_msg(nlh,