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=imUwdn++; 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 4F2785A061E for ; Wed, 02 Apr 2025 19:24:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743614642; 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=bnlShbpq/pz9xvySwn//E5FR9aTdgqRf2DH3SRQCBTk=; b=imUwdn++AW0rmHCZkUzPX6t9il4Fxe4fb1CfBDm2UNdy8wn+0VwGisdgQOblePhyAvkg9I yd5QRPH3k0aOtYh/iagEBEuquosb0R9EtKIZCUKgYbt7NCOVwFnASczP+eEEXnUXY8OlXA lfRHnQ4QTkdtErAfaeqB1WWwj5di6rc= Received: from mx-prod-mc-04.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-660-Wo8u5UTrOWGSLkZDdkd9uA-1; Wed, 02 Apr 2025 13:24:00 -0400 X-MC-Unique: Wo8u5UTrOWGSLkZDdkd9uA-1 X-Mimecast-MFC-AGG-ID: Wo8u5UTrOWGSLkZDdkd9uA_1743614640 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E4D131956048 for ; Wed, 2 Apr 2025 17:23:59 +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 D421A19560AD; Wed, 2 Apr 2025 17:23:58 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 09/18] udp: Convert to iov_tail Date: Wed, 2 Apr 2025 19:23:34 +0200 Message-ID: <20250402172343.858187-10-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: B46Qqs6RI_T-dYNXaJgz4kNM0oPTax_ouEyxQp4Kkpg_1743614640 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: TCERH2ZE2OSW7EOZBYUZVRPSBJTFE7X5 X-Message-ID-Hash: TCERH2ZE2OSW7EOZBYUZVRPSBJTFE7X5 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(). Signed-off-by: Laurent Vivier --- iov.c | 1 - udp.c | 37 ++++++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/iov.c b/iov.c index 508fb6da91fb..0c69379316aa 100644 --- a/iov.c +++ b/iov.c @@ -173,7 +173,6 @@ size_t iov_size(const struct iovec *iov, size_t iov_cnt) * Returns: The number of elements successfully copied to the destination * iov array. */ -/* cppcheck-suppress unusedFunction */ unsigned iov_copy(struct iovec *dst_iov, size_t dst_iov_cnt, const struct iovec *iov, size_t iov_cnt, size_t offset, size_t bytes) diff --git a/udp.c b/udp.c index 80520cbdf188..03906d72e75c 100644 --- a/udp.c +++ b/udp.c @@ -858,15 +858,20 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif, struct iovec m[UIO_MAXIOV]; const struct udphdr *uh; struct udp_flow *uflow; - int i, s, count = 0; + int i, j, s, count = 0; + struct iov_tail data; flow_sidx_t tosidx; in_port_t src, dst; + struct udphdr uhc; uint8_t topif; socklen_t sl; ASSERT(!c->no_udp); - uh = packet_get(p, idx, 0, sizeof(*uh), NULL); + if (!packet_base(p, idx, &data)) + return 1; + + uh = IOV_PEEK_HEADER(&data, uhc); if (!uh) return 1; @@ -903,23 +908,33 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif, pif_sockaddr(c, &to_sa, &sl, topif, &toside->eaddr, toside->eport); - for (i = 0; i < (int)p->count - idx; i++) { - struct udphdr *uh_send; - size_t len; + for (i = 0, j = 0; i < (int)p->count - idx && j < UIO_MAXIOV; i++) { + const struct udphdr *uh_send; + + if (!packet_base(p, idx + i, &data)) + return p->count - idx; - uh_send = packet_get(p, idx + i, 0, sizeof(*uh), &len); + uh_send = IOV_REMOVE_HEADER(&data, uhc); if (!uh_send) return p->count - idx; + iov_tail_prune(&data); + + if (data.cnt + j >= UIO_MAXIOV) + return p->count - idx; + mm[i].msg_hdr.msg_name = &to_sa; mm[i].msg_hdr.msg_namelen = sl; - if (len) { - m[i].iov_base = (char *)(uh_send + 1); - m[i].iov_len = len; + if (data.cnt ) { + unsigned int len; + + len = iov_copy(&m[j], UIO_MAXIOV - j, + &data.iov[0], data.cnt, data.off, SIZE_MAX); - mm[i].msg_hdr.msg_iov = m + i; - mm[i].msg_hdr.msg_iovlen = 1; + mm[i].msg_hdr.msg_iov = &m[j]; + mm[i].msg_hdr.msg_iovlen = len; + j += len; } else { mm[i].msg_hdr.msg_iov = NULL; mm[i].msg_hdr.msg_iovlen = 0; -- 2.49.0