On Mon, Jul 13, 2009 at 2:13 PM, Eli Cohen<e...@mellanox.co.il> wrote:
> Add two API functions needed for RDMAoE.
>
> ib_get_port_link_type() returns the link type support by the given device's
> port. It can be either PORT_LINK_IB for IB link layer or PORT_LINK_ETH for
> Ethernet links. Link type is reported to in query_port verb.
>
> ib_get_mac() will return the Ethernet MAC address leading to the port whose
> GID
> is spcified. This function is exported to userspace applications.
>
> ABI version is incremented from 6 to 7.
>
> Signed-off-by: Eli Cohen <e...@mellanox.co.il>
> ---
> drivers/infiniband/core/uverbs.h | 1 +
> drivers/infiniband/core/uverbs_cmd.c | 33
> +++++++++++++++++++++++++++++++++
> drivers/infiniband/core/uverbs_main.c | 1 +
> drivers/infiniband/core/verbs.c | 17 +++++++++++++++++
> include/rdma/ib_user_verbs.h | 21 ++++++++++++++++++---
> include/rdma/ib_verbs.h | 22 ++++++++++++++++++++++
> 6 files changed, 92 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/core/uverbs.h
> b/drivers/infiniband/core/uverbs.h
> index b3ea958..e69b04c 100644
> --- a/drivers/infiniband/core/uverbs.h
> +++ b/drivers/infiniband/core/uverbs.h
> @@ -194,5 +194,6 @@ IB_UVERBS_DECLARE_CMD(create_srq);
> IB_UVERBS_DECLARE_CMD(modify_srq);
> IB_UVERBS_DECLARE_CMD(query_srq);
> IB_UVERBS_DECLARE_CMD(destroy_srq);
> +IB_UVERBS_DECLARE_CMD(get_mac);
>
> #endif /* UVERBS_H */
> diff --git a/drivers/infiniband/core/uverbs_cmd.c
> b/drivers/infiniband/core/uverbs_cmd.c
> index 56feab6..eefc414 100644
> --- a/drivers/infiniband/core/uverbs_cmd.c
> +++ b/drivers/infiniband/core/uverbs_cmd.c
> @@ -452,6 +452,7 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file,
> resp.active_width = attr.active_width;
> resp.active_speed = attr.active_speed;
> resp.phys_state = attr.phys_state;
> + resp.link_type = attr.link_type;
>
> if (copy_to_user((void __user *) (unsigned long) cmd.response,
> &resp, sizeof resp))
> @@ -1824,6 +1825,38 @@ err:
> return ret;
> }
>
> +ssize_t ib_uverbs_get_mac(struct ib_uverbs_file *file,
> + const char __user *buf, int in_len,
> + int out_len)
> +{
> + struct ib_uverbs_get_mac cmd;
> + struct ib_uverbs_get_mac_resp resp;
> + int ret;
> + struct ib_pd *pd;
> +
> + if (out_len < sizeof resp)
> + return -ENOSPC;
> +
> + if (copy_from_user(&cmd, buf, sizeof cmd))
> + return -EFAULT;
> +
> + pd = idr_read_pd(cmd.pd_handle, file->ucontext);
> + if (!pd)
> + return -EINVAL;
> +
> + ret = ib_get_mac(pd->device, cmd.port, cmd.gid, resp.mac);
> + put_pd_read(pd);
> + if (!ret) {
> + if (copy_to_user((void __user *) (unsigned long) cmd.response,
> + &resp, sizeof resp)) {
> + return -EFAULT;
> + }
> + return in_len;
> + }
> +
> + return ret;
> +}
> +
> ssize_t ib_uverbs_destroy_ah(struct ib_uverbs_file *file,
> const char __user *buf, int in_len, int out_len)
> {
> diff --git a/drivers/infiniband/core/uverbs_main.c
> b/drivers/infiniband/core/uverbs_main.c
> index eb36a81..b2f148f 100644
> --- a/drivers/infiniband/core/uverbs_main.c
> +++ b/drivers/infiniband/core/uverbs_main.c
> @@ -108,6 +108,7 @@ static ssize_t (*uverbs_cmd_table[])(struct
> ib_uverbs_file *file,
> [IB_USER_VERBS_CMD_MODIFY_SRQ] = ib_uverbs_modify_srq,
> [IB_USER_VERBS_CMD_QUERY_SRQ] = ib_uverbs_query_srq,
> [IB_USER_VERBS_CMD_DESTROY_SRQ] = ib_uverbs_destroy_srq,
> + [IB_USER_VERBS_CMD_GET_MAC] = ib_uverbs_get_mac
> };
>
> static struct vfsmount *uverbs_event_mnt;
> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
> index a7da9be..bde5b0d 100644
> --- a/drivers/infiniband/core/verbs.c
> +++ b/drivers/infiniband/core/verbs.c
> @@ -94,6 +94,13 @@ rdma_node_get_transport(enum rdma_node_type node_type)
> }
> EXPORT_SYMBOL(rdma_node_get_transport);
>
> +enum ib_port_link_type ib_get_port_link_type(struct ib_device *device, u8
> port_num)
> +{
> + return device->get_port_link_type ?
> + device->get_port_link_type(device, port_num) : PORT_LINK_IB;
So do iWARP devices return PORT_LINK_IB ? If so, that seems a little
weird to me.
-- Hal
> +}
> +EXPORT_SYMBOL(ib_get_port_link_type);
> +
> /* Protection domains */
>
> struct ib_pd *ib_alloc_pd(struct ib_device *device)
> @@ -904,3 +911,13 @@ int ib_detach_mcast(struct ib_qp *qp, union ib_gid *gid,
> u16 lid)
> return qp->device->detach_mcast(qp, gid, lid);
> }
> EXPORT_SYMBOL(ib_detach_mcast);
> +
> +int ib_get_mac(struct ib_device *device, u8 port, u8 *gid, u8 *mac)
> +{
> + if (!device->get_mac)
> + return -ENOSYS;
> +
> + return device->get_mac(device, port, gid, mac);
> +}
> +EXPORT_SYMBOL(ib_get_mac);
> +
> diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h
> index a17f771..184203b 100644
> --- a/include/rdma/ib_user_verbs.h
> +++ b/include/rdma/ib_user_verbs.h
> @@ -42,7 +42,7 @@
> * Increment this value if any changes that break userspace ABI
> * compatibility are made.
> */
> -#define IB_USER_VERBS_ABI_VERSION 6
> +#define IB_USER_VERBS_ABI_VERSION 7
>
> enum {
> IB_USER_VERBS_CMD_GET_CONTEXT,
> @@ -81,7 +81,8 @@ enum {
> IB_USER_VERBS_CMD_MODIFY_SRQ,
> IB_USER_VERBS_CMD_QUERY_SRQ,
> IB_USER_VERBS_CMD_DESTROY_SRQ,
> - IB_USER_VERBS_CMD_POST_SRQ_RECV
> + IB_USER_VERBS_CMD_POST_SRQ_RECV,
> + IB_USER_VERBS_CMD_GET_MAC
> };
>
> /*
> @@ -205,7 +206,8 @@ struct ib_uverbs_query_port_resp {
> __u8 active_width;
> __u8 active_speed;
> __u8 phys_state;
> - __u8 reserved[3];
> + __u8 link_type;
> + __u8 reserved[2];
> };
>
> struct ib_uverbs_alloc_pd {
> @@ -621,6 +623,19 @@ struct ib_uverbs_destroy_ah {
> __u32 ah_handle;
> };
>
> +struct ib_uverbs_get_mac {
> + __u64 response;
> + __u32 pd_handle;
> + __u8 port;
> + __u8 reserved[3];
> + __u8 gid[16];
> +};
> +
> +struct ib_uverbs_get_mac_resp {
> + __u8 mac[6];
> + __u16 reserved;
> +};
> +
> struct ib_uverbs_attach_mcast {
> __u8 gid[16];
> __u32 qp_handle;
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index c179318..9b3d43b 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -72,6 +72,11 @@ enum rdma_transport_type {
> RDMA_TRANSPORT_IWARP
> };
>
> +enum ib_port_link_type {
> + PORT_LINK_IB,
> + PORT_LINK_ETH
> +};
> +
> enum rdma_transport_type
> rdma_node_get_transport(enum rdma_node_type node_type) __attribute_const__;
>
> @@ -298,6 +303,7 @@ struct ib_port_attr {
> u8 active_width;
> u8 active_speed;
> u8 phys_state;
> + enum ib_port_link_type link_type;
> };
>
> enum ib_device_modify_flags {
> @@ -1003,6 +1009,8 @@ struct ib_device {
> int (*query_port)(struct ib_device *device,
> u8 port_num,
> struct ib_port_attr
> *port_attr);
> + enum ib_port_link_type (*get_port_link_type)(struct ib_device
> *device,
> + u8 port_num);
> int (*query_gid)(struct ib_device *device,
> u8 port_num, int index,
> union ib_gid *gid);
> @@ -1130,6 +1138,8 @@ struct ib_device {
> struct ib_grh *in_grh,
> struct ib_mad *in_mad,
> struct ib_mad *out_mad);
> + int (*get_mac)(struct ib_device *device, u8
> port,
> + u8 *gid, u8 *mac);
>
> struct ib_dma_mapping_ops *dma_ops;
>
> @@ -1213,6 +1223,9 @@ int ib_query_device(struct ib_device *device,
> int ib_query_port(struct ib_device *device,
> u8 port_num, struct ib_port_attr *port_attr);
>
> +enum ib_port_link_type ib_get_port_link_type(struct ib_device *device,
> + u8 port_num);
> +
> int ib_query_gid(struct ib_device *device,
> u8 port_num, int index, union ib_gid *gid);
>
> @@ -2031,4 +2044,13 @@ int ib_attach_mcast(struct ib_qp *qp, union ib_gid
> *gid, u16 lid);
> */
> int ib_detach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid);
>
> +/**
> + * ib_get_mac - get the mac address for the specified gid
> + * @device: IB device used for traffic
> + * @port: port number used.
> + * @gid: gid to be resolved into mac
> + * @mac: mac of the port bearing this gid
> + */
> +int ib_get_mac(struct ib_device *device, u8 port, u8 *gid, u8 *mac);
> +
> #endif /* IB_VERBS_H */
> --
> 1.6.3.3
>
> _______________________________________________
> ewg mailing list
> e...@lists.openfabrics.org
> http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
>
_______________________________________________
general mailing list
general@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
