On Aug 29, 2011, at 11:26 AM, Jeff Layton wrote:
> On Fri, 26 Aug 2011 14:58:23 +0800
> Mi Jinlong <mijinlong@xxxxxxxxxxxxxx> wrote:
>
>> Thanks for you comment!
>>
>> Chuck Lever:
>>> On Aug 25, 2011, at 10:30 AM, Chuck Lever wrote:
>>>
>>>> This seems like a good direction to go in. More comments below.
>>>>
>>>> On Aug 24, 2011, at 1:58 AM, Mi Jinlong wrote:
>>>>
>>>>> From: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx>
>>>>> Date: Mon, 24 Aug 2011 13:22:39 +0800
>>>>> Subject: [PATCH] SUNRPC: Replace svc_addr_u by sockaddr_storage
>>>>>
>>>>> For IPv6 local address, lockd can not callback to client for
>>>>> missing scope id when binding address at inet6_bind:
>>>>>
>>>>> 324 if (addr_type & IPV6_ADDR_LINKLOCAL) {
>>>>> 325 if (addr_len >= sizeof(struct sockaddr_in6) &&
>>>>> 326 addr->sin6_scope_id) {
>>>>> 327 /* Override any existing binding, if another one
>>>>> 328 * is supplied by user.
>>>>> 329 */
>>>>> 330 sk->sk_bound_dev_if = addr->sin6_scope_id;
>>>>> 331 }
>>>>> 332
>>>>> 333 /* Binding to link-local address requires an interface */
>>>>> 334 if (!sk->sk_bound_dev_if) {
>>>>> 335 err = -EINVAL;
>>>>> 336 goto out_unlock;
>>>>> 337 }
>>>>>
>>>>> Replacing svc_addr_u by sockaddr_storage, let rqstp->rq_daddr contains more info
>>>>> besides address.
>>>>>
>>>>> Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx>
>>>>> ---
>>>>> fs/lockd/host.c | 14 ++------------
>>>>> fs/nfsd/nfs4state.c | 16 +---------------
>>>>> include/linux/sunrpc/svc.h | 30 +++++++++++++++++++++---------
>>>>> net/sunrpc/svc_xprt.c | 13 ++-----------
>>>>> net/sunrpc/svcsock.c | 9 +++++----
>>>>> 5 files changed, 31 insertions(+), 51 deletions(-)
>>>>>
>>>>> diff --git a/fs/lockd/host.c b/fs/lockd/host.c
>>>>> index b7c99bf..b23db05 100644
>>>>> --- a/fs/lockd/host.c
>>>>> +++ b/fs/lockd/host.c
>>>>> @@ -316,14 +316,8 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
>>>>> struct hlist_node *pos;
>>>>> struct nlm_host *host = NULL;
>>>>> struct nsm_handle *nsm = NULL;
>>>>> - struct sockaddr_in sin = {
>>>>> - .sin_family = AF_INET,
>>>>> - };
>>>>> - struct sockaddr_in6 sin6 = {
>>>>> - .sin6_family = AF_INET6,
>>>>> - };
>>>>> struct sockaddr *src_sap;
>>>>> - size_t src_len = rqstp->rq_addrlen;
>>>>> + size_t src_len = rqstp->rq_daddrlen;
>>>>> struct nlm_lookup_host_info ni = {
>>>>> .server = 1,
>>>>> .sap = svc_addr(rqstp),
>>>>> @@ -342,12 +336,8 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
>>>>>
>>>>> switch (ni.sap->sa_family) {
>>>>> case AF_INET:
>>>>> - sin.sin_addr.s_addr = rqstp->rq_daddr.addr.s_addr;
>>>>> - src_sap = (struct sockaddr *)&sin;
>>>>> - break;
>>>>> case AF_INET6:
>>>>> - ipv6_addr_copy(&sin6.sin6_addr, &rqstp->rq_daddr.addr6);
>>>>> - src_sap = (struct sockaddr *)&sin6;
>>>>> + src_sap = svc_daddr(rqstp);
>>>>> break;
>>>>> default:
>>>>> dprintk("lockd: %s failed; unrecognized address family\n",
>>>> With the destination address promoted to a full sockaddr, we probably do not need this switch any more.
>>
>> Got it.
>>
>>>>
>>>> I notice that the IPv6 fork of rpc_cmp_addr() does not consider the scope IDs of the passed-in addresses. Perhaps it should?
>>
>> Have add scope ID compare at __rpc_cmp_addr6 as following patch.
>>
>>>>
>>>>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>>>>> index 3787ec1..07a18a5 100644
>>>>> --- a/fs/nfsd/nfs4state.c
>>>>> +++ b/fs/nfsd/nfs4state.c
>>>>> @@ -1173,20 +1173,6 @@ find_unconfirmed_client_by_str(const char *dname, unsigned int hashval)
>>>>> return NULL;
>>>>> }
>> ... snip ...
>>>>> break;
>>>>> @@ -155,7 +156,7 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh)
>>>>> cmh->cmsg_type = IPV6_PKTINFO;
>>>>> pki->ipi6_ifindex = 0;
>>>>> ipv6_addr_copy(&pki->ipi6_addr,
>>>>> - &rqstp->rq_daddr.addr6);
>>>>> + &svc_daddr_in6(rqstp)->sin6_addr);
>>>> I kind of suspect more is needed here to deal with ipi6_ifindex.
>>
>> Got it.
>>
>>>>
>>>>> cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
>>>>> }
>>>>> break;
>>>>> @@ -500,7 +501,7 @@ static int svc_udp_get_dest_address4(struct svc_rqst *rqstp,
>>>>> struct in_pktinfo *pki = CMSG_DATA(cmh);
>>>>> if (cmh->cmsg_type != IP_PKTINFO)
>>>>> return 0;
>>>>> - rqstp->rq_daddr.addr.s_addr = pki->ipi_spec_dst.s_addr;
>>>>> + svc_daddr_in(rqstp)->sin_addr.s_addr = pki->ipi_spec_dst.s_addr;
>>>>> return 1;
>>>>> }
>>>>>
>>>>> @@ -513,7 +514,7 @@ static int svc_udp_get_dest_address6(struct svc_rqst *rqstp,
>>>>> struct in6_pktinfo *pki = CMSG_DATA(cmh);
>>>>> if (cmh->cmsg_type != IPV6_PKTINFO)
>>>>> return 0;
>>>>> - ipv6_addr_copy(&rqstp->rq_daddr.addr6, &pki->ipi6_addr);
>>>>> + ipv6_addr_copy(&svc_daddr_in6(rqstp)->sin6_addr, &pki->ipi6_addr);
>>>> Likewise, is the incoming interface index ignored when constructing svc_daddr_in6(rqstp) ?
>>>
>>> Also, I can't seem to find where the address family field of svc_daddr() is being set.
>>>
>>
>> Have complete it.
>>
>> thanks,
>> Mi Jinlong
>>
>>
>> From 84420475509ccc39ac8899f6f63140879a5278b6 Mon Sep 17 00:00:00 2001
>> From: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx>
>> Date: Mon, 26 Aug 2011 13:22:39 +0800
>> Subject: [PATCH v2] SUNRPC: Replace svc_addr_u by sockaddr_storage
>>
>> For IPv6 local address, lockd can not callback to client for
>> missing scope id when binding address at inet6_bind:
>>
>> 324 if (addr_type & IPV6_ADDR_LINKLOCAL) {
>> 325 if (addr_len >= sizeof(struct sockaddr_in6) &&
>> 326 addr->sin6_scope_id) {
>> 327 /* Override any existing binding, if another one
>> 328 * is supplied by user.
>> 329 */
>> 330 sk->sk_bound_dev_if = addr->sin6_scope_id;
>> 331 }
>> 332
>> 333 /* Binding to link-local address requires an interface */
>> 334 if (!sk->sk_bound_dev_if) {
>> 335 err = -EINVAL;
>> 336 goto out_unlock;
>> 337 }
>>
>> Replacing svc_addr_u by sockaddr_storage, let rqstp->rq_daddr contains more info
>> besides address.
>>
>> Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx>
>> ---
>> fs/lockd/host.c | 25 ++-----------------------
>> fs/nfsd/nfs4state.c | 16 +---------------
>> include/linux/sunrpc/clnt.h | 3 ++-
>> include/linux/sunrpc/svc.h | 30 +++++++++++++++++++++---------
>> net/sunrpc/svc_xprt.c | 13 ++-----------
>> net/sunrpc/svcsock.c | 23 +++++++++++++++++------
>> 6 files changed, 45 insertions(+), 65 deletions(-)
>>
>> diff --git a/fs/lockd/host.c b/fs/lockd/host.c
>> index b7c99bf..6f29836 100644
>> --- a/fs/lockd/host.c
>> +++ b/fs/lockd/host.c
>> @@ -316,14 +316,8 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
>> struct hlist_node *pos;
>> struct nlm_host *host = NULL;
>> struct nsm_handle *nsm = NULL;
>> - struct sockaddr_in sin = {
>> - .sin_family = AF_INET,
>> - };
>> - struct sockaddr_in6 sin6 = {
>> - .sin6_family = AF_INET6,
>> - };
>> - struct sockaddr *src_sap;
>> - size_t src_len = rqstp->rq_addrlen;
>> + struct sockaddr *src_sap = svc_daddr(rqstp);
>> + size_t src_len = rqstp->rq_daddrlen;
>> struct nlm_lookup_host_info ni = {
>> .server = 1,
>> .sap = svc_addr(rqstp),
>> @@ -340,21 +334,6 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
>>
>> mutex_lock(&nlm_host_mutex);
>>
>> - switch (ni.sap->sa_family) {
>> - case AF_INET:
>> - sin.sin_addr.s_addr = rqstp->rq_daddr.addr.s_addr;
>> - src_sap = (struct sockaddr *)&sin;
>> - break;
>> - case AF_INET6:
>> - ipv6_addr_copy(&sin6.sin6_addr, &rqstp->rq_daddr.addr6);
>> - src_sap = (struct sockaddr *)&sin6;
>> - break;
>> - default:
>> - dprintk("lockd: %s failed; unrecognized address family\n",
>> - __func__);
>> - goto out;
>> - }
>> -
>> if (time_after_eq(jiffies, next_gc))
>> nlm_gc_hosts();
>>
>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>> index 3787ec1..07a18a5 100644
>> --- a/fs/nfsd/nfs4state.c
>> +++ b/fs/nfsd/nfs4state.c
>> @@ -1173,20 +1173,6 @@ find_unconfirmed_client_by_str(const char *dname, unsigned int hashval)
>> return NULL;
>> }
>>
>> -static void rpc_svcaddr2sockaddr(struct sockaddr *sa, unsigned short family, union svc_addr_u *svcaddr)
>> -{
>> - switch (family) {
>> - case AF_INET:
>> - ((struct sockaddr_in *)sa)->sin_family = AF_INET;
>> - ((struct sockaddr_in *)sa)->sin_addr = svcaddr->addr;
>> - return;
>> - case AF_INET6:
>> - ((struct sockaddr_in6 *)sa)->sin6_family = AF_INET6;
>> - ((struct sockaddr_in6 *)sa)->sin6_addr = svcaddr->addr6;
>> - return;
>> - }
>> -}
>> -
>> static void
>> gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se, struct svc_rqst *rqstp)
>> {
>> @@ -1218,7 +1204,7 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se, struct svc_r
>>
>> conn->cb_prog = se->se_callback_prog;
>> conn->cb_ident = se->se_callback_ident;
>> - rpc_svcaddr2sockaddr((struct sockaddr *)&conn->cb_saddr, expected_family, &rqstp->rq_daddr);
>> + memcpy(&conn->cb_saddr, &rqstp->rq_daddr, rqstp->rq_daddrlen);
>> return;
>> out_err:
>> conn->cb_addr.ss_family = AF_UNSPEC;
>> diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
>> index db7bcaf..1529a80 100644
>> --- a/include/linux/sunrpc/clnt.h
>> +++ b/include/linux/sunrpc/clnt.h
>> @@ -218,7 +218,8 @@ static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
>> {
>> const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
>> const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
>> - return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
>> + return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr)
>> + && (sin1->sin6_scope_id == sin2->sin6_scope_id);
>
>
> Chuck's earlier catches shamed me into looking at this more
> critically. ;)
>
> A question about the above... is this really correct? Consider the case
> where we have a routable IPv6 address that's reachable via two
> different interfaces. We'd almost certainly want to call those equal,
> but this check would consider them to be different (assuming that the
> scopeid is inherited from the incoming interface).
>
> I'm still looking through the code to see if I can figure out what the
> practical upshot of this would be, but might it be safer to limit the
> scopeid check to just link-local addresses?
I think that's correct. Scope ID should be compared only on link-local addresses.
And maybe the rpc_cmp_addr() changes could be split into a separate patch.
>
>> }
>>
>> static inline bool __rpc_copy_addr6(struct sockaddr *dst,
>> diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
>> index 223588a..3bc0dc9 100644
>> --- a/include/linux/sunrpc/svc.h
>> +++ b/include/linux/sunrpc/svc.h
>> @@ -212,11 +212,6 @@ static inline void svc_putu32(struct kvec *iov, __be32 val)
>> iov->iov_len += sizeof(__be32);
>> }
>>
>> -union svc_addr_u {
>> - struct in_addr addr;
>> - struct in6_addr addr6;
>> -};
>> -
>> /*
>> * The context of a single thread, including the request currently being
>> * processed.
>> @@ -225,8 +220,12 @@ struct svc_rqst {
>> struct list_head rq_list; /* idle list */
>> struct list_head rq_all; /* all threads list */
>> struct svc_xprt * rq_xprt; /* transport ptr */
>> +
>> struct sockaddr_storage rq_addr; /* peer address */
>> size_t rq_addrlen;
>> + struct sockaddr_storage rq_daddr; /* dest addr of request
>> + * - reply from here */
>> + size_t rq_daddrlen;
>>
>> struct svc_serv * rq_server; /* RPC service definition */
>> struct svc_pool * rq_pool; /* thread pool */
>> @@ -255,9 +254,6 @@ struct svc_rqst {
>> unsigned short
>> rq_secure : 1; /* secure port */
>>
>> - union svc_addr_u rq_daddr; /* dest addr of request
>> - * - reply from here */
>> -
>> void * rq_argp; /* decoded arguments */
>> void * rq_resp; /* xdr'd results */
>> void * rq_auth_data; /* flavor-specific data */
>> @@ -300,6 +296,21 @@ static inline struct sockaddr *svc_addr(const struct svc_rqst *rqst)
>> return (struct sockaddr *) &rqst->rq_addr;
>> }
>>
>> +static inline struct sockaddr_in *svc_daddr_in(const struct svc_rqst *rqst)
>> +{
>> + return (struct sockaddr_in *) &rqst->rq_daddr;
>> +}
>> +
>> +static inline struct sockaddr_in6 *svc_daddr_in6(const struct svc_rqst *rqst)
>> +{
>> + return (struct sockaddr_in6 *) &rqst->rq_daddr;
>> +}
>> +
>> +static inline struct sockaddr *svc_daddr(const struct svc_rqst *rqst)
>> +{
>> + return (struct sockaddr *) &rqst->rq_daddr;
>> +}
>> +
>> /*
>> * Check buffer bounds after decoding arguments
>> */
>> @@ -340,7 +351,8 @@ struct svc_deferred_req {
>> struct svc_xprt *xprt;
>> struct sockaddr_storage addr; /* where reply must go */
>> size_t addrlen;
>> - union svc_addr_u daddr; /* where reply must come from */
>> + struct sockaddr_storage daddr; /* where reply must come from */
>> + size_t daddrlen;
>> struct cache_deferred_req handle;
>> size_t xprt_hlen;
>> int argslen;
>> diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
>> index bd31208..d86bb67 100644
>> --- a/net/sunrpc/svc_xprt.c
>> +++ b/net/sunrpc/svc_xprt.c
>> @@ -254,8 +254,6 @@ EXPORT_SYMBOL_GPL(svc_create_xprt);
>> */
>> void svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt)
>> {
>> - struct sockaddr *sin;
>> -
>> memcpy(&rqstp->rq_addr, &xprt->xpt_remote, xprt->xpt_remotelen);
>> rqstp->rq_addrlen = xprt->xpt_remotelen;
>>
>> @@ -263,15 +261,8 @@ void svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt)
>> * Destination address in request is needed for binding the
>> * source address in RPC replies/callbacks later.
>> */
>> - sin = (struct sockaddr *)&xprt->xpt_local;
>> - switch (sin->sa_family) {
>> - case AF_INET:
>> - rqstp->rq_daddr.addr = ((struct sockaddr_in *)sin)->sin_addr;
>> - break;
>> - case AF_INET6:
>> - rqstp->rq_daddr.addr6 = ((struct sockaddr_in6 *)sin)->sin6_addr;
>> - break;
>> - }
>> + memcpy(&rqstp->rq_daddr, &xprt->xpt_local, xprt->xpt_locallen);
>> + rqstp->rq_daddrlen = xprt->xpt_locallen;
>> }
>> EXPORT_SYMBOL_GPL(svc_xprt_copy_addrs);
>>
>> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
>> index 767d494..dfd686e 100644
>> --- a/net/sunrpc/svcsock.c
>> +++ b/net/sunrpc/svcsock.c
>> @@ -143,19 +143,20 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh)
>> cmh->cmsg_level = SOL_IP;
>> cmh->cmsg_type = IP_PKTINFO;
>> pki->ipi_ifindex = 0;
>> - pki->ipi_spec_dst.s_addr = rqstp->rq_daddr.addr.s_addr;
>> + pki->ipi_spec_dst.s_addr =
>> + svc_daddr_in(rqstp)->sin_addr.s_addr;
>> cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
>> }
>> break;
>>
>> case AF_INET6: {
>> struct in6_pktinfo *pki = CMSG_DATA(cmh);
>> + struct sockaddr_in6 *daddr = svc_daddr_in6(rqstp);
>>
>> cmh->cmsg_level = SOL_IPV6;
>> cmh->cmsg_type = IPV6_PKTINFO;
>> - pki->ipi6_ifindex = 0;
>> - ipv6_addr_copy(&pki->ipi6_addr,
>> - &rqstp->rq_daddr.addr6);
>> + pki->ipi6_ifindex = daddr->sin6_scope_id;
>> + ipv6_addr_copy(&pki->ipi6_addr, &daddr->sin6_addr);
>> cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
>> }
>> break;
>> @@ -498,9 +499,13 @@ static int svc_udp_get_dest_address4(struct svc_rqst *rqstp,
>> struct cmsghdr *cmh)
>> {
>> struct in_pktinfo *pki = CMSG_DATA(cmh);
>> + struct sockaddr_in *daddr = svc_daddr_in(rqstp);
>> +
>> if (cmh->cmsg_type != IP_PKTINFO)
>> return 0;
>> - rqstp->rq_daddr.addr.s_addr = pki->ipi_spec_dst.s_addr;
>> +
>> + daddr->sin_family = AF_INET;
>> + daddr->sin_addr.s_addr = pki->ipi_spec_dst.s_addr;
>> return 1;
>> }
>>
>> @@ -511,9 +516,14 @@ static int svc_udp_get_dest_address6(struct svc_rqst *rqstp,
>> struct cmsghdr *cmh)
>> {
>> struct in6_pktinfo *pki = CMSG_DATA(cmh);
>> + struct sockaddr_in6 *daddr = svc_daddr_in6(rqstp);
>> +
>> if (cmh->cmsg_type != IPV6_PKTINFO)
>> return 0;
>> - ipv6_addr_copy(&rqstp->rq_daddr.addr6, &pki->ipi6_addr);
>> +
>> + daddr->sin6_family = AF_INET6;
>> + ipv6_addr_copy(&daddr->sin6_addr, &pki->ipi6_addr);
>> + daddr->sin6_scope_id = pki->ipi6_ifindex;
>> return 1;
>> }
>>
>> @@ -614,6 +624,7 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
>> skb_free_datagram_locked(svsk->sk_sk, skb);
>> return 0;
>> }
>> + rqstp->rq_daddrlen = svc_addr_len(svc_daddr(rqstp));
>>
>> if (skb_is_nonlinear(skb)) {
>> /* we have to copy */
>
>
> --
> Jeff Layton <jlayton@xxxxxxxxxx>
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
