Commit 5eff6dad authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx4: Don't disable vxlan offloads under DMFS-A0 optimized steering 



Except for VXLAN steering rules, all offloads should work as they were
under plain DMFS mode. Fix that by enabling all the offloads under
DMFS-A0 mode, except for VXLAN steering rules.

Fixes: d57febe1 "net/mlx4: Add A0 hybrid steering"
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aaef66b8

drivers/infiniband/hw/mlx4/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,8 @@ static int mlx4_ib_tunnel_steer_add(struct ib_qp *qp, struct ib_flow_attr *flow_ 
	struct mlx4_dev	*dev = to_mdev(qp->device)->dev;

	int err = 0;



	if (dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)

	if (dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN ||

	    dev->caps.dmfs_high_steer_mode == MLX4_STEERING_DMFS_A0_STATIC)

		return 0; /* do nothing */



	ib_flow = flow_attr + 1;

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+2 −1
Original line number Diff line number Diff line
@@ -475,7 +475,8 @@ static int mlx4_en_tunnel_steer_add(struct mlx4_en_priv *priv, unsigned char *ad 
{

	int err;



	if (priv->mdev->dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)

	if (priv->mdev->dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN ||

	    priv->mdev->dev->caps.dmfs_high_steer_mode == MLX4_STEERING_DMFS_A0_STATIC)

		return 0; /* do nothing */



	err = mlx4_tunnel_steer_add(priv->mdev->dev, addr, priv->port, qpn,

drivers/net/ethernet/mellanox/mlx4/main.c

+1 −2
Original line number Diff line number Diff line
@@ -1744,8 +1744,7 @@ static void choose_tunnel_offload_mode(struct mlx4_dev *dev, 
				       struct mlx4_dev_cap *dev_cap)

{

	if (dev->caps.steering_mode == MLX4_STEERING_MODE_DEVICE_MANAGED &&

	    dev_cap->flags2 & MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS &&

	    dev->caps.dmfs_high_steer_mode != MLX4_STEERING_DMFS_A0_STATIC)

	    dev_cap->flags2 & MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS)

		dev->caps.tunnel_offload_mode = MLX4_TUNNEL_OFFLOAD_MODE_VXLAN;

	else

		dev->caps.tunnel_offload_mode = MLX4_TUNNEL_OFFLOAD_MODE_NONE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE