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: Yann 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 ]
Unified · Split
| @@ -31,6 +31,17 @@ config INFINIBAND_USER_ACCESS · 30 unmodified lines | ||
| 31 | 31 | libibverbs, libibcm and a hardware driver library from |
| 32 | 32 | <http://www.openfabrics.org/git/>. |
| 33 | 33 | |
| 34 | +config INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 35 | + bool "Experimental and unstable ABI for userspace access to flow steering verbs" | |
| 36 | + depends on INFINIBAND_USER_ACCESS | |
| 37 | + depends on STAGING | |
| 38 | + ---help--- | |
| 39 | + The final ABI for userspace access to flow steering verbs | |
| 40 | + has not been defined. To use the current ABI, *WHICH WILL | |
| 41 | + CHANGE IN THE FUTURE*, say Y here. | |
| 42 | + | |
| 43 | + If unsure, say N. | |
| 44 | + | |
| 34 | 45 | config INFINIBAND_USER_MEM |
| 35 | 46 | bool |
| 36 | 47 | depends on INFINIBAND_USER_ACCESS != n |
| @@ -217,7 +217,9 @@ IB_UVERBS_DECLARE_CMD(destroy_srq); · 216 unmodified lines | ||
| 217 | 217 | IB_UVERBS_DECLARE_CMD(create_xsrq); |
| 218 | 218 | IB_UVERBS_DECLARE_CMD(open_xrcd); |
| 219 | 219 | IB_UVERBS_DECLARE_CMD(close_xrcd); |
| 220 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 220 | 221 | IB_UVERBS_DECLARE_CMD(create_flow); |
| 221 | 222 | IB_UVERBS_DECLARE_CMD(destroy_flow); |
| 223 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 222 | 224 | |
| 223 | 225 | #endif /* UVERBS_H */ |
| @@ -54,7 +54,9 @@ static struct uverbs_lock_class qp_lock_class = { .name = "QP-uobj" }; · 53 unmodified lines | ||
| 54 | 54 | static struct uverbs_lock_class ah_lock_class = { .name = "AH-uobj" }; |
| 55 | 55 | static struct uverbs_lock_class srq_lock_class = { .name = "SRQ-uobj" }; |
| 56 | 56 | static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" }; |
| 57 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 57 | 58 | static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" }; |
| 59 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 58 | 60 | |
| 59 | 61 | #define INIT_UDATA(udata, ibuf, obuf, ilen, olen) \ |
| 60 | 62 | do { \ |
| @@ -2599,6 +2601,7 @@ out_put: · 2538 unmodified lines | ||
| 2599 | 2601 | return ret ? ret : in_len; |
| 2600 | 2602 | } |
| 2601 | 2603 | |
| 2604 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 2602 | 2605 | static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec, |
| 2603 | 2606 | union ib_flow_spec *ib_spec) |
| 2604 | 2607 | { |
| @@ -2824,6 +2827,7 @@ ssize_t ib_uverbs_destroy_flow(struct ib_uverbs_file *file, · 219 unmodified lines | ||
| 2824 | 2827 | |
| 2825 | 2828 | return ret ? ret : in_len; |
| 2826 | 2829 | } |
| 2830 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 2827 | 2831 | |
| 2828 | 2832 | static int __uverbs_create_xsrq(struct ib_uverbs_file *file, |
| 2829 | 2833 | struct ib_uverbs_create_xsrq *cmd, |
| @@ -115,8 +115,10 @@ static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file, · 114 unmodified lines | ||
| 115 | 115 | [IB_USER_VERBS_CMD_CLOSE_XRCD] = ib_uverbs_close_xrcd, |
| 116 | 116 | [IB_USER_VERBS_CMD_CREATE_XSRQ] = ib_uverbs_create_xsrq, |
| 117 | 117 | [IB_USER_VERBS_CMD_OPEN_QP] = ib_uverbs_open_qp, |
| 118 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 118 | 119 | [IB_USER_VERBS_CMD_CREATE_FLOW] = ib_uverbs_create_flow, |
| 119 | 120 | [IB_USER_VERBS_CMD_DESTROY_FLOW] = ib_uverbs_destroy_flow |
| 121 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 120 | 122 | }; |
| 121 | 123 | |
| 122 | 124 | 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, · 482 unmodified lines | ||
| 605 | 607 | if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << hdr.command))) |
| 606 | 608 | return -ENOSYS; |
| 607 | 609 | |
| 610 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 608 | 611 | if (hdr.command >= IB_USER_VERBS_CMD_THRESHOLD) { |
| 609 | 612 | struct ib_uverbs_cmd_hdr_ex hdr_ex; |
| 610 | 613 | |
| @@ -621,6 +624,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, · 10 unmodified lines | ||
| 621 | 624 | (hdr_ex.out_words + |
| 622 | 625 | hdr_ex.provider_out_words) * 4); |
| 623 | 626 | } else { |
| 627 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 624 | 628 | if (hdr.in_words * 4 != count) |
| 625 | 629 | return -EINVAL; |
| 626 | 630 | |
| @@ -628,7 +632,9 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, · 1 unmodified line | ||
| 628 | 632 | buf + sizeof(hdr), |
| 629 | 633 | hdr.in_words * 4, |
| 630 | 634 | hdr.out_words * 4); |
| 635 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 631 | 636 | } |
| 637 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 632 | 638 | } |
| 633 | 639 | |
| 634 | 640 | static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma) |
| @@ -1691,9 +1691,11 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) · 1690 unmodified lines | ||
| 1691 | 1691 | ibdev->ib_dev.create_flow = mlx4_ib_create_flow; |
| 1692 | 1692 | ibdev->ib_dev.destroy_flow = mlx4_ib_destroy_flow; |
| 1693 | 1693 | |
| 1694 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 1694 | 1695 | ibdev->ib_dev.uverbs_cmd_mask |= |
| 1695 | 1696 | (1ull << IB_USER_VERBS_CMD_CREATE_FLOW) | |
| 1696 | 1697 | (1ull << IB_USER_VERBS_CMD_DESTROY_FLOW); |
| 1698 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 1697 | 1699 | } |
| 1698 | 1700 | |
| 1699 | 1701 | mlx4_ib_alloc_eqs(dev, ibdev); |
| @@ -87,8 +87,10 @@ enum { · 86 unmodified lines | ||
| 87 | 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, |
| 88 | 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, |
| 89 | 89 | IB_USER_VERBS_CMD_OPEN_QP, |
| 90 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 90 | 91 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, |
| 91 | 92 | IB_USER_VERBS_CMD_DESTROY_FLOW |
| 93 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 92 | 94 | }; |
| 93 | 95 | |
| 94 | 96 | /* |
| @@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr { · 31 unmodified lines | ||
| 126 | 128 | __u16 out_words; |
| 127 | 129 | }; |
| 128 | 130 | |
| 131 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 129 | 132 | struct ib_uverbs_cmd_hdr_ex { |
| 130 | 133 | __u32 command; |
| 131 | 134 | __u16 in_words; |
| @@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex { · 2 unmodified lines | ||
| 134 | 137 | __u16 provider_out_words; |
| 135 | 138 | __u32 cmd_hdr_reserved; |
| 136 | 139 | }; |
| 140 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 137 | 141 | |
| 138 | 142 | struct ib_uverbs_get_context { |
| 139 | 143 | __u64 response; |
| @@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast { · 556 unmodified lines | ||
| 696 | 700 | __u64 driver_data[0]; |
| 697 | 701 | }; |
| 698 | 702 | |
| 703 | +#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | |
| 699 | 704 | struct ib_kern_eth_filter { |
| 700 | 705 | __u8 dst_mac[6]; |
| 701 | 706 | __u8 src_mac[6]; |
| @@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow { · 78 unmodified lines | ||
| 780 | 785 | __u32 comp_mask; |
| 781 | 786 | __u32 flow_handle; |
| 782 | 787 | }; |
| 788 | +#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | |
| 783 | 789 | |
| 784 | 790 | struct ib_uverbs_create_srq { |
| 785 | 791 | __u64 response; |