* [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel
@ 2016-04-22 15:58 Nicolas Dichtel
2016-04-25 20:47 ` David Miller
2016-04-27 19:20 ` David Miller
0 siblings, 2 replies; 8+ messages in thread
From: Nicolas Dichtel @ 2016-04-22 15:58 UTC (permalink / raw)
To: davem; +Cc: netdev, Nicolas Dichtel, Tom Herbert
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(-)
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)
--
2.8.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel
2016-04-22 15:58 [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel Nicolas Dichtel
@ 2016-04-25 20:47 ` David Miller
2016-04-27 19:20 ` David Miller
1 sibling, 0 replies; 8+ messages in thread
From: David Miller @ 2016-04-25 20:47 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: netdev, tom
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.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel
2016-04-22 15:58 [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel Nicolas Dichtel
2016-04-25 20:47 ` David Miller
@ 2016-04-27 19:20 ` David Miller
2016-04-28 16:07 ` Tom Herbert
1 sibling, 1 reply; 8+ messages in thread
From: David Miller @ 2016-04-27 19:20 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: netdev, tom
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.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel
2016-04-27 19:20 ` David Miller
@ 2016-04-28 16:07 ` Tom Herbert
2016-04-28 16:16 ` David Miller
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Tom Herbert @ 2016-04-28 16:07 UTC (permalink / raw)
To: David Miller; +Cc: Nicolas Dichtel, Linux Kernel Network Developers
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel
2016-04-28 16:07 ` Tom Herbert
@ 2016-04-28 16:16 ` David Miller
2016-04-29 13:35 ` Nicolas Dichtel
2016-05-03 7:58 ` [PATCH net v1] " Nicolas Dichtel
2 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2016-04-28 16:16 UTC (permalink / raw)
To: tom; +Cc: nicolas.dichtel, netdev
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.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel
2016-04-28 16:07 ` Tom Herbert
2016-04-28 16:16 ` David Miller
@ 2016-04-29 13:35 ` Nicolas Dichtel
2016-05-03 7:58 ` [PATCH net v1] " Nicolas Dichtel
2 siblings, 0 replies; 8+ messages in thread
From: Nicolas Dichtel @ 2016-04-29 13:35 UTC (permalink / raw)
To: Tom Herbert, David Miller; +Cc: Linux Kernel Network Developers
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
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH net v1] ipv6/ila: fix nlsize calculation for lwtunnel
2016-04-28 16:07 ` Tom Herbert
2016-04-28 16:16 ` David Miller
2016-04-29 13:35 ` Nicolas Dichtel
@ 2016-05-03 7:58 ` Nicolas Dichtel
2016-05-03 20:22 ` David Miller
2 siblings, 1 reply; 8+ messages in thread
From: Nicolas Dichtel @ 2016-05-03 7:58 UTC (permalink / raw)
To: davem; +Cc: netdev, Nicolas Dichtel, Tom Herbert
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>
---
RFC -> v1:
- rebase on last net tree
net/ipv6/ila/ila_lwt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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)
--
2.8.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH net v1] ipv6/ila: fix nlsize calculation for lwtunnel
2016-05-03 7:58 ` [PATCH net v1] " Nicolas Dichtel
@ 2016-05-03 20:22 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2016-05-03 20:22 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: netdev, tom
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Tue, 3 May 2016 09:58:27 +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>
> ---
>
> RFC -> v1:
> - rebase on last net tree
Applied and queued up for -stable, thanks for reposting this Nicolas.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-05-03 20:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-22 15:58 [RFC PATCH net] ipv6/ila: fix nlsize calculation for lwtunnel Nicolas Dichtel
2016-04-25 20:47 ` David Miller
2016-04-27 19:20 ` David Miller
2016-04-28 16:07 ` Tom Herbert
2016-04-28 16:16 ` David Miller
2016-04-29 13:35 ` Nicolas Dichtel
2016-05-03 7:58 ` [PATCH net v1] " Nicolas Dichtel
2016-05-03 20:22 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.