RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 22:08:12 +00:00
Code Issues Activity Actions

Kernel: Don't hog file descriptor table lock in sys$listen()

Browse source 
We don't need to hold the lock across the entire syscall. Once we've
fetched the open file description we're interested in, we can let go.
This commit is contained in:
Andreas Kling 2022-04-03 22:18:57 +02:00
parent bc4282c773
commit 85ceab1fec
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Kernel/Syscalls/socket.cpp
View file

@ -67,17 +67,15 @@ ErrorOr<FlatPtr> Process::sys$listen(int sockfd, int backlog)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this) VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
if (backlog < 0) if (backlog < 0)
return EINVAL; return EINVAL;
return m_fds.with_exclusive([&](auto& fds) -> ErrorOr<FlatPtr> { auto description = TRY(open_file_description(sockfd));
auto description = TRY(fds.open_file_description(sockfd)); if (!description->is_socket())
if (!description->is_socket()) return ENOTSOCK;
return ENOTSOCK; auto& socket = *description->socket();
auto& socket = *description->socket(); REQUIRE_PROMISE_FOR_SOCKET_DOMAIN(socket.domain());
REQUIRE_PROMISE_FOR_SOCKET_DOMAIN(socket.domain()); if (socket.is_connected())
if (socket.is_connected()) return EINVAL;
return EINVAL; TRY(socket.listen(backlog));
TRY(socket.listen(backlog)); return 0;
return 0;
});
} }
ErrorOr<FlatPtr> Process::sys$accept4(Userspace<Syscall::SC_accept4_params const*> user_params) ErrorOr<FlatPtr> Process::sys$accept4(Userspace<Syscall::SC_accept4_params const*> user_params)