date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=YvR1R6ODUTNn+Ap4DjwQBMz8fJtpoALck6mnA+4A3j0=;
	b=pppBBnunr9CpZio9bEF79Ecr+m7ZIPoTedZ3MTRBBAKIopcddtIKgwYg+UVk9/B2cyoX0O
	DxONwxLD6eUJvf5+1RuFlaKM7f/HIOYaCxWQ1taFJ6pWwqM83903vy4g0XpiGhOwDeWlKS
	krMdFfcfNY9CrHlQCBmTQGoal5uF/wqpV4S6XBF/De5Xti9KERGvhDotxcT0oPBbTj8waC
	WYKOXVN2qiPnGZrRBy+UCnxHbbbztkmTCPvua5tfPNnQ3UAf4IZLkXctfXXRVCaxs+bOB1
	F3WdbdtXFi5DnsB9Mo3NeHyzMur3KugKwpq4xdI6hU0Ycl9OyNU/fTrT2YfEpw==
Date: Mon, 13 Oct 2025 01:26:06 GMT
Message-Id: <202510130126.59D1Q6Q1052335@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Colin Percival <cperciva@FreeBSD.org>
Subject: git: c904188d3515 - releng/15.0 - rpc.tlsservd.c: Pin max
  threads at 1 for now
Sender: owner-dev-commits-src-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Auto-Submitted: auto-generated

The branch releng/15.0 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=c904188d35154b291c837603ed332eab694d3bb6

commit c904188d35154b291c837603ed332eab694d3bb6
Author:     Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2025-10-10 23:29:25 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-13 01:25:42 +0000

    rpc.tlsservd.c: Pin max threads at 1 for now
    
    PR#289734 reports a crash in tcp_use_close() when the rpc.tlsservd
    daemon is being used.  Although I have no, as yet, had time to track
    down/fix the race, it turns out setting rpctls_maxthreads to 1
    avoids the problem.
    
    This patch pins rpctls_maxthreads to 1 to avoid the problem,
    until there is a proper fix.
    
    Approved by:    re (cperciva)
    PR:     289734
    
    (cherry picked from commit 7a289fe3cd5c6de7ddbe394b7700b20b0bafdb3e)
    (cherry picked from commit a7fc4e326c8db7b5429b616e0446aac1a041d239)
---
 usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
index f07385a2baa7..fb0501b2db4c 100644
--- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
+++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c
@@ -168,7 +168,12 @@ main(int argc, char **argv)
 
 	rpctls_verbose = false;
 	ncpu = (u_int)sysconf(_SC_NPROCESSORS_ONLN);
+#ifdef notnow
 	rpctls_maxthreads = ncpu > 1 ? ncpu / 2 : 1;
+#else
+	/* XXX For now, until fixed properly!! */
+	rpctls_maxthreads = 1;
+#endif
 
 	while ((ch = getopt_long(argc, argv, "2C:D:dhl:N:n:mp:r:uvWw", longopts,
 	    NULL)) != -1) {
@@ -199,6 +204,8 @@ main(int argc, char **argv)
 			if (rpctls_maxthreads < 1 || rpctls_maxthreads > ncpu)
 				errx(1, "maximum threads must be between 1 and "
 				    "number of CPUs (%d)", ncpu);
+			/* XXX For now, until fixed properly!! */
+			rpctls_maxthreads = 1;
 			break;
 		case 'n':
 			hostname[0] = '@';