]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
af_unix: Try not to hold unix_gc_lock during accept().
authorKuniyuki Iwashima <kuniyu@amazon.com>
Sat, 13 Apr 2024 02:19:28 +0000 (19:19 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 16 Apr 2024 11:50:57 +0000 (13:50 +0200)
commitfd86344823b521149bb31d91eba900ba3525efa6
treeae1de297b7ddfc6eeb4ceaf8224934611d25e8d9
parente918c7bbc0df0eec447017c5064797b6072b7b0d
af_unix: Try not to hold unix_gc_lock during accept().

Commit dcf70df2048d ("af_unix: Fix up unix_edge.successor for embryo
socket.") added spin_lock(&unix_gc_lock) in accept() path, and it
caused regression in a stress test as reported by kernel test robot.

If the embryo socket is not part of the inflight graph, we need not
hold the lock.

To decide that in O(1) time and avoid the regression in the normal
use case,

  1. add a new stat unix_sk(sk)->scm_stat.nr_unix_fds

  2. count the number of inflight AF_UNIX sockets in the receive
     queue under unix_state_lock()

  3. move unix_update_edges() call under unix_state_lock()

  4. avoid locking if nr_unix_fds is 0 in unix_update_edges()

Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202404101427.92a08551-oliver.sang@intel.com
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240413021928.20946-1-kuniyu@amazon.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
include/net/af_unix.h
net/unix/af_unix.c
net/unix/garbage.c