ipv6: remove hard coded limitation on ipv6_pinfo
IPv6 inet sockets are supposed to have a "struct ipv6_pinfo" field at the end of their definition, so that inet6_sk_generic() can derive from socket size the offset of the "struct ipv6_pinfo". This is very fragile, and prevents adding bigger alignment in sockets, because inet6_sk_generic() does not work if the compiler adds padding after the ipv6_pinfo component. We are currently working on a patch series to reorganize TCP structures for better data locality and found issues similar to the one fixed in commit f5d54767 ("tcp: fix tcp_inet6_sk() for 32bit kernels") Alternative would be to force an alignment on "struct ipv6_pinfo", greater or equal to __alignof__(any ipv6 sock) to ensure there is no padding. This does not look great. v2: fix typo in mptcp_proto_v6_init() (Paolo) Signed-off-by:Eric Dumazet <edumazet@google.com> Cc: Chao Wu <wwchao@google.com> Cc: Wei Wang <weiwan@google.com> Cc: Coco Li <lixiaoyan@google.com> Cc: YiFei Zhu <zhuyifei@google.com> Reviewed-by:
Simon Horman <simon.horman@corigine.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/linux/ipv6.h 4 additions, 11 deletionsinclude/linux/ipv6.h
- include/net/sock.h 1 addition, 0 deletionsinclude/net/sock.h
- net/dccp/ipv6.c 1 addition, 0 deletionsnet/dccp/ipv6.c
- net/dccp/ipv6.h 0 additions, 4 deletionsnet/dccp/ipv6.h
- net/ipv6/af_inet6.c 2 additions, 2 deletionsnet/ipv6/af_inet6.c
- net/ipv6/ping.c 1 addition, 0 deletionsnet/ipv6/ping.c
- net/ipv6/raw.c 1 addition, 0 deletionsnet/ipv6/raw.c
- net/ipv6/tcp_ipv6.c 1 addition, 0 deletionsnet/ipv6/tcp_ipv6.c
- net/ipv6/udp.c 1 addition, 0 deletionsnet/ipv6/udp.c
- net/ipv6/udplite.c 1 addition, 0 deletionsnet/ipv6/udplite.c
- net/l2tp/l2tp_ip6.c 1 addition, 3 deletionsnet/l2tp/l2tp_ip6.c
- net/mptcp/protocol.c 1 addition, 0 deletionsnet/mptcp/protocol.c
- net/sctp/socket.c 1 addition, 0 deletionsnet/sctp/socket.c
Please register or sign in to comment