On 12/14/20 7:41 AM, Jens Axboe wrote:
> Hi Linus,
>
> Fairly light set of changes this time around, and mostly some bits that
> were pushed out to 5.11 instead of 5.10, fixes/cleanups, and a few
> features. In particular:
>
> - Cleanups around iovec import (David Laight, Pavel)
>
> - Add timeout support for io_uring_enter(2), which enables us to clean
> up liburing and avoid a timeout sqe submission in the completion path.
> The big win here is that it allows setups that split SQ and CQ
> handling into separate threads to avoid locking, as the CQ side will
> no longer submit when timeouts are needed when waiting for events.
> (Hao Xu)
>
> - Add support for socket shutdown, and renameat/unlinkat.
>
> - SQPOLL cleanups and improvements (Xiaoguang Wang)
>
> - Allow SQPOLL setups for CAP_SYS_NICE, and enable regular (non-fixed)
> files to be used.
>
> - Cancelation improvements (Pavel)
>
> - Fixed file reference improvements (Pavel)
>
> - IOPOLL related race fixes (Pavel)
>
> - Lots of other little fixes and cleanups (mostly Pavel)
>
> Please pull!
With the net branch pulled, this will now fail due to the changing
of sock_from_file. It'll merge cleanly, but you need to fix that
one up.
fs/io_uring.c: In function ‘io_shutdown’:
fs/io_uring.c:3784:9: error: too many arguments to function ‘sock_from_file’
3784 | sock = sock_from_file(req->file, &ret);
| ^~~~~~~~~~~~~~
In file included from fs/io_uring.c:63:
./include/linux/net.h:243:16: note: declared here
243 | struct socket *sock_from_file(struct file *file);
| ^~~~~~~~~~~~~~
make[1]: *** [scripts/Makefile.build:279: fs/io_uring.o] Error 1
Like so:
- sock = sock_from_file(req->file, &ret);
++ sock = sock_from_file(req->file);
+ if (unlikely(!sock))
- return ret;
++ return -ENOTSOCK;
--
Jens Axboe
