From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leon Romanovsky Subject: Re: [PATCH rdma-next 4/6] RDMA/core: Move HFI1 IOCTL declarations to common file Date: Wed, 17 Aug 2016 09:55:29 +0300 Message-ID: <20160817065529.GG5489@leon.nu> References: <1471355123-6227-1-git-send-email-leon@kernel.org> <1471355123-6227-5-git-send-email-leon@kernel.org> <20160817061630.GB27477@phlsvsds.ph.intel.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WkfBGePaEyrk4zXB" Return-path: Content-Disposition: inline In-Reply-To: <20160817061630.GB27477-W4f6Xiosr+yv7QzWx2u06xL4W9x8LtSr@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: "ira.weiny" Cc: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Matan Barak , Haggai Eran List-Id: linux-rdma@vger.kernel.org --WkfBGePaEyrk4zXB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 17, 2016 at 02:16:31AM -0400, ira.weiny wrote: > On Tue, Aug 16, 2016 at 04:45:21PM +0300, Leon Romanovsky wrote: > > From: Leon Romanovsky > >=20 > > Move HFI1 IOCTL declarations to rdma_user_ioctl.h file. >=20 > I have not tried with the patch but I'm 99% sure this will break the PSM2 > library build which includes hfi1_user.h. >=20 > This is one of those things I have pondered in the past. Most of the rdma > libraries don't actually use these definitions directly. PSM2 does. I'm not so convinced about it. "#include " was added to hfi1_user.h to share all definitions. PSM2 library will see it. >=20 > I'm not sure what other libraries do. >=20 > In the final patch of this series you admit that the name changes in that= patch > will break userspace which uses the defines directly. Can we, should we,= do > that? I'm talking about __NUM() macros. Do you really use __NUM(ASSIGN_CTXT) in user application? Why did you do it? You supposed to use HFI1_IOCTL_ASSIGN_CTXT instead. >=20 > To be completely pedantic I think we need to maintain the old names at le= ast > for some time. Perhaps they are best put in an rdma_user_compat_ioctl.h = which > is included in the final rdma_user_ioctl.h? Except __NUM() macro, there is no change in names. >=20 > For this patch I think it would be sufficient to include rdma_user_ioctl.= h in > hfi1_user.h but I would have to double check that. It is already done in patches before. >=20 > Ira >=20 > >=20 > > Signed-off-by: Matan Barak > > Signed-off-by: Haggai Eran > > Signed-off-by: Leon Romanovsky > > --- > > include/uapi/rdma/hfi/hfi1_user.h | 55 -----------------------------= -------- > > include/uapi/rdma/rdma_user_ioctl.h | 54 +++++++++++++++++++++++++++++= +++++++ > > 2 files changed, 54 insertions(+), 55 deletions(-) > >=20 > > diff --git a/include/uapi/rdma/hfi/hfi1_user.h b/include/uapi/rdma/hfi/= hfi1_user.h > > index 8aa3867..8807f06 100644 > > --- a/include/uapi/rdma/hfi/hfi1_user.h > > +++ b/include/uapi/rdma/hfi/hfi1_user.h > > @@ -58,7 +58,6 @@ > > =20 > > #include > > #include > > -#include > > =20 > > /* > > * This version number is given to the driver by the user code during > > @@ -114,60 +113,6 @@ > > #define HFI1_RCVHDR_ENTSIZE_16 (1UL << 1) > > #define HFI1_RCVDHR_ENTSIZE_32 (1UL << 2) > > =20 > > -/* User commands. */ > > -#define HFI1_CMD_ASSIGN_CTXT 1 /* allocate HFI and context */ > > -#define HFI1_CMD_CTXT_INFO 2 /* find out what resources we got */ > > -#define HFI1_CMD_USER_INFO 3 /* set up userspace */ > > -#define HFI1_CMD_TID_UPDATE 4 /* update expected TID entries */ > > -#define HFI1_CMD_TID_FREE 5 /* free expected TID entries */ > > -#define HFI1_CMD_CREDIT_UPD 6 /* force an update of PIO credit */ > > - > > -#define HFI1_CMD_RECV_CTRL 8 /* control receipt of packets */ > > -#define HFI1_CMD_POLL_TYPE 9 /* set the kind of polling we want = */ > > -#define HFI1_CMD_ACK_EVENT 10 /* ack & clear user status bits */ > > -#define HFI1_CMD_SET_PKEY 11 /* set context's pkey */ > > -#define HFI1_CMD_CTXT_RESET 12 /* reset context's HW send con= text */ > > -#define HFI1_CMD_TID_INVAL_READ 13 /* read TID cache invalidation= s */ > > -#define HFI1_CMD_GET_VERS 14 /* get the version of the user cdev */ > > - > > -/* > > - * User IOCTLs can not go above 128 if they do then see common.h and c= hange the > > - * base for the snoop ioctl > > - */ > > - > > -/* > > - * Make the ioctls occupy the last 0xf0-0xff portion of the IB range > > - */ > > -#define __NUM(cmd) (HFI1_CMD_##cmd + 0xe0) > > - > > -struct hfi1_cmd; > > -#define HFI1_IOCTL_ASSIGN_CTXT \ > > - _IOWR(IB_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info) > > -#define HFI1_IOCTL_CTXT_INFO \ > > - _IOW(IB_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info) > > -#define HFI1_IOCTL_USER_INFO \ > > - _IOW(IB_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info) > > -#define HFI1_IOCTL_TID_UPDATE \ > > - _IOWR(IB_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info) > > -#define HFI1_IOCTL_TID_FREE \ > > - _IOWR(IB_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info) > > -#define HFI1_IOCTL_CREDIT_UPD \ > > - _IO(IB_IOCTL_MAGIC, __NUM(CREDIT_UPD)) > > -#define HFI1_IOCTL_RECV_CTRL \ > > - _IOW(IB_IOCTL_MAGIC, __NUM(RECV_CTRL), int) > > -#define HFI1_IOCTL_POLL_TYPE \ > > - _IOW(IB_IOCTL_MAGIC, __NUM(POLL_TYPE), int) > > -#define HFI1_IOCTL_ACK_EVENT \ > > - _IOW(IB_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long) > > -#define HFI1_IOCTL_SET_PKEY \ > > - _IOW(IB_IOCTL_MAGIC, __NUM(SET_PKEY), __u16) > > -#define HFI1_IOCTL_CTXT_RESET \ > > - _IO(IB_IOCTL_MAGIC, __NUM(CTXT_RESET)) > > -#define HFI1_IOCTL_TID_INVAL_READ \ > > - _IOWR(IB_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info) > > -#define HFI1_IOCTL_GET_VERS \ > > - _IOR(IB_IOCTL_MAGIC, __NUM(GET_VERS), int) > > - > > #define _HFI1_EVENT_FROZEN_BIT 0 > > #define _HFI1_EVENT_LINKDOWN_BIT 1 > > #define _HFI1_EVENT_LID_CHANGE_BIT 2 > > diff --git a/include/uapi/rdma/rdma_user_ioctl.h b/include/uapi/rdma/rd= ma_user_ioctl.h > > index 820bf34..e9a69f0 100644 > > --- a/include/uapi/rdma/rdma_user_ioctl.h > > +++ b/include/uapi/rdma/rdma_user_ioctl.h > > @@ -36,6 +36,7 @@ > > #include > > #include > > #include > > +#include > > =20 > > /* Documentation/ioctl/ioctl-number.txt */ > > #define RDMA_IOCTL_MAGIC 0x1b > > @@ -51,4 +52,57 @@ > > #define IB_USER_MAD_REGISTER_AGENT2 _IOWR(IB_IOCTL_MAGIC, 4, \ > > struct ib_user_mad_reg_req2) > > =20 > > +/* User commands. */ > > +#define HFI1_CMD_ASSIGN_CTXT 1 /* allocate HFI and context */ > > +#define HFI1_CMD_CTXT_INFO 2 /* find out what resources we got */ > > +#define HFI1_CMD_USER_INFO 3 /* set up userspace */ > > +#define HFI1_CMD_TID_UPDATE 4 /* update expected TID entries */ > > +#define HFI1_CMD_TID_FREE 5 /* free expected TID entries */ > > +#define HFI1_CMD_CREDIT_UPD 6 /* force an update of PIO credit */ > > + > > +#define HFI1_CMD_RECV_CTRL 8 /* control receipt of packets */ > > +#define HFI1_CMD_POLL_TYPE 9 /* set the kind of polling we want = */ > > +#define HFI1_CMD_ACK_EVENT 10 /* ack & clear user status bits */ > > +#define HFI1_CMD_SET_PKEY 11 /* set context's pkey */ > > +#define HFI1_CMD_CTXT_RESET 12 /* reset context's HW send con= text */ > > +#define HFI1_CMD_TID_INVAL_READ 13 /* read TID cache invalidation= s */ > > +#define HFI1_CMD_GET_VERS 14 /* get the version of the user cdev */ > > + > > +/* > > + * User IOCTLs can not go above 128 if they do then see common.h and c= hange the > > + * base for the snoop ioctl > > + */ > > + > > +/* > > + * Make the ioctls occupy the last 0xf0-0xff portion of the IB range > > + */ > > +#define __NUM(cmd) (HFI1_CMD_##cmd + 0xe0) > > + > > +#define HFI1_IOCTL_ASSIGN_CTXT \ > > + _IOWR(IB_IOCTL_MAGIC, __NUM(ASSIGN_CTXT), struct hfi1_user_info) > > +#define HFI1_IOCTL_CTXT_INFO \ > > + _IOW(IB_IOCTL_MAGIC, __NUM(CTXT_INFO), struct hfi1_ctxt_info) > > +#define HFI1_IOCTL_USER_INFO \ > > + _IOW(IB_IOCTL_MAGIC, __NUM(USER_INFO), struct hfi1_base_info) > > +#define HFI1_IOCTL_TID_UPDATE \ > > + _IOWR(IB_IOCTL_MAGIC, __NUM(TID_UPDATE), struct hfi1_tid_info) > > +#define HFI1_IOCTL_TID_FREE \ > > + _IOWR(IB_IOCTL_MAGIC, __NUM(TID_FREE), struct hfi1_tid_info) > > +#define HFI1_IOCTL_CREDIT_UPD \ > > + _IO(IB_IOCTL_MAGIC, __NUM(CREDIT_UPD)) > > +#define HFI1_IOCTL_RECV_CTRL \ > > + _IOW(IB_IOCTL_MAGIC, __NUM(RECV_CTRL), int) > > +#define HFI1_IOCTL_POLL_TYPE \ > > + _IOW(IB_IOCTL_MAGIC, __NUM(POLL_TYPE), int) > > +#define HFI1_IOCTL_ACK_EVENT \ > > + _IOW(IB_IOCTL_MAGIC, __NUM(ACK_EVENT), unsigned long) > > +#define HFI1_IOCTL_SET_PKEY \ > > + _IOW(IB_IOCTL_MAGIC, __NUM(SET_PKEY), __u16) > > +#define HFI1_IOCTL_CTXT_RESET \ > > + _IO(IB_IOCTL_MAGIC, __NUM(CTXT_RESET)) > > +#define HFI1_IOCTL_TID_INVAL_READ \ > > + _IOWR(IB_IOCTL_MAGIC, __NUM(TID_INVAL_READ), struct hfi1_tid_info) > > +#define HFI1_IOCTL_GET_VERS \ > > + _IOR(IB_IOCTL_MAGIC, __NUM(GET_VERS), int) > > + > > #endif /* RDMA_USER_IOCTL_H */ > > --=20 > > 2.7.4 > >=20 > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html --WkfBGePaEyrk4zXB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXtAphAAoJEORje4g2clinf9QP/3VPtvuK6DWAwU8T6kbvSzjy U+jV+yrPzlZ7vM4PiHaxldLYuo7Xu62kjhOyV3o3HhMq4RmVkRi56tm7yHc7dZmk L7inX3WkfzthVzrJGo1QOfyqB7nTbqEgY/BThdda2VvgH+mpai0XU+la2eSohsZi Xj4taOsH4RLkAlxVzfvQ/vFlbZ+msb3zKkHQkThNIA8DO8FnxXvbcUYI0hshS+w/ TwEDgmvktXcH0Wke1IsG2jmubvWfTsaJxh+KAIbRPrUIZCL61e/RoR/P5Gr50yZU QK5VUhhN4wt1qsKcl4UqjKshGAfdnJs23zRu/LETDNFFF3YJVWcaf1UwXRF/Itnl 0kk/U0IrDEwh0qxs+wJma3CejgU/qgoUkrQRmAtTBrgCYFmKAQDJZFVXt0ixr/aw U0gfBBNQbJG/6eufI9iYeI06qwGD+4r40zIXaVKsoSDeK8jMLp9kqQyuV6FExM9k 4VPmb+bDtLtlBLbfmSf1B5QfqbbdvISlR6glVxiR1whecDO3tAdsWE3s3T36kRWY Sua2MVThK4+XWCLXpx31YPZPvMK+Re5fBQPs2EKDdUPfghKAURHUU7cDdV6vRTV/ WUqskLMTKo/4U+1n1LclrujArbug7UuFlINAW039mAFvmztmFbmG9CCN+G8T8dzU N7L3nF3ZNnLRC6Ffa8Fd =kdp/ -----END PGP SIGNATURE----- --WkfBGePaEyrk4zXB-- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html