sunrpc: Add scope id to svc_addr_u for IPv6 LINKLOCAL address

From: Mi Jinlong <mijinlong@cn.fujitsu.com>

J. Bruce Fields:
> On Mon, Aug 22, 2011 at 03:32:13PM -0400, Chuck Lever wrote:
>> On Aug 22, 2011, at 3:26 PM, J. Bruce Fields wrote:
>>
>>> On Sat, Aug 20, 2011 at 06:24:29PM +0800, Mi Jinlong wrote:
>>>> +/* 
>>>> + * Add scope id for LINKLOCAL address
>>>> + */
>>>> +struct in6_addr_scopeid{
>>>> +	struct in6_addr	sin6_addr;
>>>> +	__u32		sin6_scope_id;
>>>> +};
>>>> +
>>>> union svc_addr_u {
>>>> -    struct in_addr	addr;
>>>> -    struct in6_addr	addr6;
>>>> +	struct in_addr		addr;
>>>> +	struct in6_addr_scopeid	addr6;
>>> By the way, is there any reason why nfsd really needs its own address
>>> structure?  Shouldn't we use sockaddr_storage or something?  I feel like
>>> we've got a little too much one-off address handling in nfsd.
>> That would be my only complaint about the patch.
>>
>> I think we chose a smaller struct here to save space, and we could do that because we didn't need a port number or scope ID.  If a scope ID is indeed required, then we should consider something larger like a struct sockaddr_storage, IMO.
> 
> If we care about the size of struct svc_rqst: rq_vec and rq_pages fields
> are 4k and 2k, respectively, and the rest is lost in the noise.
> 
> Mi Jinlong, would you have the time to try this?
> 
> 	- Replace svc_addr_u by sockaddr_storage
> 	- See of that allows us to delete some lines of code in nfsd by
> 	  using standard helper functions instead of copying things by
> 	  hand.
> 
> You'd do that in one patch, then apply your scope-id fix on top of it as
> a second patch.

  After replace svc_addr_u by sockaddr_storage, the scope-id fix isn't needed.

thanks,
Mi Jinlong 

From 86bb57f2d7c29124ae73bd121bb6b97a72fe6f4d Mon Sep 17 00:00:00 2001
From: Mi Jinlong <mijinlong@cn.fujitsu.com>
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@cn.fujitsu.com>
---
 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(-)

sunrpc: Add scope id to svc_addr_u for IPv6 LINKLOCAL address

Commit Message

Comments

Patch