Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754335AbbDMSNE (ORCPT ); Mon, 13 Apr 2015 14:13:04 -0400 Received: from mga11.intel.com ([192.55.52.93]:43092 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751084AbbDMSNB (ORCPT ); Mon, 13 Apr 2015 14:13:01 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,571,1422950400"; d="scan'208";a="555354555" Date: Mon, 13 Apr 2015 14:12:49 -0400 From: "ira.weiny" To: Michael Wang Cc: Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, 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 v3 04/28] IB/Verbs: Reform IB-core cm Message-ID: <20150413181248.GA2464@phlsvsds.ph.intel.com> References: <552BB470.4090407@profitbricks.com> <552BB552.1030905@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <552BB552.1030905@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: 2652 Lines: 84 On Mon, Apr 13, 2015 at 02:23:46PM +0200, Michael Wang wrote: > > Use raw management helpers to reform IB-core cm. > > Cc: Steve Wise > Cc: Tom Talpey > Cc: Jason Gunthorpe > Cc: Doug Ledford > Cc: Ira Weiny > Cc: Sean Hefty > Signed-off-by: Michael Wang > --- > drivers/infiniband/core/cm.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c > index e28a494..50321fe 100644 > --- a/drivers/infiniband/core/cm.c > +++ b/drivers/infiniband/core/cm.c > @@ -3761,9 +3761,7 @@ static void cm_add_one(struct ib_device *ib_device) > unsigned long flags; > int ret; > u8 i; > - > - if (rdma_node_get_transport(ib_device->node_type) != RDMA_TRANSPORT_IB) > - return; > + int count = 0; I'm ok with this as an intermediate patch but going forward if we are going to have calls like static inline int cap_ib_cm_dev(struct ib_device *device) Then I think we should have similar calls like cap_ib_mad_dev(device) Which eliminates the clean up below... > > cm_dev = kzalloc(sizeof(*cm_dev) + sizeof(*port) * > ib_device->phys_port_cnt, GFP_KERNEL); > @@ -3783,6 +3781,9 @@ static void cm_add_one(struct ib_device *ib_device) > > set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask); > for (i = 1; i <= ib_device->phys_port_cnt; i++) { > + if (!rdma_ib_or_iboe(ib_device, i)) > + continue; > + > port = kzalloc(sizeof *port, GFP_KERNEL); > if (!port) > goto error1; > @@ -3809,7 +3810,16 @@ static void cm_add_one(struct ib_device *ib_device) > ret = ib_modify_port(ib_device, i, 0, &port_modify); > if (ret) > goto error3; > + > + count++; > } > + > + if (!count) { > + device_unregister(cm_dev->device); > + kfree(cm_dev); > + return; Here. I worry about mistakes being made when we loop through only to find that none of the ports support the feature and then we have to clean up. As this is initialization code I don't see any issue with looping through the ports 2 times and making the code cleaner. This applies to the SA and CM modules as well. However, in the ib_cm module you already have cap_ib_cm_dev(device) so you should use it at the start of cm_add_one. Ira -- 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/