Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a9b7d59 authored by Matan Barak's avatar Matan Barak Committed by Roland Dreier
Browse files

IB/mlx4: Enable device-managed steering support for IB ports too 



Up until now, flow steering wasn't supported when using IB ports.

This patch enables support for flow steering if all hardware ports
support that, for example the new MLX4_DEV_CAP_FLAG2_DMFS_IPOIB mlx4
device capability.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 4de65803

drivers/infiniband/hw/mlx4/main.c

+19 −12
Original line number Diff line number Diff line
@@ -92,21 +92,27 @@ static union ib_gid zgid; 


static int check_flow_steering_support(struct mlx4_dev *dev)

{

	int eth_num_ports = 0;

	int ib_num_ports = 0;

	int i;



	int dmfs = dev->caps.steering_mode == MLX4_STEERING_MODE_DEVICE_MANAGED;



	if (dmfs) {

		int i;

		mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)

			eth_num_ports++;

		mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB)

			ib_num_ports++;



	if (dev->caps.steering_mode == MLX4_STEERING_MODE_DEVICE_MANAGED) {

		if (ib_num_ports || mlx4_is_mfunc(dev)) {

			pr_warn("Device managed flow steering is unavailable "

				"for IB ports or in multifunction env.\n");

			return 0;

		dmfs &= (!ib_num_ports ||

			 (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_DMFS_IPOIB)) &&

			(!eth_num_ports ||

			 (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_FS_EN));

		if (ib_num_ports && mlx4_is_mfunc(dev)) {

			pr_warn("Device managed flow steering is unavailable for IB port in multifunction env.\n");

			dmfs = 0;

		}

		return 1;

	}

	return 0;

	return dmfs;

}



static int mlx4_ib_query_device(struct ib_device *ibdev,
@@ -165,7 +171,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev, 
			props->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2B;

		else

			props->device_cap_flags |= IB_DEVICE_MEM_WINDOW_TYPE_2A;

	if (check_flow_steering_support(dev->dev))

	if (dev->steering_support ==  MLX4_STEERING_MODE_DEVICE_MANAGED)

		props->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;

	}
@@ -1682,6 +1688,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	}



	if (check_flow_steering_support(dev)) {

		ibdev->steering_support = MLX4_STEERING_MODE_DEVICE_MANAGED;

		ibdev->ib_dev.create_flow	= mlx4_ib_create_flow;

		ibdev->ib_dev.destroy_flow	= mlx4_ib_destroy_flow;

drivers/infiniband/hw/mlx4/mlx4_ib.h

+1 −0
Original line number Diff line number Diff line
@@ -494,6 +494,7 @@ struct mlx4_ib_dev { 
	struct kobject	       *dev_ports_parent[MLX4_MFUNC_MAX];

	struct mlx4_ib_iov_port	iov_ports[MLX4_MAX_PORTS];

	struct pkey_mgt		pkeys;

	int steering_support;

};



struct ib_event_work {