From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 2/2] tap: More sensible behaviour for error on listening qemu socket
Date: Fri, 4 Aug 2023 18:32:32 +1000 [thread overview]
Message-ID: <20230804083232.1298624-3-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230804083232.1298624-1-david@gibson.dropbear.id.au>
We call tap_sock_unix_new() to handle a new connection to the qemu socket
if we get an EPOLLIN event on c->fd_tap_listen. If we get an error event
on c->fd_tap_listen instead, we'll fall through to the "tap reset" path.
However, this won't do anything useful for an error on the listening
socket, it will just close the already connected socket. If we wanted to
handle errors on this socket, we'd need to do something different than for
an error on the connected socket.
So, change the logic to explicitly do nothing for any !EPOLLIN events on
the listening socket.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
tap.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tap.c b/tap.c
index 3a43263..a8e5ce6 100644
--- a/tap.c
+++ b/tap.c
@@ -1281,8 +1281,9 @@ static void tap_sock_reset(struct ctx *c)
void tap_handler(struct ctx *c, int fd, uint32_t events,
const struct timespec *now)
{
- if (fd == c->fd_tap_listen && events == EPOLLIN) {
- tap_sock_unix_new(c);
+ if (fd == c->fd_tap_listen) {
+ if (events == EPOLLIN)
+ tap_sock_unix_new(c);
return;
}
--
@@ -1281,8 +1281,9 @@ static void tap_sock_reset(struct ctx *c)
void tap_handler(struct ctx *c, int fd, uint32_t events,
const struct timespec *now)
{
- if (fd == c->fd_tap_listen && events == EPOLLIN) {
- tap_sock_unix_new(c);
+ if (fd == c->fd_tap_listen) {
+ if (events == EPOLLIN)
+ tap_sock_unix_new(c);
return;
}
--
2.41.0
prev parent reply other threads:[~2023-08-04 8:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 8:32 [PATCH 0/2] Clean up reset of tap connections David Gibson
2023-08-04 8:32 ` [PATCH 1/2] tap: Clean up tap reset path David Gibson
2023-08-04 8:32 ` David Gibson [this message]
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=20230804083232.1298624-3-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/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.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).