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: Michael Wang <yun.wang@profitbricks.com>,
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>
Subject: [PATCH v5 09/27] IB/Verbs: Reform IB-core verbs/uverbs_cmd/sysfs
Date: Mon, 20 Apr 2015 10:36:12 +0200 [thread overview]
Message-ID: <5534BA7C.2010600@profitbricks.com> (raw)
In-Reply-To: <5534B8C9.506@profitbricks.com>
Use raw management helpers to reform IB-core verbs/uverbs_cmd/sysfs.
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/sysfs.c | 8 ++------
drivers/infiniband/core/uverbs_cmd.c | 6 ++++--
drivers/infiniband/core/verbs.c | 6 ++----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index cbd0383..8570180 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -248,14 +248,10 @@ static ssize_t phys_state_show(struct ib_port *p, struct port_attribute *unused,
static ssize_t link_layer_show(struct ib_port *p, struct port_attribute *unused,
char *buf)
{
- switch (rdma_port_get_link_layer(p->ibdev, p->port_num)) {
- case IB_LINK_LAYER_INFINIBAND:
+ if (rdma_tech_ib(p->ibdev, p->port_num))
return sprintf(buf, "%s\n", "InfiniBand");
- case IB_LINK_LAYER_ETHERNET:
+ else
return sprintf(buf, "%s\n", "Ethernet");
- default:
- return sprintf(buf, "%s\n", "Unknown");
- }
}
static PORT_ATTR_RO(state);
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index a9f0489..5dc90aa 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -515,8 +515,10 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file,
resp.active_width = attr.active_width;
resp.active_speed = attr.active_speed;
resp.phys_state = attr.phys_state;
- resp.link_layer = rdma_port_get_link_layer(file->device->ib_dev,
- cmd.port_num);
+ resp.link_layer = rdma_tech_ib(file->device->ib_dev,
+ cmd.port_num) ?
+ IB_LINK_LAYER_INFINIBAND :
+ IB_LINK_LAYER_ETHERNET;
if (copy_to_user((void __user *) (unsigned long) cmd.response,
&resp, sizeof resp))
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 626c9cf..7264860 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -200,11 +200,9 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc,
u32 flow_class;
u16 gid_index;
int ret;
- int is_eth = (rdma_port_get_link_layer(device, port_num) ==
- IB_LINK_LAYER_ETHERNET);
memset(ah_attr, 0, sizeof *ah_attr);
- if (is_eth) {
+ if (rdma_tech_iboe(device, port_num)) {
if (!(wc->wc_flags & IB_WC_GRH))
return -EPROTOTYPE;
@@ -873,7 +871,7 @@ int ib_resolve_eth_l2_attrs(struct ib_qp *qp,
union ib_gid sgid;
if ((*qp_attr_mask & IB_QP_AV) &&
- (rdma_port_get_link_layer(qp->device, qp_attr->ah_attr.port_num) == IB_LINK_LAYER_ETHERNET)) {
+ (rdma_tech_iboe(qp->device, qp_attr->ah_attr.port_num))) {
ret = ib_query_gid(qp->device, qp_attr->ah_attr.port_num,
qp_attr->ah_attr.grh.sgid_index, &sgid);
if (ret)
--
2.1.0
next prev parent reply other threads:[~2015-04-20 8:36 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 ` [PATCH v5 04/27] IB/Verbs: Reform IB-core cm Michael Wang
2015-04-20 17:04 ` 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 ` Michael Wang [this message]
2015-04-21 23:19 ` [PATCH v5 09/27] IB/Verbs: Reform IB-core verbs/uverbs_cmd/sysfs 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=5534BA7C.2010600@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).