Commit 65893b49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.15-2021-10-01' of git://git.kernel.dk/linux-block 

Pull io_uring fixes from Jens Axboe:
 "Two fixes in here:

   - The signal issue that was discussed start of this week (me).

   - Kill dead fasync support in io_uring. Looks like it was broken
     since io_uring was initially merged, and given that nobody has ever
     complained about it, let's just kill it (Pavel)"

* tag 'io_uring-5.15-2021-10-01' of git://git.kernel.dk/linux-block:
  io_uring: kill fasync
  io-wq: exclusively gate signal based exit on get_signal() return
parents f05c6437 3f008385

fs/io-wq.c

+1 −4
Original line number Diff line number Diff line
@@ -584,10 +584,7 @@ static int io_wqe_worker(void *data) 


			if (!get_signal(&ksig))

				continue;

			if (fatal_signal_pending(current) ||

			    signal_group_exit(current->signal))

			break;

			continue;

		}

		last_timeout = !ret;

	}

fs/io_uring.c

+2 −15
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ struct io_ring_ctx { 
		struct wait_queue_head	cq_wait;

		unsigned		cq_extra;

		atomic_t		cq_timeouts;

		struct fasync_struct	*cq_fasync;

		unsigned		cq_last_tm_flush;

	} ____cacheline_aligned_in_smp;
@@ -1614,10 +1613,8 @@ static void io_cqring_ev_posted(struct io_ring_ctx *ctx) 
		wake_up(&ctx->sq_data->wait);

	if (io_should_trigger_evfd(ctx))

		eventfd_signal(ctx->cq_ev_fd, 1);

	if (waitqueue_active(&ctx->poll_wait)) {

	if (waitqueue_active(&ctx->poll_wait))

		wake_up_interruptible(&ctx->poll_wait);

		kill_fasync(&ctx->cq_fasync, SIGIO, POLL_IN);

	}

}



static void io_cqring_ev_posted_iopoll(struct io_ring_ctx *ctx)
@@ -1631,10 +1628,8 @@ static void io_cqring_ev_posted_iopoll(struct io_ring_ctx *ctx) 
	}

	if (io_should_trigger_evfd(ctx))

		eventfd_signal(ctx->cq_ev_fd, 1);

	if (waitqueue_active(&ctx->poll_wait)) {

	if (waitqueue_active(&ctx->poll_wait))

		wake_up_interruptible(&ctx->poll_wait);

		kill_fasync(&ctx->cq_fasync, SIGIO, POLL_IN);

	}

}



/* Returns true if there are no backlogged entries after the flush */
@@ -9345,13 +9340,6 @@ static __poll_t io_uring_poll(struct file *file, poll_table *wait) 
	return mask;

}



static int io_uring_fasync(int fd, struct file *file, int on)

{

	struct io_ring_ctx *ctx = file->private_data;



	return fasync_helper(fd, file, on, &ctx->cq_fasync);

}



static int io_unregister_personality(struct io_ring_ctx *ctx, unsigned id)

{

	const struct cred *creds;
@@ -10145,7 +10133,6 @@ static const struct file_operations io_uring_fops = { 
	.mmap_capabilities = io_uring_nommu_mmap_capabilities,

#endif

	.poll		= io_uring_poll,

	.fasync		= io_uring_fasync,

#ifdef CONFIG_PROC_FS

	.show_fdinfo	= io_uring_show_fdinfo,

#endif