Commit 7afbddfa authored by Yann Droneaud's avatar Yann Droneaud Committed by Roland Dreier
Browse files

IB/core: Temporarily disable create_flow/destroy_flow uverbs 



The create_flow/destroy_flow uverbs and the associated extensions to
the user-kernel verbs ABI are under review and are too experimental to
freeze at this point.

So userspace is not exposed to experimental features and an uinstable
ABI, temporarily disable this for v3.12 (with a Kconfig option behind
staging to reenable it if desired).

The feature will be enabled after proper cleanup for v3.13.

Signed-off-by: default avatarYann Droneaud <ydroneaud@opteya.com>
Link: http://marc.info/?i=cover.1381351016.git.ydroneaud@opteya.com
Link: http://marc.info/?i=cover.1381177342.git.ydroneaud@opteya.com



[ Add a Kconfig option to reenable these verbs.  - Roland ]

Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 31d141e3

drivers/infiniband/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -31,6 +31,17 @@ config INFINIBAND_USER_ACCESS 
	  libibverbs, libibcm and a hardware driver library from

	  <http://www.openfabrics.org/git/>.



config INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

       bool "Experimental and unstable ABI for userspace access to flow steering verbs"

       depends on INFINIBAND_USER_ACCESS

       depends on STAGING

	---help---

	  The final ABI for userspace access to flow steering verbs

	  has not been defined.  To use the current ABI, *WHICH WILL

	  CHANGE IN THE FUTURE*, say Y here.



	  If unsure, say N.



config INFINIBAND_USER_MEM

	bool

	depends on INFINIBAND_USER_ACCESS != n

drivers/infiniband/core/uverbs.h

+2 −0
Original line number Diff line number Diff line
@@ -217,7 +217,9 @@ IB_UVERBS_DECLARE_CMD(destroy_srq); 
IB_UVERBS_DECLARE_CMD(create_xsrq);

IB_UVERBS_DECLARE_CMD(open_xrcd);

IB_UVERBS_DECLARE_CMD(close_xrcd);

#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

IB_UVERBS_DECLARE_CMD(create_flow);

IB_UVERBS_DECLARE_CMD(destroy_flow);

#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */



#endif /* UVERBS_H */

drivers/infiniband/core/uverbs_cmd.c

+4 −0
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ static struct uverbs_lock_class qp_lock_class = { .name = "QP-uobj" }; 
static struct uverbs_lock_class ah_lock_class	= { .name = "AH-uobj" };

static struct uverbs_lock_class srq_lock_class	= { .name = "SRQ-uobj" };

static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" };

#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" };

#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */



#define INIT_UDATA(udata, ibuf, obuf, ilen, olen)			\

	do {								\
@@ -2599,6 +2601,7 @@ out_put: 
	return ret ? ret : in_len;

}



#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec,

				union ib_flow_spec *ib_spec)

{
@@ -2824,6 +2827,7 @@ ssize_t ib_uverbs_destroy_flow(struct ib_uverbs_file *file, 


	return ret ? ret : in_len;

}

#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */



static int __uverbs_create_xsrq(struct ib_uverbs_file *file,

				struct ib_uverbs_create_xsrq *cmd,

drivers/infiniband/core/uverbs_main.c

+6 −0
Original line number Diff line number Diff line
@@ -115,8 +115,10 @@ static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file, 
	[IB_USER_VERBS_CMD_CLOSE_XRCD]		= ib_uverbs_close_xrcd,

	[IB_USER_VERBS_CMD_CREATE_XSRQ]		= ib_uverbs_create_xsrq,

	[IB_USER_VERBS_CMD_OPEN_QP]		= ib_uverbs_open_qp,

#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

	[IB_USER_VERBS_CMD_CREATE_FLOW]		= ib_uverbs_create_flow,

	[IB_USER_VERBS_CMD_DESTROY_FLOW]	= ib_uverbs_destroy_flow

#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */

};



static void ib_uverbs_add_one(struct ib_device *device);
@@ -605,6 +607,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
	if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << hdr.command)))

		return -ENOSYS;



#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

	if (hdr.command >= IB_USER_VERBS_CMD_THRESHOLD) {

		struct ib_uverbs_cmd_hdr_ex hdr_ex;
@@ -621,6 +624,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
						     (hdr_ex.out_words +

						      hdr_ex.provider_out_words) * 4);

	} else {

#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */

		if (hdr.in_words * 4 != count)

			return -EINVAL;
@@ -628,7 +632,9 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
						     buf + sizeof(hdr),

						     hdr.in_words * 4,

						     hdr.out_words * 4);

#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

	}

#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */

}



static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)

drivers/infiniband/hw/mlx4/main.c

+2 −0
Original line number Diff line number Diff line
@@ -1691,9 +1691,11 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
		ibdev->ib_dev.create_flow	= mlx4_ib_create_flow;

		ibdev->ib_dev.destroy_flow	= mlx4_ib_destroy_flow;



#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

		ibdev->ib_dev.uverbs_cmd_mask	|=

			(1ull << IB_USER_VERBS_CMD_CREATE_FLOW) |

			(1ull << IB_USER_VERBS_CMD_DESTROY_FLOW);

#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */

	}



	mlx4_ib_alloc_eqs(dev, ibdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE