tun: fix blocking read (71828b22) · Commits · 戴 / test

This patch moves setting of the current state into the loop. Otherwise the task may end up in a busy wait loop if none of the break conditions are met. Signed-off-by:

Timur Celik <mail@timurcelik.de> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/tun.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2167,9 +2167,9 @@ static void tun_ring_recv(struct tun_file tfile, int noblock, int *err)
		}

		add_wait_queue(&tfile->wq.wait, &wait);
		current->state = TASK_INTERRUPTIBLE;

		while (1) {
		set_current_state(TASK_INTERRUPTIBLE);
		ptr = ptr_ring_consume(&tfile->tx_ring);
		if (ptr)
		break;
		@@ -2185,7 +2185,7 @@ static void tun_ring_recv(struct tun_file tfile, int noblock, int *err)
		schedule();
		}

		current->state = TASK_RUNNING;
		set_current_state(TASK_RUNNING);
		remove_wait_queue(&tfile->wq.wait, &wait);

		out:

Admin message