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=KEg0/NRj; 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 552C95A0619 for ; Fri, 31 Jul 2026 18:46:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785516396; 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=WaE5A0aOr3p4d2X1KuFi/5KrMRwEiV515UofI6wx11I=; b=KEg0/NRjzDSddsNKXS9CcwkeDnmXT14Hj73Ga1/N+ouR0VEJJa1D3OOMorjamrponyvD/M KGRe0l9Iv0NrX5PasK/9KRJ8Yt2FoNvFk4QrePi9T6t1eGNRQ3um+9odfed/DJ76fCkEtU Rr73w7kRwcBDxbc1y5U8lyNIt8oGHH4= 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-613-zcAl8zxMNoeYfOiySmIU8g-1; Fri, 31 Jul 2026 12:46:34 -0400 X-MC-Unique: zcAl8zxMNoeYfOiySmIU8g-1 X-Mimecast-MFC-AGG-ID: zcAl8zxMNoeYfOiySmIU8g_1785516394 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 E2D381956088 for ; Fri, 31 Jul 2026 16:46:33 +0000 (UTC) Received: from lenovo-t14s.redhat.corp (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2D632424; Fri, 31 Jul 2026 16:46:32 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 3/7] passt: Integrate main event loop with threading infrastructure Date: Fri, 31 Jul 2026 18:46:24 +0200 Message-ID: <20260731164628.3556997-4-lvivier@redhat.com> In-Reply-To: <20260731164628.3556997-1-lvivier@redhat.com> References: <20260731164628.3556997-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ej659V7NLT0ybouTQ63ltwqc1ZPmYAtv_eGEpkjOcGM_1785516394 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: DXW2E5CVNU4D3MSNMCS5OBLZRF6EFAA2 X-Message-ID-Hash: DXW2E5CVNU4D3MSNMCS5OBLZRF6EFAA2 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: Convert the main event loop to use the threading subsystem. The main process now registers passt_worker() as thread #0 and starts it through the threading infrastructure instead of running a manual epoll_wait loop. Signed-off-by: Laurent Vivier --- passt.c | 20 ++++---------------- threading.c | 3 --- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/passt.c b/passt.c index 8a06838c5ed8..2cedb7ba0756 100644 --- a/passt.c +++ b/passt.c @@ -333,8 +333,7 @@ static void passt_worker(void *opaque, int nfds, struct epoll_event *events) */ int main(int argc, char **argv) { - struct epoll_event events[NUM_EPOLL_EVENTS]; - int nfds, devnull_fd = -1, fd; + int devnull_fd = -1, fd; struct ctx *c = &passt_ctx; struct rlimit limit; struct timespec now; @@ -377,9 +376,7 @@ int main(int argc, char **argv) madvise(pkt_buf, sizeof(pkt_buf), MADV_HUGEPAGE); threading_init(); - c->epollfd = epoll_create1(EPOLL_CLOEXEC); - if (c->epollfd == -1) - die_perror("Failed to create epoll file descriptor"); + c->epollfd = threading_epollfd(THREADING_ID_DEFAULT); if (getrlimit(RLIMIT_NOFILE, &limit)) die_perror("Failed to get maximum value of open files limit"); @@ -449,15 +446,6 @@ int main(int argc, char **argv) isolate_postfork(c); -loop: - /* NOLINTBEGIN(bugprone-branch-clone): intervals can be the same */ - /* cppcheck-suppress [duplicateValueTernary, unmatchedSuppression] */ - nfds = epoll_wait(c->epollfd, events, NUM_EPOLL_EVENTS, TIMER_INTERVAL); - /* NOLINTEND(bugprone-branch-clone) */ - if (nfds == -1 && errno != EINTR) - die_perror("epoll_wait() failed in main loop"); - - passt_worker(c, nfds, events); - - goto loop; + threading_worker_set(THREADING_ID_DEFAULT, passt_worker, c); + threading_start_thread(THREADING_ID_DEFAULT); } diff --git a/threading.c b/threading.c index fd5b30ed7ff6..e1ed644f5864 100644 --- a/threading.c +++ b/threading.c @@ -66,7 +66,6 @@ void threading_init(void) * * Return: 0 on success, -1 if thread index is invalid */ -/* cppcheck-suppress unusedFunction */ int threading_worker_set(unsigned int threadid, void (*worker)(void *, int, struct epoll_event *), void *opaque) @@ -90,7 +89,6 @@ int threading_worker_set(unsigned int threadid, * * Return: epoll file descriptor for the specified thread, -1 if index invalid */ -/* cppcheck-suppress unusedFunction */ int threading_epollfd(unsigned int threadid) { if (threadid >= ARRAY_SIZE(threads)) @@ -135,7 +133,6 @@ static void *threading_worker(void *opaque) * * #syscalls rt_sigaction rt_sigprocmask mprotect getrandom brk clone3 rseq set_robust_list clock_nanosleep */ -/* cppcheck-suppress unusedFunction */ void threading_start_thread(unsigned int threadid) { struct threading_context *tc; -- 2.54.0