svn commit: r338557 - in stable/11/sys/ofed: drivers/infiniband/core include/rdma
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Sep 10 08:19:40 UTC 2018
Author: hselasky
Date: Mon Sep 10 08:19:38 2018
New Revision: 338557
URL: https://svnweb.freebsd.org/changeset/base/338557
Log:
MFC r338541:
Introduce and use sgid_index in CM requests in ibcore.
For RoCE, when CM requests are received for RC and UD connections,
netdevice of the incoming request is unavailable. Because of that CM
requests are always forwarded to init_net namespace.
Now that we have the GID index available, introduce SGID index in
incoming CM requests and refer to the netdevice of it.
While at it fix some incorrect uses of init_net and make sure
the rdma_create_id() function stores the VNET it is passed.
Based on linux commit:
cee104334c98dd04e9dd4d9a4fa4784f7f6aada9
Sponsored by: Mellanox Technologies
Modified:
stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c
stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c
stable/11/sys/ofed/include/rdma/ib_addr.h
stable/11/sys/ofed/include/rdma/ib_cm.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c Mon Sep 10 08:17:36 2018 (r338556)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cm.c Mon Sep 10 08:19:38 2018 (r338557)
@@ -1453,6 +1453,7 @@ static void cm_format_req_event(struct cm_work *work,
param->retry_count = cm_req_get_retry_count(req_msg);
param->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
param->srq = cm_req_get_srq(req_msg);
+ param->ppath_sgid_index = cm_id_priv->av.ah_attr.grh.sgid_index;
work->cm_event.private_data = &req_msg->private_data;
}
@@ -3137,6 +3138,7 @@ out:
EXPORT_SYMBOL(ib_send_cm_sidr_req);
static void cm_format_sidr_req_event(struct cm_work *work,
+ const struct cm_id_private *rx_cm_id,
struct ib_cm_id *listen_id)
{
struct cm_sidr_req_msg *sidr_req_msg;
@@ -3150,6 +3152,7 @@ static void cm_format_sidr_req_event(struct cm_work *w
param->service_id = sidr_req_msg->service_id;
param->bth_pkey = cm_get_bth_pkey(work);
param->port = work->port->port_num;
+ param->sgid_index = rx_cm_id->av.ah_attr.grh.sgid_index;
work->cm_event.private_data = &sidr_req_msg->private_data;
}
@@ -3203,7 +3206,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
cm_id_priv->id.service_id = sidr_req_msg->service_id;
cm_id_priv->id.service_mask = ~cpu_to_be64(0);
- cm_format_sidr_req_event(work, &cur_cm_id_priv->id);
+ cm_format_sidr_req_event(work, cm_id_priv, &cur_cm_id_priv->id);
cm_process_work(cm_id_priv, work);
cm_deref_id(cur_cm_id_priv);
return 0;
Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c Mon Sep 10 08:17:36 2018 (r338556)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c Mon Sep 10 08:19:38 2018 (r338557)
@@ -733,6 +733,10 @@ struct rdma_cm_id *rdma_create_id(struct vnet *net,
{
struct rdma_id_private *id_priv;
+#ifdef VIMAGE
+ if (net == NULL)
+ return ERR_PTR(-EINVAL);
+#endif
id_priv = kzalloc(sizeof *id_priv, GFP_KERNEL);
if (!id_priv)
return ERR_PTR(-ENOMEM);
@@ -751,7 +755,7 @@ struct rdma_cm_id *rdma_create_id(struct vnet *net,
INIT_LIST_HEAD(&id_priv->listen_list);
INIT_LIST_HEAD(&id_priv->mc_list);
get_random_bytes(&id_priv->seq_num, sizeof id_priv->seq_num);
- id_priv->id.route.addr.dev_addr.net = TD_TO_VNET(curthread);
+ id_priv->id.route.addr.dev_addr.net = net;
return &id_priv->id;
}
@@ -1375,6 +1379,26 @@ static bool validate_net_dev(struct net_device *net_de
}
}
+static struct net_device *
+roce_get_net_dev_by_cm_event(struct ib_device *device, u8 port_num,
+ const struct ib_cm_event *ib_event)
+{
+ struct ib_gid_attr sgid_attr;
+ union ib_gid sgid;
+ int err = -EINVAL;
+
+ if (ib_event->event == IB_CM_REQ_RECEIVED) {
+ err = ib_get_cached_gid(device, port_num,
+ ib_event->param.req_rcvd.ppath_sgid_index, &sgid, &sgid_attr);
+ } else if (ib_event->event == IB_CM_SIDR_REQ_RECEIVED) {
+ err = ib_get_cached_gid(device, port_num,
+ ib_event->param.sidr_req_rcvd.sgid_index, &sgid, &sgid_attr);
+ }
+ if (err)
+ return (NULL);
+ return (sgid_attr.ndev);
+}
+
static struct net_device *cma_get_net_dev(struct ib_cm_event *ib_event,
const struct cma_req_info *req)
{
@@ -1390,8 +1414,14 @@ static struct net_device *cma_get_net_dev(struct ib_cm
if (err)
return ERR_PTR(err);
- net_dev = ib_get_net_dev_by_params(req->device, req->port, req->pkey,
- gid, listen_addr);
+ if (rdma_protocol_roce(req->device, req->port)) {
+ net_dev = roce_get_net_dev_by_cm_event(req->device, req->port,
+ ib_event);
+ } else {
+ net_dev = ib_get_net_dev_by_params(req->device, req->port,
+ req->pkey,
+ gid, listen_addr);
+ }
if (!net_dev)
return ERR_PTR(-ENODEV);
@@ -1526,10 +1556,6 @@ static struct rdma_id_private *cma_id_from_event(struc
if (IS_ERR(*net_dev)) {
if (PTR_ERR(*net_dev) == -EAFNOSUPPORT) {
/* Assuming the protocol is AF_IB */
- *net_dev = NULL;
- } else if (cma_protocol_roce_dev_port(req.device, req.port)) {
- /* TODO find the net dev matching the request parameters
- * through the RoCE GID table */
*net_dev = NULL;
} else {
return ERR_CAST(*net_dev);
Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c Mon Sep 10 08:17:36 2018 (r338556)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c Mon Sep 10 08:19:38 2018 (r338557)
@@ -146,7 +146,7 @@ void ib_copy_path_rec_from_user(struct ib_sa_path_rec
dst->packet_life_time_selector = src->packet_life_time_selector;
memset(dst->dmac, 0, sizeof(dst->dmac));
- dst->net = NULL;
+ dst->net = TD_TO_VNET(curthread);
dst->ifindex = 0;
dst->gid_type = IB_GID_TYPE_IB;
}
Modified: stable/11/sys/ofed/include/rdma/ib_addr.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_addr.h Mon Sep 10 08:17:36 2018 (r338556)
+++ stable/11/sys/ofed/include/rdma/ib_addr.h Mon Sep 10 08:19:38 2018 (r338557)
@@ -219,7 +219,11 @@ static inline void iboe_addr_get_sgid(struct rdma_dev_
struct net_device *dev;
struct ifaddr *ifa;
- dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if);
+#ifdef VIMAGE
+ if (dev_addr->net == NULL)
+ return;
+#endif
+ dev = dev_get_by_index(dev_addr->net, dev_addr->bound_dev_if);
if (dev) {
TAILQ_FOREACH(ifa, &dev->if_addrhead, ifa_link) {
if (ifa->ifa_addr == NULL ||
Modified: stable/11/sys/ofed/include/rdma/ib_cm.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_cm.h Mon Sep 10 08:17:36 2018 (r338556)
+++ stable/11/sys/ofed/include/rdma/ib_cm.h Mon Sep 10 08:19:38 2018 (r338557)
@@ -123,6 +123,13 @@ struct ib_cm_req_event_param {
struct ib_sa_path_rec *primary_path;
struct ib_sa_path_rec *alternate_path;
+ /*
+ * SGID index of the primary path. Currently only
+ * useful for RoCE. Alternate path GID attributes
+ * are not yet supported.
+ */
+ u8 ppath_sgid_index;
+
__be64 remote_ca_guid;
u32 remote_qkey;
u32 remote_qpn;
@@ -229,6 +236,13 @@ struct ib_cm_apr_event_param {
struct ib_cm_sidr_req_event_param {
struct ib_cm_id *listen_id;
__be64 service_id;
+
+ /*
+ * SGID index of the request. Currently only
+ * useful for RoCE.
+ */
+ u8 sgid_index;
+
/* P_Key that was used by the GMP's BTH header */
u16 bth_pkey;
u8 port;
More information about the svn-src-stable
mailing list