tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] IB: clean up user access config options

Add a new config option INFINIBAND_USER_MAD to control whether we
build ib_umad. Change INFINIBAND_USER_VERBS to INFINIBAND_USER_ACCESS,
and have it control ib_ucm and ib_uat as well as ib_uverbs.

Signed-off-by: James Lentini <jlentini@netapp.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

authored by

James Lentini and committed by
Roland Dreier 17781cd6 b5dcbf47

+21 -9
unified split
+18 -7
drivers/infiniband/Kconfig
··· 8 8 any protocols you wish to use as well as drivers for your 9 9 InfiniBand hardware. 10 10 11 - config INFINIBAND_USER_VERBS 12 - tristate "InfiniBand userspace verbs support" 11 + config INFINIBAND_USER_MAD 12 + tristate "InfiniBand userspace MAD support" 13 13 depends on INFINIBAND 14 14 ---help--- 15 - Userspace InfiniBand verbs support. This is the kernel side 16 - of userspace verbs, which allows userspace processes to 17 - directly access InfiniBand hardware for fast-path 18 - operations. You will also need libibverbs and a hardware 19 - driver library from <http://www.openib.org>. 15 + Userspace InfiniBand Management Datagram (MAD) support. This 16 + is the kernel side of the userspace MAD support, which allows 17 + userspace processes to send and receive MADs. You will also 18 + need libibumad from <http://www.openib.org>. 19 + 20 + config INFINIBAND_USER_ACCESS 21 + tristate "InfiniBand userspace access (verbs and CM)" 22 + depends on INFINIBAND 23 + ---help--- 24 + Userspace InfiniBand access support. This enables the 25 + kernel side of userspace verbs and the userspace 26 + communication manager (CM). This allows userspace processes 27 + to set up connections and directly access InfiniBand 28 + hardware for fast-path operations. You will also need 29 + libibverbs, libibcm and a hardware driver library from 30 + <http://www.openib.org>. 20 31 21 32 source "drivers/infiniband/hw/mthca/Kconfig" 22 33
+3 -2
drivers/infiniband/core/Makefile
··· 1 1 obj-$(CONFIG_INFINIBAND) += ib_core.o ib_mad.o ib_sa.o \ 2 - ib_cm.o ib_umad.o ib_ucm.o 3 - obj-$(CONFIG_INFINIBAND_USER_VERBS) += ib_uverbs.o 2 + ib_cm.o 3 + obj-$(CONFIG_INFINIBAND_USER_MAD) += ib_umad.o 4 + obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o 4 5 5 6 ib_core-y := packer.o ud_header.o verbs.o sysfs.o \ 6 7 device.o fmr_pool.o cache.o