lkml.org 
[lkml]   [2015]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 07/17] IB/Verbs: Use management helper cap_ib_mcast() for mcast-check

    Introduce helper cap_ib_mcast() to help us check if the port of an
    IB device support Infiniband Multicast.

    Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
    Cc: Doug Ledford <dledford@redhat.com>
    Cc: Ira Weiny <ira.weiny@intel.com>
    Cc: Sean Hefty <sean.hefty@intel.com>
    Signed-off-by: Michael Wang <yun.wang@profitbricks.com>
    ---
    drivers/infiniband/core/multicast.c | 12 +++---------
    include/rdma/ib_verbs.h | 15 +++++++++++++++
    2 files changed, 18 insertions(+), 9 deletions(-)

    diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
    index fa17b55..bdc1880 100644
    --- a/drivers/infiniband/core/multicast.c
    +++ b/drivers/infiniband/core/multicast.c
    @@ -780,8 +780,7 @@ static void mcast_event_handler(struct ib_event_handler *handler,
    int index;

    dev = container_of(handler, struct mcast_device, event_handler);
    - if (rdma_port_get_link_layer(dev->device, event->element.port_num) !=
    - IB_LINK_LAYER_INFINIBAND)
    + if (WARN_ON(!cap_ib_mcast(dev->device, event->element.port_num)))
    return;

    index = event->element.port_num - dev->start_port;
    @@ -808,9 +807,6 @@ static void mcast_add_one(struct ib_device *device)
    int i;
    int count = 0;

    - if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
    - return;
    -
    dev = kmalloc(sizeof *dev + device->phys_port_cnt * sizeof *port,
    GFP_KERNEL);
    if (!dev)
    @@ -824,8 +820,7 @@ static void mcast_add_one(struct ib_device *device)
    }

    for (i = 0; i <= dev->end_port - dev->start_port; i++) {
    - if (rdma_port_get_link_layer(device, dev->start_port + i) !=
    - IB_LINK_LAYER_INFINIBAND)
    + if (!cap_ib_mcast(device, dev->start_port + i))
    continue;
    port = &dev->port[i];
    port->dev = dev;
    @@ -863,8 +858,7 @@ static void mcast_remove_one(struct ib_device *device)
    flush_workqueue(mcast_wq);

    for (i = 0; i <= dev->end_port - dev->start_port; i++) {
    - if (rdma_port_get_link_layer(device, dev->start_port + i) ==
    - IB_LINK_LAYER_INFINIBAND) {
    + if (cap_ib_mcast(device, dev->start_port + i)) {
    port = &dev->port[i];
    deref_port(port);
    wait_for_completion(&port->comp);
    diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
    index c405e45..5a5f6d5 100644
    --- a/include/rdma/ib_verbs.h
    +++ b/include/rdma/ib_verbs.h
    @@ -1833,6 +1833,21 @@ static inline int cap_ib_sa(struct ib_device *device, u8 port_num)
    return rdma_transport_ib(device, port_num);
    }

    +/**
    + * cap_ib_mcast - Check if the port of device has the capability Infiniband
    + * Multicast.
    + *
    + * @device: Device to be checked
    + * @port_num: Port number of the device
    + *
    + * Return 0 when port of the device don't support Infiniband
    + * Multicast.
    + */
    +static inline int cap_ib_mcast(struct ib_device *device, u8 port_num)
    +{
    + return cap_ib_sa(device, port_num);
    +}
    +
    int ib_query_gid(struct ib_device *device,
    u8 port_num, int index, union ib_gid *gid);

    --
    2.1.0

    \
     
     \ /
      Last update: 2015-04-07 15:01    [W:3.445 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site