From nobody Wed Aug 6 20:10:01 2025 X-Original-To: dev-commits-src-main@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 4by1cB3grwz648sJ; Wed, 06 Aug 2025 20:10:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4by1c94lN9z41W2; Wed, 06 Aug 2025 20:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754511001; 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=DYygX3WlYItzeA1wtA/2nECGYYAD8FVfd4D3l9L5j/8=; b=s8wKMTias6JrZRbjPA9PyRLXdc0K3AUQAOyV6Ag76N4LfGXJ48a7WNhqCTIFZ2vqCvX5dt f4vGSQo68Z+sDNPfPK97bPHYnZ1sTUQf70pC6b4UNvociAnh6ehEPqFDP830S6Dd+3+6N1 0CZI39ujUB6pgNPBmV5VkM08y7ON+jG88MnIm3zJzxMdJF163tgbr7bT3kTSrY0a4Vs75l aPN33HVXEpb1MO64HsKw3Yj10yXm5v/IKVh5KhYc0oRPeMmGQtROwZQoWHXd3nX9zDvQod 7GzumaSGWsXhNBbjL6rl26RrBpRefJ3MHfO2NT95ncXQVFGsMMRc2x2YwwqwRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754511001; 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=DYygX3WlYItzeA1wtA/2nECGYYAD8FVfd4D3l9L5j/8=; b=kbUPFZd4EeWwaQm2B2ZiMh6tiQtBl3G6sbrQ9qiPQE0z9x0xnL24OgLIz9U3RQklKHvB1O LtVJbELlwbRK/RLvH9fXkOfxH1yjdI/X8/+qtTQ1PC7eAudFuYHbJ3Zav9/zz0VPGfk6l0 KAEXBQE6Xcs+jULdWEAZO3leoG1atUiqI1vbgbZy9WKWiuzv2yowoDvKec8+oDVCmMeRkf 6zZcYfsSdcdXF09XtiiauP/ZyXz/JA6zFZEGBhEDiYPH2Ox8vy0AVsFPHbkOdD5GH8k/3w wxgB76OGtg2mN+G5LQPWhiNkyo7xcZImy1b49cvPbcJt/77zXSFehyXuXRMzGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754511001; a=rsa-sha256; cv=none; b=gUgYthsS9W33vXrwOf0KLbERUQsAgraHzxCL0/Iu8+7/LRdU0Ltp3YUDeyDh+IDxQK4/Cm imzHXb31gJjew7k816z5GXEMqjs2aK+aFEgUnNKZBaGPt+IzsawGIunHhDxsM7WtFjCJ1J QI3AyaNYhnJNQOOXsZeAgPFFfNtX7Y0rXfHEKm60b0iMasy/6ZmMVIExADBOzFT1ZxVt8b 8xnNsYLHY6qlVAuE6ocR3o4hyNWvaJGuDhPxmkYOPPxOHDloI6/6rGGNEOhR11gEbFjbbn WvIW3wZ6XaqPhEzHDO/GPpD0O4uYM57FbOxNtTBb1WA76yfQMzqPqzfXPRivmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4by1c94B4jzc8k; Wed, 06 Aug 2025 20:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 576KA1II061921; Wed, 6 Aug 2025 20:10:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 576KA1Hw061916; Wed, 6 Aug 2025 20:10:01 GMT (envelope-from git) Date: Wed, 6 Aug 2025 20:10:01 GMT Message-Id: <202508062010.576KA1Hw061916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 40484d3117d9 - main - ctld: Use freebsd::fd_up to manage the lifecycle of accepted sockets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 40484d3117d9520de3755d5c91ddb26ed7ce6bcb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=40484d3117d9520de3755d5c91ddb26ed7ce6bcb commit 40484d3117d9520de3755d5c91ddb26ed7ce6bcb Author: John Baldwin AuthorDate: 2025-08-06 19:57:27 +0000 Commit: John Baldwin CommitDate: 2025-08-06 19:57:27 +0000 ctld: Use freebsd::fd_up to manage the lifecycle of accepted sockets Explicitly hand off ownership of accepted sockets to the portal::handle_connection method. Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D51729 --- usr.sbin/ctld/ctld.cc | 8 +++----- usr.sbin/ctld/ctld.hh | 2 +- usr.sbin/ctld/iscsi.cc | 12 ++++++------ usr.sbin/ctld/iscsi.hh | 5 +++-- usr.sbin/ctld/login.cc | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 4821bdb030c1..451245b8d5fa 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -2166,7 +2166,7 @@ wait_for_children(bool block) } static void -handle_connection(struct portal *portal, int fd, +handle_connection(struct portal *portal, freebsd::fd_up fd, const struct sockaddr *client_sa, bool dont_fork) { struct portal_group *pg; @@ -2197,10 +2197,8 @@ handle_connection(struct portal *portal, int fd, pid = fork(); if (pid < 0) log_err(1, "fork"); - if (pid > 0) { - close(fd); + if (pid > 0) return; - } conf->close_pidfile(); } @@ -2214,7 +2212,7 @@ handle_connection(struct portal *portal, int fd, log_set_peer_addr(host); setproctitle("%s", host); - portal->handle_connection(fd, host, client_sa); + portal->handle_connection(std::move(fd), host, client_sa); log_debugx("nothing more to do; exiting"); exit(0); } diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index 7842f1bb5715..6ecee3b73c4f 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -144,7 +144,7 @@ struct portal { bool reuse_socket(portal &oldp); bool init_socket(); virtual bool init_socket_options(int s __unused) { return true; } - virtual void handle_connection(int fd, const char *host, + virtual void handle_connection(freebsd::fd_up fd, const char *host, const struct sockaddr *client_sa) = 0; portal_group *portal_group() { return p_portal_group; } diff --git a/usr.sbin/ctld/iscsi.cc b/usr.sbin/ctld/iscsi.cc index 8d32974ab504..bee036b95bf2 100644 --- a/usr.sbin/ctld/iscsi.cc +++ b/usr.sbin/ctld/iscsi.cc @@ -61,7 +61,7 @@ struct iscsi_portal final : public portal { portal(pg, listen, protocol, std::move(ai)) {} bool init_socket_options(int s) override; - void handle_connection(int fd, const char *host, + void handle_connection(freebsd::fd_up fd, const char *host, const struct sockaddr *client_sa) override; }; @@ -410,13 +410,13 @@ pdu_fail(const struct connection *conn __unused, const char *reason __unused) { } -iscsi_connection::iscsi_connection(struct portal *portal, int fd, +iscsi_connection::iscsi_connection(struct portal *portal, freebsd::fd_up fd, const char *host, const struct sockaddr *client_sa) : - conn_portal(portal), conn_initiator_addr(host), + conn_portal(portal), conn_fd(std::move(fd)), conn_initiator_addr(host), conn_initiator_sa(client_sa) { connection_init(&conn, &conn_ops, proxy_mode); - conn.conn_socket = fd; + conn.conn_socket = conn_fd; } iscsi_connection::~iscsi_connection() @@ -496,12 +496,12 @@ iscsi_connection::handle() } void -iscsi_portal::handle_connection(int fd, const char *host, +iscsi_portal::handle_connection(freebsd::fd_up fd, const char *host, const struct sockaddr *client_sa) { struct conf *conf = portal_group()->conf(); - iscsi_connection conn(this, fd, host, client_sa); + iscsi_connection conn(this, std::move(fd), host, client_sa); start_timer(conf->timeout(), true); kernel_capsicate(); conn.handle(); diff --git a/usr.sbin/ctld/iscsi.hh b/usr.sbin/ctld/iscsi.hh index 5a6729541119..d510e8c6731b 100644 --- a/usr.sbin/ctld/iscsi.hh +++ b/usr.sbin/ctld/iscsi.hh @@ -36,8 +36,8 @@ #define CONN_SESSION_TYPE_NORMAL 2 struct iscsi_connection { - iscsi_connection(struct portal *portal, int fd, const char *host, - const struct sockaddr *client_sa); + iscsi_connection(struct portal *portal, freebsd::fd_up fd, + const char *host, const struct sockaddr *client_sa); ~iscsi_connection(); void handle(); @@ -61,6 +61,7 @@ private: struct portal *conn_portal = nullptr; const struct port *conn_port = nullptr; struct target *conn_target = nullptr; + freebsd::fd_up conn_fd; int conn_session_type = CONN_SESSION_TYPE_NONE; std::string conn_initiator_name; std::string conn_initiator_addr; diff --git a/usr.sbin/ctld/login.cc b/usr.sbin/ctld/login.cc index 87e8d3092fef..cda11cc1f21b 100644 --- a/usr.sbin/ctld/login.cc +++ b/usr.sbin/ctld/login.cc @@ -752,7 +752,7 @@ iscsi_connection::login_negotiate(struct pdu *request) conn_max_burst_limit = (1 << 24) - 1; conn_first_burst_limit = (1 << 24) - 1; kernel_limits(pg->offload(), - conn.conn_socket, + conn_fd, &conn_max_recv_data_segment_limit, &conn_max_send_data_segment_limit, &conn_max_burst_limit,