Commit 2f8ec867 authored by Chris Mi's avatar Chris Mi Committed by Saeed Mahameed
Browse files

net/mlx5e: Specify out ifindex when looking up encap route 



There is a use case that the local and remote VTEPs are in the same
host. Currently, the out ifindex is not specified when looking up the
encap route for offloads. So in this case, a local route is returned
and the route dev is lo.

Actual tunnel interface can be created with a parameter "dev" [1],
which specifies the physical device to use for tunnel endpoint
communication. Pass this parameter to driver when looking up encap
route for offloads. So that a unicast route will be returned.

[1] ip link add name vxlan1 type vxlan id 100 dev enp4s0f0 remote 1.1.1.1 dstport 4789

Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
Reviewed-by: default avatarMaor Dickman <maord@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 3222efd4

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+8 −0
Original line number Diff line number Diff line
@@ -118,6 +118,11 @@ static int mlx5e_route_lookup_ipv4_get(struct mlx5e_priv *priv, 


		uplink_dev = mlx5_eswitch_uplink_get_proto_dev(esw, REP_ETH);

		attr->fl.fl4.flowi4_oif = uplink_dev->ifindex;

	} else {

		struct mlx5e_tc_tunnel *tunnel = mlx5e_get_tc_tun(mirred_dev);



		if (tunnel && tunnel->get_remote_ifindex)

			attr->fl.fl4.flowi4_oif = tunnel->get_remote_ifindex(mirred_dev);

	}



	rt = ip_route_output_key(dev_net(mirred_dev), &attr->fl.fl4);
@@ -435,12 +440,15 @@ static int mlx5e_route_lookup_ipv6_get(struct mlx5e_priv *priv, 
				       struct net_device *mirred_dev,

				       struct mlx5e_tc_tun_route_attr *attr)

{

	struct mlx5e_tc_tunnel *tunnel = mlx5e_get_tc_tun(mirred_dev);

	struct net_device *route_dev;

	struct net_device *out_dev;

	struct dst_entry *dst;

	struct neighbour *n;

	int ret;



	if (tunnel && tunnel->get_remote_ifindex)

		attr->fl.fl6.flowi6_oif = tunnel->get_remote_ifindex(mirred_dev);

	dst = ipv6_stub->ipv6_dst_lookup_flow(dev_net(mirred_dev), NULL, &attr->fl.fl6,

					      NULL);

	if (IS_ERR(dst))

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct mlx5e_tc_tunnel { 
			    void *headers_v);

	bool (*encap_info_equal)(struct mlx5e_encap_key *a,

				 struct mlx5e_encap_key *b);

	int (*get_remote_ifindex)(struct net_device *mirred_dev);

};



extern struct mlx5e_tc_tunnel vxlan_tunnel;

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c

+9 −0
Original line number Diff line number Diff line
@@ -141,6 +141,14 @@ static int mlx5e_tc_tun_parse_vxlan(struct mlx5e_priv *priv, 
	return 0;

}



static int mlx5e_tc_tun_get_remote_ifindex(struct net_device *mirred_dev)

{

	const struct vxlan_dev *vxlan = netdev_priv(mirred_dev);

	const struct vxlan_rdst *dst = &vxlan->default_dst;



	return dst->remote_ifindex;

}



struct mlx5e_tc_tunnel vxlan_tunnel = {

	.tunnel_type          = MLX5E_TC_TUNNEL_TYPE_VXLAN,

	.match_level          = MLX5_MATCH_L4,
@@ -151,4 +159,5 @@ struct mlx5e_tc_tunnel vxlan_tunnel = { 
	.parse_udp_ports      = mlx5e_tc_tun_parse_udp_ports_vxlan,

	.parse_tunnel         = mlx5e_tc_tun_parse_vxlan,

	.encap_info_equal     = mlx5e_tc_tun_encap_info_equal_generic,

	.get_remote_ifindex   = mlx5e_tc_tun_get_remote_ifindex,

};