2016-03-16 18:41:43

by Shirley Ma

Subject: [PATCH v2] svcrdma: add IPv6 support

Add rdma6 option to support NFS/RDMA IPv6.
Allow both IPv4 and IPv6 to bind same port at the same time,
restricts use of the IPv6 socket to IPv6 communication.

Changes from v1:
- Check rdma_set_afonly return value (suggested by Leon Romanovsky)

Signed-off-by: Shirley Ma <[email protected]>
---

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -869,7 +869,7 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
int ret;

dprintk("svcrdma: Creating RDMA socket\n");
- if (sa->sa_family != AF_INET) {
+ if ((sa->sa_family != AF_INET) && (sa->sa_family != AF_INET6)) {
dprintk("svcrdma: Address family %d is not supported.\n", sa->sa_family);
return ERR_PTR(-EAFNOSUPPORT);
}
@@ -885,6 +885,16 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
goto err0;
}

+ /* Allow both IPv4 and IPv6 sockets to bind a single port
+ * at the same time.
+ */
+#if IS_ENABLED(CONFIG_IPV6)
+ ret = rdma_set_afonly(listen_id, 1);
+ if (ret) {
+ dprintk("svcrdma: rdma_set_afonly failed = %d\n", ret);
+ goto err1;
+ }
+#endif
ret = rdma_bind_addr(listen_id, sa);
if (ret) {
dprintk("svcrdma: rdma_bind_addr failed = %d\n", ret);

2016-03-17 08:42:17

by Leon Romanovsky

Subject: Re: [PATCH v2] svcrdma: add IPv6 support

On Wed, Mar 16, 2016 at 11:41:33AM -0700, Shirley Ma wrote:
> Add rdma6 option to support NFS/RDMA IPv6.
> Allow both IPv4 and IPv6 to bind same port at the same time,
> restricts use of the IPv6 socket to IPv6 communication.
>
> Changes from v1:
> - Check rdma_set_afonly return value (suggested by Leon Romanovsky)

Looks good to me.
Acked-by: Leon Romanovsky <[email protected]>

Thanks.

>
> Signed-off-by: Shirley Ma <[email protected]>
> ---
>
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> @@ -869,7 +869,7 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
> int ret;
>
> dprintk("svcrdma: Creating RDMA socket\n");
> - if (sa->sa_family != AF_INET) {
> + if ((sa->sa_family != AF_INET) && (sa->sa_family != AF_INET6)) {

> dprintk("svcrdma: Address family %d is not supported.\n", sa->sa_family);
> return ERR_PTR(-EAFNOSUPPORT);
> }
> @@ -885,6 +885,16 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
> goto err0;
> }
>
> + /* Allow both IPv4 and IPv6 sockets to bind a single port
> + * at the same time.
> + */
> +#if IS_ENABLED(CONFIG_IPV6)
> + ret = rdma_set_afonly(listen_id, 1);
> + if (ret) {
> + dprintk("svcrdma: rdma_set_afonly failed = %d\n", ret);
> + goto err1;
> + }
> +#endif
> ret = rdma_bind_addr(listen_id, sa);
> if (ret) {
> dprintk("svcrdma: rdma_bind_addr failed = %d\n", ret);

2016-03-17 14:01:58

by Chuck Lever III

Subject: Re: [PATCH v2] svcrdma: add IPv6 support

Server-side patch; cc-ing Bruce.

> On Mar 17, 2016, at 4:42 AM, Leon Romanovsky <[email protected]> wrote:
>
> On Wed, Mar 16, 2016 at 11:41:33AM -0700, Shirley Ma wrote:
>> Add rdma6 option to support NFS/RDMA IPv6.
>> Allow both IPv4 and IPv6 to bind same port at the same time,
>> restricts use of the IPv6 socket to IPv6 communication.
>>
>> Changes from v1:
>> - Check rdma_set_afonly return value (suggested by Leon Romanovsky)
>
> Looks good to me.
> Acked-by: Leon Romanovsky <[email protected]>
>
> Thanks.
>
>>
>> Signed-off-by: Shirley Ma <[email protected]>
>> ---
>>
>> diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
>> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
>> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
>> @@ -869,7 +869,7 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
>> int ret;
>>
>> dprintk("svcrdma: Creating RDMA socket\n");
>> - if (sa->sa_family != AF_INET) {
>> + if ((sa->sa_family != AF_INET) && (sa->sa_family != AF_INET6)) {
>
>> dprintk("svcrdma: Address family %d is not supported.\n", sa->sa_family);
>> return ERR_PTR(-EAFNOSUPPORT);
>> }
>> @@ -885,6 +885,16 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
>> goto err0;
>> }
>>
>> + /* Allow both IPv4 and IPv6 sockets to bind a single port
>> + * at the same time.
>> + */
>> +#if IS_ENABLED(CONFIG_IPV6)
>> + ret = rdma_set_afonly(listen_id, 1);
>> + if (ret) {
>> + dprintk("svcrdma: rdma_set_afonly failed = %d\n", ret);
>> + goto err1;
>> + }
>> +#endif
>> ret = rdma_bind_addr(listen_id, sa);
>> if (ret) {
>> dprintk("svcrdma: rdma_bind_addr failed = %d\n", ret);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Chuck Lever

2016-04-04 18:09:26

by Shirley Ma

Subject: [PATCH v3] svcrdma: add IPv6 support

Add rdma6 option to support NFS/RDMA IPv6 addressing.
Allow both IPv4 and IPv6 to bind same port at the same time,
restricts use of the IPv6 socket to IPv6 communication.

Changes from v1:
- Check rdma_set_afonly return value (suggested by Leon Romanovsky)

Changes from v2:
- Acked-by: Leon Romanovsky <[email protected]>

Signed-off-by: Shirley Ma <[email protected]>
---

net/sunrpc/xprtrdma/svc_rdma_transport.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 9066896..d2680b8 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -789,7 +789,7 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
int ret;

dprintk("svcrdma: Creating RDMA socket\n");
- if (sa->sa_family != AF_INET) {
+ if ((sa->sa_family != AF_INET) && (sa->sa_family != AF_INET6)) {
dprintk("svcrdma: Address family %d is not supported.\n", sa->sa_family);
return ERR_PTR(-EAFNOSUPPORT);
}
@@ -805,6 +805,16 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv,
goto err0;
}

+ /* Allow both IPv4 and IPv6 sockets to bind a single port
+ * at the same time.
+ */
+#if IS_ENABLED(CONFIG_IPV6)
+ ret = rdma_set_afonly(listen_id, 1);
+ if (ret) {
+ dprintk("svcrdma: rdma_set_afonly failed = %d\n", ret);
+ goto err1;
+ }
+#endif
ret = rdma_bind_addr(listen_id, sa);
if (ret) {
dprintk("svcrdma: rdma_bind_addr failed = %d\n", ret);