leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RDMA/cxgb4: Add support for active and passive open connection with IPv6 address

Browse Source 
Add new cpl messages, cpl_act_open_req6 and cpl_t5_act_open_req6, for
initiating active open connections.

Use LLD api cxgb4_create_server and cxgb4_create_server6 for
initiating passive open connections. Similarly use cxgb4_remove_server
to remove the passive open connections in place of listen_stop.

Add support for iWARP over VLAN device and enable IPv6 support on VLAN device.

Make use of import_ep in c4iw_reconnect.

Signed-off-by: Vipul Pandya <vipul@chelsio.com>

[ Fix build when IPv6 is disabled and make sure iw_cxgb4 is not built-in
  when ipv6 is a module.  - Roland ]

Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
Vipul Pandya 2013-07-04 16:10:47 +05:30 committed by Roland Dreier
parent 01bcca68c3
commit 830662f6f0
4 changed files with 637 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/cxgb4/Kconfig
View File

@ -1,6 +1,6 @@
config INFINIBAND_CXGB4 config INFINIBAND_CXGB4
tristate "Chelsio T4 RDMA Driver" tristate "Chelsio T4 RDMA Driver"
depends on CHELSIO_T4 && INET depends on CHELSIO_T4 && INET && (IPV6 || IPV6=n)
select GENERIC_ALLOCATOR select GENERIC_ALLOCATOR
---help--- ---help---
This is an iWARP/RDMA driver for the Chelsio T4 1GbE and This is an iWARP/RDMA driver for the Chelsio T4 1GbE and

816
drivers/infiniband/hw/cxgb4/cm.c
View File

File diff suppressed because it is too large Load Diff

116
drivers/infiniband/hw/cxgb4/device.c
View File

