Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 15 Feb 2021 08:12:50 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Arjun Roy <arjunroy@google.com>, Jakub Kicinski <kuba@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stanislav Fomichev <sdf@google.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the net-next
 tree
Message-ID: <20210215081250.19bc8921@canb.auug.org.au>
In-Reply-To: <20210125111223.2540294c@canb.auug.org.au>
References: <20210125111223.2540294c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/oRD_PR_AcP8WZx1lBSo5l0F";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Mon, 25 Jan 2021 11:12:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the bpf-next tree got a conflict in:
>=20
>   net/ipv4/tcp.c
>=20
> between commit:
>=20
>   7eeba1706eba ("tcp: Add receive timestamp support for receive zerocopy.=
")
>=20
> from the net-next tree and commit:
>=20
>   9cacf81f8161 ("bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE")
>=20
> from the bpf-next tree.
>=20
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>=20
> diff --cc net/ipv4/tcp.c
> index e1a17c6b473c,26aa923cf522..000000000000
> --- a/net/ipv4/tcp.c
> +++ b/net/ipv4/tcp.c
> @@@ -4160,18 -4098,13 +4160,20 @@@ static int do_tcp_getsockopt(struct soc
>   		if (copy_from_user(&zc, optval, len))
>   			return -EFAULT;
>   		lock_sock(sk);
>  -		err =3D tcp_zerocopy_receive(sk, &zc);
>  +		err =3D tcp_zerocopy_receive(sk, &zc, &tss);
> + 		err =3D BPF_CGROUP_RUN_PROG_GETSOCKOPT_KERN(sk, level, optname,
> + 							  &zc, &len, err);
>   		release_sock(sk);
>  -		if (len >=3D offsetofend(struct tcp_zerocopy_receive, err))
>  -			goto zerocopy_rcv_sk_err;
>  +		if (len >=3D offsetofend(struct tcp_zerocopy_receive, msg_flags))
>  +			goto zerocopy_rcv_cmsg;
>   		switch (len) {
>  +		case offsetofend(struct tcp_zerocopy_receive, msg_flags):
>  +			goto zerocopy_rcv_cmsg;
>  +		case offsetofend(struct tcp_zerocopy_receive, msg_controllen):
>  +		case offsetofend(struct tcp_zerocopy_receive, msg_control):
>  +		case offsetofend(struct tcp_zerocopy_receive, flags):
>  +		case offsetofend(struct tcp_zerocopy_receive, copybuf_len):
>  +		case offsetofend(struct tcp_zerocopy_receive, copybuf_address):
>   		case offsetofend(struct tcp_zerocopy_receive, err):
>   			goto zerocopy_rcv_sk_err;
>   		case offsetofend(struct tcp_zerocopy_receive, inq):

With the merge window about to open, this is a reminder that this
conflict still exists.

--=20
Cheers,
Stephen Rothwell

--Sig_/oRD_PR_AcP8WZx1lBSo5l0F
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmApklIACgkQAVBC80lX
0GwVrQf8DfYze7Pz5Wl5aIUiKJfYVXgLEgqctp/06iv/FvxwfACJNTnF3Zly7BX3
Z7Iltesm8n7XAyaCsfcte+ICkiLMCkE0XlHPM3uj9Xy5BxojNhQkpN0ymdiU3QWj
N8mnem8QubZnANKoqNiL/YZPSssKeqKKyuMx98z34aNVIRVT3t8rojAZ0dJze2sJ
AIkLN5QTlYRdFqpdaWNK7vWERObay3cf4Wkbh578vYYTuIMsAEUL3g1Jhum4cZD5
K+zoavnrhOt0MHBvkcsnqRQ3/zP41iDp1Xw9p+8WctTuEW8cRMbN+TrjXmzt4I67
U3/MxFkC8Z+4dMqe8S6hzAV6i5EIkg==
=nY0U
-----END PGP SIGNATURE-----

--Sig_/oRD_PR_AcP8WZx1lBSo5l0F--