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

Commit 59082a32 authored by Matan Barak's avatar Matan Barak Committed by Leon Romanovsky
Browse files

IB/core: Support passing uhw for create_flow 



This is required when user-space drivers need to pass extra information
regarding how to handle this flow steering specification.

Reviewed-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarBoris Pismenny <borisp@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent ebb6796b

drivers/infiniband/core/uverbs_cmd.c

+6 −1
Original line number Diff line number Diff line
@@ -3513,11 +3513,16 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file, 
		err = -EINVAL;

		goto err_free;

	}

	flow_id = ib_create_flow(qp, flow_attr, IB_FLOW_DOMAIN_USER);



	flow_id = qp->device->create_flow(qp, flow_attr,

					  IB_FLOW_DOMAIN_USER, uhw);



	if (IS_ERR(flow_id)) {

		err = PTR_ERR(flow_id);

		goto err_free;

	}

	atomic_inc(&qp->usecnt);

	flow_id->qp = qp;

	flow_id->uobject = uobj;

	uobj->object = flow_id;

	uflow = container_of(uobj, typeof(*uflow), uobject);

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -1982,7 +1982,7 @@ struct ib_flow *ib_create_flow(struct ib_qp *qp, 
	if (!qp->device->create_flow)

		return ERR_PTR(-EOPNOTSUPP);



	flow_id = qp->device->create_flow(qp, flow_attr, domain);

	flow_id = qp->device->create_flow(qp, flow_attr, domain, NULL);

	if (!IS_ERR(flow_id)) {

		atomic_inc(&qp->usecnt);

		flow_id->qp = qp;

drivers/infiniband/hw/mlx4/main.c

+5 −1
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ static int mlx4_ib_add_dont_trap_rule(struct mlx4_dev *dev, 


static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,

				    struct ib_flow_attr *flow_attr,

				    int domain)

				    int domain, struct ib_udata *udata)

{

	int err = 0, i = 0, j = 0;

	struct mlx4_ib_flow *mflow;
@@ -1865,6 +1865,10 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
	    (flow_attr->type != IB_FLOW_ATTR_NORMAL))

		return ERR_PTR(-EOPNOTSUPP);



	if (udata &&

	    udata->inlen && !ib_is_udata_cleared(udata, 0, udata->inlen))

		return ERR_PTR(-EOPNOTSUPP);



	memset(type, 0, sizeof(type));



	mflow = kzalloc(sizeof(*mflow), GFP_KERNEL);

drivers/infiniband/hw/mlx5/main.c

+6 −1
Original line number Diff line number Diff line
@@ -3245,7 +3245,8 @@ static struct mlx5_ib_flow_handler *create_sniffer_rule(struct mlx5_ib_dev *dev, 


static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp,

					   struct ib_flow_attr *flow_attr,

					   int domain)

					   int domain,

					   struct ib_udata *udata)

{

	struct mlx5_ib_dev *dev = to_mdev(qp->device);

	struct mlx5_ib_qp *mqp = to_mqp(qp);
@@ -3257,6 +3258,10 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp, 
	int err;

	int underlay_qpn;



	if (udata &&

	    udata->inlen && !ib_is_udata_cleared(udata, 0, udata->inlen))

		return ERR_PTR(-EOPNOTSUPP);



	if (flow_attr->priority > MLX5_IB_FLOW_LAST_PRIO)

		return ERR_PTR(-ENOMEM);

include/rdma/ib_verbs.h

+2 −1
Original line number Diff line number Diff line
@@ -2427,7 +2427,8 @@ struct ib_device { 
	struct ib_flow *	   (*create_flow)(struct ib_qp *qp,

						  struct ib_flow_attr

						  *flow_attr,

						  int domain);

						  int domain,

						  struct ib_udata *udata);

	int			   (*destroy_flow)(struct ib_flow *flow_id);

	int			   (*check_mr_status)(struct ib_mr *mr, u32 check_mask,

						      struct ib_mr_status *mr_status);