Received-SPF: pass (google.com: domain of linux-kernel+bounces-91444-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 5 Mar 2024 11:19:15 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Eric Dumazet <edumazet@google.com>
Cc: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>, Networking <netdev@vger.kernel.org>, Jiri
 Pirko <jiri@nvidia.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the net-next tree
Message-ID: <20240305111915.742aaf1f@canb.auug.org.au>
In-Reply-To: <CANn89iKsbT_qAdAiP6R6HRxic1YE3J6afMhWzF27Pbn2ifeCyg@mail.gmail.com>
References: <20240301121108.5d39e4f9@canb.auug.org.au>
	<CANn89iKpsHTQ9Zqz4cbCGOuj8sp5CCYGHe3Wvk2cyQL4HPADkw@mail.gmail.com>
	<CANn89iKsbT_qAdAiP6R6HRxic1YE3J6afMhWzF27Pbn2ifeCyg@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_//0OK9MpWFRWZb=MOrx_m8GI";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_//0OK9MpWFRWZb=MOrx_m8GI
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Eric,

On Fri, 1 Mar 2024 10:54:19 +0100 Eric Dumazet <edumazet@google.com> wrote:
>
> OK, I think the issue is caused by a hole at the start of
> tcp_sock_write_rx group
>=20
> I will send this patch for review, thanks !
>=20
> diff --git a/include/linux/tcp.h b/include/linux/tcp.h
> index 988a30ef6bfe956fa573f1f18c8284aa382dc1cc..55399ee2a57e736b55ed067fc=
06ea620bbe62fd3
> 100644
> --- a/include/linux/tcp.h
> +++ b/include/linux/tcp.h
> @@ -304,7 +304,7 @@ struct tcp_sock {
>         __cacheline_group_end(tcp_sock_write_txrx);
>=20
>         /* RX read-write hotpath cache lines */
> -       __cacheline_group_begin(tcp_sock_write_rx);
> +       __cacheline_group_begin(tcp_sock_write_rx) __aligned(8);
>         u64     bytes_received;
>                                 /* RFC4898 tcpEStatsAppHCThruOctetsReceiv=
ed
>                                  * sum(delta(rcv_nxt)), or how many bytes
> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
> index c82dc42f57c65df112f79080ff407cd98d11ce68..7e1b848398d04f2da2a91c3af=
97b1e2e3895b8ee
> 100644
> --- a/net/ipv4/tcp.c
> +++ b/net/ipv4/tcp.c
> @@ -4651,7 +4651,7 @@ static void __init tcp_struct_check(void)
>         CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock,
> tcp_sock_write_tx, tsorted_sent_queue);
>         CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock,
> tcp_sock_write_tx, highest_sack);
>         CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock,
> tcp_sock_write_tx, ecn_flags);
> -       CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_write_tx, 1=
13);
> +       CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_write_tx, 1=
05);
>=20
>         /* TXRX read-write hotpath cache lines */
>         CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock,
> tcp_sock_write_txrx, pred_flags);

I will apply this patch to them merge of the net-next tree until it is
applied there.

--=20
Cheers,
Stephen Rothwell

--Sig_//0OK9MpWFRWZb=MOrx_m8GI
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXmZQMACgkQAVBC80lX
0GwgVQf/UzJ5KS73jOaujls1vJ3m+uZjTGSV2CR9GXdSXMqzsrTvMsg9k5FaD7Qm
2jEMT+LWqdsI3+9L3aeYpOADQl7rRIgFpecd1dRZVr57Wnq/8Ij+bKrgn7NNhLif
O8U0S6ii8NafSDOXtIB0l/O6PgaEW+YtnlOYaCFKwzsAbxaYfAa/Ke54HwhgGGRO
Bzm7CKxjcnYQ9xnyz88Ig2IKAipiuEUiPRgy3pVAyv914RXIwmwUSlDpxKR79e2p
6XfQ2QsqZ4A113Oe5nTbrTU8VeAokO8epLwZEeE3w5rAE6f0EMDYgji3UQMzEGIo
1axhga8xHAVTf8KqZTJUiRNAbdD0oA==
=tMoX
-----END PGP SIGNATURE-----

--Sig_//0OK9MpWFRWZb=MOrx_m8GI--