ipv6: remove hard coded limitation on ipv6_pinfo
authorEric Dumazet <edumazet@google.com>
Thu, 20 Jul 2023 11:09:01 +0000 (11:09 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jul 2023 08:39:31 +0000 (09:39 +0100)
commitf5f80e32de12fad2813d37270e8364a03e6d3ef0
tree40646cf495a3ae868afc96d9d63fba08834be509
parent1671bcfd76fdc0b9e65153cf759153083755fe4c
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 f5d547676ca0
("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>
13 files changed:
include/linux/ipv6.h
include/net/sock.h
net/dccp/ipv6.c
net/dccp/ipv6.h
net/ipv6/af_inet6.c
net/ipv6/ping.c
net/ipv6/raw.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/ipv6/udplite.c
net/l2tp/l2tp_ip6.c
net/mptcp/protocol.c
net/sctp/socket.c