diff mbox

nfs-utils regression on IPv6-less kernels

Message ID 20150817160639.GA1173@infradead.org (mailing list archive)
State New, archived
Headers show

Commit Message

Christoph Hellwig Aug. 17, 2015, 4:06 p.m. UTC 
On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote:
> Probably stopped working with "rpc.nfsd: Squelch DNS errors when
> using --host option".
> 
> getaddrinfo(3) returns a list of addresses, some of which are
> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even
> on kernels which do not support IPv6, there may be at least one
> IPv6 address in the list.
> 
> nfssvc_setfds() then loops over this list. The error handling
> in nfssvc_setfds() causes the loop to exit if the socket(2)
> call fails. It should "continue" if the error is EAFNOSUPPORT.
> In fact, that xlog notice can also be removed.
> 
> I'm traveling this week. Is this enough for you to generate a
> fix?

Yes, that works:

---
From: Christoph Hellwig <hch@lst.de>
Subject: nfsd: ignore unsupported address types in nfssvc_setfds

Just continue and try a different record returned from getaddrinfo
if the kernel does not support an address family.  This fixes nfsd
startup on kernels without IPv6 support.

Suggested-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Chuck Lever Aug. 17, 2015, 4:09 p.m. UTC | #1 
On Aug 17, 2015, at 9:06 AM, Christoph Hellwig <hch@infradead.org> wrote:

> On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote:
>> Probably stopped working with "rpc.nfsd: Squelch DNS errors when
>> using --host option".
>> 
>> getaddrinfo(3) returns a list of addresses, some of which are
>> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even
>> on kernels which do not support IPv6, there may be at least one
>> IPv6 address in the list.
>> 
>> nfssvc_setfds() then loops over this list. The error handling
>> in nfssvc_setfds() causes the loop to exit if the socket(2)
>> call fails. It should "continue" if the error is EAFNOSUPPORT.
>> In fact, that xlog notice can also be removed.
>> 
>> I'm traveling this week. Is this enough for you to generate a
>> fix?
> 
> Yes, that works:
> 
> ---
> From: Christoph Hellwig <hch@lst.de>
> Subject: nfsd: ignore unsupported address types in nfssvc_setfds
> 
> Just continue and try a different record returned from getaddrinfo
> if the kernel does not support an address family.  This fixes nfsd
> startup on kernels without IPv6 support.
> 
> Suggested-by: Chuck Lever <chuck.lever@oracle.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Yep, that's what I was thinking.

Reviewed-by: Chuck Lever <chuck.lever@oracle.com>

And maybe add a "Fixes: 2f8a6020of4c rpc.nfsd: yada"
at your discretion.


> diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
> index a2b11d8..fc11d23 100644
> --- a/utils/nfsd/nfssvc.c
> +++ b/utils/nfsd/nfssvc.c
> @@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
> 		sockfd = socket(addr->ai_family, addr->ai_socktype,
> 				addr->ai_protocol);
> 		if (sockfd < 0) {
> -			if (errno == EAFNOSUPPORT)
> -				xlog(L_NOTICE, "address family %s not "
> -						"supported by protocol %s",
> -						family, proto);
> -			else
> +			if (errno != EAFNOSUPPORT) {
> 				xlog(L_ERROR, "unable to create %s %s socket: "
> 				     "errno %d (%m)", family, proto, errno);
> -			rc = errno;
> -			goto error;
> +				rc = errno;
> +				goto error;
> +			}
> +			addr = addr->ai_next;
> +			continue;
> 		}
> #ifdef IPV6_SUPPORTED
> 		if (addr->ai_family == AF_INET6 &&

--
Chuck Lever



--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steve Dickson Sept. 9, 2015, 3:47 p.m. UTC | #2 
On 08/17/2015 12:06 PM, Christoph Hellwig wrote:
> On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote:
>> Probably stopped working with "rpc.nfsd: Squelch DNS errors when
>> using --host option".
>>
>> getaddrinfo(3) returns a list of addresses, some of which are
>> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even
>> on kernels which do not support IPv6, there may be at least one
>> IPv6 address in the list.
>>
>> nfssvc_setfds() then loops over this list. The error handling
>> in nfssvc_setfds() causes the loop to exit if the socket(2)
>> call fails. It should "continue" if the error is EAFNOSUPPORT.
>> In fact, that xlog notice can also be removed.
>>
>> I'm traveling this week. Is this enough for you to generate a
>> fix?
> 
> Yes, that works:
> 
> ---
> From: Christoph Hellwig <hch@lst.de>
> Subject: nfsd: ignore unsupported address types in nfssvc_setfds
> 
> Just continue and try a different record returned from getaddrinfo
> if the kernel does not support an address family.  This fixes nfsd
> startup on kernels without IPv6 support.
> 
> Suggested-by: Chuck Lever <chuck.lever@oracle.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Sorry it took so long... committed!

steved.

> 
> diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
> index a2b11d8..fc11d23 100644
> --- a/utils/nfsd/nfssvc.c
> +++ b/utils/nfsd/nfssvc.c
> @@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
>  		sockfd = socket(addr->ai_family, addr->ai_socktype,
>  				addr->ai_protocol);
>  		if (sockfd < 0) {
> -			if (errno == EAFNOSUPPORT)
> -				xlog(L_NOTICE, "address family %s not "
> -						"supported by protocol %s",
> -						family, proto);
> -			else
> +			if (errno != EAFNOSUPPORT) {
>  				xlog(L_ERROR, "unable to create %s %s socket: "
>  				     "errno %d (%m)", family, proto, errno);
> -			rc = errno;
> -			goto error;
> +				rc = errno;
> +				goto error;
> +			}
> +			addr = addr->ai_next;
> +			continue;
>  		}
>  #ifdef IPV6_SUPPORTED
>  		if (addr->ai_family == AF_INET6 &&
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chuck Lever Oct. 29, 2015, 9:22 p.m. UTC | #3 
> On Sep 9, 2015, at 11:47 AM, Steve Dickson <SteveD@redhat.com> wrote:
> 
> 
> 
> On 08/17/2015 12:06 PM, Christoph Hellwig wrote:
>> On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote:
>>> Probably stopped working with "rpc.nfsd: Squelch DNS errors when
>>> using --host option".
>>> 
>>> getaddrinfo(3) returns a list of addresses, some of which are
>>> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even
>>> on kernels which do not support IPv6, there may be at least one
>>> IPv6 address in the list.
>>> 
>>> nfssvc_setfds() then loops over this list. The error handling
>>> in nfssvc_setfds() causes the loop to exit if the socket(2)
>>> call fails. It should "continue" if the error is EAFNOSUPPORT.
>>> In fact, that xlog notice can also be removed.
>>> 
>>> I'm traveling this week. Is this enough for you to generate a
>>> fix?
>> 
>> Yes, that works:
>> 
>> ---
>> From: Christoph Hellwig <hch@lst.de>
>> Subject: nfsd: ignore unsupported address types in nfssvc_setfds
>> 
>> Just continue and try a different record returned from getaddrinfo
>> if the kernel does not support an address family.  This fixes nfsd
>> startup on kernels without IPv6 support.
>> 
>> Suggested-by: Chuck Lever <chuck.lever@oracle.com>
>> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Sorry it took so long... committed!

I’m pulling from git://linux-nfs.org/nfs-utils but I
don’t see this commit. What’s the correct URL to pull
from for upstream nfs-utils?


> steved.
> 
>> 
>> diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
>> index a2b11d8..fc11d23 100644
>> --- a/utils/nfsd/nfssvc.c
>> +++ b/utils/nfsd/nfssvc.c
>> @@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
>> 		sockfd = socket(addr->ai_family, addr->ai_socktype,
>> 				addr->ai_protocol);
>> 		if (sockfd < 0) {
>> -			if (errno == EAFNOSUPPORT)
>> -				xlog(L_NOTICE, "address family %s not "
>> -						"supported by protocol %s",
>> -						family, proto);
>> -			else
>> +			if (errno != EAFNOSUPPORT) {
>> 				xlog(L_ERROR, "unable to create %s %s socket: "
>> 				     "errno %d (%m)", family, proto, errno);
>> -			rc = errno;
>> -			goto error;
>> +				rc = errno;
>> +				goto error;
>> +			}
>> +			addr = addr->ai_next;
>> +			continue;
>> 		}
>> #ifdef IPV6_SUPPORTED
>> 		if (addr->ai_family == AF_INET6 &&
>> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

—
Chuck Lever



--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steve Dickson Oct. 30, 2015, 1:22 p.m. UTC | #4 
On 10/29/2015 05:22 PM, Chuck Lever wrote:
> 
>> On Sep 9, 2015, at 11:47 AM, Steve Dickson <SteveD@redhat.com> wrote:
>>
>>
>>
>> On 08/17/2015 12:06 PM, Christoph Hellwig wrote:
>>> On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote:
>>>> Probably stopped working with "rpc.nfsd: Squelch DNS errors when
>>>> using --host option".
>>>>
>>>> getaddrinfo(3) returns a list of addresses, some of which are
>>>> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even
>>>> on kernels which do not support IPv6, there may be at least one
>>>> IPv6 address in the list.
>>>>
>>>> nfssvc_setfds() then loops over this list. The error handling
>>>> in nfssvc_setfds() causes the loop to exit if the socket(2)
>>>> call fails. It should "continue" if the error is EAFNOSUPPORT.
>>>> In fact, that xlog notice can also be removed.
>>>>
>>>> I'm traveling this week. Is this enough for you to generate a
>>>> fix?
>>>
>>> Yes, that works:
>>>
>>> ---
>>> From: Christoph Hellwig <hch@lst.de>
>>> Subject: nfsd: ignore unsupported address types in nfssvc_setfds
>>>
>>> Just continue and try a different record returned from getaddrinfo
>>> if the kernel does not support an address family.  This fixes nfsd
>>> startup on kernels without IPv6 support.
>>>
>>> Suggested-by: Chuck Lever <chuck.lever@oracle.com>
>>> Signed-off-by: Christoph Hellwig <hch@lst.de>
>> Sorry it took so long... committed!
> 
> I’m pulling from git://linux-nfs.org/nfs-utils but I
> don’t see this commit. What’s the correct URL to pull
> from for upstream nfs-utils?
Well it is Halloween so maybe a spook got or I did the 
commit and forgot to do the push... One of those two
happen! ;-) 

Its there now... Sorry for the confusion... 

steved. 
> 
> 
>> steved.
>>
>>>
>>> diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
>>> index a2b11d8..fc11d23 100644
>>> --- a/utils/nfsd/nfssvc.c
>>> +++ b/utils/nfsd/nfssvc.c
>>> @@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
>>> 		sockfd = socket(addr->ai_family, addr->ai_socktype,
>>> 				addr->ai_protocol);
>>> 		if (sockfd < 0) {
>>> -			if (errno == EAFNOSUPPORT)
>>> -				xlog(L_NOTICE, "address family %s not "
>>> -						"supported by protocol %s",
>>> -						family, proto);
>>> -			else
>>> +			if (errno != EAFNOSUPPORT) {
>>> 				xlog(L_ERROR, "unable to create %s %s socket: "
>>> 				     "errno %d (%m)", family, proto, errno);
>>> -			rc = errno;
>>> -			goto error;
>>> +				rc = errno;
>>> +				goto error;
>>> +			}
>>> +			addr = addr->ai_next;
>>> +			continue;
>>> 		}
>>> #ifdef IPV6_SUPPORTED
>>> 		if (addr->ai_family == AF_INET6 &&
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> —
> Chuck Lever
> 
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
index a2b11d8..fc11d23 100644
--- a/utils/nfsd/nfssvc.c
+++ b/utils/nfsd/nfssvc.c
@@ -174,15 +174,14 @@  nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
 		sockfd = socket(addr->ai_family, addr->ai_socktype,
 				addr->ai_protocol);
 		if (sockfd < 0) {
-			if (errno == EAFNOSUPPORT)
-				xlog(L_NOTICE, "address family %s not "
-						"supported by protocol %s",
-						family, proto);
-			else
+			if (errno != EAFNOSUPPORT) {
 				xlog(L_ERROR, "unable to create %s %s socket: "
 				     "errno %d (%m)", family, proto, errno);
-			rc = errno;
-			goto error;
+				rc = errno;
+				goto error;
+			}
+			addr = addr->ai_next;
+			continue;
 		}
 #ifdef IPV6_SUPPORTED
 		if (addr->ai_family == AF_INET6 &&