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=huWa38Uo; 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 BB65C5A026F for ; Fri, 17 Oct 2025 12:31:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760697103; 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=pUEJrns/W6jBJMHBo+n/ZveiS4rj3IKSWLEKnwm3emE=; b=huWa38UouHUlx1AIyJ9V9QxOBQ4nwrofTaxIZ7KmC7oHkdqH5bvKopKD+iNFyu1tLPmc9k SW58v+48vsfUx/Ib/cq6mw/NJ2AHvtgZSMeZ3Ep07K4UOapSri3jHuYFwcn4ut88yqG0xG tOSlLJrLwCWkfUorJxPJGfppxdy0d7Y= Received: from mx-prod-mc-05.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-553-Z8W4A2JvMo2sR1aQ0Kf0bg-1; Fri, 17 Oct 2025 06:31:42 -0400 X-MC-Unique: Z8W4A2JvMo2sR1aQ0Kf0bg-1 X-Mimecast-MFC-AGG-ID: Z8W4A2JvMo2sR1aQ0Kf0bg_1760697101 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4E4F1956080 for ; Fri, 17 Oct 2025 10:31:41 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.32.230]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C90FE1800452; Fri, 17 Oct 2025 10:31:40 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v4 5/7] icmp: Use thread-based epoll management for ICMP flows Date: Fri, 17 Oct 2025 12:31:27 +0200 Message-ID: <20251017103129.229412-6-lvivier@redhat.com> In-Reply-To: <20251017103129.229412-1-lvivier@redhat.com> References: <20251017103129.229412-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Aal9PFv8uDvd907NcnnadBGK1sTgV5_Ill7_9a6doVY_1760697101 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: C3DJVF7ALAIQFGFI3RQRHTZRVWNZ3ZB5 X-Message-ID-Hash: C3DJVF7ALAIQFGFI3RQRHTZRVWNZ3ZB5 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: Store the thread number in the flow_common structure for ICMP ping flows using flow_epollfd_set() and retrieve the corresponding epoll file descriptor with flow_epollfd_get() instead of passing c->epollfd directly. This makes ICMP consistent with the recent TCP changes and follows the pattern established in previous commit. Signed-off-by: Laurent Vivier --- icmp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/icmp.c b/icmp.c index 56dfac6c958e..baddd8e5aacb 100644 --- a/icmp.c +++ b/icmp.c @@ -149,7 +149,7 @@ unexpected: static void icmp_ping_close(const struct ctx *c, const struct icmp_ping_flow *pingf) { - epoll_del(c->epollfd, pingf->sock); + epoll_del(flow_epollfd(&pingf->f), pingf->sock); close(pingf->sock); flow_hash_remove(c, FLOW_SIDX(pingf, INISIDE)); } @@ -206,11 +206,13 @@ static struct icmp_ping_flow *icmp_ping_new(const struct ctx *c, if (pingf->sock > FD_REF_MAX) goto cancel; + flow_thread_set(&pingf->f, 0); + ref.type = EPOLL_TYPE_PING; ref.flowside = FLOW_SIDX(flow, TGTSIDE); ref.fd = pingf->sock; - if (epoll_add(c->epollfd, EPOLLIN, &ref) < 0) { + if (epoll_add(flow_epollfd(&pingf->f), EPOLLIN, &ref) < 0) { close(pingf->sock); goto cancel; } -- 2.51.0