From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id D56365A0279 for ; Thu, 10 Aug 2023 04:33:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1691634801; bh=vkEW8SZLfru11+pJ60BXj1Q0ZQr/KJSjGOAVl/QDEpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LwSvtYMwfBDok/gPHznAIvJo/CkPvUbpmeStHPGkHrjNWT9rTRSZRJG/hihxdl72/ n45WN8Nts+SJdK78/ASEcfMDp3zWP8cr9YlNqWGcgoMUlXMZiR0QO7XdUMGgJbE7ne b18ZEBzMGiQuV1o7CBJ3iBXsgWEUOnncJ+W2OL7o= Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4RLrZT2ljxz4wyM; Thu, 10 Aug 2023 12:33:21 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 07/13] epoll: Fold sock_handler into general switch on epoll event fd Date: Thu, 10 Aug 2023 12:33:09 +1000 Message-ID: <20230810023315.684784-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810023315.684784-1-david@gibson.dropbear.id.au> References: <20230810023315.684784-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ISFAPCY5X65XKC37HM4Z7NSBOAVU6OPF X-Message-ID-Hash: ISFAPCY5X65XKC37HM4Z7NSBOAVU6OPF 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: When we process events from epoll_wait(), we check for a number of special cases before calling sock_handler() which then dispatches based on the protocol type of the socket in the event. Fold these cases together into a single switch on the fd type recorded in the epoll data field. Signed-off-by: David Gibson --- passt.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/passt.c b/passt.c index 45e9fbf..665262b 100644 --- a/passt.c +++ b/passt.c @@ -64,29 +64,6 @@ char *epoll_type_str[EPOLL_TYPE_MAX + 1] = { [EPOLL_TYPE_TAP] = "tap device", }; -/** - * sock_handler() - Event handler for L4 sockets - * @c: Execution context - * @ref: epoll reference - * @events: epoll events - * @now: Current timestamp - */ -static void sock_handler(struct ctx *c, union epoll_ref ref, - uint32_t events, const struct timespec *now) -{ - trace("%s: packet from %s %i (events: 0x%08x)", - c->mode == MODE_PASST ? "passt" : "pasta", - EPOLL_TYPE_STR(ref.type), ref.fd, events); - - if (!c->no_tcp && ref.type == EPOLL_TYPE_TCP) - tcp_sock_handler(c, ref, events, now); - else if (!c->no_udp && ref.type == EPOLL_TYPE_UDP) - udp_sock_handler(c, ref, events, now); - else if (!c->no_icmp && - (ref.type == EPOLL_TYPE_ICMP || ref.type == EPOLL_TYPE_ICMPV6)) - icmp_sock_handler(c, ref, events, now); -} - /** * post_handler() - Run periodic and deferred tasks for L4 protocol handlers * @c: Execution context @@ -330,13 +307,36 @@ loop: for (i = 0; i < nfds; i++) { union epoll_ref ref = *((union epoll_ref *)&events[i].data.u64); + uint32_t eventmask = events[i].events; - if (ref.type == EPOLL_TYPE_TAP) + trace("%s: epoll event on %s %i (events: 0x%08x)", + c.mode == MODE_PASST ? "passt" : "pasta", + EPOLL_TYPE_STR(ref.type), ref.fd, events); + + switch (ref.type) { + case EPOLL_TYPE_TAP: tap_handler(&c, ref.fd, events[i].events, &now); - else if (ref.type == EPOLL_TYPE_NSQUIT) + break; + case EPOLL_TYPE_NSQUIT: pasta_netns_quit_handler(&c, quit_fd); - else - sock_handler(&c, ref, events[i].events, &now); + break; + case EPOLL_TYPE_TCP: + if (!c.no_tcp) + tcp_sock_handler(&c, ref, eventmask, &now); + break; + case EPOLL_TYPE_UDP: + if (!c.no_udp) + udp_sock_handler(&c, ref, eventmask, &now); + break; + case EPOLL_TYPE_ICMP: + case EPOLL_TYPE_ICMPV6: + if (!c.no_icmp) + icmp_sock_handler(&c, ref, eventmask, &now); + break; + default: + /* Can't happen */ + ASSERT(0); + } } post_handler(&c, &now); -- 2.41.0