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 2/4] um: os_set_fd_block: Return old blocking mode Date: Sat, 1 Jan 2022 22:58:08 +0100 [thread overview] Message-ID: <20220101215810.13260-3-richard@nod.at> (raw) In-Reply-To: <20220101215810.13260-1-richard@nod.at> This will be needed when we restore the old mode upon exit. The function now returns < 0 in case of an error, 1 if O_NONBLOCK was set, 0 otherwise. Signed-off-by: Richard Weinberger <richard@nod.at> --- arch/um/drivers/chan_kern.c | 8 ++++---- arch/um/drivers/chan_user.c | 2 +- arch/um/drivers/mconsole_kern.c | 2 +- arch/um/drivers/ubd_user.c | 2 +- arch/um/drivers/xterm.c | 2 +- arch/um/os-Linux/file.c | 5 ++++- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c index 62997055c454..86be115b5890 100644 --- a/arch/um/drivers/chan_kern.c +++ b/arch/um/drivers/chan_kern.c @@ -83,7 +83,7 @@ static const struct chan_ops not_configged_ops = { static int open_one_chan(struct chan *chan) { - int fd, err; + int fd, ret; if (chan->opened) return 0; @@ -95,10 +95,10 @@ static int open_one_chan(struct chan *chan) if (fd < 0) return fd; - err = os_set_fd_block(fd, 0); - if (err) { + ret = os_set_fd_block(fd, 0); + if (ret < 0) { (*chan->ops->close)(fd, chan->data); - return err; + return ret; } chan->fd = fd; diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 6040817c036f..b449656cd5f8 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c @@ -257,7 +257,7 @@ static int winch_tramp(int fd, struct tty_port *port, int *fd_out, } err = os_set_fd_block(*fd_out, 0); - if (err) { + if (err < 0) { printk(UM_KERN_ERR "winch_tramp: failed to set thread_fd " "non-blocking.\n"); goto out_close; diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 6ead1e240457..8000914f9cd4 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -732,7 +732,7 @@ static int __init mconsole_init(void) printk(KERN_ERR "Failed to initialize management console\n"); return 1; } - if (os_set_fd_block(sock, 0)) + if (os_set_fd_block(sock, 0) < 0) goto out; register_reboot_notifier(&reboot_notifier); diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c index a1afe414ce48..a930a254826b 100644 --- a/arch/um/drivers/ubd_user.c +++ b/arch/um/drivers/ubd_user.c @@ -42,7 +42,7 @@ int start_io_thread(unsigned long sp, int *fd_out) err = os_set_fd_block(*fd_out, 0); err = os_set_fd_block(kernel_fd, 0); - if (err) { + if (err < 0) { printk("start_io_thread - failed to set nonblocking I/O.\n"); goto out_close; } diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c index 87ca4a47cd66..01be81c25266 100644 --- a/arch/um/drivers/xterm.c +++ b/arch/um/drivers/xterm.c @@ -161,7 +161,7 @@ static int xterm_open(int input, int output, int primary, void *d, } err = os_set_fd_block(new, 0); - if (err) { + if (err < 0) { printk(UM_KERN_ERR "xterm_open : failed to set xterm " "descriptor non-blocking, err = %d\n", -err); goto out_close2; diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c index e4421dbc4c36..af2b3cba2c93 100644 --- a/arch/um/os-Linux/file.c +++ b/arch/um/os-Linux/file.c @@ -445,11 +445,14 @@ int os_clear_fd_async(int fd) int os_set_fd_block(int fd, int blocking) { int flags; + int oldmode; flags = fcntl(fd, F_GETFL); if (flags < 0) return -errno; + oldmode = !!(flags & O_NONBLOCK); + if (blocking) flags &= ~O_NONBLOCK; else @@ -458,7 +461,7 @@ int os_set_fd_block(int fd, int blocking) if (fcntl(fd, F_SETFL, flags) < 0) return -errno; - return 0; + return oldmode; } int os_accept_connection(int fd) -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
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 2/4] um: os_set_fd_block: Return old blocking mode Date: Sat, 1 Jan 2022 22:58:08 +0100 [thread overview] Message-ID: <20220101215810.13260-3-richard@nod.at> (raw) In-Reply-To: <20220101215810.13260-1-richard@nod.at> This will be needed when we restore the old mode upon exit. The function now returns < 0 in case of an error, 1 if O_NONBLOCK was set, 0 otherwise. Signed-off-by: Richard Weinberger <richard@nod.at> --- arch/um/drivers/chan_kern.c | 8 ++++---- arch/um/drivers/chan_user.c | 2 +- arch/um/drivers/mconsole_kern.c | 2 +- arch/um/drivers/ubd_user.c | 2 +- arch/um/drivers/xterm.c | 2 +- arch/um/os-Linux/file.c | 5 ++++- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c index 62997055c454..86be115b5890 100644 --- a/arch/um/drivers/chan_kern.c +++ b/arch/um/drivers/chan_kern.c @@ -83,7 +83,7 @@ static const struct chan_ops not_configged_ops = { static int open_one_chan(struct chan *chan) { - int fd, err; + int fd, ret; if (chan->opened) return 0; @@ -95,10 +95,10 @@ static int open_one_chan(struct chan *chan) if (fd < 0) return fd; - err = os_set_fd_block(fd, 0); - if (err) { + ret = os_set_fd_block(fd, 0); + if (ret < 0) { (*chan->ops->close)(fd, chan->data); - return err; + return ret; } chan->fd = fd; diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 6040817c036f..b449656cd5f8 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c @@ -257,7 +257,7 @@ static int winch_tramp(int fd, struct tty_port *port, int *fd_out, } err = os_set_fd_block(*fd_out, 0); - if (err) { + if (err < 0) { printk(UM_KERN_ERR "winch_tramp: failed to set thread_fd " "non-blocking.\n"); goto out_close; diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 6ead1e240457..8000914f9cd4 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -732,7 +732,7 @@ static int __init mconsole_init(void) printk(KERN_ERR "Failed to initialize management console\n"); return 1; } - if (os_set_fd_block(sock, 0)) + if (os_set_fd_block(sock, 0) < 0) goto out; register_reboot_notifier(&reboot_notifier); diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c index a1afe414ce48..a930a254826b 100644 --- a/arch/um/drivers/ubd_user.c +++ b/arch/um/drivers/ubd_user.c @@ -42,7 +42,7 @@ int start_io_thread(unsigned long sp, int *fd_out) err = os_set_fd_block(*fd_out, 0); err = os_set_fd_block(kernel_fd, 0); - if (err) { + if (err < 0) { printk("start_io_thread - failed to set nonblocking I/O.\n"); goto out_close; } diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c index 87ca4a47cd66..01be81c25266 100644 --- a/arch/um/drivers/xterm.c +++ b/arch/um/drivers/xterm.c @@ -161,7 +161,7 @@ static int xterm_open(int input, int output, int primary, void *d, } err = os_set_fd_block(new, 0); - if (err) { + if (err < 0) { printk(UM_KERN_ERR "xterm_open : failed to set xterm " "descriptor non-blocking, err = %d\n", -err); goto out_close2; diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c index e4421dbc4c36..af2b3cba2c93 100644 --- a/arch/um/os-Linux/file.c +++ b/arch/um/os-Linux/file.c @@ -445,11 +445,14 @@ int os_clear_fd_async(int fd) int os_set_fd_block(int fd, int blocking) { int flags; + int oldmode; flags = fcntl(fd, F_GETFL); if (flags < 0) return -errno; + oldmode = !!(flags & O_NONBLOCK); + if (blocking) flags &= ~O_NONBLOCK; else @@ -458,7 +461,7 @@ int os_set_fd_block(int fd, int blocking) if (fcntl(fd, F_SETFL, flags) < 0) return -errno; - return 0; + return oldmode; } int os_accept_connection(int fd) -- 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: 27+ 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 ` Richard Weinberger 2022-01-01 21:58 ` [PATCH 1/4] um: Run console exit code also upon kernel panic Richard Weinberger 2022-01-01 21:58 ` Richard Weinberger 2022-01-04 5:58 ` kernel test robot 2022-01-04 8:56 ` Johannes Berg 2022-01-04 8:56 ` Johannes Berg 2022-01-01 21:58 ` Richard Weinberger [this message] 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-04 9:00 ` Johannes Berg 2022-01-01 21:58 ` [PATCH 3/4] um: chan: Restore blocking mode upon exit Richard Weinberger 2022-01-01 21:58 ` Richard Weinberger 2022-01-01 21:58 ` [PATCH 4/4] um: irq: Restore O_ASYNC " Richard Weinberger 2022-01-01 21:58 ` Richard Weinberger 2022-01-04 9:02 ` Johannes Berg 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-3-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.