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=YkuAXWi3; 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 F1BD65A061D for ; Thu, 17 Apr 2025 18:52:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744908744; 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=BmjjqKVf7ydK8pPdIEQ4quL0uk5LEqm7+F8os+tgkvQ=; b=YkuAXWi3e10595by+sfJv1Z4ufeZjuerbjTurkH9nMgdsoG3bD1zfb0iqs9fRspXPo631B hyhi9wZ1/iwzhCMKCge2y31l4dR1S/7+tpB5EbmQj9/ZzAZ+proK8CNab2JjwN65ksnkMm AhpHIWDyZviEFDt+xZ317uIIPdqV50s= Received: from mx-prod-mc-02.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-481-1MMotnBVM5S083N4W6sOGQ-1; Thu, 17 Apr 2025 12:52:22 -0400 X-MC-Unique: 1MMotnBVM5S083N4W6sOGQ-1 X-Mimecast-MFC-AGG-ID: 1MMotnBVM5S083N4W6sOGQ_1744908742 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 03A5E195608C for ; Thu, 17 Apr 2025 16:52:22 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.32.6]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E2AB519560BA; Thu, 17 Apr 2025 16:52:20 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v5 22/29] dhcp: use iov_tail rather than pool Date: Thu, 17 Apr 2025 18:51:29 +0200 Message-ID: <20250417165136.2688884-23-lvivier@redhat.com> In-Reply-To: <20250417165136.2688884-1-lvivier@redhat.com> References: <20250417165136.2688884-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: qlrSQ5Z7yzac64WNUxtdWg6dkbm607HjAMuarrTbYJM_1744908742 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: LSMUVDYGZYMB4QXG24GR4VUWLCJ4L5DM X-Message-ID-Hash: LSMUVDYGZYMB4QXG24GR4VUWLCJ4L5DM 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: Signed-off-by: Laurent Vivier --- dhcp.c | 32 ++++++++++++++------------------ dhcp.h | 2 +- tap.c | 5 +---- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dhcp.c b/dhcp.c index e8408ef04839..e7ea7723ebd3 100644 --- a/dhcp.c +++ b/dhcp.c @@ -296,11 +296,11 @@ static void opt_set_dns_search(const struct ctx *c, size_t max_len) /** * dhcp() - Check if this is a DHCP message, reply as needed * @c: Execution context - * @p: Packet pool, single packet with Ethernet buffer + * @data: Single packet with Ethernet buffer * * Return: 0 if it's not a DHCP message, 1 if handled, -1 on failure */ -int dhcp(const struct ctx *c, const struct pool *p) +int dhcp(const struct ctx *c, struct iov_tail *data) { size_t mlen, dlen, opt_len; char macstr[ETH_ADDRSTRLEN]; @@ -308,7 +308,6 @@ int dhcp(const struct ctx *c, const struct pool *p) const struct ethhdr *eh; const struct iphdr *iph; const struct udphdr *uh; - struct iov_tail data; struct msg const *m; struct msg mc; struct ethhdr ehc; @@ -317,18 +316,15 @@ int dhcp(const struct ctx *c, const struct pool *p) struct msg reply; unsigned int i; - if (!packet_data(p, 0, &data)) - return -1; - - eh = IOV_REMOVE_HEADER(&data, ehc); - iph = IOV_PEEK_HEADER(&data, iphc); + eh = IOV_REMOVE_HEADER(data, ehc); + iph = IOV_PEEK_HEADER(data, iphc); if (!eh || !iph) return -1; - if (!iov_tail_drop(&data, iph->ihl * 4UL)) + if (!iov_tail_drop(data, iph->ihl * 4UL)) return -1; - uh = IOV_REMOVE_HEADER(&data, uhc); + uh = IOV_REMOVE_HEADER(data, uhc); if (!uh) return -1; @@ -338,8 +334,8 @@ int dhcp(const struct ctx *c, const struct pool *p) if (c->no_dhcp) return 1; - mlen = iov_tail_size(&data); - m = (struct msg const *)iov_remove_header_(&data, &mc, offsetof(struct msg, o), + mlen = iov_tail_size(data); + m = (struct msg const *)iov_remove_header_(data, &mc, offsetof(struct msg, o), __alignof__(struct msg)); if (!m || mlen != ntohs(uh->len) - sizeof(*uh) || @@ -366,24 +362,24 @@ int dhcp(const struct ctx *c, const struct pool *p) for (i = 0; i < ARRAY_SIZE(opts); i++) opts[i].clen = -1; - opt_len = iov_tail_size(&data); + opt_len = iov_tail_size(data); while (opt_len >= 2) { uint8_t olenc, typec; const uint8_t *olen; uint8_t *type; - type = IOV_REMOVE_HEADER(&data, typec); - olen = IOV_REMOVE_HEADER(&data, olenc); + type = IOV_REMOVE_HEADER(data, typec); + olen = IOV_REMOVE_HEADER(data, olenc); if (!type || !olen) return -1; - opt_len = iov_tail_size(&data); + opt_len = iov_tail_size(data); if (opt_len < *olen) return -1; - iov_to_buf(&data.iov[0], data.cnt, data.off, &opts[*type].c, *olen); + iov_to_buf(&data->iov[0], data->cnt, data->off, &opts[*type].c, *olen); opts[*type].clen = *olen; - iov_tail_drop(&data, *olen); + iov_tail_drop(data, *olen); opt_len -= *olen; } diff --git a/dhcp.h b/dhcp.h index 87aeecd8dec8..cd50c99b8856 100644 --- a/dhcp.h +++ b/dhcp.h @@ -6,7 +6,7 @@ #ifndef DHCP_H #define DHCP_H -int dhcp(const struct ctx *c, const struct pool *p); +int dhcp(const struct ctx *c, struct iov_tail *data); void dhcp_init(void); #endif /* DHCP_H */ diff --git a/tap.c b/tap.c index b1c817451031..846d4b35dda7 100644 --- a/tap.c +++ b/tap.c @@ -783,11 +783,8 @@ resume: if (iph->protocol == IPPROTO_UDP) { struct iov_tail eh_data; - PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); - packet_data(in, i, &eh_data); - packet_add(pkt, &eh_data); - if (dhcp(c, pkt)) + if (dhcp(c, &eh_data)) continue; } -- 2.49.0