On 04/16/2015 03:36 PM, Hal Rosenstock wrote:
> On 4/16/2015 4:12 AM, Michael Wang wrote:
>>
>> Introduce helper cap_ib_sa() to help us check if the port of an
>> IB device support Infiniband Subnet Administrator.
>
> Nit: Administrator -> Administration
Will be in next version :-)
Regards,
Michael Wang
>
>>
>> Cc: Steve Wise <sw...@opengridcomputing.com>
>> Cc: Tom Talpey <t...@talpey.com>
>> Cc: Jason Gunthorpe <jguntho...@obsidianresearch.com>
>> Cc: Doug Ledford <dledf...@redhat.com>
>> Cc: Ira Weiny <ira.we...@intel.com>
>> Cc: Sean Hefty <sean.he...@intel.com>
>> Signed-off-by: Michael Wang <yun.w...@profitbricks.com>
>> ---
>> drivers/infiniband/core/cma.c | 4 ++--
>> drivers/infiniband/core/sa_query.c | 10 +++++-----
>> drivers/infiniband/core/ucma.c | 2 +-
>> include/rdma/ib_verbs.h | 15 +++++++++++++++
>> 4 files changed, 23 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
>> index a6f1526..094816f 100644
>> --- a/drivers/infiniband/core/cma.c
>> +++ b/drivers/infiniband/core/cma.c
>> @@ -955,7 +955,7 @@ static inline int cma_user_data_offset(struct
>> rdma_id_private *id_priv)
>>
>> static void cma_cancel_route(struct rdma_id_private *id_priv)
>> {
>> - if (rdma_tech_ib(id_priv->id.device, id_priv->id.port_num)) {
>> + if (cap_ib_sa(id_priv->id.device, id_priv->id.port_num)) {
>> if (id_priv->query)
>> ib_sa_cancel_query(id_priv->query_id, id_priv->query);
>> }
>> @@ -1979,7 +1979,7 @@ int rdma_resolve_route(struct rdma_cm_id *id, int
>> timeout_ms)
>> return -EINVAL;
>>
>> atomic_inc(&id_priv->refcount);
>> - if (rdma_tech_ib(id->device, id->port_num))
>> + if (cap_ib_sa(id->device, id->port_num))
>> ret = cma_resolve_ib_route(id_priv, timeout_ms);
>> else if (rdma_tech_iboe(id->device, id->port_num))
>> ret = cma_resolve_iboe_route(id_priv);
>> diff --git a/drivers/infiniband/core/sa_query.c
>> b/drivers/infiniband/core/sa_query.c
>> index 803ccf7..fc7e161 100644
>> --- a/drivers/infiniband/core/sa_query.c
>> +++ b/drivers/infiniband/core/sa_query.c
>> @@ -450,7 +450,7 @@ static void ib_sa_event(struct ib_event_handler
>> *handler, struct ib_event *event
>> struct ib_sa_port *port =
>> &sa_dev->port[event->element.port_num -
>> sa_dev->start_port];
>>
>> - if (WARN_ON(!rdma_tech_ib(handler->device, port->port_num)))
>> + if (WARN_ON(!cap_ib_sa(handler->device, port->port_num)))
>> return;
>>
>> spin_lock_irqsave(&port->ah_lock, flags);
>> @@ -1173,7 +1173,7 @@ static void ib_sa_add_one(struct ib_device *device)
>>
>> for (i = 0; i <= e - s; ++i) {
>> spin_lock_init(&sa_dev->port[i].ah_lock);
>> - if (!rdma_tech_ib(device, i + 1))
>> + if (!cap_ib_sa(device, i + 1))
>> continue;
>>
>> sa_dev->port[i].sm_ah = NULL;
>> @@ -1210,7 +1210,7 @@ static void ib_sa_add_one(struct ib_device *device)
>> goto err;
>>
>> for (i = 0; i <= e - s; ++i) {
>> - if (rdma_tech_ib(device, i + 1))
>> + if (cap_ib_sa(device, i + 1))
>> update_sm_ah(&sa_dev->port[i].update_task);
>> }
>>
>> @@ -1218,7 +1218,7 @@ static void ib_sa_add_one(struct ib_device *device)
>>
>> err:
>> while (--i >= 0) {
>> - if (rdma_tech_ib(device, i + 1))
>> + if (cap_ib_sa(device, i + 1))
>> ib_unregister_mad_agent(sa_dev->port[i].agent);
>> }
>>
>> @@ -1240,7 +1240,7 @@ static void ib_sa_remove_one(struct ib_device *device)
>> flush_workqueue(ib_wq);
>>
>> for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) {
>> - if (rdma_tech_ib(device, i + 1)) {
>> + if (cap_ib_sa(device, i + 1)) {
>> ib_unregister_mad_agent(sa_dev->port[i].agent);
>> if (sa_dev->port[i].sm_ah)
>> kref_put(&sa_dev->port[i].sm_ah->ref,
>> free_sm_ah);
>> diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
>> index 7331c6c..bed7957 100644
>> --- a/drivers/infiniband/core/ucma.c
>> +++ b/drivers/infiniband/core/ucma.c
>> @@ -723,7 +723,7 @@ static ssize_t ucma_query_route(struct ucma_file *file,
>> resp.node_guid = (__force __u64) ctx->cm_id->device->node_guid;
>> resp.port_num = ctx->cm_id->port_num;
>>
>> - if (rdma_tech_ib(ctx->cm_id->device, ctx->cm_id->port_num))
>> + if (cap_ib_sa(ctx->cm_id->device, ctx->cm_id->port_num))
>> ucma_copy_ib_route(&resp, &ctx->cm_id->route);
>> else if (rdma_tech_iboe(ctx->cm_id->device, ctx->cm_id->port_num))
>> ucma_copy_iboe_route(&resp, &ctx->cm_id->route);
>> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
>> index e4999f6..3bfdf81 100644
>> --- a/include/rdma/ib_verbs.h
>> +++ b/include/rdma/ib_verbs.h
>> @@ -1833,6 +1833,21 @@ static inline int cap_iw_cm(struct ib_device *device,
>> u8 port_num)
>> return rdma_tech_iwarp(device, port_num);
>> }
>>
>> +/**
>> + * cap_ib_sa - Check if the port of device has the capability Infiniband
>> + * Subnet Administrator.
>
> Nit: Administrator -> Administration
>
>> + *
>> + * @device: Device to be checked
>> + * @port_num: Port number of the device
>> + *
>> + * Return 0 when port of the device don't support Infiniband
>> + * Subnet Administrator.
>
> Nit: Administrator -> Administration
>
>> + */
>> +static inline int cap_ib_sa(struct ib_device *device, u8 port_num)
>> +{
>> + return rdma_tech_ib(device, port_num);
>> +}
>> +
>> int ib_query_gid(struct ib_device *device,
>> u8 port_num, int index, union ib_gid *gid);
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
