Diff below shuffles sys_socket() to look like sys_socketpair().
The goal is to do socket operations first in both functions. Since
they don't need the KERNEL_LOCK(), we will be able to mark the syscalls
NOLOCK and only grab it before messing with file descriptors.
ok?
Index: kern/uipc_syscalls.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_syscalls.c,v
retrieving revision 1.162
diff -u -p -r1.162 uipc_syscalls.c
--- kern/uipc_syscalls.c 9 Jan 2018 15:14:23 -0000 1.162
+++ kern/uipc_syscalls.c 7 Feb 2018 14:29:34 -0000
@@ -83,7 +83,7 @@ sys_socket(struct proc *p, void *v, regi
struct file *fp;
int type = SCARG(uap, type);
int domain = SCARG(uap, domain);
- int fd, error;
+ int fd, cloexec, nonblock, fflag, error;
unsigned int ss = 0;
if ((type & SOCK_DNS) && !(domain == AF_INET || domain == AF_INET6))
@@ -95,23 +95,24 @@ sys_socket(struct proc *p, void *v, regi
if (error)
return (error);
- fdplock(fdp);
- error = falloc(p, (type & SOCK_CLOEXEC) ? UF_EXCLOSE : 0, &fp, &fd);
- fdpunlock(fdp);
+ type &= ~(SOCK_CLOEXEC | SOCK_NONBLOCK | SOCK_DNS);
+ cloexec = (SCARG(uap, type) & SOCK_CLOEXEC) ? UF_EXCLOSE : 0;
+ nonblock = SCARG(uap, type) & SOCK_NONBLOCK;
+ fflag = FREAD | FWRITE | (nonblock ? FNONBLOCK : 0);
+
+ error = socreate(SCARG(uap, domain), &so, type, SCARG(uap, protocol));
if (error != 0)
goto out;
- fp->f_flag = FREAD | FWRITE | (type & SOCK_NONBLOCK ? FNONBLOCK : 0);
- fp->f_type = DTYPE_SOCKET;
- fp->f_ops = &socketops;
- error = socreate(SCARG(uap, domain), &so,
- type & ~(SOCK_CLOEXEC | SOCK_NONBLOCK | SOCK_DNS), SCARG(uap,
protocol));
+ fdplock(fdp);
+ error = falloc(p, cloexec, &fp, &fd);
+ fdpunlock(fdp);
if (error) {
- fdplock(fdp);
- fdremove(fdp, fd);
- closef(fp, p);
- fdpunlock(fdp);
+ soclose(so);
} else {
+ fp->f_flag = fflag;
+ fp->f_type = DTYPE_SOCKET;
+ fp->f_ops = &socketops;
if (type & SOCK_NONBLOCK)
so->so_state |= SS_NBIO;
so->so_state |= ss;
