From nobody Tue Jan 27 18:43:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f0vSb2v7Tz6QFsG for ; Tue, 27 Jan 2026 18:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vSb1qBcz3qv9 for ; Tue, 27 Jan 2026 18:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTV3PNaxX/wTfMguYJXcYl2oSJDepe6H/aYu4P4lyT0=; b=IYeXnViIGW+qtl3UflP09xyT1YFUuU4P9JiDlF1vrTzbMtKnC/xEYuo11On0RnPaCFq8j5 KdYHeVaRs6ihIXvMrObi0UnBUc3hSnESuaSxhldg2vnQ+pRDub3S8rWKs1jqvfCdvEVZUv uQnkteGYSoKBEcGvnmntUotPR6qdP+9MTylAeBPyBuZZ6MGI/6Sy4UaxeRFbNH1VeWlR9t jLrwezSuoPjbcMPFOb7clli7uD1kjjGzls3zK1sKG4828Vq6dlqN19NyOxPmoBnArrJwwK hXVS+PXkwBhRCnL8BB0GN0v1dTK3grM/JT/GHw6FszVVO8Qe8NNayBrqTYSHag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTV3PNaxX/wTfMguYJXcYl2oSJDepe6H/aYu4P4lyT0=; b=gY3EWR/PYNfJQkyuun00ZyzPxr8i55hHG/zddkRPlUAkMVrM/OdAku/UkJou6YY3Mdy9OH yjRl1vSwJNiCzC2sFv0Km9zqvnlhgcxFTd7Eb4GOChqNOeusdBuyAt2sHkY+v/9PyUtoAk goi/Z1bO96hXGnwZ6n1rdLaCJKs+yRd0/zaRuHNOyFK+8QXM9R9BUXCfzCbqyI9Z4FrqcG yDbmmM+VVtovT1FPv0E91mufWebM7JCOu9bY5D6SU/2ZfI97m9r53tZSUNAxQhBTzRA3ik yyEnLOQjFdoXYsKHxDnPvJ+xiVroiFXnWLyvuOxWENfQyetbNyvpn7BaKA9jHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539439; a=rsa-sha256; cv=none; b=FRGgjXRyU9Pw5HrCnL/J35OBz78jj/kmU+7OcssMbx/R5xHW/NNf7fceAi5LbOjv07wwEc bwttJe9GisJphTWvq3UM6xmiULDxoJYFvnZVizRjod37/iT07M2+3RlHvLlfYQWmQm1aaj E6xOMX9biiO7wKnKJenIeSyGd/zqR7qG7WEEYVBRS3rTxbS86xt7VMoRPXJ0fXPWdMHogS TWYXSusp9wxhgczOs10P/eWfhIVNobekzV61jXhNr9DmL7IatQeFgrijBetlPmqch3gFGq GXG/PNQXzxGCkeG7WEy2eNzHvkhCLm/fWqoR7pMHGHy66QcGeIwl9Czk6TdYBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vSb0FYDz3Wd for ; Tue, 27 Jan 2026 18:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f041 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:43:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 42234f50008e - stable/14 - ctld: Use kevent(2) for socket events rather than select(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 42234f50008eca7a3764e411a4627d85dbae6cae Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:43:59 +0000 Message-Id: <6979076f.f041.6e176f0@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=42234f50008eca7a3764e411a4627d85dbae6cae commit 42234f50008eca7a3764e411a4627d85dbae6cae Author: John Baldwin AuthorDate: 2025-01-30 15:48:44 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:56 +0000 ctld: Use kevent(2) for socket events rather than select(2) Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48597 (cherry picked from commit 66b107e82b2f4be2e9b648897e04ffd675a43469) --- usr.sbin/ctld/ctld.c | 136 ++++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 62 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index 84e8cf22ade5..b327fb8f003b 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -66,6 +67,7 @@ static volatile bool sighup_received = false; static volatile bool sigterm_received = false; static volatile bool sigalrm_received = false; +static int kqfd; static int nchildren = 0; static uint16_t last_portal_group_tag = 0xff; @@ -1782,10 +1784,31 @@ conf_verify(struct conf *conf) return (0); } +static bool +portal_reuse_socket(struct portal *oldp, struct portal *newp) +{ + struct kevent kev; + + if (strcmp(newp->p_listen, oldp->p_listen) != 0) + return (false); + + if (oldp->p_socket <= 0) + return (false); + + EV_SET(&kev, oldp->p_socket, EVFILT_READ, EV_ADD, 0, 0, newp); + if (kevent(kqfd, &kev, 1, NULL, 0, NULL) == -1) + return (false); + + newp->p_socket = oldp->p_socket; + oldp->p_socket = 0; + return (true); +} + static bool portal_init_socket(struct portal *p) { struct portal_group *pg = p->p_portal_group; + struct kevent kev; int error, sockbuf; int one = 1; @@ -1871,6 +1894,14 @@ portal_init_socket(struct portal *p) p->p_socket = 0; return (false); } + EV_SET(&kev, p->p_socket, EVFILT_READ, EV_ADD, 0, 0, p); + error = kevent(kqfd, &kev, 1, NULL, 0, NULL); + if (error == -1) { + log_warn("kevent(2) failed to register for %s", p->p_listen); + close(p->p_socket); + p->p_socket = 0; + return (false); + } return (true); } @@ -2117,16 +2148,11 @@ conf_apply(struct conf *oldconf, struct conf *newconf) pg_next) { TAILQ_FOREACH(oldp, &oldpg->pg_portals, p_next) { - if (strcmp(newp->p_listen, - oldp->p_listen) == 0 && - oldp->p_socket > 0) { - newp->p_socket = - oldp->p_socket; - oldp->p_socket = 0; - break; - } + if (portal_reuse_socket(oldp, newp)) + goto reused; } } + reused: if (newp->p_socket > 0) { /* * We're done with this portal. @@ -2355,26 +2381,10 @@ handle_connection(struct portal *portal, int fd, exit(0); } -static int -fd_add(int fd, fd_set *fdset, int nfds) -{ - - /* - * Skip sockets which we failed to bind. - */ - if (fd <= 0) - return (nfds); - - FD_SET(fd, fdset); - if (fd > nfds) - nfds = fd; - return (nfds); -} - static void main_loop(struct conf *conf, bool dont_fork) { - struct portal_group *pg; + struct kevent kev; struct portal *portal; struct sockaddr_storage client_sa; socklen_t client_salen; @@ -2382,8 +2392,7 @@ main_loop(struct conf *conf, bool dont_fork) int connection_id; int portal_id; #endif - fd_set fdset; - int error, nfds, client_fd; + int error, client_fd; pidfile_write(conf->conf_pidfh); @@ -2418,38 +2427,34 @@ found: #endif assert(proxy_mode == false); - FD_ZERO(&fdset); - nfds = 0; - TAILQ_FOREACH(pg, &conf->conf_portal_groups, pg_next) { - TAILQ_FOREACH(portal, &pg->pg_portals, p_next) - nfds = fd_add(portal->p_socket, &fdset, nfds); - } - error = select(nfds + 1, &fdset, NULL, NULL, NULL); - if (error <= 0) { + error = kevent(kqfd, NULL, 0, &kev, 1, NULL); + if (error == -1) { if (errno == EINTR) - return; - log_err(1, "select"); + continue; + log_err(1, "kevent"); } - TAILQ_FOREACH(pg, &conf->conf_portal_groups, pg_next) { - TAILQ_FOREACH(portal, &pg->pg_portals, p_next) { - if (!FD_ISSET(portal->p_socket, &fdset)) - continue; - client_salen = sizeof(client_sa); - client_fd = accept(portal->p_socket, - (struct sockaddr *)&client_sa, - &client_salen); - if (client_fd < 0) { - if (errno == ECONNABORTED) - continue; - log_err(1, "accept"); - } - assert(client_salen >= client_sa.ss_len); - handle_connection(portal, client_fd, - (struct sockaddr *)&client_sa, - dont_fork); - break; + switch (kev.filter) { + case EVFILT_READ: + portal = kev.udata; + assert(portal->p_socket == (int)kev.ident); + + client_salen = sizeof(client_sa); + client_fd = accept(portal->p_socket, + (struct sockaddr *)&client_sa, + &client_salen); + if (client_fd < 0) { + if (errno == ECONNABORTED) + continue; + log_err(1, "accept"); } + assert(client_salen >= client_sa.ss_len); + + handle_connection(portal, client_fd, + (struct sockaddr *)&client_sa, dont_fork); + break; + default: + __assert_unreachable(); } #ifdef ICL_KERNEL_PROXY } @@ -2735,13 +2740,6 @@ main(int argc, char **argv) if (new_pports_from_conf(newconf, &kports)) log_errx(1, "Error associating physical ports; exiting"); - error = conf_apply(oldconf, newconf); - if (error != 0) - log_errx(1, "failed to apply configuration; exiting"); - - conf_delete(oldconf); - oldconf = NULL; - if (dont_daemonize == false) { log_debugx("daemonizing"); if (daemon(0, 0) == -1) { @@ -2751,6 +2749,20 @@ main(int argc, char **argv) } } + kqfd = kqueue(); + if (kqfd == -1) { + log_warn("Cannot create kqueue"); + pidfile_remove(newconf->conf_pidfh); + exit(1); + } + + error = conf_apply(oldconf, newconf); + if (error != 0) + log_errx(1, "failed to apply configuration; exiting"); + + conf_delete(oldconf); + oldconf = NULL; + /* Schedule iSNS update */ if (!TAILQ_EMPTY(&newconf->conf_isns)) set_timeout((newconf->conf_isns_period + 2) / 3, false);