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=BBQb4LAR; 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 B3E8D5A061E for ; Fri, 03 Oct 2025 17:27:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759505250; 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=wmEpU7quAfO7s/FR70Q0hRVTHFeTeZxtFIha76YBXEI=; b=BBQb4LARW7km9IvdSlzAQSxs30UrVrpj25yZJYTYwbeYWx69FeveaOW30i/DrA9e9zB5tN 83W89zhF8WzDx8GkYLeKSNVKe5UYXLV/ajlf6a/lcLSdxk4uTVY6TxH9uiJu6IOUPg0PVE fJy1u4ELmDV6fd5LO8zPVgFlLhkuQA0= Received: from mx-prod-mc-01.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-497-b4M4MUXGPZaZKfKXXBNjkQ-1; Fri, 03 Oct 2025 11:27:28 -0400 X-MC-Unique: b4M4MUXGPZaZKfKXXBNjkQ-1 X-Mimecast-MFC-AGG-ID: b4M4MUXGPZaZKfKXXBNjkQ_1759505247 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 851E61955D61 for ; Fri, 3 Oct 2025 15:27:27 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.224.166]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 676E419560B8; Fri, 3 Oct 2025 15:27:26 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 4/5] icmp: Use epollfd from flow_common structure Date: Fri, 3 Oct 2025 17:27:16 +0200 Message-ID: <20251003152717.2437765-5-lvivier@redhat.com> In-Reply-To: <20251003152717.2437765-1-lvivier@redhat.com> References: <20251003152717.2437765-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: bviCZkSddrvRNqqTKTpHQvNB73P6PrCcVdm-GPuvwO8_1759505247 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: BHNSGTCWDCGHAKZAKNBCAG7G5XBCH5WJ X-Message-ID-Hash: BHNSGTCWDCGHAKZAKNBCAG7G5XBCH5WJ 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 epollfd in the flow_common structure for ICMP ping flows and use it for epoll operations 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 d6f0abe68269..2246e1c9ef1d 100644 --- a/icmp.c +++ b/icmp.c @@ -151,7 +151,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(pingf->f.epollfd, pingf->sock); close(pingf->sock); flow_hash_remove(c, FLOW_SIDX(pingf, INISIDE)); } @@ -213,9 +213,11 @@ static struct icmp_ping_flow *icmp_ping_new(const struct ctx *c, ref.flowside = FLOW_SIDX(flow, TGTSIDE); ref.fd = pingf->sock; + pingf->f.epollfd = c->epollfd; + ev.events = EPOLLIN; ev.data.u64 = ref.u64; - if (epoll_ctl(c->epollfd, EPOLL_CTL_ADD, pingf->sock, &ev) == -1) { + if (epoll_ctl(pingf->f.epollfd, EPOLL_CTL_ADD, pingf->sock, &ev) == -1) { warn_perror("L4 epoll_ctl"); close(pingf->sock); goto cancel; -- 2.50.1