From: Michael Wang <yun.wang@profitbricks.com>
To: Roland Dreier <roland@kernel.org>,
Sean Hefty <sean.hefty@intel.com>,
linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org,
hal@dev.mellanox.co.il
Cc: Tom Tucker <tom@opengridcomputing.com>,
Steve Wise <swise@opengridcomputing.com>,
Hoang-Nam Nguyen <hnguyen@de.ibm.com>,
Christoph Raisch <raisch@de.ibm.com>,
Mike Marciniszyn <infinipath@intel.com>,
Eli Cohen <eli@mellanox.com>,
Faisal Latif <faisal.latif@intel.com>,
Jack Morgenstein <jackm@dev.mellanox.co.il>,
Or Gerlitz <ogerlitz@mellanox.com>,
Haggai Eran <haggaie@mellanox.com>,
Ira Weiny <ira.weiny@intel.com>, Tom Talpey <tom@talpey.com>,
Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
Doug Ledford <dledford@redhat.com>,
Michael Wang <yun.wang@profitbricks.com>
Subject: [PATCH v5 04/27] IB/Verbs: Reform IB-core cm
Date: Mon, 20 Apr 2015 10:33:45 +0200 [thread overview]
Message-ID: <5534B9E9.1020108@profitbricks.com> (raw)
In-Reply-To: <5534B8C9.506@profitbricks.com>
Use raw management helpers to reform IB-core cm.
Cc: Hal Rosenstock <hal@dev.mellanox.co.il>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Tom Talpey <tom@talpey.com>
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/cm.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index e28a494..3c10b75 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;
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,13 @@ 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)
+ goto free;
+
ib_set_client_data(ib_device, &cm_client, cm_dev);
write_lock_irqsave(&cm.device_lock, flags);
@@ -3825,11 +3832,15 @@ error1:
port_modify.set_port_cap_mask = 0;
port_modify.clr_port_cap_mask = IB_PORT_CM_SUP;
while (--i) {
+ if (!rdma_ib_or_iboe(ib_device, i))
+ continue;
+
port = cm_dev->port[i-1];
ib_modify_port(ib_device, port->port_num, 0, &port_modify);
ib_unregister_mad_agent(port->mad_agent);
cm_remove_port_fs(port);
}
+free:
device_unregister(cm_dev->device);
kfree(cm_dev);
}
@@ -3853,6 +3864,9 @@ static void cm_remove_one(struct ib_device *ib_device)
write_unlock_irqrestore(&cm.device_lock, flags);
for (i = 1; i <= ib_device->phys_port_cnt; i++) {
+ if (!rdma_ib_or_iboe(ib_device, i))
+ continue;
+
port = cm_dev->port[i-1];
ib_modify_port(ib_device, port->port_num, 0, &port_modify);
ib_unregister_mad_agent(port->mad_agent);
--
2.1.0
next prev parent reply other threads:[~2015-04-20 8:33 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 8:28 [PATCH v5 00/27] IB/Verbs: IB Management Helpers Michael Wang
2015-04-20 8:32 ` [PATCH v5 01/27] IB/Verbs: Implement new callback query_transport() Michael Wang
2015-04-22 0:04 ` ira.weiny
2015-04-22 15:02 ` Doug Ledford
2015-04-22 15:21 ` Devesh Sharma
2015-04-22 16:22 ` ira.weiny
2015-04-22 16:42 ` Doug Ledford
2015-04-23 7:13 ` Michael Wang
2015-04-20 8:32 ` [PATCH v5 02/27] IB/Verbs: Implement raw management helpers Michael Wang
2015-04-22 0:05 ` ira.weiny
2015-04-20 8:33 ` [PATCH v5 03/27] IB/Verbs: Reform IB-core mad/agent/user_mad Michael Wang
2015-04-22 0:05 ` ira.weiny
2015-04-20 8:33 ` Michael Wang [this message]
2015-04-20 17:04 ` [PATCH v5 04/27] IB/Verbs: Reform IB-core cm Hal Rosenstock
2015-04-21 7:42 ` Michael Wang
2015-04-22 0:05 ` ira.weiny
2015-04-20 8:34 ` [PATCH v5 05/27] IB/Verbs: Reform IB-core sa_query Michael Wang
2015-04-22 0:05 ` ira.weiny
2015-04-20 8:34 ` [PATCH v5 06/27] IB/Verbs: Reform IB-core multicast Michael Wang
2015-04-22 0:06 ` ira.weiny
2015-04-20 8:35 ` [PATCH v5 07/27] IB/Verbs: Reform IB-ulp ipoib Michael Wang
2015-04-22 0:06 ` ira.weiny
2015-04-20 8:35 ` [PATCH v5 08/27] IB/Verbs: Reform IB-ulp xprtrdma Michael Wang
2015-04-22 0:06 ` ira.weiny
2015-04-20 8:36 ` [PATCH v5 09/27] IB/Verbs: Reform IB-core verbs/uverbs_cmd/sysfs Michael Wang
2015-04-21 23:19 ` ira.weiny
2015-04-22 7:38 ` Michael Wang
2015-04-22 16:28 ` ira.weiny
2015-04-23 9:25 ` Michael Wang
2015-04-20 8:36 ` [PATCH v5 10/27] IB/Verbs: Reform cm related part in IB-core cma/ucm Michael Wang
2015-04-22 0:07 ` ira.weiny
2015-04-20 8:37 ` [PATCH v5 11/27] IB/Verbs: Reform route related part in IB-core cma Michael Wang
2015-04-22 0:07 ` ira.weiny
2015-04-20 8:37 ` [PATCH v5 12/27] IB/Verbs: Reform mcast " Michael Wang
2015-04-22 0:07 ` ira.weiny
2015-04-20 8:38 ` [PATCH v5 13/27] IB/Verbs: Reserve legacy transport type in 'dev_addr' Michael Wang
2015-04-21 5:58 ` Devesh Sharma
2015-04-21 8:05 ` Michael Wang
2015-04-22 0:08 ` ira.weiny
2015-04-20 8:38 ` [PATCH v5 14/27] IB/Verbs: Reform cma_acquire_dev() Michael Wang
2015-04-21 6:15 ` Devesh Sharma
2015-04-21 8:08 ` Michael Wang
2015-04-22 0:08 ` ira.weiny
2015-04-20 8:38 ` [PATCH v5 15/27] IB/Verbs: Reform rest part in IB-core cma Michael Wang
2015-04-22 0:08 ` ira.weiny
2015-04-20 8:39 ` [PATCH v5 16/27] IB/Verbs: Use management helper cap_ib_mad() Michael Wang
2015-04-22 0:09 ` ira.weiny
2015-04-20 8:39 ` [PATCH v5 17/27] IB/Verbs: Use management helper cap_ib_smi() Michael Wang
2015-04-22 0:09 ` ira.weiny
2015-04-20 8:40 ` [PATCH v5 18/27] IB/Verbs: Use management helper cap_ib_cm() Michael Wang
2015-04-22 0:09 ` ira.weiny
2015-04-20 8:40 ` [PATCH v5 19/27] IB/Verbs: Use management helper cap_iw_cm() Michael Wang
2015-04-20 14:00 ` Steve Wise
2015-04-20 15:16 ` Michael Wang
2015-04-20 15:51 ` Tom Tucker
2015-04-20 16:19 ` Jason Gunthorpe
2015-04-20 16:39 ` Tom Tucker
2015-04-21 7:39 ` Michael Wang
2015-04-21 15:06 ` Tom Tucker
2015-04-22 0:10 ` ira.weiny
2015-04-20 8:40 ` [PATCH v5 20/27] IB/Verbs: Use management helper cap_ib_sa() Michael Wang
2015-04-22 0:10 ` ira.weiny
2015-04-20 8:41 ` [PATCH v5 21/27] IB/Verbs: Use management helper cap_ib_mcast() Michael Wang
2015-04-22 0:10 ` ira.weiny
2015-04-20 8:41 ` [PATCH v5 22/27] IB/Verbs: Use management helper cap_ipoib() Michael Wang
2015-04-22 0:11 ` ira.weiny
2015-04-22 5:40 ` Jason Gunthorpe
2015-04-22 8:49 ` Michael Wang
2015-04-22 16:45 ` ira.weiny
2015-04-22 16:54 ` Hefty, Sean
2015-04-23 9:31 ` Michael Wang
2015-04-22 17:24 ` Jason Gunthorpe
2015-04-23 7:53 ` Michael Wang
2015-04-20 8:42 ` [PATCH v5 23/27] IB/Verbs: Use management helper cap_read_multi_sge() Michael Wang
2015-04-22 0:11 ` ira.weiny
2015-04-20 8:42 ` [PATCH v5 24/27] IB/Verbs: Use management helper cap_af_ib() Michael Wang
2015-04-22 0:11 ` ira.weiny
2015-04-20 8:43 ` [PATCH v5 25/27] IB/Verbs: Use management helper cap_eth_ah() Michael Wang
2015-04-22 0:11 ` ira.weiny
2015-04-20 8:43 ` [PATCH v5 26/27] IB/Verbs: Clean up rdma_ib_or_iboe() Michael Wang
2015-04-22 0:12 ` ira.weiny
2015-04-20 8:43 ` [PATCH v5 27/27] IB/Verbs: Cleanup rdma_node_get_transport() Michael Wang
2015-04-22 0:13 ` ira.weiny
2015-04-21 5:41 ` [PATCH v5 00/27] IB/Verbs: IB Management Helpers Devesh Sharma
2015-04-21 7:46 ` Michael Wang
2015-04-21 11:03 ` Devesh Sharma
2015-04-21 15:56 ` Michael Wang
2015-04-21 23:36 ` Liran Liss
2015-04-22 2:41 ` ira.weiny
2015-04-22 8:32 ` Michael Wang
[not found] ` <DB4PR05MB086335365371E756B789FE84B1EE0@DB4PR05MB0863.eurprd05.prod.outlook.com>
2015-04-22 16:40 ` Jason Gunthorpe
[not found] ` <DB4PR05MB08633B2B2E3BA32752EE8098B1EC0@DB4PR05MB0863.eurprd05.prod.outlook.com>
2015-04-24 16:42 ` Jason Gunthorpe
2015-04-27 19:10 ` ira.weiny
2015-04-22 16:40 ` Hefty, Sean
2015-04-24 14:49 ` Liran Liss
2015-04-22 8:30 ` Michael Wang
2015-04-22 16:16 ` Liran Liss
2015-04-23 7:33 ` Michael Wang
2015-04-24 14:44 ` Liran Liss
2015-04-24 15:07 ` Michael Wang
2015-04-27 19:22 ` ira.weiny
2015-04-22 14:59 ` Doug Ledford
2015-04-22 16:57 ` Jason Gunthorpe
2015-04-23 8:36 ` Michael Wang
2015-04-22 17:10 ` ira.weiny
2015-04-23 9:36 ` Michael Wang
[not found] ` <DB4PR05MB08630282DEFFFB181A525B67B1EC0@DB4PR05MB0863.eurprd05.prod.outlook.com>
2015-04-27 20:58 ` ira.weiny
2015-04-22 16:46 ` Dave Goodell (dgoodell)
2015-04-22 0:28 ` ira.weiny
2015-04-22 7:44 ` Michael Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5534B9E9.1020108@profitbricks.com \
--to=yun.wang@profitbricks.com \
--cc=dledford@redhat.com \
--cc=eli@mellanox.com \
--cc=faisal.latif@intel.com \
--cc=haggaie@mellanox.com \
--cc=hal@dev.mellanox.co.il \
--cc=hnguyen@de.ibm.com \
--cc=infinipath@intel.com \
--cc=ira.weiny@intel.com \
--cc=jackm@dev.mellanox.co.il \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=raisch@de.ibm.com \
--cc=roland@kernel.org \
--cc=sean.hefty@intel.com \
--cc=swise@opengridcomputing.com \
--cc=tom@opengridcomputing.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).