um: Fix uml_mconsole stop/go

kot-begemot-uk · richardweinberger · commit 1a3a6a2a035b · 2022-03-11T10:49:19.000+01:00
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>
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
@@ -224,7 +224,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 (;;) {
@@ -247,6 +247,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
`@@ -224,7 +224,7 @@ void mconsole_go(struct mc_request *req)`
`224`	`224`
`225`	`225`	`void mconsole_stop(struct mc_request *req)`
`226`	`226`	`{`
`227`		`- deactivate_fd(req->originating_fd, MCONSOLE_IRQ);`
	`227`	`+ block_signals();`
`228`	`228`	`os_set_fd_block(req->originating_fd, 1);`
`229`	`229`	`mconsole_reply(req, "stopped", 0, 0);`
`230`	`230`	`for (;;) {`
`@@ -247,6 +247,7 @@ void mconsole_stop(struct mc_request *req)`
`247`	`247`	`}`
`248`	`248`	`os_set_fd_block(req->originating_fd, 0);`
`249`	`249`	`mconsole_reply(req, "", 0, 0);`
	`250`	`+ unblock_signals();`
`250`	`251`	`}`
`251`	`252`
`252`	`253`	`static DEFINE_SPINLOCK(mc_devices_lock);`