public inbox for linux-um@lists.infradead.org
 help / color / mirror / Atom feed
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 4/4] um: irq: Restore O_ASYNC upon exit
Date: Sat,  1 Jan 2022 22:58:10 +0100	[thread overview]
Message-ID: <20220101215810.13260-5-richard@nod.at> (raw)
In-Reply-To: <20220101215810.13260-1-richard@nod.at>

Just like with O_NONBLOCK, make sure UML clears O_ASYNC
upon exit when it set it.

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/um/kernel/irq.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index a8873d9bc28b..e020bdccfa23 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -342,6 +342,7 @@ static void free_irq_by_irq_and_dev(unsigned int irq, void *dev)
 				continue;
 
 			os_del_epoll_fd(entry->fd);
+			os_clear_fd_async(entry->fd);
 			reg->events = 0;
 			update_or_free_irq_entry(entry);
 			goto out;
@@ -396,8 +397,10 @@ int deactivate_all_fds(void)
 	os_set_ioignore();
 
 	/* we can no longer call kfree() here so just deactivate */
-	list_for_each_entry(entry, &active_fds, list)
+	list_for_each_entry(entry, &active_fds, list) {
 		os_del_epoll_fd(entry->fd);
+		os_clear_fd_async(entry->fd);
+	}
 	os_close_epoll_fd();
 	return 0;
 }
-- 
2.26.2


_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um


  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 ` [PATCH 3/4] um: chan: Restore blocking mode upon exit Richard Weinberger
2022-01-01 21:58 ` Richard Weinberger [this message]
2022-01-04  9:02   ` [PATCH 4/4] um: irq: Restore O_ASYNC " 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-5-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