From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC7DD1E3DC4 for ; Wed, 16 Apr 2025 01:10:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.189 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765850; cv=none; b=tbjXz2xKyLoBvfezjZ2JNsJVo/OHdqpxx2Van9G7gdvf9sEBe3MX7g0DMSC2i+glRvLX10ZMIwbQycYSLKoSE8/5sBHlK/zHLMfBbZhWVNWnxPn34rm0XB0WrZLnWRJrHbJeVWFKbCmCqC/47gA80VkCE1VRVEcFGnryCfuKF7A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744765850; c=relaxed/simple; bh=PDALcxKJXPzeoDntncEi1hWk1OSxrLhN9dVIBsoey5o=; h=MIME-Version:Date:Content-Type:From:Message-ID:Subject:To:Cc: In-Reply-To:References; b=fcosIWz9Xa2BTNxpIHa/LoMAMl65mCvcQ5cOYJy8AzPVZNCD+6NnJt3c3pUt4Il1hbjkCQ3A4LFhKI43Ccap3qS7j8rO+GewTP9cO2TGNCs57AtMHJAglPFGV2UIlzfPWm/nHT9nonHWGML/Rbaca9QjNoJoOnJM7nfIL1RSQGQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ixhqu8ie; arc=none smtp.client-ip=91.218.175.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ixhqu8ie" Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1744765844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kSgRQqL/0m8ZtEm6XJrXuugzLrHJy50AWjnxLd/indg=; b=ixhqu8iedvbNYZZhAX9c91zgXduok+vZJKGlSmGaxJE1uiR3JKuJDFltBAKRo+/9x1Rir1 tEZ0H2juVM1uAyM3HPeHozFbMIoX756b8pW1BR6mKgEhw4yP5U0s05b1JKwoBPA7Q1iBPz cRoc+ywAEk2RI1Kfvg7CfqvOOoYDuIo= Date: Wed, 16 Apr 2025 01:10:42 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Jiayuan Chen" Message-ID: TLS-Required: No Subject: Re: [PATCH bpf] selftests/bpf: remove sockmap_ktls disconnect_after_delete test To: "Ihor Solodrai" , "Alexei Starovoitov" Cc: "Alexei Starovoitov" , "Andrii Nakryiko" , "Daniel Borkmann" , "Eduard" , "bpf" , "Network Development" , "Jakub Kicinski" , "Paolo Abeni" , "Mykola Lysenko" , "Kernel Team" In-Reply-To: References: <20250415163332.1836826-1-ihor.solodrai@linux.dev> <3cb523bc8eb334cb420508a84f3f1d37543f4253@linux.dev> <02aa843af95ad3413fb37f898007cb17723dd1aa@linux.dev> X-Migadu-Flow: FLOW_OUT April 16, 2025 at 01:37, "Ihor Solodrai" wrote: >=20 >=20On 4/15/25 10:05 AM, Alexei Starovoitov wrote: >=20 >=20>=20 >=20> On Tue, Apr 15, 2025 at 10:01 AM Ihor Solodrai wrote: > >=20 >=20> >=20 >=20> > On 4/15/25 9:53 AM, Jiayuan Chen wrote: > > >=20 >=20>=20 >=20> April 16, 2025 at 24:33, "Ihor Solodrai" = wrote: > >=20 >=20> "sockmap_ktls disconnect_after_delete" test has been failing on BP= F CI > >=20 >=20> after recent merges from netdev: > >=20 >=20> * https://github.com/kernel-patches/bpf/actions/runs/14458537639 > >=20 >=20> * https://github.com/kernel-patches/bpf/actions/runs/14457178732 > >=20 >=20> It happens because disconnect has been disabled for TLS [1], and i= t > >=20 >=20> renders the test case invalid. Remove it from the suite. > >=20 >=20> [1] https://lore.kernel.org/netdev/20250404180334.3224206-1-kuba@k= ernel.org/ > >=20 >=20> Signed-off-by: Ihor Solodrai > >=20 >=20> Reviewed-by: Jiayuan Chen > >=20 >=20> The original selftest patch used disconnect to re-produce the endl= ess > > loop caused by tcp_bpf_unhash, which has already been removed. > > I hope this doesn't conflict with bpf-next... > >=20 >=20> >=20 >=20> > 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? > > >=20 >=20> What commit in bpf-next does it conflict with ? > > In general, avoiding merge conflicts is preferred. > >=20 >=20https://web.git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/= commit/?id=3D05ebde1bcb50a71cd56d8edd3008f53a781146e9 > https://lore.kernel.org/bpf/20250219052015.274405-1-jiayuan.chen@linux.= dev/ > It adds tests in the same file. The code to delete simply moved. > I think we can avoid conflict by applying 05ebde1bcb50 to bpf first, > if that's an option (it might depend on other changes, idk). > Then the version of the patch for bpf-next would apply to both trees. > If not, then apply only to bpf-next, and disable the test on CI? > I'm not sure whether we can cherry-pick the commit to bpf branch. I believe it would be more convenient for the maintainer to merge the patch that only removes 'ASSERT_OK(err, "disconnect");', as this change will not introduce conflicts with the bpf-next branch. Once the bpf branch is merged into bpf-next, you can then remove the entire function in the bpf-next branch.