tcp: fix tcp_inet6_sk() for 32bit kernels
Subsystems (3)
PATCH 1/1 tcp: fix tcp_inet6_sk() for 32bit kernels
It turns out that struct ipv6_pinfo is not located as we think.
inet6_sk_generic() and tcp_inet6_sk() disagree on 32bit kernels by 4-bytes, because struct tcp_sock has 8-bytes alignment,
but ipv6_pinfo size is not a multiple of 8.
sizeof(struct ipv6_pinfo): 116 (not padded to 8)
I actually first coded tcp_inet6_sk() as this patch does, but thought that "container_of(tcp_sk(sk), struct tcp6_sock, tcp)" was cleaner.
As Julian told me : Nobody should use tcp6_sock.inet6 directly, it should be accessed via tcp_inet6_sk() or inet6_sk().
This happened when we added the first u64 field in struct tcp_sock.
--- net/ipv6/tcp_ipv6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ipv6/tcp_ipv6.c +3 -2
@@ -93,12 +93,13 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk,/* Helper returning the inet6 address from a given tcp socket. * It can be used in TCP stack instead of inet6_sk(sk). * This avoids a dereference and allow compiler optimizations. +* It is a specialized version of inet6_sk_generic(). */ static struct ipv6_pinfo *tcp_inet6_sk (const struct sock *sk) { - struct tcp6_sock *tcp6 = container_of(tcp_sk(sk), struct tcp6_sock, tcp); +unsigned int offset =sizeof (struct tcp6_sock ) -sizeof (struct ipv6_pinfo ); -return &tcp6->inet6; +return (struct ipv6_pinfo *)(((u8 *)sk) + offset); }static void inet6_sk_rx_dst_set (struct sock *sk,const struct sk_buff *skb)
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Mon, 1 Apr 2019 03:09:20 -0700
Quoted 11 lines
It turns out that struct
ipv6_pinfois not located as we think.
inet6_sk_generic()andtcp_inet6_sk()disagree on 32bit kernels by 4-bytes, because structtcp_sockhas 8-bytes alignment,
butipv6_pinfosize is not a multiple of 8.
sizeof(struct ipv6_pinfo): 116 (not padded to 8)I actually first coded
tcp_inet6_sk()as this patch does, but thought that "container_of(tcp_sk(sk), struct tcp6_sock, tcp)" was cleaner.
Quoted 8 lines
As Julian told me : Nobody should use tcp6_sock.inet6 directly, it should be accessed via
tcp_inet6_sk()orinet6_sk().This happened when we added the first u64 field in struct
tcp_sock.Fixes 93a77c11ae79 ("tcp: add tcp_inet6_sk() helper")Signed-off-by Eric Dumazet <[email protected]>Bisected-by Julian Anastasov <[email protected]>
This looks like a net-next change, because the Fixes tag commit is only there. So that's where I have applied it.
Maybe we should change the name of the tcp6_sock.inet6 member if it should never be accessed directly.
Quoted 4 lines · David Miller
This looks like a net-next change, because the Fixes tag commit is only there. So that's where I have applied it.
Oops, wrong script, yes this is a net-next change.
Quoted 3 lines
Maybe we should change the name of the tcp6_sock.inet6 member if it should never be accessed directly.
Or add an __alignof__(u64) if this does not increase memory needs.
Hello,
Quoted 33 lines · Eric Dumazet
It turns out that struct
ipv6_pinfois not located as we think.
inet6_sk_generic()andtcp_inet6_sk()disagree on 32bit kernels by 4-bytes, because structtcp_sockhas 8-bytes alignment,
butipv6_pinfosize is not a multiple of 8.
sizeof(struct ipv6_pinfo): 116 (not padded to 8)I actually first coded
tcp_inet6_sk()as this patch does, but thought that "container_of(tcp_sk(sk), struct tcp6_sock, tcp)" was cleaner.As Julian told me : Nobody should use tcp6_sock.inet6 directly, it should be accessed via
tcp_inet6_sk()orinet6_sk().This happened when we added the first u64 field in struct
tcp_sock.Fixes 93a77c11ae79 ("tcp: add tcp_inet6_sk() helper")Signed-off-by Eric Dumazet <[email protected]>Bisected-by Julian Anastasov <[email protected]>--- net/ipv6/tcp_ipv6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)net/ipv6/tcp_ipv6.c +1
-0@@ -93,12 +93,13 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk,/* Helper returning the inet6 address from a given tcp socket. * It can be used in TCP stack instead of inet6_sk(sk). * This avoids a dereference and allow compiler optimizations. +* It is a specialized version of inet6_sk_generic(). */
net/ipv6/tcp_ipv6.c static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk, · line 105
Quoted 10 lines
net/ipv6/tcp_ipv6.c +2
-2static struct ipv6_pinfo *tcp_inet6_sk (const struct sock *sk) { - struct tcp6_sock *tcp6 = container_of(tcp_sk(sk), struct tcp6_sock, tcp); +unsigned int offset =sizeof (struct tcp6_sock ) -sizeof (struct ipv6_pinfo ); -return &tcp6->inet6; +return (struct ipv6_pinfo *)(((u8 *)sk) + offset); }static void inet6_sk_rx_dst_set (struct sock *sk,const struct sk_buff *skb)
Thanks Eric! It is working here.
Regards
--
Julian Anastasov <[email protected]>