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

RDMA/core: Commonize RDMA IOCTL declarations location

This patch provides one common file (rdma_user_ioctl.h)
for all RDMA UAPI IOCTLs.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

authored by

Leon Romanovsky and committed by
Doug Ledford
843debb8 a121103c

+46 -4
+1
include/uapi/rdma/Kbuild
··· 1 1 # UAPI Header export list 2 2 header-y += ib_user_cm.h 3 + header-y += rdma_user_ioctl.h 3 4 header-y += ib_user_mad.h 4 5 header-y += ib_user_sa.h 5 6 header-y += ib_user_verbs.h
+1 -1
include/uapi/rdma/hfi/hfi1_user.h
··· 57 57 #define _LINUX__HFI1_USER_H 58 58 59 59 #include <linux/types.h> 60 + #include <rdma/rdma_user_ioctl.h> 60 61 61 62 /* 62 63 * This version number is given to the driver by the user code during ··· 133 132 * User IOCTLs can not go above 128 if they do then see common.h and change the 134 133 * base for the snoop ioctl 135 134 */ 136 - #define IB_IOCTL_MAGIC 0x1b /* See Documentation/ioctl/ioctl-number.txt */ 137 135 138 136 /* 139 137 * Make the ioctls occupy the last 0xf0-0xff portion of the IB range
+1 -3
include/uapi/rdma/ib_user_mad.h
··· 35 35 #define IB_USER_MAD_H 36 36 37 37 #include <linux/types.h> 38 - #include <linux/ioctl.h> 38 + #include <rdma/rdma_user_ioctl.h> 39 39 40 40 /* 41 41 * Increment this value if any changes that break userspace ABI ··· 229 229 __u8 rmpp_version; 230 230 __u8 reserved[3]; 231 231 }; 232 - 233 - #define IB_IOCTL_MAGIC 0x1b 234 232 235 233 #define IB_USER_MAD_REGISTER_AGENT _IOWR(IB_IOCTL_MAGIC, 1, \ 236 234 struct ib_user_mad_reg_req)
+43
include/uapi/rdma/rdma_user_ioctl.h
··· 1 + /* 2 + * Copyright (c) 2016 Mellanox Technologies, LTD. All rights reserved. 3 + * 4 + * This software is available to you under a choice of one of two 5 + * licenses. You may choose to be licensed under the terms of the GNU 6 + * General Public License (GPL) Version 2, available from the file 7 + * COPYING in the main directory of this source tree, or the 8 + * OpenIB.org BSD license below: 9 + * 10 + * Redistribution and use in source and binary forms, with or 11 + * without modification, are permitted provided that the following 12 + * conditions are met: 13 + * 14 + * - Redistributions of source code must retain the above 15 + * copyright notice, this list of conditions and the following 16 + * disclaimer. 17 + * 18 + * - Redistributions in binary form must reproduce the above 19 + * copyright notice, this list of conditions and the following 20 + * disclaimer in the documentation and/or other materials 21 + * provided with the distribution. 22 + * 23 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 24 + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 25 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 26 + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 27 + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 28 + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 29 + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 30 + * SOFTWARE. 31 + */ 32 + 33 + #ifndef RDMA_USER_IOCTL_H 34 + #define RDMA_USER_IOCTL_H 35 + 36 + #include <linux/types.h> 37 + #include <linux/ioctl.h> 38 + 39 + /* Documentation/ioctl/ioctl-number.txt */ 40 + #define RDMA_IOCTL_MAGIC 0x1b 41 + #define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC 42 + 43 + #endif /* RDMA_USER_IOCTL_H */