Doug/Jason,
Seems like I got the authdates screwed up again. These show up in
reverse order in patchwork. Would you like a respin?
These two will enable me to finalize the associated rdma tool submission.
Thanks,
Steve.
On 3/27/2018 10:38 AM, Steve Wise wrote:
> Since the rdma_port_space enum is being passed between
> user and kernel for user cm_id setup, we need it in a
> UAPI header. So add it to rdma_user_cm.h.
>
> This also fixes the cm_id restrack changes which pass up the port space
> value via the RDMA_NLDEV_ATTR_RES_PS attribute.
>
> Fixes: 00313983cda6 ("RDMA/nldev: provide detailed CM_ID information")
>
> Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
> ---
> include/rdma/rdma_cm.h | 8 +-------
> include/uapi/rdma/rdma_user_cm.h | 7 +++++++
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
> index 7652efc..86652a0 100644
> --- a/include/rdma/rdma_cm.h
> +++ b/include/rdma/rdma_cm.h
> @@ -38,6 +38,7 @@
> #include <linux/in6.h>
> #include <rdma/ib_addr.h>
> #include <rdma/ib_sa.h>
> +#include <uapi/rdma/rdma_user_cm.h>
>
> /*
> * Upon receiving a device removal event, users must destroy the associated
> @@ -64,13 +65,6 @@ enum rdma_cm_event_type {
>
> const char *__attribute_const__ rdma_event_msg(enum rdma_cm_event_type event);
>
> -enum rdma_port_space {
> - RDMA_PS_IPOIB = 0x0002,
> - RDMA_PS_IB = 0x013F,
> - RDMA_PS_TCP = 0x0106,
> - RDMA_PS_UDP = 0x0111,
> -};
> -
> #define RDMA_IB_IP_PS_MASK 0xFFFFFFFFFFFF0000ULL
> #define RDMA_IB_IP_PS_TCP 0x0000000001060000ULL
> #define RDMA_IB_IP_PS_UDP 0x0000000001110000ULL
> diff --git a/include/uapi/rdma/rdma_user_cm.h b/include/uapi/rdma/rdma_user_cm.h
> index c83ef00..851652d 100644
> --- a/include/uapi/rdma/rdma_user_cm.h
> +++ b/include/uapi/rdma/rdma_user_cm.h
> @@ -70,6 +70,13 @@ enum {
> RDMA_USER_CM_CMD_JOIN_MCAST
> };
>
> +enum rdma_port_space {
> + RDMA_PS_IPOIB = 0x0002,
> + RDMA_PS_IB = 0x013F,
> + RDMA_PS_TCP = 0x0106,
> + RDMA_PS_UDP = 0x0111,
> +};
> +
> /*
> * command ABI structures.
> */
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
