public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH] btrfs: check if task has died in btrfs_uring_read_finished()
@ 2024-12-13 12:46 Mark Harmstone
  0 siblings, 0 replies; only message in thread
From: Mark Harmstone @ 2024-12-13 12:46 UTC (permalink / raw)
  To: linux-btrfs, io-uring; +Cc: Mark Harmstone, Pavel Begunkov

If the task has died by the time we call btrfs_uring_read_finished(),
return -ECANCELED rather than trying to copy the pages back to
userspace.

Signed-off-by: Mark Harmstone <[email protected]>
Suggested-by: Pavel Begunkov <[email protected]>
---
(This is quite possibly a resend. I intended this to be the sequel to
"[PATCH 1/2] io_uring/cmd: let cmds to know about dying task", but I
can't find it anywhere on the mailing lists now.)

 fs/btrfs/ioctl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 64cebc32fe76..6913967083fe 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4754,6 +4754,11 @@ static void btrfs_uring_read_finished(struct io_uring_cmd *cmd, unsigned int iss
 	/* The inode lock has already been acquired in btrfs_uring_read_extent.  */
 	btrfs_lockdep_inode_acquire(inode, i_rwsem);
 
+	if (unlikely(issue_flags & IO_URING_F_TASK_DEAD)) {
+		ret = -ECANCELED;
+		goto out;
+	}
+
 	if (priv->err) {
 		ret = priv->err;
 		goto out;
-- 
2.45.2


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2024-12-13 12:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-13 12:46 [PATCH] btrfs: check if task has died in btrfs_uring_read_finished() Mark Harmstone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox