From: Michael Wang <yun.wang@profitbricks.com>
To: Roland Dreier <roland@kernel.org>,
Sean Hefty <sean.hefty@intel.com>,
Hal Rosenstock <hal.rosenstock@gmail.com>,
Ira Weiny <ira.weiny@intel.com>,
linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-nfs@vger.kernel.org, netdev@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
Trond Myklebust <trond.myklebust@primarydata.com>,
"David S. Miller" <davem@davemloft.net>,
Or Gerlitz <ogerlitz@mellanox.com>,
Moni Shoua <monis@mellanox.com>,
PJ Waskiewicz <pj.waskiewicz@solidfire.com>,
Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>,
Yan Burman <yanb@mellanox.com>,
Jack Morgenstein <jackm@dev.mellanox.co.il>,
Bart Van Assche <bvanassche@acm.org>,
Yann Droneaud <ydroneaud@opteya.com>,
Colin Ian King <colin.king@canonical.com>,
Majd Dibbiny <majd@mellanox.com>, Jiri Kosina <jkosina@suse.cz>,
Matan Barak <matanb@mellanox.com>,
Alex Estrin <alex.estrin@intel.com>,
Doug Ledford <dledford@redhat.com>,
Eric Dumazet <edumazet@google.com>,
Erez Shitrit <erezsh@mellanox.com>,
Sagi Grimberg <sagig@mellanox.com>,
Haggai Eran <haggaie@mellanox.com>,
Shachar Raindel <raindel@mellanox.com>,
Mike Marciniszyn <mike.marciniszyn@intel.com>,
Steve Wise <swise@opengridcomputing.com>, Tom Tucker <tom@ogc.us>,
Chuck Lever <chuck.lever@oracle.com>,
Michael Wang <yun.wang@profitbricks.com>
Subject: [RFC PATCH 10/11] IB/Verbs: Use management helper cap_ib() for ib-check
Date: Fri, 27 Mar 2015 16:49:05 +0100 [thread overview]
Message-ID: <55157BF1.8020303@profitbricks.com> (raw)
In-Reply-To: <551579CA.4030901@profitbricks.com>
TODO:
We need to classify these check into the management helper.
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/cma.c | 5 ++---
drivers/infiniband/hw/mlx4/mad.c | 4 ++--
drivers/infiniband/hw/mlx4/main.c | 5 ++---
include/rdma/ib_verbs.h | 8 ++++++++
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index cbbc85b..1f68816 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -696,7 +696,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
int ret;
u16 pkey;
- if (rdma_port_ll_is_ib(id_priv->id.device, id_priv->id.port_num))
+ if (cap_ib(id_priv->id.device, id_priv->id.port_num))
pkey = ib_addr_get_pkey(dev_addr);
else
pkey = 0xffff;
@@ -2053,8 +2053,7 @@ port_found:
goto out;
id_priv->id.route.addr.dev_addr.dev_type =
- (rdma_port_ll_is_ib(cma_dev->device, p)) ?
- ARPHRD_INFINIBAND : ARPHRD_ETHER;
+ (cap_ib(cma_dev->device, p)) ? ARPHRD_INFINIBAND : ARPHRD_ETHER;
rdma_addr_set_sgid(&id_priv->id.route.addr.dev_addr, &gid);
ib_addr_set_pkey(&id_priv->id.route.addr.dev_addr, pkey);
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 09874d0..2a867fd 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -1247,7 +1247,7 @@ out:
static int get_slave_base_gid_ix(struct mlx4_ib_dev *dev, int slave, int port)
{
- if (rdma_port_ll_is_ib(&dev->ib_dev, port))
+ if (cap_ib(&dev->ib_dev, port))
return slave;
return mlx4_get_base_gid_ix(dev->dev, slave, port);
}
@@ -1255,7 +1255,7 @@ static int get_slave_base_gid_ix(struct mlx4_ib_dev *dev, int slave, int port)
static void fill_in_real_sgid_index(struct mlx4_ib_dev *dev, int slave, int port,
struct ib_ah_attr *ah_attr)
{
- if (rdma_port_ll_is_ib(&dev->ib_dev, port))
+ if (cap_ib(&dev->ib_dev, port))
ah_attr->grh.sgid_index = slave;
else
ah_attr->grh.sgid_index += get_slave_base_gid_ix(dev, slave, port);
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index f445f4c..1acc1c1 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -482,7 +482,7 @@ static int iboe_query_gid(struct ib_device *ibdev, u8 port, int index,
static int mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
union ib_gid *gid)
{
- if (rdma_port_ll_is_ib(ibdev, port))
+ if (cap_ib(ibdev, port))
return __mlx4_ib_query_gid(ibdev, port, index, gid, 0);
else
return iboe_query_gid(ibdev, port, index, gid);
@@ -2552,8 +2552,7 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr,
case MLX4_DEV_EVENT_PORT_UP:
if (p > ibdev->num_ports)
return;
- if (mlx4_is_master(dev) &&
- rdma_port_ll_is_ib(&ibdev->ib_dev, p)) {
+ if (mlx4_is_master(dev) && cap_ib(&ibdev->ib_dev, p)) {
mlx4_ib_invalidate_all_guid_record(ibdev, p);
}
ibev.event = IB_EVENT_PORT_ACTIVE;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index eead588..deeaa52 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1921,6 +1921,14 @@ static inline int cap_ipoib(struct ib_device *device, u8 port_num)
return rdma_port_ll_is_ib(device, port_num);
}
+/**
+ * TO BE CLASSIFIED
+ */
+static inline int cap_ib(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);
--
2.1.0
next prev parent reply other threads:[~2015-03-27 15:49 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 15:39 [RFC PATCH 00/11] IB/Verbs: IB Management Helpers Michael Wang
2015-03-27 15:40 ` [PATCH 01/11] IB/Verbs: Use helpers to check transport and link layer Michael Wang
2015-03-30 15:56 ` Doug Ledford
2015-03-30 16:14 ` Michael Wang
2015-03-30 16:22 ` Doug Ledford
2015-03-30 17:04 ` Michael Wang
2015-03-27 15:42 ` [RFC PATCH 02/11] IB/Verbs: Use management helper tech_iboe() for iboe-check Michael Wang
2015-03-30 16:17 ` Doug Ledford
2015-03-30 16:23 ` Michael Wang
2015-03-27 15:43 ` [RFC PATCH 03/11] IB/Verbs: Use management helper has_mad() for mad-check Michael Wang
2015-03-27 15:44 ` [RFC PATCH 04/11] IB/Verbs: Use management helper cap_smi() for smi-check Michael Wang
2015-03-27 16:32 ` Jason Gunthorpe
2015-03-27 16:59 ` Yun Wang
2015-03-27 15:45 ` [RFC PATCH 05/11] IB/Verbs: Use management helper has_cm() for cm-check Michael Wang
2015-03-27 15:46 ` [RFC PATCH 06/11] IB/Verbs: Use management helper has_sa() and cap_sa(), for sa-check Michael Wang
2015-03-27 16:47 ` ira.weiny
2015-03-27 17:13 ` Yun Wang
2015-03-27 19:49 ` Doug Ledford
2015-03-30 16:16 ` Doug Ledford
2015-03-30 16:42 ` Michael Wang
2015-03-30 17:02 ` Doug Ledford
2015-03-31 13:22 ` Michael Wang
2015-03-31 23:12 ` Jason Gunthorpe
2015-04-01 0:51 ` ira.weiny
2015-04-01 1:31 ` Jason Gunthorpe
2015-03-27 15:46 ` [RFC PATCH 07/11] IB/Verbs: Use management helper has_mcast() and, cap_mcast() for mcast-check Michael Wang
2015-03-27 16:28 ` Jason Gunthorpe
2015-03-27 17:05 ` ira.weiny
2015-03-27 17:31 ` Yun Wang
2015-03-27 17:49 ` Jason Gunthorpe
2015-03-27 18:09 ` Yun Wang
2015-03-27 17:47 ` Jason Gunthorpe
2015-03-30 8:30 ` Michael Wang
2015-03-30 22:33 ` Jason Gunthorpe
2015-03-30 16:11 ` Doug Ledford
2015-03-30 16:20 ` Michael Wang
2015-03-30 23:47 ` ira.weiny
2015-03-31 7:25 ` Michael Wang
2015-03-27 15:47 ` [RFC PATCH 08/11] IB/Verbs: Use management helper has_iwarp() for, iwarp-check Michael Wang
2015-03-27 16:13 ` Jason Gunthorpe
2015-03-27 16:17 ` Michael Wang
2015-03-27 17:16 ` ira.weiny
2015-03-27 17:29 ` Jason Gunthorpe
2015-03-30 15:10 ` Michael Wang
2015-03-30 22:35 ` Jason Gunthorpe
2015-03-31 7:39 ` Michael Wang
2015-03-31 11:19 ` Tom Talpey
2015-03-31 11:41 ` Michael Wang
2015-03-31 13:56 ` Tom Talpey
2015-03-31 13:58 ` Michael Wang
2015-03-27 17:35 ` Yun Wang
2015-03-30 16:13 ` Doug Ledford
2015-03-30 16:21 ` Michael Wang
2015-03-31 23:20 ` Jason Gunthorpe
2015-03-27 15:48 ` [RFC PATCH 09/11] IB/Verbs: Use management helper has_ipoib() and, cap_ipoib() for ipoib-check Michael Wang
2015-03-27 16:06 ` Jason Gunthorpe
2015-03-27 16:15 ` Michael Wang
2015-03-27 16:38 ` Jason Gunthorpe
2015-03-27 15:49 ` Michael Wang [this message]
2015-03-27 15:49 ` [RFC PATCH 11/11] IB/Verbs: Use management helper cap_eth() for eth-check Michael Wang
2015-04-06 20:22 ` [RFC PATCH 00/11] IB/Verbs: IB Management Helpers ira.weiny
2015-04-07 7:31 ` Michael Wang
2015-04-07 12:48 ` 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=55157BF1.8020303@profitbricks.com \
--to=yun.wang@profitbricks.com \
--cc=Tatyana.E.Nikolova@intel.com \
--cc=alex.estrin@intel.com \
--cc=bfields@fieldses.org \
--cc=bvanassche@acm.org \
--cc=chuck.lever@oracle.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=edumazet@google.com \
--cc=erezsh@mellanox.com \
--cc=haggaie@mellanox.com \
--cc=hal.rosenstock@gmail.com \
--cc=ira.weiny@intel.com \
--cc=jackm@dev.mellanox.co.il \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=majd@mellanox.com \
--cc=matanb@mellanox.com \
--cc=mike.marciniszyn@intel.com \
--cc=monis@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=pj.waskiewicz@solidfire.com \
--cc=raindel@mellanox.com \
--cc=roland@kernel.org \
--cc=sagig@mellanox.com \
--cc=sean.hefty@intel.com \
--cc=swise@opengridcomputing.com \
--cc=tom@ogc.us \
--cc=trond.myklebust@primarydata.com \
--cc=yanb@mellanox.com \
--cc=ydroneaud@opteya.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).