@ -103,18 +103,43 @@ static int dump_qp(int id, void *p, void *data)
if (space == 0) if (space == 0)
return 1; return 1;
if (qp->ep) if (qp->ep) {
cc = snprintf(qpd->buf + qpd->pos, space, if (qp->ep->com.local_addr.ss_family == AF_INET) {
"qp sq id %u rq id %u state %u onchip %u " struct sockaddr_in *lsin = (struct sockaddr_in *)
"ep tid %u state %u %pI4:%u->%pI4:%u\n", &qp->ep->com.local_addr;
qp->wq.sq.qid, qp->wq.rq.qid, (int)qp->attr.state, struct sockaddr_in *rsin = (struct sockaddr_in *)
qp->wq.sq.flags & T4_SQ_ONCHIP, &qp->ep->com.remote_addr;
qp->ep->hwtid, (int)qp->ep->com.state,
&qp->ep->com.local_addr.sin_addr.s_addr, cc = snprintf(qpd->buf + qpd->pos, space,
ntohs(qp->ep->com.local_addr.sin_port), "rc qp sq id %u rq id %u state %u "
&qp->ep->com.remote_addr.sin_addr.s_addr, "onchip %u ep tid %u state %u "
ntohs(qp->ep->com.remote_addr.sin_port)); "%pI4:%u->%pI4:%u\n",
else qp->wq.sq.qid, qp->wq.rq.qid,
(int)qp->attr.state,
qp->wq.sq.flags & T4_SQ_ONCHIP,
qp->ep->hwtid, (int)qp->ep->com.state,
&lsin->sin_addr, ntohs(lsin->sin_port),
&rsin->sin_addr, ntohs(rsin->sin_port));
} else {
struct sockaddr_in6 *lsin6 = (struct sockaddr_in6 *)
&qp->ep->com.local_addr;
struct sockaddr_in6 *rsin6 = (struct sockaddr_in6 *)
&qp->ep->com.remote_addr;
cc = snprintf(qpd->buf + qpd->pos, space,
"rc qp sq id %u rq id %u state %u "
"onchip %u ep tid %u state %u "
"%pI6:%u->%pI6:%u\n",
qp->wq.sq.qid, qp->wq.rq.qid,
(int)qp->attr.state,
qp->wq.sq.flags & T4_SQ_ONCHIP,
qp->ep->hwtid, (int)qp->ep->com.state,
&lsin6->sin6_addr,
ntohs(lsin6->sin6_port),
&rsin6->sin6_addr,
ntohs(rsin6->sin6_port));
}
} else
cc = snprintf(qpd->buf + qpd->pos, space, cc = snprintf(qpd->buf + qpd->pos, space,
"qp sq id %u rq id %u state %u onchip %u\n", "qp sq id %u rq id %u state %u onchip %u\n",
qp->wq.sq.qid, qp->wq.rq.qid, qp->wq.sq.qid, qp->wq.rq.qid,
@ -351,15 +376,37 @@ static int dump_ep(int id, void *p, void *data)
if (space == 0) if (space == 0)
return 1; return 1;
cc = snprintf(epd->buf + epd->pos, space, if (ep->com.local_addr.ss_family == AF_INET) {
"ep %p cm_id %p qp %p state %d flags 0x%lx history 0x%lx " struct sockaddr_in *lsin = (struct sockaddr_in *)
"hwtid %d atid %d %pI4:%d <-> %pI4:%d\n", &ep->com.local_addr;
ep, ep->com.cm_id, ep->com.qp, (int)ep->com.state, struct sockaddr_in *rsin = (struct sockaddr_in *)
ep->com.flags, ep->com.history, ep->hwtid, ep->atid, &ep->com.remote_addr;
&ep->com.local_addr.sin_addr.s_addr,
ntohs(ep->com.local_addr.sin_port), cc = snprintf(epd->buf + epd->pos, space,
&ep->com.remote_addr.sin_addr.s_addr, "ep %p cm_id %p qp %p state %d flags 0x%lx "
ntohs(ep->com.remote_addr.sin_port)); "history 0x%lx hwtid %d atid %d "
"%pI4:%d <-> %pI4:%d\n",
ep, ep->com.cm_id, ep->com.qp,
(int)ep->com.state, ep->com.flags,
ep->com.history, ep->hwtid, ep->atid,
&lsin->sin_addr, ntohs(lsin->sin_port),
&rsin->sin_addr, ntohs(rsin->sin_port));
} else {
struct sockaddr_in6 *lsin6 = (struct sockaddr_in6 *)
&ep->com.local_addr;
struct sockaddr_in6 *rsin6 = (struct sockaddr_in6 *)
&ep->com.remote_addr;
cc = snprintf(epd->buf + epd->pos, space,
"ep %p cm_id %p qp %p state %d flags 0x%lx "
"history 0x%lx hwtid %d atid %d "
"%pI6:%d <-> %pI6:%d\n",
ep, ep->com.cm_id, ep->com.qp,
(int)ep->com.state, ep->com.flags,
ep->com.history, ep->hwtid, ep->atid,
&lsin6->sin6_addr, ntohs(lsin6->sin6_port),
&rsin6->sin6_addr, ntohs(rsin6->sin6_port));
}
if (cc < space) if (cc < space)
epd->pos += cc; epd->pos += cc;
return 0; return 0;
@ -376,12 +423,27 @@ static int dump_listen_ep(int id, void *p, void *data)
if (space == 0) if (space == 0)
return 1; return 1;
cc = snprintf(epd->buf + epd->pos, space, if (ep->com.local_addr.ss_family == AF_INET) {
"ep %p cm_id %p state %d flags 0x%lx stid %d backlog %d " struct sockaddr_in *lsin = (struct sockaddr_in *)
"%pI4:%d\n", ep, ep->com.cm_id, (int)ep->com.state, &ep->com.local_addr;
ep->com.flags, ep->stid, ep->backlog,
&ep->com.local_addr.sin_addr.s_addr, cc = snprintf(epd->buf + epd->pos, space,
ntohs(ep->com.local_addr.sin_port)); "ep %p cm_id %p state %d flags 0x%lx stid %d "
"backlog %d %pI4:%d\n",
ep, ep->com.cm_id, (int)ep->com.state,
ep->com.flags, ep->stid, ep->backlog,
&lsin->sin_addr, ntohs(lsin->sin_port));
} else {
struct sockaddr_in6 *lsin6 = (struct sockaddr_in6 *)
&ep->com.local_addr;
cc = snprintf(epd->buf + epd->pos, space,
"ep %p cm_id %p state %d flags 0x%lx stid %d "
"backlog %d %pI6:%d\n",
ep, ep->com.cm_id, (int)ep->com.state,
ep->com.flags, ep->stid, ep->backlog,
&lsin6->sin6_addr, ntohs(lsin6->sin6_port));
}
if (cc < space) if (cc < space)
epd->pos += cc; epd->pos += cc;
return 0; return 0;

4
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
View File

@ -752,8 +752,8 @@ struct c4iw_ep_common {
enum c4iw_ep_state state; enum c4iw_ep_state state;
struct kref kref; struct kref kref;
struct mutex mutex; struct mutex mutex;
struct sockaddr_in local_addr; struct sockaddr_storage local_addr;
struct sockaddr_in remote_addr; struct sockaddr_storage remote_addr;
struct c4iw_wr_wait wr_wait; struct c4iw_wr_wait wr_wait;
unsigned long flags; unsigned long flags;
unsigned long history; unsigned long history;