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=JWiNz8uV; 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 4CB8C5A061A for ; Wed, 02 Apr 2025 19:24:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743614645; 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=ImR3fFq28OgChKj3E5/1POE+KPJuCBdnvE7ef8Hf6Pg=; b=JWiNz8uV9oNkDmsqiaCc+9l31dajzB3nrr7sK2AjVOkaRuF/ni9gMaLcB1jmXmYM2AHIGh gY3koLlfPprc80WXGII8EK/DYmxRIPluE/xFz3Gv6bW87xS1KYQ0E2Kr7tnZrYJHduH9jt o6pMOkd+aG+fAS0HtzUrL/cEgvmhnBc= Received: from mx-prod-mc-03.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-253-EiznWnqXNFKHquvdOToNig-1; Wed, 02 Apr 2025 13:24:03 -0400 X-MC-Unique: EiznWnqXNFKHquvdOToNig-1 X-Mimecast-MFC-AGG-ID: EiznWnqXNFKHquvdOToNig_1743614643 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 10F3D1955BC6 for ; Wed, 2 Apr 2025 17:24:03 +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 F3AE51955BF2; Wed, 2 Apr 2025 17:24:01 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 11/18] tcp: Convert tcp_data_from_tap() to use iov_tail Date: Wed, 2 Apr 2025 19:23:36 +0200 Message-ID: <20250402172343.858187-12-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: R0_XbkXi4b1Z6kQM3ZGTwZds_wj9UwEK66dbuZXDgLM_1743614643 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: NYEWZ4CEOXZDVEXZWO3ZC2L4LRPADJNF X-Message-ID-Hash: NYEWZ4CEOXZDVEXZWO3ZC2L4LRPADJNF 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_PEEK_HEADER() rather than packet_get(). Signed-off-by: Laurent Vivier --- tcp.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tcp.c b/tcp.c index 790714a08793..a9c04551d9d6 100644 --- a/tcp.c +++ b/tcp.c @@ -1643,14 +1643,19 @@ static int tcp_data_from_tap(const struct ctx *c, struct tcp_tap_conn *conn, for (i = idx, iov_i = 0; i < (int)p->count; i++) { uint32_t seq, seq_offset, ack_seq; const struct tcphdr *th; - char *data; + struct iov_tail data; + unsigned int count; + struct tcphdr thc; size_t off; - th = packet_get(p, i, 0, sizeof(*th), &len); + if (!packet_base(p, i, &data)) + return -1; + + th = IOV_PEEK_HEADER(&data, thc); if (!th) return -1; - len += sizeof(*th); + len = iov_tail_size(&data); off = th->doff * 4UL; if (off < sizeof(*th) || off > len) return -1; @@ -1661,9 +1666,7 @@ static int tcp_data_from_tap(const struct ctx *c, struct tcp_tap_conn *conn, } len -= off; - data = packet_get(p, i, off, len, NULL); - if (!data) - continue; + data.off = off; seq = ntohl(th->seq); if (SEQ_LT(seq, conn->seq_from_tap) && len <= 1) { @@ -1737,10 +1740,11 @@ static int tcp_data_from_tap(const struct ctx *c, struct tcp_tap_conn *conn, continue; } - tcp_iov[iov_i].iov_base = data + seq_offset; - tcp_iov[iov_i].iov_len = len - seq_offset; - seq_from_tap += tcp_iov[iov_i].iov_len; - iov_i++; + count = iov_copy(&tcp_iov[iov_i], UIO_MAXIOV - iov_i, + &data.iov[0], data.cnt, data.off + seq_offset, + len - seq_offset); + seq_from_tap += iov_size(&tcp_iov[iov_i], count); + iov_i += count; if (keep == i) keep = -1; -- 2.49.0