github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

thunderbolt: stream: Support IOCB_NOWAIT in non-blocking I/O as well

Browse Source 
For read_iter/write_iter() it is also possible to pass IOCB_NOWAIT with
the kiocb to indicate non-blocking read/write. For instance io_uring
does this. So take this into account on read and write paths.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Mika Westerberg 2026-06-17 07:42:06 +03:00
parent af73a21a8e
commit 42bc693533
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/thunderbolt/stream.c
View File

@ -633,10 +633,23 @@ static void tbstream_dev_stop(struct tbstream_dev *sdev)
sdev->tx_ring.ring = NULL; sdev->tx_ring.ring = NULL;
} }
static int tbstream_dev_lock(struct tbstream_dev *sdev, bool nowait)
{
if (nowait) {
if (!mutex_trylock(&sdev->lock))
return -EAGAIN;
} else {
if (mutex_lock_interruptible(&sdev->lock))
return -ERESTARTSYS;
}
return 0;
}
static ssize_t static ssize_t
tbstream_dev_fops_read_iter(struct kiocb *kiocb, struct iov_iter *to) tbstream_dev_fops_read_iter(struct kiocb *kiocb, struct iov_iter *to)
{ {
struct file *file = kiocb->ki_filp; struct file *file = kiocb->ki_filp;
bool nowait = file->f_flags & O_NONBLOCK || kiocb->ki_flags & IOCB_NOWAIT;
struct tbstream_dev *sdev = to_tbstream_dev(file->private_data); struct tbstream_dev *sdev = to_tbstream_dev(file->private_data);
size_t nbytes; size_t nbytes;
int ret; int ret;
@ -645,14 +658,16 @@ tbstream_dev_fops_read_iter(struct kiocb *kiocb, struct iov_iter *to)
if (ret) if (ret)
return ret; return ret;
if (mutex_lock_interruptible(&sdev->lock)) ret = tbstream_dev_lock(sdev, nowait);
return -ERESTARTSYS; if (ret)
return ret;
while (!tbstream_ring_available(&sdev->rx_ring)) { while (!tbstream_ring_available(&sdev->rx_ring)) {
mutex_unlock(&sdev->lock); mutex_unlock(&sdev->lock);
if (file->f_flags & O_NONBLOCK) if (nowait)
return -EAGAIN; return -EAGAIN;
ret = wait_event_interruptible(sdev->wait, ret = wait_event_interruptible(sdev->wait,
tbstream_ring_available(&sdev->rx_ring) || tbstream_ring_available(&sdev->rx_ring) ||
tbstream_dev_valid(sdev) != 0 || tbstream_dev_valid(sdev) != 0 ||
@ -668,8 +683,9 @@ tbstream_dev_fops_read_iter(struct kiocb *kiocb, struct iov_iter *to)
if (tbstream_dev_closed(sdev) || tbstream_dev_removed(sdev)) if (tbstream_dev_closed(sdev) || tbstream_dev_removed(sdev))
return 0; return 0;
if (mutex_lock_interruptible(&sdev->lock)) ret = tbstream_dev_lock(sdev, nowait);
return -ERESTARTSYS; if (ret)
return ret;
} }
nbytes = 0; nbytes = 0;
@ -729,6 +745,7 @@ static ssize_t
tbstream_dev_fops_write_iter(struct kiocb *kiocb, struct iov_iter *from) tbstream_dev_fops_write_iter(struct kiocb *kiocb, struct iov_iter *from)
{ {
struct file *file = kiocb->ki_filp; struct file *file = kiocb->ki_filp;
bool nowait = file->f_flags & O_NONBLOCK || kiocb->ki_flags & IOCB_NOWAIT;
struct tbstream_dev *sdev = to_tbstream_dev(file->private_data); struct tbstream_dev *sdev = to_tbstream_dev(file->private_data);
size_t nbytes; size_t nbytes;
int ret; int ret;
@ -737,14 +754,16 @@ tbstream_dev_fops_write_iter(struct kiocb *kiocb, struct iov_iter *from)
if (ret) if (ret)
return ret; return ret;
if (mutex_lock_interruptible(&sdev->lock)) ret = tbstream_dev_lock(sdev, nowait);
return -ERESTARTSYS; if (ret)
return ret;
while (!tbstream_ring_available(&sdev->tx_ring)) { while (!tbstream_ring_available(&sdev->tx_ring)) {
mutex_unlock(&sdev->lock); mutex_unlock(&sdev->lock);
if (file->f_flags & O_NONBLOCK) if (nowait)
return -EAGAIN; return -EAGAIN;
ret = wait_event_interruptible(sdev->wait, ret = wait_event_interruptible(sdev->wait,
tbstream_ring_available(&sdev->tx_ring) || tbstream_ring_available(&sdev->tx_ring) ||
tbstream_dev_valid(sdev) != 0 || tbstream_dev_valid(sdev) != 0 ||
@ -760,8 +779,9 @@ tbstream_dev_fops_write_iter(struct kiocb *kiocb, struct iov_iter *from)
if (tbstream_dev_closed(sdev) || tbstream_dev_removed(sdev)) if (tbstream_dev_closed(sdev) || tbstream_dev_removed(sdev))
return -ENXIO; return -ENXIO;
if (mutex_lock_interruptible(&sdev->lock)) ret = tbstream_dev_lock(sdev, nowait);
return -ERESTARTSYS; if (ret)
return ret;
} }
nbytes = 0; nbytes = 0;