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=V3OBJ2iK; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id EDE535A026F for ; Wed, 02 Apr 2025 19:24:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743614656; 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=Oe2Rd8Bfmw9wDwo+5puKl+vBApyb4cylp+X3bSNunlI=; b=V3OBJ2iKFF0s3wKa/IajwG7FYJCO35n9o1Vir++BP5TslDZ4sKY6aafECdlIf30VFQ+Nzk XCn+rNyHeBz/qBiUvm/pCx+JAeU5KcbOBBgVJez/XQddjEaW2d1Z6YLnIg5ieQkEmt+GFz agvcg8jViomLiApieQaiqxkOaFfaYnI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-169-DTWg4KTSPk-BjF-3TXUrtg-1; Wed, 02 Apr 2025 13:24:14 -0400 X-MC-Unique: DTWg4KTSPk-BjF-3TXUrtg-1 X-Mimecast-MFC-AGG-ID: DTWg4KTSPk-BjF-3TXUrtg_1743614654 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1C1BC1809CA3 for ; Wed, 2 Apr 2025 17:24:14 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.33.101]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0B01019560AD; Wed, 2 Apr 2025 17:24:12 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 18/18] tap: Convert to iov_tail Date: Wed, 2 Apr 2025 19:23:43 +0200 Message-ID: <20250402172343.858187-19-lvivier@redhat.com> In-Reply-To: <20250402172343.858187-1-lvivier@redhat.com> References: <20250402172343.858187-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JqrdAMQ6_vT1e9926h1-RX272OnXAM36Ezx4esRp2os_1743614654 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: CNGRWIJ2EN2UTNLQOP5MB3NF476TAY44 X-Message-ID-Hash: CNGRWIJ2EN2UTNLQOP5MB3NF476TAY44 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: Use packet_base() and extract headers using IOV_REMOVE_HEADER() and IOV_PEEK_HEADER() rather than packet_get(). Remove packet_get() as it is not used anymore. Signed-off-by: Laurent Vivier --- packet.c | 53 ----------------------------------------------------- packet.h | 10 ---------- tap.c | 23 ++++++++++++++--------- 3 files changed, 14 insertions(+), 72 deletions(-) diff --git a/packet.c b/packet.c index 8066ac12502b..e917b0daad2a 100644 --- a/packet.c +++ b/packet.c @@ -103,59 +103,6 @@ void packet_add_do(struct pool *p, struct iov_tail *data, p->count++; } -/** - * packet_get_do() - Get data range from packet descriptor from given pool - * @p: Packet pool - * @idx: Index of packet descriptor in pool - * @offset: Offset of data range in packet descriptor - * @len: Length of desired data range - * @left: Length of available data after range, set on return, can be NULL - * @func: For tracing: name of calling function, NULL means no trace() - * @line: For tracing: caller line of function call - * - * Return: pointer to start of data range, NULL on invalid range or descriptor - */ -void *packet_get_do(const struct pool *p, size_t idx, size_t offset, - size_t len, size_t *left, const char *func, int line) -{ - char *ptr; - - if (idx >= p->size || idx >= p->count) { - if (func) { - trace("packet %zu from pool size: %zu, count: %zu, " - "%s:%i", idx, p->size, p->count, func, line); - } - return NULL; - } - - if (len > PACKET_MAX_LEN) { - if (func) { - trace("packet data length %zu, %s:%i", - len, func, line); - } - return NULL; - } - - if (len + offset > p->pkt[idx].iov_len) { - if (func) { - trace("data length %zu, offset %zu from length %zu, " - "%s:%i", len, offset, p->pkt[idx].iov_len, - func, line); - } - return NULL; - } - - ptr = (char *)p->pkt[idx].iov_base + offset; - - if (packet_check_range(p, ptr, len, func, line)) - return NULL; - - if (left) - *left = p->pkt[idx].iov_len - offset - len; - - return ptr; -} - /** * packet_base_do() - Get data range from packet descriptor from given pool * @p: Packet pool diff --git a/packet.h b/packet.h index 35058e747a43..787535a228a5 100644 --- a/packet.h +++ b/packet.h @@ -32,9 +32,6 @@ struct pool { int vu_packet_check_range(void *buf, const char *ptr, size_t len); void packet_add_do(struct pool *p, struct iov_tail *data, const char *func, int line); -void *packet_get_do(const struct pool *p, const size_t idx, - size_t offset, size_t len, size_t *left, - const char *func, int line); bool packet_base_do(const struct pool *p, const size_t idx, struct iov_tail *data, const char *func, int line); @@ -43,13 +40,6 @@ void pool_flush(struct pool *p); #define packet_add(p, data) \ packet_add_do(p, data, __func__, __LINE__) -#define packet_get(p, idx, offset, len, left) \ - packet_get_do(p, idx, offset, len, left, __func__, __LINE__) - - -#define packet_get_try(p, idx, offset, len, left) \ - packet_get_do(p, idx, offset, len, left, NULL, 0) - #define packet_base(p, idx, data) \ packet_base_do(p, idx, data, __func__, __LINE__) diff --git a/tap.c b/tap.c index 280a04981954..d6a1da8481a2 100644 --- a/tap.c +++ b/tap.c @@ -870,17 +870,24 @@ resume: const struct udphdr *uh; struct iov_tail data; struct ipv6hdr *ip6h; + struct ipv6hdr ip6hc; + struct ethhdr ehc; + struct udphdr uhc; uint8_t proto; - char *l4h; - eh = packet_get(in, i, 0, sizeof(*eh), NULL); + if (!packet_base(in, i, &data)) + return -1; + + eh = IOV_REMOVE_HEADER(&data, ehc); if (!eh) continue; - ip6h = packet_get(in, i, sizeof(*eh), sizeof(*ip6h), &check); + ip6h = IOV_PEEK_HEADER(&data, ip6hc); if (!ip6h) continue; + check = iov_tail_size(&data) - sizeof(*ip6h); + saddr = &ip6h->saddr; daddr = &ip6h->daddr; @@ -888,10 +895,8 @@ resume: if (plen != check) continue; - data = IOV_TAIL_FROM_BUF(ip6h, sizeof(*ip6h) + check, 0); if (!ipv6_l4hdr(&data, &proto, &l4len)) continue; - l4h = (char *)data.iov[0].iov_base + data.off; if (IN6_IS_ADDR_LOOPBACK(saddr) || IN6_IS_ADDR_LOOPBACK(daddr)) { char sstr[INET6_ADDRSTRLEN], dstr[INET6_ADDRSTRLEN]; @@ -916,6 +921,8 @@ resume: } if (proto == IPPROTO_ICMPV6) { + const struct icmp6hdr *l4h; + struct icmp6hdr l4hc; PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); if (c->no_icmp) @@ -924,9 +931,9 @@ resume: if (l4len < sizeof(struct icmp6hdr)) continue; - data = IOV_TAIL_FROM_BUF(l4h, l4len, 0); packet_add(pkt, &data); + l4h = IOV_PEEK_HEADER(&data, l4hc); if (ndp(c, (struct icmp6hdr *)l4h, saddr, pkt)) continue; @@ -939,12 +946,11 @@ resume: if (l4len < sizeof(*uh)) continue; - uh = (struct udphdr *)l4h; + uh = IOV_PEEK_HEADER(&data, uhc); if (proto == IPPROTO_UDP) { PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); - data = IOV_TAIL_FROM_BUF(l4h, l4len, 0); packet_add(pkt, &data); if (dhcpv6(c, pkt, saddr, daddr)) @@ -999,7 +1005,6 @@ resume: #undef L4_SET append: - data = IOV_TAIL_FROM_BUF(l4h, l4len, 0); packet_add((struct pool *)&seq->p, &data); } -- 2.49.0