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=R2sZILxj; 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 2F26F5A026F for ; Tue, 07 Oct 2025 18:40:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759855242; 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=GJfBfBgiNc52qcSyTFf2EvtfMLT6TiZa2GSELBQI/Dw=; b=R2sZILxj4pyAcUjQUzcpq4phfosQt1pQwGxZEd+F5/+ChZ3bLCWqMBiqKtQzO6/rqlUJjB 2XnKUD1+CuUVAw+ANqgYgkgJ6cDqEQdxWuhdUjUcHQXs08sh31jSLRKBNHOl5CREby/32m 4UQhxGbsBMCY7WsgV6o9HM2TadowY1Y= Received: from mx-prod-mc-06.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-695-vNlOxoexPqq7s90g4-Xg3Q-1; Tue, 07 Oct 2025 12:40:40 -0400 X-MC-Unique: vNlOxoexPqq7s90g4-Xg3Q-1 X-Mimecast-MFC-AGG-ID: vNlOxoexPqq7s90g4-Xg3Q_1759855240 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2526318004D4 for ; Tue, 7 Oct 2025 16:40:40 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.224.166]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 120331800447; Tue, 7 Oct 2025 16:40:38 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v2 6/6] udp: Use epollfd from flow_common structure Date: Tue, 7 Oct 2025 18:40:26 +0200 Message-ID: <20251007164026.3882026-7-lvivier@redhat.com> In-Reply-To: <20251007164026.3882026-1-lvivier@redhat.com> References: <20251007164026.3882026-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: ttMO8ZhiVzPCCHYSI-K71A1F3w2C3yhezr7RrGsHX60_1759855240 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: 2I6DY32UMMSI6AA7ARMGUCZLBUEP6S64 X-Message-ID-Hash: 2I6DY32UMMSI6AA7ARMGUCZLBUEP6S64 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: Update UDP flow handling to use the epollfd field from the flow_common structure instead of accessing it from the context. This aligns UDP with the recent changes to TCP and ICMP flow management. Signed-off-by: Laurent Vivier --- udp_flow.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/udp_flow.c b/udp_flow.c index caaf3dababb1..2814373e4173 100644 --- a/udp_flow.c +++ b/udp_flow.c @@ -52,7 +52,7 @@ void udp_flow_close(const struct ctx *c, struct udp_flow *uflow) flow_foreach_sidei(sidei) { flow_hash_remove(c, FLOW_SIDX(uflow, sidei)); if (uflow->s[sidei] >= 0) { - epoll_del(c->epollfd, uflow->s[sidei]); + epoll_del(uflow->f.epollfd, uflow->s[sidei]); close(uflow->s[sidei]); uflow->s[sidei] = -1; } @@ -92,7 +92,9 @@ static int udp_flow_sock(const struct ctx *c, ref.data = fref.data; ref.fd = s; - rc = epoll_add(c->epollfd, EPOLLIN, &ref); + flow_set_epollfd(&uflow->f, c->epollfd); + + rc = epoll_add(uflow->f.epollfd, EPOLLIN, &ref); if (rc < 0) { close(s); return rc; @@ -101,7 +103,7 @@ static int udp_flow_sock(const struct ctx *c, if (flowside_connect(c, s, pif, side) < 0) { rc = -errno; - epoll_del(c->epollfd, s); + epoll_del(uflow->f.epollfd, s); close(s); flow_dbg_perror(uflow, "Couldn't connect flow socket"); -- 2.50.1