| Message ID | 1456625990-4739-2-git-send-email-santosh.shilimkar@oracle.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, Feb 27, 2016 at 06:19:38PM -0800, Santosh Shilimkar wrote: > RDS iWarp support code has become stale and non testable. As > indicated earlier, am dropping the support for it. > > If new iWarp user(s) shows up in future, we can adapat the RDS IB > transprt for the special RDMA READ sink case. iWarp needs an MR > for the RDMA READ sink. Please take a look at the RDMA RW API series I posted yesterday - if you can adopt RDS to that you should get iWarp support for free. But having two different codebases for IB/RoCE vs iWarp was always a bad idea, so great to see the second one retired! Acked-by: Christoph Hellwig <hch@lst.de>
On 2/28/16 1:05 AM, Christoph Hellwig wrote: > On Sat, Feb 27, 2016 at 06:19:38PM -0800, Santosh Shilimkar wrote: >> RDS iWarp support code has become stale and non testable. As >> indicated earlier, am dropping the support for it. >> >> If new iWarp user(s) shows up in future, we can adapat the RDS IB >> transprt for the special RDMA READ sink case. iWarp needs an MR >> for the RDMA READ sink. > > Please take a look at the RDMA RW API series I posted yesterday - if > you can adopt RDS to that you should get iWarp support for free. > Will have a look. Thanks for the pointer. > But having two different codebases for IB/RoCE vs iWarp was always a bad > idea, so great to see the second one retired! > > Acked-by: Christoph Hellwig <hch@lst.de> > Thanks !!
On Sun, Feb 28, 2016 at 4:19 AM, Santosh Shilimkar <santosh.shilimkar@oracle.com> wrote: > RDS iWarp support code has become stale and non testable. As > indicated earlier, am dropping the support for it. > > If new iWarp user(s) shows up in future, we can adapat the RDS IB > transprt for the special RDMA READ sink case. iWarp needs an MR > for the RDMA READ sink. > > Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> Hi, just wondered if there's any special reason that all this series carries double S.O.B signature line with your name appearing twice on two different email addresses?
On 2/28/16 11:51 AM, Or Gerlitz wrote: > On Sun, Feb 28, 2016 at 4:19 AM, Santosh Shilimkar > <santosh.shilimkar@oracle.com> wrote: >> RDS iWarp support code has become stale and non testable. As >> indicated earlier, am dropping the support for it. >> >> If new iWarp user(s) shows up in future, we can adapat the RDS IB >> transprt for the special RDMA READ sink case. iWarp needs an MR >> for the RDMA READ sink. >> >> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org> >> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> > > Hi, just wondered if there's any special reason that all this series > carries double S.O.B signature line with your name appearing twice on > two different email addresses? > Nothing special. I sign of all my patches with k.org id and have to keep Oracle id as well being a payed Oracle employee. ;-) Regards, Santosh
On Mon, Feb 29, 2016 at 2:26 AM, santosh.shilimkar@oracle.com <santosh.shilimkar@oracle.com> wrote: > On 2/28/16 11:51 AM, Or Gerlitz wrote: >> On Sun, Feb 28, 2016 at 4:19 AM, Santosh Shilimkar <santosh.shilimkar@oracle.com> wrote: >>> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org> >>> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> >> Hi, just wondered if there's any special reason that all this series >> carries double S.O.B signature line with your name appearing twice on >> two different email addresses? > Nothing special. I sign of all my patches with k.org id and have to > keep Oracle id as well being a payed Oracle employee. ;-) so the kernel logs are carrying forever either 64 or 55 bytes with your 2nd signature which are sort of not a must... Or.
diff --git a/Documentation/networking/rds.txt b/Documentation/networking/rds.txt index e1a3d59..9d219d8 100644 --- a/Documentation/networking/rds.txt +++ b/Documentation/networking/rds.txt @@ -19,9 +19,7 @@ to N*N if you use a connection-oriented socket transport like TCP. RDS is not Infiniband-specific; it was designed to support different transports. The current implementation used to support RDS over TCP as well -as IB. Work is in progress to support RDS over iWARP, and using DCE to -guarantee no dropped packets on Ethernet, it may be possible to use RDS over -UDP in the future. +as IB. The high-level semantics of RDS from the application's point of view are diff --git a/net/rds/Kconfig b/net/rds/Kconfig index f2c670b..bffde4b 100644 --- a/net/rds/Kconfig +++ b/net/rds/Kconfig @@ -4,14 +4,13 @@ config RDS depends on INET ---help--- The RDS (Reliable Datagram Sockets) protocol provides reliable, - sequenced delivery of datagrams over Infiniband, iWARP, - or TCP. + sequenced delivery of datagrams over Infiniband or TCP. config RDS_RDMA - tristate "RDS over Infiniband and iWARP" + tristate "RDS over Infiniband" depends on RDS && INFINIBAND && INFINIBAND_ADDR_TRANS ---help--- - Allow RDS to use Infiniband and iWARP as a transport. + Allow RDS to use Infiniband as a transport. This transport supports RDMA operations. config RDS_TCP diff --git a/net/rds/Makefile b/net/rds/Makefile index 56d3f60..19e5485 100644 --- a/net/rds/Makefile +++ b/net/rds/Makefile @@ -6,9 +6,7 @@ rds-y := af_rds.o bind.o cong.o connection.o info.o message.o \ obj-$(CONFIG_RDS_RDMA) += rds_rdma.o rds_rdma-y := rdma_transport.o \ ib.o ib_cm.o ib_recv.o ib_ring.o ib_send.o ib_stats.o \ - ib_sysctl.o ib_rdma.o \ - iw.o iw_cm.o iw_recv.o iw_ring.o iw_send.o iw_stats.o \ - iw_sysctl.o iw_rdma.o + ib_sysctl.o ib_rdma.o obj-$(CONFIG_RDS_TCP) += rds_tcp.o diff --git a/net/rds/iw.c b/net/rds/iw.c deleted file mode 100644 index f4a9fff..0000000 diff --git a/net/rds/iw.h b/net/rds/iw.h deleted file mode 100644 index 5af01d1..0000000 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c deleted file mode 100644 index aea4c91..0000000 diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c deleted file mode 100644 index b09a40c..0000000 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c deleted file mode 100644 index a66d179..0000000 diff --git a/net/rds/iw_ring.c b/net/rds/iw_ring.c deleted file mode 100644 index da8e3b6..0000000 diff --git a/net/rds/iw_send.c b/net/rds/iw_send.c deleted file mode 100644 index e20bd50..0000000 diff --git a/net/rds/iw_stats.c b/net/rds/iw_stats.c deleted file mode 100644 index 5fe67f6..0000000 diff --git a/net/rds/iw_sysctl.c b/net/rds/iw_sysctl.c deleted file mode 100644 index 139239d..0000000 diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c index 9c1fed8..4f4b3d8 100644 --- a/net/rds/rdma_transport.c +++ b/net/rds/rdma_transport.c @@ -49,9 +49,7 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id, rdsdebug("conn %p id %p handling event %u (%s)\n", conn, cm_id, event->event, rdma_event_msg(event->event)); - if (cm_id->device->node_type == RDMA_NODE_RNIC) - trans = &rds_iw_transport; - else + if (cm_id->device->node_type == RDMA_NODE_IB_CA) trans = &rds_ib_transport; /* Prevent shutdown from tearing down the connection @@ -200,10 +198,6 @@ static int rds_rdma_init(void) if (ret) goto out; - ret = rds_iw_init(); - if (ret) - goto err_iw_init; - ret = rds_ib_init(); if (ret) goto err_ib_init; @@ -211,8 +205,6 @@ static int rds_rdma_init(void) goto out; err_ib_init: - rds_iw_exit(); -err_iw_init: rds_rdma_listen_stop(); out: return ret; @@ -224,11 +216,10 @@ static void rds_rdma_exit(void) /* stop listening first to ensure no new connections are attempted */ rds_rdma_listen_stop(); rds_ib_exit(); - rds_iw_exit(); } module_exit(rds_rdma_exit); MODULE_AUTHOR("Oracle Corporation <rds-devel@oss.oracle.com>"); -MODULE_DESCRIPTION("RDS: IB/iWARP transport"); +MODULE_DESCRIPTION("RDS: IB transport"); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/net/rds/rdma_transport.h b/net/rds/rdma_transport.h index faba4e3..ff2010e 100644 --- a/net/rds/rdma_transport.h +++ b/net/rds/rdma_transport.h @@ -16,9 +16,4 @@ extern struct rds_transport rds_ib_transport; int rds_ib_init(void); void rds_ib_exit(void); -/* from iw.c */ -extern struct rds_transport rds_iw_transport; -int rds_iw_init(void); -void rds_iw_exit(void); - #endif