From nobody Sun Feb 8 14:13:21 2026 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (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 9135F2638BE for ; Tue, 8 Apr 2025 07:32:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744097532; cv=none; b=u0FPiHLJK469exW3dBGvDy5RHhYOQnHN9Uc8A3Hum4zrLL8BpCT/aCwdXJF3gyHD6y0RHJv4Iin0zs9bjhaVzgm0AcRUfutIS0rT+NEXgMwDxYzkTyYHyAB4k07gTTYepRYgyyGG8PXc//digcGzsnNqJm1tzZ0P5k2zbOv0l0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744097532; c=relaxed/simple; bh=ZOHoR1DVLuoqBGux5wOEYgvMSK5hDjDDqM2npNWq+30=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dp0V1mf/DOJZ9BAPXnvxdAn0zMsjDZBTQr6mpBj4fQ8R/ODRx8/ZxKkgsnPpjtyyRcIbOuWn4dqWs0LphbGeeDzERLjsPtiRj25USpESDooBF7euBkTeSx/ToKTOadhuoTNLFVhicxnvvNXDW6zCub1kMNLTTjRNLUATZLJ0mhw= 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=vAF6DArQ; arc=none smtp.client-ip=95.215.58.176 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="vAF6DArQ" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1744097527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BLSYPFz/nwodbHpxtrd6necAV0xMxciGJi0Eu7RL7/E=; b=vAF6DArQxICiHwPXm3kZnG6hCFPfTSX4JcMnXXDJ1UL60dr3mPnIXNE5zna9W9KVTAQuk3 BC5omLqJaoKkUI53/UjzTIBU+a4JSPhJEVFbbgXGsJYb6Qs4TtJ++eq+2W1HdnV++Sxx/y jCc8DGGtk4d9o53hjXvnBLxd0Pl2ea8= From: Jiayuan Chen To: bpf@vger.kernel.org Cc: mrpre@163.com, Jiayuan Chen , John Fastabend , Jakub Sitnicki , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan , Michal Luczaj , Cong Wang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v4 3/3] selftests/bpf: Add edge case tests for sockmap Date: Tue, 8 Apr 2025 15:29:54 +0800 Message-ID: <20250408073033.60377-4-jiayuan.chen@linux.dev> In-Reply-To: <20250408073033.60377-1-jiayuan.chen@linux.dev> References: <20250408073033.60377-1-jiayuan.chen@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Add edge case tests for sockmap. Signed-off-by: Jiayuan Chen --- .../selftests/bpf/prog_tests/socket_helpers.h | 13 +++- .../selftests/bpf/prog_tests/sockmap_basic.c | 60 +++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/socket_helpers.h b/tool= s/testing/selftests/bpf/prog_tests/socket_helpers.h index 1bdfb79ef009..a805143dd84f 100644 --- a/tools/testing/selftests/bpf/prog_tests/socket_helpers.h +++ b/tools/testing/selftests/bpf/prog_tests/socket_helpers.h @@ -313,11 +313,22 @@ static inline int recv_timeout(int fd, void *buf, siz= e_t len, int flags, =20 static inline int create_pair(int family, int sotype, int *p0, int *p1) { - __close_fd int s, c =3D -1, p =3D -1; + __close_fd int s =3D -1, c =3D -1, p =3D -1; struct sockaddr_storage addr; socklen_t len =3D sizeof(addr); int err; =20 + if (family =3D=3D AF_UNIX) { + int fds[2]; + + err =3D socketpair(family, sotype, 0, fds); + if (!err) { + *p0 =3D fds[0]; + *p1 =3D fds[1]; + } + return err; + } + s =3D socket_loopback(family, sotype); if (s < 0) return s; diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools= /testing/selftests/bpf/prog_tests/sockmap_basic.c index 1e3e4392dcca..c72357f41035 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c @@ -1042,6 +1042,59 @@ static void test_sockmap_vsock_unconnected(void) xclose(map); } =20 +void *close_thread(void *arg) +{ + int *fd =3D (int *)arg; + + sleep(1); + close(*fd); + *fd =3D -1; + return NULL; +} + +void test_sockmap_with_close_on_write(int family, int sotype) +{ + struct test_sockmap_pass_prog *skel; + int err, map, verdict; + pthread_t tid; + int zero =3D 0; + int c =3D -1, p =3D -1; + + skel =3D test_sockmap_pass_prog__open_and_load(); + if (!ASSERT_OK_PTR(skel, "open_and_load")) + return; + + verdict =3D bpf_program__fd(skel->progs.prog_skb_verdict); + map =3D bpf_map__fd(skel->maps.sock_map_rx); + + err =3D bpf_prog_attach(verdict, map, BPF_SK_SKB_STREAM_VERDICT, 0); + if (!ASSERT_OK(err, "bpf_prog_attach")) + goto out; + + err =3D create_pair(family, sotype, &c, &p); + if (!ASSERT_OK(err, "create_pair")) + goto out; + + err =3D bpf_map_update_elem(map, &zero, &p, BPF_ANY); + if (!ASSERT_OK(err, "bpf_map_update_elem")) + goto out; + + err =3D pthread_create(&tid, 0, close_thread, &p); + if (!ASSERT_OK(err, "pthread_create")) + goto out; + + while (p > 0) + send(c, "a", 1, MSG_NOSIGNAL); + + pthread_join(tid, NULL); +out: + if (c > 0) + close(c); + if (p > 0) + close(p); + test_sockmap_pass_prog__destroy(skel); +} + void test_sockmap_basic(void) { if (test__start_subtest("sockmap create_update_free")) @@ -1108,4 +1161,11 @@ void test_sockmap_basic(void) test_sockmap_skb_verdict_vsock_poll(); if (test__start_subtest("sockmap vsock unconnected")) test_sockmap_vsock_unconnected(); + if (test__start_subtest("sockmap with write on close")) { + test_sockmap_with_close_on_write(AF_UNIX, SOCK_STREAM); + test_sockmap_with_close_on_write(AF_UNIX, SOCK_DGRAM); + test_sockmap_with_close_on_write(AF_INET, SOCK_STREAM); + test_sockmap_with_close_on_write(AF_INET, SOCK_DGRAM); + test_sockmap_with_close_on_write(AF_VSOCK, SOCK_STREAM); + } } --=20 2.47.1