Return-Path: Received: from mail-wi0-f175.google.com ([209.85.212.175]:37574 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752835AbbCaHZt (ORCPT ); Tue, 31 Mar 2015 03:25:49 -0400 Received: by wiaa2 with SMTP id a2so14377872wia.0 for ; Tue, 31 Mar 2015 00:25:48 -0700 (PDT) Message-ID: <551A4BF9.8050801@profitbricks.com> Date: Tue, 31 Mar 2015 09:25:45 +0200 From: Michael Wang MIME-Version: 1.0 To: "ira.weiny" CC: Doug Ledford , Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, netdev@vger.kernel.org, "J. Bruce Fields" , Trond Myklebust , "David S. Miller" , Or Gerlitz , Moni Shoua , PJ Waskiewicz , Tatyana Nikolova , Yan Burman , Jack Morgenstein , Bart Van Assche , Yann Droneaud , Colin Ian King , Majd Dibbiny , Jiri Kosina , Matan Barak , Alex Estrin , Eric Dumazet , Erez Shitrit , Sagi Grimberg , Haggai Eran , Shachar Raindel , Mike Marciniszyn , Steve Wise , Tom Tucker , Chuck Lever Subject: Re: [RFC PATCH 07/11] IB/Verbs: Use management helper has_mcast() and, cap_mcast() for mcast-check References: <551579CA.4030901@profitbricks.com> <55157B71.6040505@profitbricks.com> <1427731918.21101.198.camel@redhat.com> <551977E0.5030001@profitbricks.com> <20150330234717.GA28446@phlsvsds.ph.intel.com> In-Reply-To: <20150330234717.GA28446@phlsvsds.ph.intel.com> Content-Type: text/plain; charset=windows-1252 Sender: linux-nfs-owner@vger.kernel.org List-ID: On 03/31/2015 01:47 AM, ira.weiny wrote: > On Mon, Mar 30, 2015 at 06:20:48PM +0200, Michael Wang wrote: >> [snip] >>>> Cc: Jason Gunthorpe >>>> Cc: Doug Ledford >>>> Cc: Ira Weiny >>>> Cc: Sean Hefty >>>> Signed-off-by: Michael Wang >>>> --- >>>> drivers/infiniband/core/cma.c | 2 +- >>>> drivers/infiniband/core/multicast.c | 8 ++++---- >>>> include/rdma/ib_verbs.h | 28 ++++++++++++++++++++++++++++ >>>> 3 files changed, 33 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c >>>> index 276fb76..cbbc85b 100644 >>>> --- a/drivers/infiniband/core/cma.c >>>> +++ b/drivers/infiniband/core/cma.c >>>> @@ -3398,7 +3398,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr) >>>> ib_detach_mcast(id->qp, >>>> &mc->multicast.ib->rec.mgid, >>>> be16_to_cpu(mc->multicast.ib->rec.mlid)); >>>> - if (rdma_transport_is_ib(id_priv->cma_dev->device)) { >>>> + if (has_mcast(id_priv->cma_dev->device)) { > > You need a similar check in rdma_join_multicast. Thanks for the remind, I'll give it a reform :-) Regards, Michael Wang > > Ira > > >>>> switch (rdma_port_get_link_layer(id->device, id->port_num)) { >>>> case IB_LINK_LAYER_INFINIBAND: >>>> ib_sa_free_multicast(mc->multicast.ib); >>>> diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c >>>> index 17573ff..ffeaf27 100644 >>>> --- a/drivers/infiniband/core/multicast.c >>>> +++ b/drivers/infiniband/core/multicast.c >>>> @@ -780,7 +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_ll_is_ib(dev->device, event->element.port_num)) >>>> + if (!cap_mcast(dev->device, event->element.port_num)) >>>> return; >>>> >>>> index = event->element.port_num - dev->start_port; >>>> @@ -807,7 +807,7 @@ static void mcast_add_one(struct ib_device *device) >>>> int i; >>>> int count = 0; >>>> >>>> - if (!rdma_transport_is_ib(device)) >>>> + if (!has_mcast(device)) >>>> return; >>>> >>>> dev = kmalloc(sizeof *dev + device->phys_port_cnt * sizeof *port, >>>> @@ -823,7 +823,7 @@ static void mcast_add_one(struct ib_device *device) >>>> } >>>> >>>> for (i = 0; i <= dev->end_port - dev->start_port; i++) { >>>> - if (!rdma_port_ll_is_ib(device, dev->start_port + i)) >>>> + if (!cap_mcast(device, dev->start_port + i)) >>>> continue; >>>> port = &dev->port[i]; >>>> port->dev = dev; >>>> @@ -861,7 +861,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_ll_is_ib(device, dev->start_port + i)) { >>>> + if (cap_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 fa8ffa3..e796104 100644 >>>> --- a/include/rdma/ib_verbs.h >>>> +++ b/include/rdma/ib_verbs.h >>>> @@ -1823,6 +1823,19 @@ static inline int has_sa(struct ib_device *device) >>>> } >>>> >>>> /** >>>> + * has_mcast - Check if a device support Multicast. >>>> + * >>>> + * @device: Device to be checked >>>> + * >>>> + * Return 0 when a device has none port to support >>>> + * Multicast. >>>> + */ >>>> +static inline int has_mcast(struct ib_device *device) >>>> +{ >>>> + return rdma_transport_is_ib(device); >>>> +} >>>> + >>>> +/** >>>> * cap_smi - Check if the port of device has the capability >>>> * Subnet Management Interface. >>>> * >>>> @@ -1852,6 +1865,21 @@ static inline int cap_sa(struct ib_device *device, u8 port_num) >>>> return rdma_port_ll_is_ib(device, port_num); >>>> } >>>> >>>> +/** >>>> + * cap_mcast - Check if the port of device has the capability >>>> + * Multicast. >>>> + * >>>> + * @device: Device to be checked >>>> + * @port_num: Port number of the device >>>> + * >>>> + * Return 0 when port of the device don't support >>>> + * Multicast. >>>> + */ >>>> +static inline int cap_mcast(struct ib_device *device, u8 port_num) >>>> +{ >>>> + return rdma_port_ll_is_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-rdma" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html