From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IGwlb+Q4; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id E07DC5A0276 for ; Wed, 03 Dec 2025 19:54:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764788081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3qTj8FWRjXBQ46H0pToEgWztWgk6ephc4FI7EdLQLwQ=; b=IGwlb+Q41Gbqe9Q9S9T/R97EACCaq8cFlphBVf/a8Dz4Lddy3vL2xG9DZaoLQaLJnzfGbh WXLxW8THWkj1moUUU/fLd4Aafyt20vrv8tF6/e6Q6Bl0Dlz7xwRNYeD1cXr9N1EOPUuPuQ er3w9bn99zdb9uep3TZwL8JNAiPmw9g= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-204-VrT2aZJWPSizPDNIsBdH8Q-1; Wed, 03 Dec 2025 13:54:40 -0500 X-MC-Unique: VrT2aZJWPSizPDNIsBdH8Q-1 X-Mimecast-MFC-AGG-ID: VrT2aZJWPSizPDNIsBdH8Q_1764788079 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AEAC11956088 for ; Wed, 3 Dec 2025 18:54:39 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.225.59]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9D4A8180028C; Wed, 3 Dec 2025 18:54:38 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v3 1/6] tap: Remove pool parameter from tap4_handler() and tap6_handler() Date: Wed, 3 Dec 2025 19:54:29 +0100 Message-ID: <20251203185435.582096-2-lvivier@redhat.com> In-Reply-To: <20251203185435.582096-1-lvivier@redhat.com> References: <20251203185435.582096-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YRF4CYJ1_ggcLTJ10nLucRX6cSx61ZO1FcS8Z8uQZPc_1764788079 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: 76NHGT25JVCTUOTB72CSPKZFJGEE4IPM X-Message-ID-Hash: 76NHGT25JVCTUOTB72CSPKZFJGEE4IPM X-MailFrom: lvivier@redhat.com 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: Laurent Vivier 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: These handlers only ever operate on their respective global pools (pool_tap4 and pool_tap6). The pool parameter was always passed the same value, making it unnecessary indirection. Access the global pools directly instead, simplifying the function signatures. Signed-off-by: Laurent Vivier --- tap.c | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/tap.c b/tap.c index 44b06448757a..2cda8c9772b8 100644 --- a/tap.c +++ b/tap.c @@ -696,23 +696,21 @@ static bool tap4_is_fragment(const struct iphdr *iph, /** * tap4_handler() - IPv4 and ARP packet handler for tap file descriptor * @c: Execution context - * @in: Ingress packet pool, packets with Ethernet headers * @now: Current timestamp * * Return: count of packets consumed by handlers */ -static int tap4_handler(struct ctx *c, const struct pool *in, - const struct timespec *now) +static int tap4_handler(struct ctx *c, const struct timespec *now) { unsigned int i, j, seq_count; struct tap4_l4_t *seq; - if (!c->ifi4 || !in->count) - return in->count; + if (!c->ifi4 || !pool_tap4->count) + return pool_tap4->count; i = 0; resume: - for (seq_count = 0, seq = NULL; i < in->count; i++) { + for (seq_count = 0, seq = NULL; i < pool_tap4->count; i++) { size_t l3len, hlen, l4len; struct ethhdr eh_storage; struct iphdr iph_storage; @@ -722,7 +720,7 @@ resume: struct iov_tail data; struct iphdr *iph; - if (!packet_get(in, i, &data)) + if (!packet_get(pool_tap4, i, &data)) continue; eh = IOV_PEEK_HEADER(&data, eh_storage); @@ -789,7 +787,7 @@ resume: if (iph->protocol == IPPROTO_UDP) { struct iov_tail eh_data; - packet_get(in, i, &eh_data); + packet_get(pool_tap4, i, &eh_data); if (dhcp(c, &eh_data)) continue; } @@ -820,7 +818,7 @@ resume: goto append; if (seq_count == TAP_SEQS) - break; /* Resume after flushing if i < in->count */ + break; /* Resume after flushing if i < pool_tap4->count */ for (seq = tap4_l4 + seq_count - 1; seq >= tap4_l4; seq--) { if (L4_MATCH(iph, uh, seq)) { @@ -866,32 +864,30 @@ append: } } - if (i < in->count) + if (i < pool_tap4->count) goto resume; - return in->count; + return pool_tap4->count; } /** * tap6_handler() - IPv6 packet handler for tap file descriptor * @c: Execution context - * @in: Ingress packet pool, packets with Ethernet headers * @now: Current timestamp * * Return: count of packets consumed by handlers */ -static int tap6_handler(struct ctx *c, const struct pool *in, - const struct timespec *now) +static int tap6_handler(struct ctx *c, const struct timespec *now) { unsigned int i, j, seq_count = 0; struct tap6_l4_t *seq; - if (!c->ifi6 || !in->count) - return in->count; + if (!c->ifi6 || !pool_tap6->count) + return pool_tap6->count; i = 0; resume: - for (seq_count = 0, seq = NULL; i < in->count; i++) { + for (seq_count = 0, seq = NULL; i < pool_tap6->count; i++) { size_t l4len, plen, check; struct in6_addr *saddr, *daddr; struct ipv6hdr ip6h_storage; @@ -903,7 +899,7 @@ resume: struct ipv6hdr *ip6h; uint8_t proto; - if (!packet_get(in, i, &data)) + if (!packet_get(pool_tap6, i, &data)) return -1; eh = IOV_REMOVE_HEADER(&data, eh_storage); @@ -1011,7 +1007,7 @@ resume: goto append; if (seq_count == TAP_SEQS) - break; /* Resume after flushing if i < in->count */ + break; /* Resume after flushing if i < pool_tap6->count */ for (seq = tap6_l4 + seq_count - 1; seq >= tap6_l4; seq--) { if (L4_MATCH(ip6h, proto, uh, seq)) { @@ -1058,10 +1054,10 @@ append: } } - if (i < in->count) + if (i < pool_tap6->count) goto resume; - return in->count; + return pool_tap6->count; } /** @@ -1080,8 +1076,8 @@ void tap_flush_pools(void) */ void tap_handler(struct ctx *c, const struct timespec *now) { - tap4_handler(c, pool_tap4, now); - tap6_handler(c, pool_tap6, now); + tap4_handler(c, now); + tap6_handler(c, now); } /** @@ -1115,14 +1111,14 @@ void tap_add_packet(struct ctx *c, struct iov_tail *data, case ETH_P_ARP: case ETH_P_IP: if (!pool_can_fit(pool_tap4, data)) { - tap4_handler(c, pool_tap4, now); + tap4_handler(c, now); pool_flush(pool_tap4); } packet_add(pool_tap4, data); break; case ETH_P_IPV6: if (!pool_can_fit(pool_tap6, data)) { - tap6_handler(c, pool_tap6, now); + tap6_handler(c, now); pool_flush(pool_tap6); } packet_add(pool_tap6, data); -- 2.51.1