On Thu, Apr 11, 2024 at 3:38 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Hi all, > > On Tue, 9 Apr 2024 07:10:40 +0200 Eric Dumazet <edumazet@xxxxxxxxxx> wrote: > > > > On Tue, Apr 9, 2024 at 3:40 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > > > After merging the net-next tree, today's linux-next build (arm > > > multi_v7_defconfig) failed like this: > > > > > > In file included from <command-line>: > > > In function 'tcp_struct_check', > > > inlined from 'tcp_init' at net/ipv4/tcp.c:4703:2: > > > include/linux/compiler_types.h:460:45: error: call to '__compiletime_assert_940' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct tcp_sock, __cacheline_group_end__tcp_sock_write_txrx) - offsetofend(struct tcp_sock, __cacheline_group_begin__tcp_sock_write_txrx) > 92 > > > 460 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > > > | ^ > > > include/linux/compiler_types.h:441:25: note: in definition of macro '__compiletime_assert' > > > 441 | prefix ## suffix(); \ > > > | ^~~~~~ > > > include/linux/compiler_types.h:460:9: note: in expansion of macro '_compiletime_assert' > > > 460 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > > > | ^~~~~~~~~~~~~~~~~~~ > > > include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' > > > 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) > > > | ^~~~~~~~~~~~~~~~~~ > > > include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' > > > 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) > > > | ^~~~~~~~~~~~~~~~ > > > include/linux/cache.h:108:9: note: in expansion of macro 'BUILD_BUG_ON' > > > 108 | BUILD_BUG_ON(offsetof(TYPE, __cacheline_group_end__##GROUP) - \ > > > | ^~~~~~~~~~~~ > > > net/ipv4/tcp.c:4673:9: note: in expansion of macro 'CACHELINE_ASSERT_GROUP_SIZE' > > > 4673 | CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_write_txrx, 92); > > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > > > Presumably caused by commit > > > > > > d2c3a7eb1afa ("tcp: more struct tcp_sock adjustments") > > > > > > I have reverted that commit for today. > > > > Yeah, a build bot gave us a warning yesterday, I will fix this today. > > I am still getting this build failure. Do you have the fix in your tree ? 9b9fd45869e744bea7d32a94793736e3d9fd7d26 tcp: tweak tcp_sock_write_txrx size assertion