net/mlx5: Support internal port as decap route device

When performing route device lookup for decap action, support
the case of ovs internal port as the lookup result.

In such case, an internal port struct is mapped and attached
to the flow attributes so that the source port matching of the
rule will match on the internal port's metadata value.

Signed-off-by: Ariel Levkovich <lariel@nvidia.com>
Reviewed-by: Vlad Buslov <vladbu@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index c57180d030c7ea2e17fa8f2cd9ebb5a1af03a57f..a5e4509732257c3c9e080893660040c450756231 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -711,6 +711,7 @@ int mlx5e_tc_tun_route_lookup(struct mlx5e_priv *priv,
                              struct mlx5_flow_attr *flow_attr)
 {
        struct mlx5_esw_flow_attr *esw_attr = flow_attr->esw_attr;
+       struct mlx5e_tc_int_port *int_port;
        TC_TUN_ROUTE_ATTR_INIT(attr);
        u16 vport_num;
        int err = 0;
@@ -735,17 +736,25 @@ int mlx5e_tc_tun_route_lookup(struct mlx5e_priv *priv,
        if (err)
                return err;
 
-       if (attr.route_dev->netdev_ops != &mlx5e_netdev_ops ||
-           !mlx5e_tc_is_vf_tunnel(attr.out_dev, attr.route_dev))
-               goto out;
-
-       err = mlx5e_tc_query_route_vport(attr.out_dev, attr.route_dev, &vport_num);
-       if (err)
-               goto out;
+       if (attr.route_dev->netdev_ops == &mlx5e_netdev_ops &&
+           mlx5e_tc_is_vf_tunnel(attr.out_dev, attr.route_dev)) {
+               err = mlx5e_tc_query_route_vport(attr.out_dev, attr.route_dev, &vport_num);
+               if (err)
+                       goto out;
 
-       esw_attr->rx_tun_attr->vni = MLX5_GET(fte_match_param, spec->match_value,
-                                             misc_parameters.vxlan_vni);
-       esw_attr->rx_tun_attr->decap_vport = vport_num;
+               esw_attr->rx_tun_attr->vni = MLX5_GET(fte_match_param, spec->match_value,
+                                                     misc_parameters.vxlan_vni);
+               esw_attr->rx_tun_attr->decap_vport = vport_num;
+       } else if (netif_is_ovs_master(attr.route_dev)) {
+               int_port = mlx5e_tc_int_port_get(mlx5e_get_int_port_priv(priv),
+                                                attr.route_dev->ifindex,
+                                                MLX5E_TC_INT_PORT_INGRESS);
+               if (IS_ERR(int_port)) {
+                       err = PTR_ERR(int_port);
+                       goto out;
+               }
+               esw_attr->int_port = int_port;
+       }
 
 out:
        if (flow_attr->tun_ip_version == 4)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index e11a906d70c7d49c87506609ae4ac32c236ceeb8..835caa1c7b745964f741f883153f64f297d53ec9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1401,6 +1401,9 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
        int err = 0;
        int out_index;
 
+       parse_attr = attr->parse_attr;
+       esw_attr = attr->esw_attr;
+
        /* We check chain range only for tc flows.
         * For ft flows, we checked attr->chain was originally 0 and set it to
         * FDB_FT_CHAIN which is outside tc range.
@@ -1426,6 +1429,24 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
                err = mlx5e_attach_decap_route(priv, flow);
                if (err)
                        goto err_out;
+
+               if (!attr->chain && esw_attr->int_port) {
+                       /* If decap route device is internal port, change the
+                        * source vport value in reg_c0 back to uplink just in
+                        * case the rule performs goto chain > 0. If we have a miss
+                        * on chain > 0 we want the metadata regs to hold the
+                        * chain id so SW will resume handling of this packet
+                        * from the proper chain.
+                        */
+                       u32 metadata = mlx5_eswitch_get_vport_metadata_for_set(esw,
+                                                                       esw_attr->in_rep->vport);
+
+                       err = mlx5e_tc_match_to_reg_set(priv->mdev, &parse_attr->mod_hdr_acts,
+                                                       MLX5_FLOW_NAMESPACE_FDB, VPORT_TO_REG,
+                                                       metadata);
+                       if (err)
+                               return err;
+               }
        }
 
        if (flow_flag_test(flow, L3_TO_L2_DECAP)) {
@@ -1434,9 +1455,6 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
                        goto err_out;
        }
 
-       parse_attr = attr->parse_attr;
-       esw_attr = attr->esw_attr;
-
        if (netif_is_ovs_master(parse_attr->filter_dev)) {
                struct mlx5e_tc_int_port *int_port;