History

RDMA/core: Unify style of IOCTL commands

MAD and HFI1 have different naming convention, this patch simplifies and unifies their defines and names. As part of cleanup, the HFI1 _NUM() macro and command indexes were removed (controversial). This will cause intentional (and arguably unnecessary) breakage to the PSM user space library.

Leon Romanovsky committed 10 years ago

Commit fa83b791 parent 10b31e71 file · +38 −60Browse files

Unified · Split

include/uapi/rdma/rdma_user_ioctl.h+38−60
@@ -39,71 +39,49 @@ · 38 unmodified lines
39#include <rdma/hfi/hfi1_ioctl.h>39#include <rdma/hfi/hfi1_ioctl.h>
40 40
41/* Documentation/ioctl/ioctl-number.txt */41/* Documentation/ioctl/ioctl-number.txt */
42#define RDMA_IOCTL_MAGIC 0x1b42#define RDMA_IOCTL_MAGIC 0x1b
43/* Legacy name, for user space application which already use it */43/* Legacy name, for user space application which already use it */
44#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC44#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC
45
46#define IB_USER_MAD_REGISTER_AGENT _IOWR(RDMA_IOCTL_MAGIC, 1, \
47 struct ib_user_mad_reg_req)
48
49#define IB_USER_MAD_UNREGISTER_AGENT _IOW(RDMA_IOCTL_MAGIC, 2, __u32)
50
51#define IB_USER_MAD_ENABLE_PKEY _IO(RDMA_IOCTL_MAGIC, 3)
52
53#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(RDMA_IOCTL_MAGIC, 4, \
54 struct ib_user_mad_reg_req2)
55
56/* User commands. */
57#define HFI1_CMD_ASSIGN_CTXT 1 /* allocate HFI and context */
58#define HFI1_CMD_CTXT_INFO 2 /* find out what resources we got */
59#define HFI1_CMD_USER_INFO 3 /* set up userspace */
60#define HFI1_CMD_TID_UPDATE 4 /* update expected TID entries */
61#define HFI1_CMD_TID_FREE 5 /* free expected TID entries */
62#define HFI1_CMD_CREDIT_UPD 6 /* force an update of PIO credit */
63
64#define HFI1_CMD_RECV_CTRL 8 /* control receipt of packets */
65#define HFI1_CMD_POLL_TYPE 9 /* set the kind of polling we want */
66#define HFI1_CMD_ACK_EVENT 10 /* ack & clear user status bits */
67#define HFI1_CMD_SET_PKEY 11 /* set context's pkey */
68#define HFI1_CMD_CTXT_RESET 12 /* reset context's HW send context */
69#define HFI1_CMD_TID_INVAL_READ 13 /* read TID cache invalidations */
70#define HFI1_CMD_GET_VERS 14 /* get the version of the user cdev */
71 45
72/*46/*
73 * User IOCTLs can not go above 128 if they do then see common.h and change the47 * General blocks assignments
74 * base for the snoop ioctl48 * It is closed on purpose do not expose it it user space
49 * #define MAD_CMD_BASE 0x00
50 * #define HFI1_CMD_BAS 0xE0
75 */51 */
76 52
77/*53/* MAD specific section */
78 * Make the ioctls occupy the last 0xf0-0xff portion of the IB range54#define IB_USER_MAD_REGISTER_AGENT _IOWR(RDMA_IOCTL_MAGIC, 0x01, struct ib_user_mad_reg_req)
79 */55#define IB_USER_MAD_UNREGISTER_AGENT _IOW(RDMA_IOCTL_MAGIC, 0x02, __u32)
80#define __NUM(cmd) (HFI1_CMD_##cmd + 0xe0)56#define IB_USER_MAD_ENABLE_PKEY _IO(RDMA_IOCTL_MAGIC, 0x03)
57#define IB_USER_MAD_REGISTER_AGENT2 _IOWR(RDMA_IOCTL_MAGIC, 0x04, struct ib_user_mad_reg_req2)
81 58
82#define HFI1_IOCTL_ASSIGN_CTXT \59/* HFI specific section */
83 _IOWR(RDMA_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info)60/* allocate HFI and context */
84#define HFI1_IOCTL_CTXT_INFO \61#define HFI1_IOCTL_ASSIGN_CTXT _IOWR(RDMA_IOCTL_MAGIC, 0xE1, struct hfi1_user_info)
85 _IOW(RDMA_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info)62/* find out what resources we got */
86#define HFI1_IOCTL_USER_INFO \63#define HFI1_IOCTL_CTXT_INFO _IOW(RDMA_IOCTL_MAGIC, 0xE2, struct hfi1_ctxt_info)
87 _IOW(RDMA_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info)64/* set up userspace */
88#define HFI1_IOCTL_TID_UPDATE \65#define HFI1_IOCTL_USER_INFO _IOW(RDMA_IOCTL_MAGIC, 0xE3, struct hfi1_base_info)
89 _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info)66/* update expected TID entries */
90#define HFI1_IOCTL_TID_FREE \67#define HFI1_IOCTL_TID_UPDATE _IOWR(RDMA_IOCTL_MAGIC, 0xE4, struct hfi1_tid_info)
91 _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info)68/* free expected TID entries */
92#define HFI1_IOCTL_CREDIT_UPD \69#define HFI1_IOCTL_TID_FREE _IOWR(RDMA_IOCTL_MAGIC, 0xE5, struct hfi1_tid_info)
93 _IO(RDMA_IOCTL_MAGIC, __NUM(CREDIT_UPD))70/* force an update of PIO credit */
94#define HFI1_IOCTL_RECV_CTRL \71#define HFI1_IOCTL_CREDIT_UPD _IO(RDMA_IOCTL_MAGIC, 0xE6)
95 _IOW(RDMA_IOCTL_MAGIC, __NUM(RECV_CTRL), int)72/* control receipt of packets */
96#define HFI1_IOCTL_POLL_TYPE \73#define HFI1_IOCTL_RECV_CTRL _IOW(RDMA_IOCTL_MAGIC, 0xE8, int)
97 _IOW(RDMA_IOCTL_MAGIC, __NUM(POLL_TYPE), int)74/* set the kind of polling we want */
98#define HFI1_IOCTL_ACK_EVENT \75#define HFI1_IOCTL_POLL_TYPE _IOW(RDMA_IOCTL_MAGIC, 0xE9, int)
99 _IOW(RDMA_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long)76/* ack & clear user status bits */
100#define HFI1_IOCTL_SET_PKEY \77#define HFI1_IOCTL_ACK_EVENT _IOW(RDMA_IOCTL_MAGIC, 0xEA, unsigned long)
101 _IOW(RDMA_IOCTL_MAGIC, __NUM(SET_PKEY), __u16)78/* set context's pkey */
102#define HFI1_IOCTL_CTXT_RESET \79#define HFI1_IOCTL_SET_PKEY _IOW(RDMA_IOCTL_MAGIC, 0xEB, __u16)
103 _IO(RDMA_IOCTL_MAGIC, __NUM(CTXT_RESET))80/* reset context's HW send context */
104#define HFI1_IOCTL_TID_INVAL_READ \81#define HFI1_IOCTL_CTXT_RESET _IO(RDMA_IOCTL_MAGIC, 0xEC)
105 _IOWR(RDMA_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info)82/* read TID cache invalidations */
106#define HFI1_IOCTL_GET_VERS \83#define HFI1_IOCTL_TID_INVAL_READ _IOWR(RDMA_IOCTL_MAGIC, 0xED, struct hfi1_tid_info)
107 _IOR(RDMA_IOCTL_MAGIC, __NUM(GET_VERS), int)84/* get the version of the user cdev */
85#define HFI1_IOCTL_GET_VERS _IOR(RDMA_IOCTL_MAGIC, 0xEE, int)
108 86
109#endif /* RDMA_USER_IOCTL_H */87#endif /* RDMA_USER_IOCTL_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t