um: Fix uml_mconsole stop/go

kot-begemot-uk · gregkh · commit 272c74323dcc · 2022-04-08T14:40:44.000+02:00
commit 1a3a6a2 upstream. Moving to an EPOLL based IRQ controller broke uml_mconsole stop/go commands. This fixes it and restores stop/go functionality. Fixes: ff6a179 ("Epoll based IRQ controller") Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
@@ -223,7 +223,7 @@ void mconsole_go(struct mc_request *req)
 
 void mconsole_stop(struct mc_request *req)
 {
-	deactivate_fd(req->originating_fd, MCONSOLE_IRQ);
+	block_signals();
 	os_set_fd_block(req->originating_fd, 1);
 	mconsole_reply(req, "stopped", 0, 0);
 	for (;;) {
@@ -246,6 +246,7 @@ void mconsole_stop(struct mc_request *req)
 	}
 	os_set_fd_block(req->originating_fd, 0);
 	mconsole_reply(req, "", 0, 0);
+	unblock_signals();
 }
 
 static DEFINE_SPINLOCK(mc_devices_lock);

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ void mconsole_go(struct mc_request *req)`
`223`	`223`
`224`	`224`	`void mconsole_stop(struct mc_request *req)`
`225`	`225`	`{`
`226`		`- deactivate_fd(req->originating_fd, MCONSOLE_IRQ);`
	`226`	`+ block_signals();`
`227`	`227`	`os_set_fd_block(req->originating_fd, 1);`
`228`	`228`	`mconsole_reply(req, "stopped", 0, 0);`
`229`	`229`	`for (;;) {`
`@@ -246,6 +246,7 @@ void mconsole_stop(struct mc_request *req)`
`246`	`246`	`}`
`247`	`247`	`os_set_fd_block(req->originating_fd, 0);`
`248`	`248`	`mconsole_reply(req, "", 0, 0);`
	`249`	`+ unblock_signals();`
`249`	`250`	`}`
`250`	`251`
`251`	`252`	`static DEFINE_SPINLOCK(mc_devices_lock);`