| Message ID | 1461340682-31568-1-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Fri, 22 Apr 2016 17:58:02 +0200 > The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR. > > Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module") > CC: Tom Herbert <tom@herbertland.com> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > > Tom, when I read the comment, I feel I'm misssing something, but what? Tom please take a look at this, thanks.
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Fri, 22 Apr 2016 17:58:02 +0200 > The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR. > > Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module") > CC: Tom Herbert <tom@herbertland.com> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > > Tom, when I read the comment, I feel I'm misssing something, but what? Tom, seriously, please look at this. And with recent changes in net-next the csum attribute size needs to be specified as well, plus the locator needs to use the 64-bit alignment sizing helper.
On Wed, Apr 27, 2016 at 12:20 PM, David Miller <davem@davemloft.net> wrote: > From: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Date: Fri, 22 Apr 2016 17:58:02 +0200 > >> The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR. >> >> Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module") >> CC: Tom Herbert <tom@herbertland.com> >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> --- >> >> Tom, when I read the comment, I feel I'm misssing something, but what? > > Tom, seriously, please look at this. > Yes, it is an issue. Need to do add size for ILA_ATTR_LOCATOR and ILA_ATTR_CSUM_MODE. Also not we made ILA_ATTR_CSUM_MODE u64 in fill encap info. I will send a path shortly. > And with recent changes in net-next the csum attribute size needs to > be specified as well, plus the locator needs to use the 64-bit > alignment sizing helper. Something other than nla_put_u64_64bit? Thanks, Tom
From: Tom Herbert <tom@herbertland.com> Date: Thu, 28 Apr 2016 09:07:25 -0700 > On Wed, Apr 27, 2016 at 12:20 PM, David Miller <davem@davemloft.net> wrote: >> From: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> Date: Fri, 22 Apr 2016 17:58:02 +0200 >> >>> The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR. >>> >>> Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module") >>> CC: Tom Herbert <tom@herbertland.com> >>> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >>> --- >>> >>> Tom, when I read the comment, I feel I'm misssing something, but what? >> >> Tom, seriously, please look at this. >> > Yes, it is an issue. Need to do add size for ILA_ATTR_LOCATOR and > ILA_ATTR_CSUM_MODE. Also not we made ILA_ATTR_CSUM_MODE u64 in fill > encap info. I will send a path shortly. > >> And with recent changes in net-next the csum attribute size needs to >> be specified as well, plus the locator needs to use the 64-bit >> alignment sizing helper. > > Something other than nla_put_u64_64bit? That's what it should use, yes.
Le 28/04/2016 18:07, Tom Herbert a écrit : > On Wed, Apr 27, 2016 at 12:20 PM, David Miller <davem@davemloft.net> wrote: >> From: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> Date: Fri, 22 Apr 2016 17:58:02 +0200 >> >>> The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR. >>> >>> Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module") >>> CC: Tom Herbert <tom@herbertland.com> >>> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >>> --- >>> >>> Tom, when I read the comment, I feel I'm misssing something, but what? >> >> Tom, seriously, please look at this. >> > Yes, it is an issue. Need to do add size for ILA_ATTR_LOCATOR and > ILA_ATTR_CSUM_MODE. Also not we made ILA_ATTR_CSUM_MODE u64 in fill > encap info. I will send a path shortly. David, I saw that you didn't apply this patch. Note that Tom's patch is for net-next while this one is for net. I think that both patches are needed (and they will conflict after the next merge). Regards, Nicolas
diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c index 2ae3c4fd8aab..41f18de5dcc2 100644 --- a/net/ipv6/ila/ila_lwt.c +++ b/net/ipv6/ila/ila_lwt.c @@ -120,8 +120,7 @@ nla_put_failure: static int ila_encap_nlsize(struct lwtunnel_state *lwtstate) { - /* No encapsulation overhead */ - return 0; + return nla_total_size(sizeof(u64)); /* ILA_ATTR_LOCATOR */ } static int ila_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b)
The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR. Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module") CC: Tom Herbert <tom@herbertland.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- Tom, when I read the comment, I feel I'm misssing something, but what? net/ipv6/ila/ila_lwt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)