From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH v2 04/13] tap: Fold reset handling into tap_handler_passt()
Date: Fri, 11 Aug 2023 13:07:26 +1000 [thread overview]
Message-ID: <ZNWl7us5lDY/Qak+@zatzit> (raw)
In-Reply-To: <20230810214946.4bdf200b@elisabeth>
[-- Attachment #1: Type: text/plain, Size: 2665 bytes --]
On Thu, Aug 10, 2023 at 09:49:46PM +0200, Stefano Brivio wrote:
> On Thu, 10 Aug 2023 12:33:06 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > We call tap_sock_reset() if tap_handler_passt() fails, or if we get an
> > error event on the socket. Fold that logic into tap_handler() passt itself
> > which simplifies the caller.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> > tap.c | 63 ++++++++++++++++++++++++++++++-----------------------------
> > 1 file changed, 32 insertions(+), 31 deletions(-)
> >
> > diff --git a/tap.c b/tap.c
> > index 866ca4d..501af33 100644
> > --- a/tap.c
> > +++ b/tap.c
> > @@ -891,19 +891,41 @@ append:
> > return in->count;
> > }
> >
> > +/**
> > + * tap_sock_reset() - Handle closing or failure of connect AF_UNIX socket
> > + * @c: Execution context
> > + */
> > +static void tap_sock_reset(struct ctx *c)
> > +{
> > + if (c->one_off) {
> > + info("Client closed connection, exiting");
> > + exit(EXIT_SUCCESS);
> > + }
> > +
> > + /* Close the connected socket, wait for a new connection */
> > + epoll_ctl(c->epollfd, EPOLL_CTL_DEL, c->fd_tap, NULL);
> > + close(c->fd_tap);
> > + c->fd_tap = -1;
> > +}
> > +
> > /**
> > * tap_handler_passt() - Packet handler for AF_UNIX file descriptor
> > * @c: Execution context
> > + * @events: epoll events
> > * @now: Current timestamp
> > - *
> > - * Return: -ECONNRESET on receive error, 0 otherwise
> > */
> > -static int tap_handler_passt(struct ctx *c, const struct timespec *now)
> > +static void tap_handler_passt(struct ctx *c, uint32_t events,
> > + const struct timespec *now)
> > {
> > struct ethhdr *eh;
> > ssize_t n, rem;
> > char *p;
> >
> > + if (events & (EPOLLRDHUP | EPOLLHUP | EPOLLERR)) {
> > + tap_sock_reset(c);
> > + return;
> > + }
> > +
> > redo:
> > p = pkt_buf;
> > rem = 0;
> > @@ -914,12 +936,13 @@ redo:
> > n = recv(c->fd_tap, p, TAP_BUF_FILL, MSG_DONTWAIT);
> > if (n < 0) {
> > if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
> > - return 0;
> > + return;
> >
> > epoll_ctl(c->epollfd, EPOLL_CTL_DEL, c->fd_tap, NULL);
> > close(c->fd_tap);
> >
> > - return -ECONNRESET;
> > + tap_sock_reset(c);
>
> ...also reported by covscan: close() before this is redundant now.
Oops, yes. I spotted that, but then forgot to fix it. Fixed for a
new spin.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2023-08-11 3:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-10 2:33 [PATCH v2 00/13] Clean up to tap errors and epoll dispatch David Gibson
2023-08-10 2:33 ` [PATCH v2 01/13] tap: Clean up tap reset path David Gibson
2023-08-10 2:33 ` [PATCH v2 02/13] tap: Clean up behaviour for errors on listening Unix socket David Gibson
2023-08-10 2:33 ` [PATCH v2 03/13] tap: Fold reset handling into tap_handler_pasta() David Gibson
2023-08-10 2:33 ` [PATCH v2 04/13] tap: Fold reset handling into tap_handler_passt() David Gibson
2023-08-10 19:49 ` Stefano Brivio
2023-08-11 3:07 ` David Gibson [this message]
2023-08-10 2:33 ` [PATCH v2 05/13] epoll: Generalize epoll_ref to cover things other than sockets David Gibson
2023-08-10 2:33 ` [PATCH v2 06/13] epoll: Always use epoll_ref for the epoll data variable David Gibson
2023-08-10 2:33 ` [PATCH v2 07/13] epoll: Fold sock_handler into general switch on epoll event fd David Gibson
2023-08-10 19:49 ` Stefano Brivio
2023-08-11 3:11 ` David Gibson
2023-08-10 2:33 ` [PATCH v2 08/13] epoll: Split handling of ICMP and ICMPv6 sockets David Gibson
2023-08-10 2:33 ` [PATCH v2 09/13] epoll: Tiny cleanup to udp_sock_handler() David Gibson
2023-08-10 2:33 ` [PATCH v2 10/13] epoll: Split handling of TCP timerfds into its own handler function David Gibson
2023-08-10 2:33 ` [PATCH v2 11/13] epoll: Split handling of listening TCP sockets into their own handler David Gibson
2023-08-10 2:33 ` [PATCH v2 12/13] epoll: Split listening Unix domain socket into its own type David Gibson
2023-08-10 2:33 ` [PATCH v2 13/13] epoll: Use different epoll types for passt and pasta tap fds David Gibson
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=ZNWl7us5lDY/Qak+@zatzit \
--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).