netdev - Re: [PATCH bpf] selftests/bpf: remove sockmap_ktls disconnect_after

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAADnVQ+5_mqEGnEs-RwBwh7+v2aeCotrbxKRC2qrzoo2hz_1Hw@mail.gmail.com>
Date: Tue, 15 Apr 2025 10:05:31 -0700
From: Alexei Starovoitov <alexei.starovoitov@...il.com>
To: Ihor Solodrai <ihor.solodrai@...ux.dev>
Cc: Jiayuan Chen <jiayuan.chen@...ux.dev>, Alexei Starovoitov <ast@...nel.org>, 
	Andrii Nakryiko <andrii@...nel.org>, Daniel Borkmann <daniel@...earbox.net>, Eduard <eddyz87@...il.com>, 
	bpf <bpf@...r.kernel.org>, Network Development <netdev@...r.kernel.org>, 
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Mykola Lysenko <mykolal@...com>, 
	Kernel Team <kernel-team@...a.com>
Subject: Re: [PATCH bpf] selftests/bpf: remove sockmap_ktls
 disconnect_after_delete test

On Tue, Apr 15, 2025 at 10:01 AM Ihor Solodrai <ihor.solodrai@...ux.dev> wrote:
>
> On 4/15/25 9:53 AM, Jiayuan Chen wrote:
> > April 16, 2025 at 24:33, "Ihor Solodrai" <ihor.solodrai@...ux.dev> wrote:
> >>
> >> "sockmap_ktls disconnect_after_delete" test has been failing on BPF CI
> >> after recent merges from netdev:
> >> * https://github.com/kernel-patches/bpf/actions/runs/14458537639
> >> * https://github.com/kernel-patches/bpf/actions/runs/14457178732
> >> It happens because disconnect has been disabled for TLS [1], and it
> >> renders the test case invalid. Remove it from the suite.
> >> [1] https://lore.kernel.org/netdev/20250404180334.3224206-1-kuba@kernel.org/
> >> Signed-off-by: Ihor Solodrai <ihor.solodrai@...ux.dev>
> >
> > Reviewed-by: Jiayuan Chen <jiayuan.chen@...ux.dev>
> >
> > The original selftest patch used disconnect to re-produce the endless
> > loop caused by tcp_bpf_unhash, which has already been removed.
> >
> > I hope this doesn't conflict with bpf-next...
>
> I just tried applying to bpf-next, and it does indeed have a
> conflict... Although kdiff3 merged it automatically.
>
> What's the right way to resolve this? Send for bpf-next?

What commit in bpf-next does it conflict with ?

In general, avoiding merge conflicts is preferred.