diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-10-03 13:59:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-21 12:37:33 +0200 |
| commit | 75e94c7e8859e58aadc15a98cc9704edff47d4f2 (patch) | |
| tree | 4d6a366d268aee159c4c59bdf6651c56af8619aa /io_uring | |
| parent | 826d45aaac3a903b10409c54ebec6c4db7e57383 (diff) | |
| download | linux-75e94c7e8859e58aadc15a98cc9704edff47d4f2.tar.gz linux-75e94c7e8859e58aadc15a98cc9704edff47d4f2.tar.bz2 linux-75e94c7e8859e58aadc15a98cc9704edff47d4f2.zip | |
io_uring/af_unix: defer registered files gc to io_uring release
commit 0091bfc81741b8d3aeb3b7ab8636f911b2de6e80 upstream.
Instead of putting io_uring's registered files in unix_gc() we want it
to be done by io_uring itself. The trick here is to consider io_uring
registered files for cycle detection but not actually putting them down.
Because io_uring can't register other ring instances, this will remove
all refs to the ring file triggering the ->release path and clean up
with io_ring_ctx_free().
Cc: stable@vger.kernel.org
Fixes: 6b06314c47e1 ("io_uring: add file set registration")
Reported-and-tested-by: David Bouman <dbouman03@gmail.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
[axboe: add kerneldoc comment to skb, fold in skb leak fix]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/rsrc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index cf3272113214..50721c17c6cb 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -855,6 +855,7 @@ int __io_scm_file_account(struct io_ring_ctx *ctx, struct file *file) UNIXCB(skb).fp = fpl; skb->sk = sk; + skb->scm_io_uring = 1; skb->destructor = unix_destruct_scm; refcount_add(skb->truesize, &sk->sk_wmem_alloc); } |