d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reinstate unify_tcp_port_space and associated code that was lost during

Browse Source 
the last OFED update (r278886).

iWARP on FreeBSD is properly integrated with the network stack and the
iWARP drivers _never_ operate out of any private TCP port-space that is
invisible to the kernel.  Instead, an iWARP connection shows up as a TCP
socket (which is what it is) fully visible to the kernel and standard
tools like netstat, sockstat, etc.
This commit is contained in:
Navdeep Parhar 2015-08-12 22:09:58 +00:00
parent dbe90f04b4
commit 6b5c8394f1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=286703
1 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sys/ofed/drivers/infiniband/core/cma.c
View File

@ -72,6 +72,11 @@ static int def_prec2sl = 3;
module_param_named(def_prec2sl, def_prec2sl, int, 0644);
MODULE_PARM_DESC(def_prec2sl, "Default value for SL priority with RoCE. Valid values 0 - 7");
static int unify_tcp_port_space = 1;
module_param(unify_tcp_port_space, int, 0644);
MODULE_PARM_DESC(unify_tcp_port_space, "Unify the host TCP and RDMA port "
"space allocation (default=1)");
static int debug_level = 0;
#define cma_pr(level, priv, format, arg...) \
printk(level "CMA: %p: %s: " format, ((struct rdma_id_priv *) priv) , __func__, ## arg)
@ -957,6 +962,8 @@ static void cma_release_port(struct rdma_id_private *id_priv)
kfree(bind_list);
}
mutex_unlock(&lock);
if (id_priv->sock)
sock_release(id_priv->sock);
}
static void cma_leave_mc_groups(struct rdma_id_private *id_priv)
@ -2449,6 +2456,42 @@ static int cma_bind_listen(struct rdma_id_private *id_priv)
return ret;
}
static int cma_get_tcp_port(struct rdma_id_private *id_priv)
{
int ret;
int size;
struct socket *sock;
ret = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);
if (ret)
return ret;
#ifdef __linux__
ret = sock->ops->bind(sock,
(struct sockaddr *) &id_priv->id.route.addr.src_addr,
ip_addr_size((struct sockaddr *) &id_priv->id.route.addr.src_addr));
#else
ret = -sobind(sock,
(struct sockaddr *)&id_priv->id.route.addr.src_addr,
curthread);
#endif
if (ret) {
sock_release(sock);
return ret;
}
size = ip_addr_size((struct sockaddr *) &id_priv->id.route.addr.src_addr);
ret = sock_getname(sock,
(struct sockaddr *) &id_priv->id.route.addr.src_addr,
&size, 0);
if (ret) {
sock_release(sock);
return ret;
}
id_priv->sock = sock;
return 0;
}
static int cma_get_port(struct rdma_id_private *id_priv)
{
struct idr *ps;
@ -2460,6 +2503,11 @@ static int cma_get_port(struct rdma_id_private *id_priv)
break;
case RDMA_PS_TCP:
ps = &tcp_ps;
if (unify_tcp_port_space) {
ret = cma_get_tcp_port(id_priv);
if (ret)
goto out;
}
break;
case RDMA_PS_UDP:
ps = &udp_ps;
@ -2480,7 +2528,7 @@ static int cma_get_port(struct rdma_id_private *id_priv)
else
ret = cma_use_port(ps, id_priv);
mutex_unlock(&lock);
out:
return ret;
}