From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id D60725A0274 for ; Fri, 11 Aug 2023 07:12:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1691730753; bh=4937s+5IrGwBogWfLy5Ri7lnTjyPReCrRdyrFrMqQuo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=awpK66fTwYWSchJ2668KrpTKhSziE0NfBMzKDOujsQYfj+kGg91i//3GtetuDEHEv QKkvi8cOhCedNHMZFuyu7oUfbYv2gCzxGSordhUAU1ddsCWwvpFROB7zxy8SHcYzJ4 xFlLDqNVW0wCVz1ibbGbR+nr/v4o07+5zORXxT6s= Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4RMX3j1lndz4wy3; Fri, 11 Aug 2023 15:12:33 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 04/13] tap: Fold reset handling into tap_handler_passt() Date: Fri, 11 Aug 2023 15:12:20 +1000 Message-ID: <20230811051229.343838-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811051229.343838-1-david@gibson.dropbear.id.au> References: <20230811051229.343838-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 7ESH3QLJAESIY5ZQQWF34ZYCPKDZ5G3N X-Message-ID-Hash: 7ESH3QLJAESIY5ZQQWF34ZYCPKDZ5G3N X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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. It also makes it clearer that we had a redundant EPOLL_CTL_DEL and close() in one of the reset paths, so fix that too. Signed-off-by: David Gibson --- tap.c | 68 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/tap.c b/tap.c index d717bc2..3777de8 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; @@ -913,13 +935,9 @@ redo: n = recv(c->fd_tap, p, TAP_BUF_FILL, MSG_DONTWAIT); if (n < 0) { - if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) - return 0; - - epoll_ctl(c->epollfd, EPOLL_CTL_DEL, c->fd_tap, NULL); - close(c->fd_tap); - - return -ECONNRESET; + if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK) + tap_sock_reset(c); + return; } while (n > (ssize_t)sizeof(uint32_t)) { @@ -934,7 +952,7 @@ redo: if (len > n) { rem = recv(c->fd_tap, p + n, len - n, 0); if ((n += rem) != len) - return 0; + return; } /* Complete the partial read above before discarding a malformed @@ -975,8 +993,6 @@ next: /* We can't use EPOLLET otherwise. */ if (rem) goto redo; - - return 0; } /** @@ -1258,23 +1274,6 @@ void tap_sock_init(struct ctx *c) } } -/** - * 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() - Packet handler for AF_UNIX or tuntap file descriptor * @c: Execution context @@ -1290,11 +1289,8 @@ void tap_handler(struct ctx *c, int fd, uint32_t events, return; } - if (c->mode == MODE_PASST) { - if (tap_handler_passt(c, now) || - (events & (EPOLLRDHUP | EPOLLHUP | EPOLLERR))) - tap_sock_reset(c); - } else if (c->mode == MODE_PASTA) { + if (c->mode == MODE_PASST) + tap_handler_passt(c, events, now); + else if (c->mode == MODE_PASTA) tap_handler_pasta(c, events, now); - } } -- 2.41.0