Current wrapper function create_pair() is used to create a pair of
connected links and returns two fds, but it does not support unix sockets.
Here we introduce socketpair() into create_pair(), which supports creating
a pair of unix sockets, since the semantics of the two are the same.
Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev>
---
.../selftests/bpf/prog_tests/socket_helpers.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/socket_helpers.h b/tools/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, size_t len, int flags,
static inline int create_pair(int family, int sotype, int *p0, int *p1)
{
- __close_fd int s, c = -1, p = -1;
+ __close_fd int s = -1, c = -1, p = -1;
struct sockaddr_storage addr;
socklen_t len = sizeof(addr);
int err;
+ if (family == AF_UNIX) {
+ int fds[2];
+
+ err = socketpair(family, sotype, 0, fds);
+ if (!err) {
+ *p0 = fds[0];
+ *p1 = fds[1];
+ }
+ return err;
+ }
+
s = socket_loopback(family, sotype);
if (s < 0)
return s;
--
2.47.1On Wed, Feb 26, 2025 at 09:22:41PM +0800, Jiayuan Chen wrote: > Current wrapper function create_pair() is used to create a pair of > connected links and returns two fds, but it does not support unix sockets. > > Here we introduce socketpair() into create_pair(), which supports creating > a pair of unix sockets, since the semantics of the two are the same. Since it is only for UDS and only has effectively 1 line of code, how about just calling socketpair(AF_UNIX) in your patch 3/3? Thanks!
On Thu, Feb 27, 2025 at 11:52:04AM -0800, Cong Wang wrote: > On Wed, Feb 26, 2025 at 09:22:41PM +0800, Jiayuan Chen wrote: > > Current wrapper function create_pair() is used to create a pair of > > connected links and returns two fds, but it does not support unix sockets. > > > > Here we introduce socketpair() into create_pair(), which supports creating > > a pair of unix sockets, since the semantics of the two are the same. > > Since it is only for UDS and only has effectively 1 line of code, how > about just calling socketpair(AF_UNIX) in your patch 3/3? > > Thanks! Thanks, Cong, I'll expand selftest to cover TCP and UDP, looks like I missed doing those.
On 2025-02-27 11:52:04, Cong Wang wrote: > On Wed, Feb 26, 2025 at 09:22:41PM +0800, Jiayuan Chen wrote: > > Current wrapper function create_pair() is used to create a pair of > > connected links and returns two fds, but it does not support unix sockets. > > > > Here we introduce socketpair() into create_pair(), which supports creating > > a pair of unix sockets, since the semantics of the two are the same. > > Since it is only for UDS and only has effectively 1 line of code, how > about just calling socketpair(AF_UNIX) in your patch 3/3? If we run that test with more than AF_UNIX it might be best as is. I think there might be some value testing that flow on TCP/UDP even if its not related to the bug. Thanks, John
On Thu, Feb 27, 2025 at 02:21:41PM -0800, John Fastabend wrote: > On 2025-02-27 11:52:04, Cong Wang wrote: > > On Wed, Feb 26, 2025 at 09:22:41PM +0800, Jiayuan Chen wrote: > > > Current wrapper function create_pair() is used to create a pair of > > > connected links and returns two fds, but it does not support unix sockets. > > > > > > Here we introduce socketpair() into create_pair(), which supports creating > > > a pair of unix sockets, since the semantics of the two are the same. > > > > Since it is only for UDS and only has effectively 1 line of code, how > > about just calling socketpair(AF_UNIX) in your patch 3/3? > > If we run that test with more than AF_UNIX it might be best as is. I > think there might be some value testing that flow on TCP/UDP even if > its not related to the bug. > > Thanks, > John Thanks, John! I'll make selftest cover more types of sockets.
© 2016 - 2025 Red Hat, Inc.