From: Richard Weinberger <richard@nod.at>
To: linux-um@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, johannes.berg@intel.com,
anton.ivanov@cambridgegreys.com,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 3/4] um: chan: Restore blocking mode upon exit
Date: Sat, 1 Jan 2022 22:58:09 +0100 [thread overview]
Message-ID: <20220101215810.13260-4-richard@nod.at> (raw)
In-Reply-To: <20220101215810.13260-1-richard@nod.at>
Make sure that O_NONBLOCK is cleared upon exit if UML sets it.
Otherwise stdin/out behaves strange after UML terminates.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/um/drivers/chan.h | 1 +
arch/um/drivers/chan_kern.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/arch/um/drivers/chan.h b/arch/um/drivers/chan.h
index c37cc4f26f91..6b8c462f146e 100644
--- a/arch/um/drivers/chan.h
+++ b/arch/um/drivers/chan.h
@@ -22,6 +22,7 @@ struct chan {
unsigned int output:1;
unsigned int opened:1;
unsigned int enabled:1;
+ unsigned int fd_blocking:1;
int fd;
const struct chan_ops *ops;
void *data;
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 86be115b5890..6d512589fa50 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -102,6 +102,7 @@ static int open_one_chan(struct chan *chan)
}
chan->fd = fd;
+ chan->fd_blocking = ret;
chan->opened = 1;
return 0;
@@ -223,6 +224,8 @@ static void close_one_chan(struct chan *chan, int delay_free_irq)
if (chan->ops->close != NULL)
(*chan->ops->close)(chan->fd, chan->data);
+ os_set_fd_block(chan->fd, chan->fd_blocking);
+
chan->opened = 0;
chan->fd = -1;
}
--
2.26.2
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
next prev parent reply other threads:[~2022-01-01 21:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-01 21:58 [PATCH 0/4] um: Assorted console related fixes Richard Weinberger
2022-01-01 21:58 ` [PATCH 1/4] um: Run console exit code also upon kernel panic Richard Weinberger
2022-01-04 8:56 ` Johannes Berg
2022-01-01 21:58 ` [PATCH 2/4] um: os_set_fd_block: Return old blocking mode Richard Weinberger
2022-01-04 9:00 ` Johannes Berg
2022-01-01 21:58 ` Richard Weinberger [this message]
2022-01-01 21:58 ` [PATCH 4/4] um: irq: Restore O_ASYNC upon exit Richard Weinberger
2022-01-04 9:02 ` Johannes Berg
2022-03-09 5:29 ` [PATCH 0/4] um: Assorted console related fixes Glenn Washburn
2022-03-09 8:35 ` Richard Weinberger
2022-03-09 16:13 ` Randy Dunlap
2022-03-09 16:21 ` Richard Weinberger
2022-03-09 16:48 ` Randy Dunlap
2022-03-10 18:21 ` Glenn Washburn
2022-04-04 21:41 ` Richard Weinberger
2022-06-06 23:16 ` Glenn Washburn
2022-06-07 8:22 ` Johannes Berg
2022-06-07 15:10 ` Glenn Washburn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220101215810.13260-4-richard@nod.at \
--to=richard@nod.at \
--cc=anton.ivanov@cambridgegreys.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox