Fix io_uring async rlimit(RLIMIT_NOFILE)
Subsystems (5)
Jens Axboe
maintainerPATCH 1/1 Fix io_uring async rlimit(RLIMIT_NOFILE)
If we handle openat/openat2/accept in an async manner, then we need to ensure that the max open file limit is honored. All of these end up boiling down to the check in get_unused_fd_flags(), which does rlimit(RLIMIT_NOFILE), which uses the current->signal->rlim[] limits.
Instead of fiddling with the task ->signal pointer, just allow us to pass in the correct value as set from the original task at request prep time.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 io_uring: make sure openat/openat2 honor rlimit nofile
Dmitry reports that a test case shows that io_uring isn't honoring a modified rlimit nofile setting. get_unused_fd_flags() checks the task signal->rlimi[] for the limits. As this isn't easily inheritable, provide a __get_unused_fd_flags() that takes the value instead. Then we can grab it when the request is prepared (from the original task), and pass that in when we do the async part part of the open.
--- fs/file.c | 7 ++++++- fs/io_uring.c | 5 ++++- include/linux/file.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-)
fs/file.c +6 -1
@@ -540,9 +540,14 @@ static int alloc_fd(unsigned start, unsigned flags)return __alloc_fd (current->files, start,rlimit (RLIMIT_NOFILE ), flags); } +int __get_unused_fd_flags (unsigned flags,unsigned long nofile) +{ +return __alloc_fd (current->files,0 , nofile, flags); +} +int get_unused_fd_flags (unsigned flags) { -return __alloc_fd (current->files,0 ,rlimit (RLIMIT_NOFILE ), flags); +return __get_unused_fd_flags (flags,rlimit (RLIMIT_NOFILE )); }EXPORT_SYMBOL (get_unused_fd_flags);
fs/io_uring.c +4 -1
@@ -397,6 +397,7 @@ struct io_open {struct filename *filename;struct statx __user *buffer;struct open_how how; +unsigned long nofile; };struct io_files_update {
@@ -2577,6 +2578,7 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return ret; } + req->open.nofile =rlimit (RLIMIT_NOFILE ); req->flags |=REQ_F_NEED_CLEANUP ;return 0 ; }
@@ -2618,6 +2620,7 @@ static int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return ret; } + req->open.nofile =rlimit (RLIMIT_NOFILE ); req->flags |=REQ_F_NEED_CLEANUP ;return 0 ; }
@@ -2636,7 +2639,7 @@ static int io_openat2(struct io_kiocb *req, struct io_kiocb **nxt,if (ret) goto err; - ret =get_unused_fd_flags (req->open.how.flags); + ret =__get_unused_fd_flags (req->open.how.flags, req->open.nofile);if (ret <0 ) goto err;
include/linux/file.h +1 -0
@@ -85,6 +85,7 @@ extern int f_dupfd(unsigned int from, struct file *file, unsigned flags);extern int replace_fd (unsigned fd,struct file *file,unsigned flags);extern void set_close_on_exec (unsigned int fd,int flag);extern bool get_close_on_exec (unsigned int fd); +extern int __get_unused_fd_flags (unsigned flags,unsigned long nofile);extern int get_unused_fd_flags (unsigned flags);extern void put_unused_fd (unsigned int fd);
Signature · 1 line
2.25.2
Jens Axboe
maintainerPATCH 2/2 io_uring: make sure accept honor rlimit nofile
In reply to Jens AxboeJust like commit 21ec2da35ce3, this fixes the fact that IORING_OP_ACCEPT ends up using get_unused_fd_flags(), which checks current->signal->rlim[] for limits.
Add an extra argument to __sys_accept4_file() that allows us to pass in the proper nofile limit, and grab it at request prep time.
--- fs/io_uring.c | 5 ++++- include/linux/socket.h | 3 ++- net/socket.c | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-)
fs/io_uring.c +4 -1
@@ -343,6 +343,7 @@ struct io_accept {struct sockaddr __user *addr;int __user *addr_len;int flags; +unsigned long nofile; };struct io_sync {
@@ -3324,6 +3325,7 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) accept->addr =u64_to_user_ptr (READ_ONCE (sqe->addr)); accept->addr_len =u64_to_user_ptr (READ_ONCE (sqe->addr2)); accept->flags =READ_ONCE (sqe->accept_flags); + accept->nofile =rlimit (RLIMIT_NOFILE );return 0 ;#else return -EOPNOTSUPP ;
@@ -3340,7 +3342,8 @@ static int __io_accept(struct io_kiocb *req, struct io_kiocb **nxt, file_flags = force_nonblock ?O_NONBLOCK :0 ; ret =__sys_accept4_file (req->file, file_flags, accept->addr, - accept->addr_len, accept->flags); + accept->addr_len, accept->flags, + accept->nofile);if (ret == -EAGAIN && force_nonblock)return -EAGAIN ;if (ret == -ERESTARTSYS )
include/linux/socket.h +2 -1
@@ -401,7 +401,8 @@ extern int __sys_sendto(int fd, void __user *buff, size_t len, int addr_len);extern int __sys_accept4_file (struct file *file,unsigned file_flags,struct sockaddr __user *upeer_sockaddr, -int __user *upeer_addrlen,int flags); +int __user *upeer_addrlen,int flags, +unsigned long nofile);extern int __sys_accept4 (int fd,struct sockaddr __user *upeer_sockaddr,int __user *upeer_addrlen,int flags);extern int __sys_socket (int family,int type,int protocol);
net/socket.c +5 -3
@@ -1707,7 +1707,8 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)int __sys_accept4_file (struct file *file,unsigned file_flags,struct sockaddr __user *upeer_sockaddr, -int __user *upeer_addrlen,int flags) +int __user *upeer_addrlen,int flags, +unsigned long nofile) {struct socket *sock, *newsock;struct file *newfile;
@@ -1738,7 +1739,7 @@ int __sys_accept4_file(struct file *file, unsigned file_flags,*/ __module_get (newsock->ops->owner); - newfd =get_unused_fd_flags (flags); + newfd =__get_unused_fd_flags (flags, nofile);if (unlikely (newfd <0 )) { err = newfd;sock_release (newsock);
@@ -1807,7 +1808,8 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, f =fdget (fd);if (f.file) { ret =__sys_accept4_file (f.file,0 , upeer_sockaddr, - upeer_addrlen, flags); + upeer_addrlen, flags, +rlimit (RLIMIT_NOFILE ));if (f.flags)fput (f.file); }
Signature · 1 line
2.25.2
Re: [PATCH 1/2] io_uring: make sure openat/openat2 honor rlimit nofile
In reply to Jens AxboeFrom: Jens Axboe <[email protected]>
Date: Thu, 19 Mar 2020 20:22:15 -0600
Quoted 9 lines
Dmitry reports that a test case shows that
io_uringisn't honoring a modified rlimit nofile setting.get_unused_fd_flags()checks the task signal->rlimi[] for the limits. As this isn't easily inheritable, provide a__get_unused_fd_flags()that takes the value instead. Then we can grab it when the request is prepared (from the original task), and pass that in when we do the async part part of the open.Reported-by Dmitry Kadashev <[email protected]>Signed-off-by Jens Axboe <[email protected]>
Re: [PATCH 2/2] io_uring: make sure accept honor rlimit nofile
In reply to Jens AxboeFrom: Jens Axboe <[email protected]>
Date: Thu, 19 Mar 2020 20:22:16 -0600
Quoted 8 lines
Just like commit
21ec2da35ce3, this fixes the fact thatIORING_OP_ACCEPTends up usingget_unused_fd_flags(), which checks current->signal->rlim[] for limits.Add an extra argument to
__sys_accept4_file()that allows us to pass in the proper nofile limit, and grab it at request prep time.Signed-off-by Jens Axboe <[email protected]>
Jens Axboe
maintainerRe: [PATCH 2/2] io_uring: make sure accept honor rlimit nofile
Quoted 7 lines · David Miller
From: Jens Axboe <[email protected]>
Date: Thu, 19 Mar 2020 20:22:16 -0600Quoted 4 lines
Just like commit
21ec2da35ce3, this fixes the fact thatIORING_OP_ACCEPTends up usingget_unused_fd_flags(), which checks current->signal->rlim[] for limits.
Quoted 6 lines
Quoted 4 lines
Add an extra argument to
__sys_accept4_file()that allows us to pass in the proper nofile limit, and grab it at request prep time.Signed-off-by Jens Axboe <[email protected]>Acked-by David S. Miller <[email protected]>
Thanks, added to both.
Signature · 1 line
Jens Axboe