| Message ID | 3f7dc1f0-79ca-d85c-4d16-8c12c5bd492d@kernel.dk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 438b406055cd21105aad77db7938ee4720b09bee |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | tun: flag the device as supporting FMODE_NOWAIT | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 7 Mar 2023 20:45:56 -0700 you wrote: > tun already checks for both O_NONBLOCK and IOCB_NOWAIT in its read > and write iter handlers, so it's fully ready for FMODE_NOWAIT. But > for some reason it doesn't set it. Rectify that oversight. > > Signed-off-by: Jens Axboe <axboe@kernel.dk> > > > [...] Here is the summary with links: - tun: flag the device as supporting FMODE_NOWAIT https://git.kernel.org/netdev/net-next/c/438b406055cd You are awesome, thank you!
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index ad653b32b2f0..4c7f74904c25 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -3463,6 +3463,8 @@ static int tun_chr_open(struct inode *inode, struct file * file) sock_set_flag(&tfile->sk, SOCK_ZEROCOPY); + /* tun groks IOCB_NOWAIT just fine, mark it as such */ + file->f_mode |= FMODE_NOWAIT; return 0; }
tun already checks for both O_NONBLOCK and IOCB_NOWAIT in its read and write iter handlers, so it's fully ready for FMODE_NOWAIT. But for some reason it doesn't set it. Rectify that oversight. Signed-off-by: Jens Axboe <axboe@kernel.dk> ---