Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965369AbbDVAGO (ORCPT ); Tue, 21 Apr 2015 20:06:14 -0400 Received: from mga03.intel.com ([134.134.136.65]:48384 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932096AbbDVAGG (ORCPT ); Tue, 21 Apr 2015 20:06:06 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,619,1422950400"; d="scan'208";a="683663907" Date: Tue, 21 Apr 2015 20:05:55 -0400 From: "ira.weiny" To: Michael Wang Cc: Roland Dreier , Sean Hefty , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, hal@dev.mellanox.co.il, Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Tom Talpey , Jason Gunthorpe , Doug Ledford Subject: Re: [PATCH v5 05/27] IB/Verbs: Reform IB-core sa_query Message-ID: <20150422000554.GF15893@phlsvsds.ph.intel.com> References: <5534B8C9.506@profitbricks.com> <5534BA0F.4040606@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5534BA0F.4040606@profitbricks.com> User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4021 Lines: 119 On Mon, Apr 20, 2015 at 10:34:23AM +0200, Michael Wang wrote: > > Use raw management helpers to reform IB-core sa_query. > > Cc: Hal Rosenstock > Cc: Steve Wise > Cc: Tom Talpey > Cc: Jason Gunthorpe > Cc: Doug Ledford > Cc: Ira Weiny > Cc: Sean Hefty > Signed-off-by: Michael Wang > Reviewed-by: Ira Weiny > --- > drivers/infiniband/core/sa_query.c | 29 +++++++++++++++++------------ > 1 file changed, 17 insertions(+), 12 deletions(-) > > diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c > index c38f030..60dc7aa 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 (rdma_port_get_link_layer(handler->device, port->port_num) != IB_LINK_LAYER_INFINIBAND) > + if (WARN_ON(!rdma_tech_ib(handler->device, port->port_num))) > return; > > spin_lock_irqsave(&port->ah_lock, flags); > @@ -540,7 +540,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, > ah_attr->port_num = port_num; > ah_attr->static_rate = rec->rate; > > - force_grh = rdma_port_get_link_layer(device, port_num) == IB_LINK_LAYER_ETHERNET; > + force_grh = rdma_tech_iboe(device, port_num); > > if (rec->hop_limit > 1 || force_grh) { > ah_attr->ah_flags = IB_AH_GRH; > @@ -1153,9 +1153,7 @@ static void ib_sa_add_one(struct ib_device *device) > { > struct ib_sa_device *sa_dev; > int s, e, i; > - > - if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB) > - return; > + int count = 0; > > if (device->node_type == RDMA_NODE_IB_SWITCH) > s = e = 0; > @@ -1175,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_port_get_link_layer(device, i + 1) != IB_LINK_LAYER_INFINIBAND) > + if (!rdma_tech_ib(device, i + 1)) > continue; > > sa_dev->port[i].sm_ah = NULL; > @@ -1189,8 +1187,13 @@ static void ib_sa_add_one(struct ib_device *device) > goto err; > > INIT_WORK(&sa_dev->port[i].update_task, update_sm_ah); > + > + count++; > } > > + if (!count) > + goto free; > + > ib_set_client_data(device, &sa_client, sa_dev); > > /* > @@ -1204,19 +1207,21 @@ static void ib_sa_add_one(struct ib_device *device) > if (ib_register_event_handler(&sa_dev->event_handler)) > goto err; > > - for (i = 0; i <= e - s; ++i) > - if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND) > + for (i = 0; i <= e - s; ++i) { > + if (rdma_tech_ib(device, i + 1)) > update_sm_ah(&sa_dev->port[i].update_task); > + } > > return; > > err: > - while (--i >= 0) > - if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND) > + while (--i >= 0) { > + if (rdma_tech_ib(device, i + 1)) > ib_unregister_mad_agent(sa_dev->port[i].agent); > + } > > +free: > kfree(sa_dev); > - > return; > } > > @@ -1233,7 +1238,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_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND) { > + if (rdma_tech_ib(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); > -- > 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/