Commit 77d2720059618b9b6e827a8b73831eb6c6fad63c
Committed by
Linus Torvalds
1 parent
99829b8329
Exists in
master
and in
39 other branches
flag parameters: NONBLOCK in socket and socketpair
This patch introduces support for the SOCK_NONBLOCK flag in socket, socketpair, and paccept. To do this the internal function sock_attach_fd gets an additional parameter which it uses to set the appropriate flag for the file descriptor. Given that in modern, scalable programs almost all socket connections are non-blocking and the minimal additional cost for the new functionality I see no reason not to add this code. The following test must be adjusted for architectures other than x86 and x86-64 and in case the syscall numbers changed. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #include <fcntl.h> #include <pthread.h> #include <stdio.h> #include <unistd.h> #include <netinet/in.h> #include <sys/socket.h> #include <sys/syscall.h> #ifndef __NR_paccept # ifdef __x86_64__ # define __NR_paccept 288 # elif defined __i386__ # define SYS_PACCEPT 18 # define USE_SOCKETCALL 1 # else # error "need __NR_paccept" # endif #endif #ifdef USE_SOCKETCALL # define paccept(fd, addr, addrlen, mask, flags) \ ({ long args[6] = { \ (long) fd, (long) addr, (long) addrlen, (long) mask, 8, (long) flags }; \ syscall (__NR_socketcall, SYS_PACCEPT, args); }) #else # define paccept(fd, addr, addrlen, mask, flags) \ syscall (__NR_paccept, fd, addr, addrlen, mask, 8, flags) #endif #define PORT 57392 #define SOCK_NONBLOCK O_NONBLOCK static pthread_barrier_t b; static void * tf (void *arg) { pthread_barrier_wait (&b); int s = socket (AF_INET, SOCK_STREAM, 0); struct sockaddr_in sin; sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); sin.sin_port = htons (PORT); connect (s, (const struct sockaddr *) &sin, sizeof (sin)); close (s); pthread_barrier_wait (&b); pthread_barrier_wait (&b); s = socket (AF_INET, SOCK_STREAM, 0); sin.sin_port = htons (PORT); connect (s, (const struct sockaddr *) &sin, sizeof (sin)); close (s); pthread_barrier_wait (&b); return NULL; } int main (void) { int fd; fd = socket (PF_INET, SOCK_STREAM, 0); if (fd == -1) { puts ("socket(0) failed"); return 1; } int fl = fcntl (fd, F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if (fl & O_NONBLOCK) { puts ("socket(0) set non-blocking mode"); return 1; } close (fd); fd = socket (PF_INET, SOCK_STREAM|SOCK_NONBLOCK, 0); if (fd == -1) { puts ("socket(SOCK_NONBLOCK) failed"); return 1; } fl = fcntl (fd, F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if ((fl & O_NONBLOCK) == 0) { puts ("socket(SOCK_NONBLOCK) does not set non-blocking mode"); return 1; } close (fd); int fds[2]; if (socketpair (PF_UNIX, SOCK_STREAM, 0, fds) == -1) { puts ("socketpair(0) failed"); return 1; } for (int i = 0; i < 2; ++i) { fl = fcntl (fds[i], F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if (fl & O_NONBLOCK) { printf ("socketpair(0) set non-blocking mode for fds[%d]\n", i); return 1; } close (fds[i]); } if (socketpair (PF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, 0, fds) == -1) { puts ("socketpair(SOCK_NONBLOCK) failed"); return 1; } for (int i = 0; i < 2; ++i) { fl = fcntl (fds[i], F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if ((fl & O_NONBLOCK) == 0) { printf ("socketpair(SOCK_NONBLOCK) does not set non-blocking mode for fds[%d]\n", i); return 1; } close (fds[i]); } pthread_barrier_init (&b, NULL, 2); struct sockaddr_in sin; pthread_t th; if (pthread_create (&th, NULL, tf, NULL) != 0) { puts ("pthread_create failed"); return 1; } int s = socket (AF_INET, SOCK_STREAM, 0); int reuse = 1; setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse)); sin.sin_family = AF_INET; sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK); sin.sin_port = htons (PORT); bind (s, (struct sockaddr *) &sin, sizeof (sin)); listen (s, SOMAXCONN); pthread_barrier_wait (&b); int s2 = paccept (s, NULL, 0, NULL, 0); if (s2 < 0) { puts ("paccept(0) failed"); return 1; } fl = fcntl (s2, F_GETFL); if (fl & O_NONBLOCK) { puts ("paccept(0) set non-blocking mode"); return 1; } close (s2); close (s); pthread_barrier_wait (&b); s = socket (AF_INET, SOCK_STREAM, 0); sin.sin_port = htons (PORT); setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse)); bind (s, (struct sockaddr *) &sin, sizeof (sin)); listen (s, SOMAXCONN); pthread_barrier_wait (&b); s2 = paccept (s, NULL, 0, NULL, SOCK_NONBLOCK); if (s2 < 0) { puts ("paccept(SOCK_NONBLOCK) failed"); return 1; } fl = fcntl (s2, F_GETFL); if ((fl & O_NONBLOCK) == 0) { puts ("paccept(SOCK_NONBLOCK) does not set non-blocking mode"); return 1; } close (s2); close (s); pthread_barrier_wait (&b); puts ("OK"); return 0; } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Ulrich Drepper <drepper@redhat.com> Acked-by: Davide Libenzi <davidel@xmailserver.org> Cc: Michael Kerrisk <mtk.manpages@googlemail.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 11 additions and 11 deletions Side-by-side Diff
include/linux/net.h
net/socket.c
... | ... | @@ -369,7 +369,7 @@ |
369 | 369 | return fd; |
370 | 370 | } |
371 | 371 | |
372 | -static int sock_attach_fd(struct socket *sock, struct file *file) | |
372 | +static int sock_attach_fd(struct socket *sock, struct file *file, int flags) | |
373 | 373 | { |
374 | 374 | struct dentry *dentry; |
375 | 375 | struct qstr name = { .name = "" }; |
... | ... | @@ -391,7 +391,7 @@ |
391 | 391 | init_file(file, sock_mnt, dentry, FMODE_READ | FMODE_WRITE, |
392 | 392 | &socket_file_ops); |
393 | 393 | SOCK_INODE(sock)->i_fop = &socket_file_ops; |
394 | - file->f_flags = O_RDWR; | |
394 | + file->f_flags = O_RDWR | (flags & O_NONBLOCK); | |
395 | 395 | file->f_pos = 0; |
396 | 396 | file->private_data = sock; |
397 | 397 | |
... | ... | @@ -404,7 +404,7 @@ |
404 | 404 | int fd = sock_alloc_fd(&newfile, flags); |
405 | 405 | |
406 | 406 | if (likely(fd >= 0)) { |
407 | - int err = sock_attach_fd(sock, newfile); | |
407 | + int err = sock_attach_fd(sock, newfile, flags); | |
408 | 408 | |
409 | 409 | if (unlikely(err < 0)) { |
410 | 410 | put_filp(newfile); |
... | ... | @@ -1223,7 +1223,7 @@ |
1223 | 1223 | int flags; |
1224 | 1224 | |
1225 | 1225 | flags = type & ~SOCK_TYPE_MASK; |
1226 | - if (flags & ~SOCK_CLOEXEC) | |
1226 | + if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)) | |
1227 | 1227 | return -EINVAL; |
1228 | 1228 | type &= SOCK_TYPE_MASK; |
1229 | 1229 | |
... | ... | @@ -1234,7 +1234,7 @@ |
1234 | 1234 | if (retval < 0) |
1235 | 1235 | goto out; |
1236 | 1236 | |
1237 | - retval = sock_map_fd(sock, flags & O_CLOEXEC); | |
1237 | + retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); | |
1238 | 1238 | if (retval < 0) |
1239 | 1239 | goto out_release; |
1240 | 1240 | |
... | ... | @@ -1260,7 +1260,7 @@ |
1260 | 1260 | int flags; |
1261 | 1261 | |
1262 | 1262 | flags = type & ~SOCK_TYPE_MASK; |
1263 | - if (flags & ~SOCK_CLOEXEC) | |
1263 | + if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)) | |
1264 | 1264 | return -EINVAL; |
1265 | 1265 | type &= SOCK_TYPE_MASK; |
1266 | 1266 | |
1267 | 1267 | |
... | ... | @@ -1298,12 +1298,12 @@ |
1298 | 1298 | goto out_release_both; |
1299 | 1299 | } |
1300 | 1300 | |
1301 | - err = sock_attach_fd(sock1, newfile1); | |
1301 | + err = sock_attach_fd(sock1, newfile1, flags & O_NONBLOCK); | |
1302 | 1302 | if (unlikely(err < 0)) { |
1303 | 1303 | goto out_fd2; |
1304 | 1304 | } |
1305 | 1305 | |
1306 | - err = sock_attach_fd(sock2, newfile2); | |
1306 | + err = sock_attach_fd(sock2, newfile2, flags & O_NONBLOCK); | |
1307 | 1307 | if (unlikely(err < 0)) { |
1308 | 1308 | fput(newfile1); |
1309 | 1309 | goto out_fd1; |
... | ... | @@ -1429,7 +1429,7 @@ |
1429 | 1429 | int err, len, newfd, fput_needed; |
1430 | 1430 | struct sockaddr_storage address; |
1431 | 1431 | |
1432 | - if (flags & ~SOCK_CLOEXEC) | |
1432 | + if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)) | |
1433 | 1433 | return -EINVAL; |
1434 | 1434 | |
1435 | 1435 | if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) |
... | ... | @@ -1459,7 +1459,7 @@ |
1459 | 1459 | goto out_put; |
1460 | 1460 | } |
1461 | 1461 | |
1462 | - err = sock_attach_fd(newsock, newfile); | |
1462 | + err = sock_attach_fd(newsock, newfile, flags & O_NONBLOCK); | |
1463 | 1463 | if (err < 0) |
1464 | 1464 | goto out_fd_simple; |
1465 | 1465 |