From nobody Mon Oct 6 02:22:10 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 4cg31t4Zddz69LGg; Mon, 06 Oct 2025 02:22:10 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cg31t3zBSz3sSS; Mon, 06 Oct 2025 02:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759717330; 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=KfVi6Wk1HWlDHWevmS4ytJjzTNfO4Mk1qh32fnYNZgc=; b=M0l6fhibk6bOMKw/ZOn3lyeurf17kgULgfN74hujbvwIvk3vMMvQqGfuCFmEdxrcuAFe/c 4s1Iw6R6WR2hPqnyc4xRqui5t6qvLuaO5ptyeYq0CY1yCODoa/3PSjptc2sIvM9VUR1Qc4 5NL2wz3gWPhEscfnZ/glcB9LjRSAgGM0VTVvzJNwHVfJknk+F5ivaMUN5UF5uATo05EtWA rWYBERrBOt5wmUblRMNT2jZOLm/zuMnY4EmaEhNENDmnUg2uP4bpUq+bprtoKw7yOFDVZJ qf4JnA/5dNQyPWCec0+Ivj+zuQpE3mKfL2Vp3zhG8Q4CdOdrFfTSwtXKQIX3yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759717330; 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=KfVi6Wk1HWlDHWevmS4ytJjzTNfO4Mk1qh32fnYNZgc=; b=PdParP6oycOGC2NkjKhy4OVhvZDiB466WXvBLzqR7VQhtYwvUM9pytfkxyILqqKuIDBMiE tjkm0f568dbzikUW0Ph4sJALr5enN1mzmizmYGkGae/6iPaoOpaSUPS+adFd+R/m6Ue8x9 noKKYluZqLA1GgsrEW5HBZd3c148d6J2n6DP00I139zwfCcVnXTGNxOqa2eFvR8kDPESQv olnNXf9RcqRpYsulahjdY5kW1tlAv5UDwfNdjxg46m/aGEUcMirYT7MXuMxbOXHAQMOsGK zuS4AvVyuQHX1g4JH18MW42CU+Ppo3uhyUzBWPrhVpwz25gQv+5srGTJX6DcqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759717330; a=rsa-sha256; cv=none; b=LWTi1tkaYVFr3DnVowU9RcNxpRxmVdTIC7ATMrUHdkMlJvMkpZ5uFYhQlFuarp1APmz5DY RcBCwzsKDXYViBAdJckfUefeK1jl+F8KVPXAaS+8IKhrb6d6mddo6yvB6zEkyEEassiB2r zWxCm8JMXjTv63qtmrPoS8Q4UO2Neg2wRnIvrlvLgm/jI7T+/i9NvY+McVnZv84Da4Ynu7 fRxFKuDCajPdJSJVrS/Gr0LzaxdAkJKUPbH+2Px3fvgW3HvL858UZ0e12zIMFY8PvMx6xe R/UwP+n9s2BnJ6fabyH82DLE8dlw+1LpVPva/ELESG0p++hMX/nBZHxf4rMUNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cg31t3MH7zgHS; Mon, 06 Oct 2025 02:22:10 +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 5962MAd7061879; Mon, 6 Oct 2025 02:22:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5962MAwu061876; Mon, 6 Oct 2025 02:22:10 GMT (envelope-from git) Date: Mon, 6 Oct 2025 02:22:10 GMT Message-Id: <202510060222.5962MAwu061876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: e0b571d77364 - main - mtx: rename MTX_CONTESTED to MTX_WAITERS 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0b571d77364d0dcae5492d9f3b901d01d3e13ca Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e0b571d77364d0dcae5492d9f3b901d01d3e13ca commit e0b571d77364d0dcae5492d9f3b901d01d3e13ca Author: Mateusz Guzik AuthorDate: 2025-10-06 02:00:50 +0000 Commit: Mateusz Guzik CommitDate: 2025-10-06 02:19:38 +0000 mtx: rename MTX_CONTESTED to MTX_WAITERS Using the word "contested" for the case where there are threads blocked on the lock is misleading at best (the lock is already contested if it is being held by one thread and wanted by another). It also diverges from naming used in other primitives (which refer to them as "waiters"). Rename it for some consistency. There were uses of the flag outside of mutex code itself. This is an abuse of the interface. The netgraph thing looks suspicious at best, the sctp thing is fundamentally wrong. Fixing those up is left as an exercise for the reader. While here touch up stale commentary. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_mutex.c | 23 +++++++++-------------- sys/netgraph/netflow/netflow.c | 6 +++--- sys/netinet/sctp_lock_bsd.h | 6 +++--- sys/sys/mutex.h | 6 +++--- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index b7316ea5f387..d67c70984528 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -503,8 +503,8 @@ _mtx_trylock_flags_(volatile uintptr_t *c, int opts, const char *file, int line) /* * __mtx_lock_sleep: the tougher part of acquiring an MTX_DEF lock. * - * We call this if the lock is either contested (i.e. we need to go to - * sleep waiting for it), or if we need to recurse on it. + * We get here if lock profiling is enabled, the lock is already held by + * someone else or we are recursing on it. */ #if LOCK_DEBUG > 0 void @@ -660,13 +660,8 @@ retry_turnstile: } #endif - /* - * If the mutex isn't already contested and a failure occurs - * setting the contested bit, the mutex was either released - * or the state of the MTX_RECURSED bit changed. - */ - if ((v & MTX_CONTESTED) == 0 && - !atomic_fcmpset_ptr(&m->mtx_lock, &v, v | MTX_CONTESTED)) { + if ((v & MTX_WAITERS) == 0 && + !atomic_fcmpset_ptr(&m->mtx_lock, &v, v | MTX_WAITERS)) { goto retry_turnstile; } @@ -1029,8 +1024,8 @@ thread_lock_set(struct thread *td, struct mtx *new) /* * __mtx_unlock_sleep: the tougher part of releasing an MTX_DEF lock. * - * We are only called here if the lock is recursed, contested (i.e. we - * need to wake up a blocked thread) or lockstat probe is active. + * We get here if lock profiling is enabled, the lock is already held by + * someone else or we are recursing on it. */ #if LOCK_DEBUG > 0 void @@ -1207,7 +1202,7 @@ _mtx_destroy(volatile uintptr_t *c) if (!mtx_owned(m)) MPASS(mtx_unowned(m)); else { - MPASS((m->mtx_lock & (MTX_RECURSED|MTX_CONTESTED)) == 0); + MPASS((m->mtx_lock & (MTX_RECURSED|MTX_WAITERS)) == 0); /* Perform the non-mtx related part of mtx_unlock_spin(). */ if (LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin) { @@ -1359,8 +1354,8 @@ db_show_mtx(const struct lock_object *lock) db_printf("DESTROYED"); else { db_printf("OWNED"); - if (m->mtx_lock & MTX_CONTESTED) - db_printf(", CONTESTED"); + if (m->mtx_lock & MTX_WAITERS) + db_printf(", WAITERS"); if (m->mtx_lock & MTX_RECURSED) db_printf(", RECURSED"); } diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c index 978d6fd0b54d..05c6062463be 100644 --- a/sys/netgraph/netflow/netflow.c +++ b/sys/netgraph/netflow/netflow.c @@ -960,7 +960,7 @@ struct ngnf_show_header *resp) list_id = 0; TAILQ_FOREACH(fle, &hsh->head, fle_hash) { - if (hsh->mtx.mtx_lock & MTX_CONTESTED) { + if (hsh->mtx.mtx_lock & MTX_WAITERS) { resp->hash_id = i; resp->list_id = list_id; mtx_unlock(&hsh->mtx); @@ -1111,7 +1111,7 @@ ng_netflow_expire(void *arg) * Interrupt thread wants this entry! * Quick! Quick! Bail out! */ - if (hsh->mtx.mtx_lock & MTX_CONTESTED) + if (hsh->mtx.mtx_lock & MTX_WAITERS) break; /* @@ -1150,7 +1150,7 @@ ng_netflow_expire(void *arg) * Interrupt thread wants this entry! * Quick! Quick! Bail out! */ - if (hsh->mtx.mtx_lock & MTX_CONTESTED) + if (hsh->mtx.mtx_lock & MTX_WAITERS) break; /* diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h index ec66be0cf371..a60983cb30e3 100644 --- a/sys/netinet/sctp_lock_bsd.h +++ b/sys/netinet/sctp_lock_bsd.h @@ -263,10 +263,10 @@ } while (0) #define SCTP_INP_LOCK_CONTENDED(_inp) \ - ((_inp)->inp_mtx.mtx_lock & MTX_CONTESTED) + ((_inp)->inp_mtx.mtx_lock & MTX_WAITERS) #define SCTP_INP_READ_CONTENDED(_inp) \ - ((_inp)->inp_rdata_mtx.mtx_lock & MTX_CONTESTED) + ((_inp)->inp_rdata_mtx.mtx_lock & MTX_WAITERS) #ifdef SCTP_LOCK_LOGGING #define SCTP_INP_RLOCK(_inp) do { \ @@ -337,7 +337,7 @@ } while (0) #define SCTP_ASOC_CREATE_LOCK_CONTENDED(_inp) \ - ((_inp)->inp_create_mtx.mtx_lock & MTX_CONTESTED) + ((_inp)->inp_create_mtx.mtx_lock & MTX_WAITERS) /* * For the majority of things (once we have found the association) we will diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 83300d4eb593..4f6b45d78a88 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -68,9 +68,9 @@ */ #define MTX_UNOWNED 0x00000000 /* Cookie for free mutex */ #define MTX_RECURSED 0x00000001 /* lock recursed (for MTX_DEF only) */ -#define MTX_CONTESTED 0x00000002 /* lock contested (for MTX_DEF only) */ +#define MTX_WAITERS 0x00000002 /* lock has waiters (for MTX_DEF only) */ #define MTX_DESTROYED 0x00000004 /* lock destroyed */ -#define MTX_FLAGMASK (MTX_RECURSED | MTX_CONTESTED | MTX_DESTROYED) +#define MTX_FLAGMASK (MTX_RECURSED | MTX_WAITERS | MTX_DESTROYED) /* * Prototypes @@ -217,7 +217,7 @@ void _thread_lock(struct thread *); #define _mtx_obtain_lock_fetch(mp, vp, tid) \ atomic_fcmpset_acq_ptr(&(mp)->mtx_lock, vp, (tid)) -/* Try to release mtx_lock if it is unrecursed and uncontested. */ +/* Try to release mtx_lock if it is unrecursed and without waiters. */ #define _mtx_release_lock(mp, tid) \ atomic_cmpset_rel_ptr(&(mp)->mtx_lock, (tid), MTX_UNOWNED) From nobody Mon Oct 6 11:58: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 4cgHpL29sYz6BPSV; Mon, 06 Oct 2025 11:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgHpL0MmRz4Q2d; Mon, 06 Oct 2025 11:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759751882; 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=89hQpCLvDAWbewiivjob9uTxY13CS1FEVzmkKYl3l2Q=; b=OHH2FhJQtfQrksM3lkNZnRkYJlJM0CXU+ctfYUBQeqEgtPhwt+EoFltOOGlbuuLlNlFueI Jvi9J4p3jScCWna8m+XldfxTd4nJSNSyTU8dJ7jFMmXUrtC29OB1JBmDj/Fmfu4BKNYSvn kywyf1RvtDWC+8Kzp5XPt077lSlv/kGht6X6XUtqaovcZOFAMmMTOH7PG9ivF97NPX0BQt 7nAVlWSm5Y3NEiDmCiFSYkL5xpvtHCqLCPhtz4VQhfkTkpoUbZjByB3Nd5ZM2Kp3xpRZJD qUZPQvf0cFsNrMDff7cIWj1Xqsf0+C0E8Xi8rVeONNrQWJhRr43Lxamz5piE9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759751882; 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=89hQpCLvDAWbewiivjob9uTxY13CS1FEVzmkKYl3l2Q=; b=hE4tC3OPzKtUrMUC3Ma7+HnBzuL5zHaPzzkEsrhedgfi++nNbtWbVJJAaNqP966T+Gmd8G 1OKJHnvWZ7UQbJhKx0FQEcCxy+oQbfGlcvzal3IBgtrGOMaHOaY7JrE55SW4bQTfZ4gHir z49Nq6eok44zQwI2lxTy8vT8hzW/1RR+lqhXcsyPd4wKwxEERw5wk8bFxyzmjis9l9ItzR mPnpgmDcMP4OsnvslrOhMcXlvDQ+YKTYxl1r/bbAsfNK9hr7ikC2rEiJrlakkgIGpfHueb Nre3ul3Np9/11ZTTFrr6Ya7d7wlXBrGThWwmXqRunKiRP8Izy09HuXMw1CllUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759751882; a=rsa-sha256; cv=none; b=AIbvladSxP9GW6jLwPcQIs9va+mKy9p8QGAchV8a1kV1V1UDBTYthLHmOUoYPFGeVTOx98 xpy/RJiicU3e1QGXI5rNQ4zPRN0DAvCpWmEKQPdiYL76ZOe6UCH4h5MzoxABLAcpJy8k59 Hsjyh0GGfHCjbOuf6UGxh1TzdpXOj8rCPE6nq51hYJ3Bve22WjLY/tEZQvi99yU2c1P73u M/y65qvjxTWbU2scVUTEc1+dJuVg3deOkvioWMNqrpCFDxPvtHbPmJ1n0I+2IErlrq4h7b aB6/JCpgLqmqJgXdKqtnZ9Ln8CeCsngHSwkccEDWoNkMA+JU9WVS3a6xD7Aikg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgHpK68Q1zxfV; Mon, 06 Oct 2025 11:58: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 596Bw1TB048023; Mon, 6 Oct 2025 11:58:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Bw1pd048020; Mon, 6 Oct 2025 11:58:01 GMT (envelope-from git) Date: Mon, 6 Oct 2025 11:58:01 GMT Message-Id: <202510061158.596Bw1pd048020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5fda4690b4a1 - main - release: Set INSTALL_AS_USER=yes when running pkg clean in NO_ROOT mode 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fda4690b4a1b471331ff819c372ac2476b60ab2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5fda4690b4a1b471331ff819c372ac2476b60ab2 commit 5fda4690b4a1b471331ff819c372ac2476b60ab2 Author: Mark Johnston AuthorDate: 2025-10-04 12:48:46 +0000 Commit: Mark Johnston CommitDate: 2025-10-06 11:45:05 +0000 release: Set INSTALL_AS_USER=yes when running pkg clean in NO_ROOT mode Otherwise pkg complains about unexpected ownership of the root directory. MFC after: 1 day Fixes: 86221f965c06 ("vmimage.subr: Fix NO_ROOT build in ..._rmcache") --- release/tools/vmimage.subr | 1 + 1 file changed, 1 insertion(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3b0519c21dbc..cae8a113871e 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -256,6 +256,7 @@ vm_extra_pkg_rmcache() { if [ -n "${NO_ROOT}" ]; then ${PKG_CMD} \ -o ASSUME_ALWAYS_YES=yes \ + -o INSTALL_AS_USER=yes \ -r ${DESTDIR} \ clean -y -a else From nobody Mon Oct 6 12:55:41 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 4cgK4s5gXHz635HG; Mon, 06 Oct 2025 12:55:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgK4s4G3nz3H75; Mon, 06 Oct 2025 12:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759755341; 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=cx5ruoktRVbBKe5umkHJzfB1/tFzz5h+MdDaG8TBcww=; b=CZgjDMYhmOPr6wozu2bxOwVe9RQZYGgz4/yEcYUZZo6GEVcc/CrjRBF5FuxPL3F7M7yKL1 t/+TxVZ3iF+uc8FtJSZkt9m6Lf3T/hgIMx92G+KmErGVFoHGgLAnYPtlRuUh0Ftt3tCMJn s+ktA1MBbE3rHJ4NYaJwKBBXvcW942M+x4m8FT1NRLpH5ZmFN40xDf8szMgdipQkbQ9cMg xNGp+MrqQmO5PMTAvZ+whuSMTPO8McL1YgojhTTE0XtQZgrgTBpIpfXd8Y6fraEm5OzGHQ V0rT0Hi+PFd0bMI37pSheItU9eZfvQYb54BFbXArq+dJXE4YsHuEkQ9zhj2gdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759755341; 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=cx5ruoktRVbBKe5umkHJzfB1/tFzz5h+MdDaG8TBcww=; b=u/dad8MEpc2uhcbDZjGsVhvpRu+aT1FPfjLbTBLnZMTVocbaKuBMgdwAoPnGdQpEHN02x0 +7KHCo+vLO//NHpPZa+HmblxAFghGKyDP1V+sREbnAfDPDD2nykQQmmbZ2tmdCwhdHf3PO yGubzPVBxVBF2hZtX9HkJweuxxmMw3RwWdWVfkzCM+Ccx9+fzDzry8mhNNOm6pxfLjIQ8T swKazV1lM1sKhC4li2ohHVspu+bJnuEpr2AMp+D7UcRovMI+/rl7vU5oPNN/h7DODJ2mAo Vq0kuRwqY6CLM1GH2lF35gYW31DGXL/NB3FFeMpVSNt7D1KsVF5UQQ0ybfzTXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759755341; a=rsa-sha256; cv=none; b=Eg4YA5S5N3s8ZETP+TvF+f7bOAY1pavuntiStLCw2sHEze46aAtUczGDU1oihinczFGeHZ wEWWv81YSUkZjtSrimfBFQtd5Uk3+kVPWhQOF4RQhGHYAQgnTukkFcozqu3V1k29CnU8Zi 0/JWc4rg5ey+qLp7Z31C/xkO1bDpNd7M0lTdCt28iXgRLrdHU9dGH95BpF9Eap+dkIq/2x 0yCvCP7uXLjp0hOdwVdD4tOZgFL5y/UjTxDn+gvXvL/DcXJ8tuaZqXo3Qis0dDV6vmTkC9 a6ypnEahUZSbzz2FhniUi6WaougZ2uI5xxQbvP64V+yxtejB+RAqH5jR58KExw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgK4s3pqfz100S; Mon, 06 Oct 2025 12:55:41 +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 596Ctffj060161; Mon, 6 Oct 2025 12:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Ctfh5060158; Mon, 6 Oct 2025 12:55:41 GMT (envelope-from git) Date: Mon, 6 Oct 2025 12:55:41 GMT Message-Id: <202510061255.596Ctfh5060158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 893c3b857e60 - main - release: packages: Fix grammar in pkg description 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 893c3b857e6059f25865fefab93b323c8e345877 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=893c3b857e6059f25865fefab93b323c8e345877 commit 893c3b857e6059f25865fefab93b323c8e345877 Author: Jose Luis Duran AuthorDate: 2025-10-06 12:48:00 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-06 12:50:59 +0000 release: packages: Fix grammar in pkg description Reported by: ivy Approved by: emaste (mentor) MFC after: 1 hour Differential Revision: https://reviews.freebsd.org/D52917 --- release/packages/ucl/ctf-all.ucl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/ucl/ctf-all.ucl b/release/packages/ucl/ctf-all.ucl index 25d46ab9421a..970ac3ffb4fa 100644 --- a/release/packages/ucl/ctf-all.ucl +++ b/release/packages/ucl/ctf-all.ucl @@ -30,7 +30,7 @@ CTF is intended specifically for runtime program analyzers such as DTrace. This package provides the ctfconvert(1), ctfdump(1) and ctfmerge(1) utilities which are used to work with CTF data, and the libctf library which allows -application to access CTF debugging information programmatically. +applications to access CTF debugging information programmatically. EOD licenses = [ "CDDL-1.0" ] From nobody Mon Oct 6 12:55:42 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 4cgK4t6lcCz635Gs; Mon, 06 Oct 2025 12:55:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgK4t5FGHz3HCS; Mon, 06 Oct 2025 12:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759755342; 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=r/ZS6wvlGTD0s2EEREEXb2dwqd/6Qz6r5Zfy8Y1B09Y=; b=lL0pBNdP+QgR/6g0fGZHmd9fflIhgJTeanGxIkxaHT0R+nNoaFhAeTv5HcQWO68Ui8lwao 7186YHndBfydQje9dsfsvaKbX80Z0VWOe9Uz1OAFpfTHCkg8gujrd20rp/V+5R6UbyeF7k 2xksqsbUWCN605ma+Q9EiTPUqdnyt85tROOBuYRE/+2+4FU6mqLA4pXDWVhC/Owxt2sbou pk1gKDMSnVxme2RgAlu6Fhd4oepq6ycm0cmps0uadmeacUiL4I9xcrGjVLNOAU9uLZglh0 oB7lZtdenhPIpXADHnlVb2JOXzPJb2lukq1eJQ+nwdQqPqsYx5yubAcXvTJIGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759755342; 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=r/ZS6wvlGTD0s2EEREEXb2dwqd/6Qz6r5Zfy8Y1B09Y=; b=Y/4hXqRK5QKNa/PeyVQAkqE9k5ZbO/6rUWxV2Z2hfkk/0BU9PvJNmKV4WLPbfsiwego8Zs 7iFkoDIg/NY2ZpwLFOkvXCmnOcWAmDiiD0HtqC1cUfcBu9tiVOJBcMJx3Y+PHgyv80/Ht3 yNzS00SBpM6+pjEI6VXnQ1JM44mfv7KdO3ftNbgbrNAAhMdPLlgDcTC55dgqr37nJUmI3/ +ABXD7/PLXbcr21lhqX0yMNZtADaOiiQOrQsgf9MG9JaK8Dh6LMC5LjZQdq5CE79mwePRa oy6yPveTFI509azt+AbgBWCZ79UulIx648gOaWcL2obf02r9Pc3NJEjU7MmZYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759755342; a=rsa-sha256; cv=none; b=aosN6+695+O98ozhFGb85hSrHsW8/oeJ0ejTp3F3Nh+zPbC0vPgTbmIXnR5PFrQ02Zb30T NZQvtQ/uswp5jzsat1F4YM9lkaQmWoEMNw9jd0MxvcbgvnHWU0e/Tj0WiY2c9jSgVAx520 nCJhlKR06KAIgqhFWqKPGrt8CR56B2u8Sd0TQFE353cgTUkvHO4kyt+Me5LpwiqyAheX6R 0H60ynh6+74UnYS34yGGXKe4pCFqcTMPnioG3bAUuAq7qUX7pB8q9kGXTbyOhdqZJDw2fI AhfoLPVCuz1p7HQU7T1qoWeaQmlTrQhddWAsk+XouRj+IAyhSHLu1b6Z/WT4qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgK4t4q00zyhx; Mon, 06 Oct 2025 12:55:42 +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 596CtgQ6060197; Mon, 6 Oct 2025 12:55:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596CtgBQ060194; Mon, 6 Oct 2025 12:55:42 GMT (envelope-from git) Date: Mon, 6 Oct 2025 12:55:42 GMT Message-Id: <202510061255.596CtgBQ060194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 75f7e003b79d - main - nss_tacplus: Fix typo MK_INSTALLIB -> MK_INSTALLLIB 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75f7e003b79d4a1d1cad77cc7bbe2ccb96435cd5 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=75f7e003b79d4a1d1cad77cc7bbe2ccb96435cd5 commit 75f7e003b79d4a1d1cad77cc7bbe2ccb96435cd5 Author: Jose Luis Duran AuthorDate: 2025-10-06 12:54:05 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-06 12:54:05 +0000 nss_tacplus: Fix typo MK_INSTALLIB -> MK_INSTALLLIB Reviewed by: des Approved by: emaste (mentor) Fixes: 6c5cdba1bafe ("Add nss_tacplus, a TACACS+ NSS module.") MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D52882 --- ObsoleteFiles.inc | 3 +++ lib/nss_tacplus/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 36e8c048661e..3645cff43458 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251006: Remove libnss_tacplus.a (it never should have been installed) +OLD_FILES+=usr/lib/libnss_tacplus.a + # 20251003: kgdb python scripts moved OLD_FILES+=usr/libexec/kgdb/acttrace.py OLD_DIRS+=usr/libexec/kgdb diff --git a/lib/nss_tacplus/Makefile b/lib/nss_tacplus/Makefile index a969cd85778d..c85297a7dbaa 100644 --- a/lib/nss_tacplus/Makefile +++ b/lib/nss_tacplus/Makefile @@ -3,7 +3,7 @@ SRCS= ${LIB}.c SHLIB_MAJOR= 1 SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} LIBADD= tacplus -MK_INSTALLIB= no +MK_INSTALLLIB= no MAN= ${LIB}.8 .include From nobody Mon Oct 6 14:33:32 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 4cgMFn08rYz69RfK; Mon, 06 Oct 2025 14:33:33 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgMFm6Z3rz3WRP; Mon, 06 Oct 2025 14:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759761212; 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=uccV+CPcdna5T4iXEjOp18j0zRpOaBeNQamMoYtNUYQ=; b=k8lDySPCB8GxVpa4S/kcpdZ75nOqW69yyE5yI+cU5WrJYn3HJ4llai2Ttn5TyXMTzYj22l iiqtykrCjimjuRjfEqkQlQOlGuOC5B9xEWtdjir867Hxd75Y9cU5gLpFMfdJclqn7rGhw6 d8EDI+SB94389shv7JFmer4jvxv0NGQr8r6zZN/xWe+hByPcxrWaKVdsNi0P/zcys2QOgi /Kxg00RwJEoHRAV+nWiOVPEOj559QCtkP5YaC3Fks61V7Zu2kwYF5IbeyWjmCp/r2H61UF RtsPh0sY20uV0CxKAV2RO+FcXMPkG8jv3jfLsmWnLZlDN2Y86NWZCChw5ralPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759761212; 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=uccV+CPcdna5T4iXEjOp18j0zRpOaBeNQamMoYtNUYQ=; b=Pno11KUddoWEb+iRqMVFCtgTc8P1uIr0Xn01U/ccdQ0HNyXbkUzF+Q7OXl1sdw70vaaC+N JBfGhOhFAdyXB496i7nZi3+vJ0iSnifQ9vanUG4B6XkyXFdD5MjKurZ06il1ryYtRxSEUa HgkwsDY0XsEHiGCYIh6OOqjg/rkXanp7X4GDn4/ID7+SLlk4x1lctekGEiFmI6gQ4Wd7I7 /6fbLDwX7hKQM2zyNI8vSy46eVLycFDIXUKYGz8OnKoyp4FBjuBzj/2zrxLGTgz6IcFsE/ GW6IhIRABLw10VhTMz1T9343OZ+/rAmqlw38ldLtGAVnOJetn+sXABGrMJVKWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759761212; a=rsa-sha256; cv=none; b=hks47W3BYftpNJG7XlmK9ceFDoAP8iNIhjEU37E0Ug4KXCDnYLohtKpoX1Z070/0z2tiQW ZYYiRIj2vAZSckR+3LyB4HAiQ1FafvWG05BXoWnlnyelIfHDTzScOItgan7HWhhgYoFbLy 8tSzkyRtlbV0/XHKsf9bZ1/Z9z6v/ssOxe2bwZzY+2z8wIqOOHi1IUhOpI+6O2M+wt0v+n rSYQQXlh8ptx29hqXePeUrOzu4e+GtmXJgf+5o2MDSPGuJ+kU/+sxqKBF8u4RORs0whWfT OdyuloxLobMatIcvB/OS4/yvpwpcxiFIjH+eyTu0xk5qYXjwpK8VmcErBK+zcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgMFm5zWVz131w; Mon, 06 Oct 2025 14:33:32 +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 596EXWcU049500; Mon, 6 Oct 2025 14:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596EXWOc049497; Mon, 6 Oct 2025 14:33:32 GMT (envelope-from git) Date: Mon, 6 Oct 2025 14:33:32 GMT Message-Id: <202510061433.596EXWOc049497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 941b8ecdc087 - main - tcp: remove stray ; 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 941b8ecdc08749eeec1b88aac0442dad8cb8fb09 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=941b8ecdc08749eeec1b88aac0442dad8cb8fb09 commit 941b8ecdc08749eeec1b88aac0442dad8cb8fb09 Author: Michael Tuexen AuthorDate: 2025-10-06 14:32:08 +0000 Commit: Michael Tuexen CommitDate: 2025-10-06 14:32:08 +0000 tcp: remove stray ; No functional change intended. MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp_syncache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index def6bc886617..2bb99596f965 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1272,7 +1272,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, syncache_send_challenge_ack(sc, m); SCH_UNLOCK(sch); free(s, M_TCPLOG); - return (-1); /* Do not send RST */; + return (-1); /* Do not send RST */ } /* From nobody Mon Oct 6 15:22:45 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 4cgNLZ0NHcz69Wgv; Mon, 06 Oct 2025 15:22:46 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgNLY6v4rz3d5G; Mon, 06 Oct 2025 15:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764166; 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=0RREO6SmxzcfxgOL2RnFiwxuYZH+67k0zA2tURciLPc=; b=PgFRCc3hL8oHrvF0j6TixYG6EhMbcnW+bKCO2Ca1A+nnOOyZHM2YJbdZX62Lmlqmbt7rko vEaGND4Ycsxu1InnRRiR0qPLqTLpAJZxz8jWuUPT/uTu9y8pC7SK/4KgizdV56aR4pi7Fy cHNwMuJn+rC7vHjcxnEuN/WuA7ybQqaoGuWHepifKU3Xky6odcFr4faglMDDLnLXZ//yTj KsviZjwqLVQsvH5D9kJN5TaBNKt8XRFRQrZokw+HZ6Dr3EJGFrzPsxDlY/39YGhTiDfZWT iZ0S5gllzLQzbIm6lXHR0/GUVmEnVw1jKxGX885yb6a/IyXwmBqm5iXWwbvwDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764166; 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=0RREO6SmxzcfxgOL2RnFiwxuYZH+67k0zA2tURciLPc=; b=UEgozJ05o2i6Ua0KgiH1K2EzYHEVAhEtWTJi3GwjsO2rmVK8R78Q7zSeN1jsyB0DvO23Zt jHaQ6yVEV4PIa7n6n3LmEHpDrAICAQ8JEEnC/vVp9YNbDvMtvkUFAo3Gkiz5zfAneMzfej 1Le9lKjNwyGVbUJuDdLhtkNOg3FzdOsdVbVU9srxrHd7aUtgNH2junp1S89ZyCFi01376O F1XOFkB88/VoMS2Pu2RlidarSrleN0zEVaXizd2hE5RZk36PJ6Plb47C7YQz4TjVh894KG VrmSOetFsDk2tT5fSau9TS78FfUq6Uw6QWcNMVK63GMJIMkgl0UVXv0nv+l9Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759764166; a=rsa-sha256; cv=none; b=MTVyZCRjzQBSzFnWeiD+UN3OYX/WOMQi2QMzXtYHjiNHqZcm5az/LUJahC+8Cy3PfCVgvM 1Trg/kL8RZ9BRcHDpD66Ierd6/8CBX5kKO4L/4Pcdh/FrYgKNHNUdOiy+/Jm00PtgibBRS Nz/+NFgV7m1eu0Q9BCU+wPh+8XsGQQUSAa2vkRCzT5Z3trtPbooZlpu0yguU08nKJnUhUv H3TixYoVbOIGEL69L41OPIRWzCBFRX1BxbSX2GIs9WPqZ8u8c8YbFhFzB6lyTbDAMvICSe v2LspVUDlhof8u3Y0bkY/l29UnpZ2DF3ThtEFbUKabSVjiKMVb1/6o28P7E1xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgNLY6Ppvz145F; Mon, 06 Oct 2025 15:22:45 +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 596FMjw2043822; Mon, 6 Oct 2025 15:22:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596FMjFQ043819; Mon, 6 Oct 2025 15:22:45 GMT (envelope-from git) Date: Mon, 6 Oct 2025 15:22:45 GMT Message-Id: <202510061522.596FMjFQ043819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c8141e273a3e - main - nullfs: Fix some style after recent changes 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8 commit c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8 Author: Olivier Certner AuthorDate: 2025-10-06 12:48:24 +0000 Commit: Olivier Certner CommitDate: 2025-10-06 15:21:40 +0000 nullfs: Fix some style after recent changes In 'nullfs_subr.c': - Sort the headers. - Use '__func__' in preference to the function's name in an assertion. This applies comments from D38761, one of which was missed and the other added too late. Reviewed by: kib MFC with: 249ec85352b5 ("nullfs: smr-protected hash lookup") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52935 --- sys/fs/nullfs/null_subr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 146d3bbdaedd..ad8cd08279cc 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -36,12 +36,12 @@ #include #include #include -#include #include #include #include -#include +#include #include +#include #include @@ -143,7 +143,7 @@ null_hashget(struct mount *mp, struct vnode *lowervp) struct vnode *vp; enum vgetstate vs; - ASSERT_VOP_LOCKED(lowervp, "null_hashget"); + ASSERT_VOP_LOCKED(lowervp, __func__); rw_assert(&null_hash_lock, RA_UNLOCKED); vfs_smr_enter(); From nobody Mon Oct 6 15:22:46 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 4cgNLb20FZz69WrB; Mon, 06 Oct 2025 15:22:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgNLb1Pchz3ctl; Mon, 06 Oct 2025 15:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764167; 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=60+xKA/67igTXxh0/5hU5BvL5mR9x75/acnCrmjVziU=; b=jQyaAkz4/O+5luinJweO2/1OfooqYj9WvYXg90uzNlEnt6/Ao+nWv2PBtjJD33cs4achbK nmbxjbYys5QeM1t7vXp9bqSkwtapt/dulsScIFovnhuiAZrLHjwA9iIo32WIFRqdEOkIkF ESEG5FBDWVtvGl8WRStRl7BBD9k73fgz5C2s642YmCEyV6kp2x8HMvJMFrMUZ6NVZNFjF7 5364EVfMK/pIkVQj3rtFDSvlbdR/prKc58H1HJDIyTUBFdM4+mAV/75bbpCiXp+pMZGcNg BMchTdfH7+tyGfWa9hxb59aImZ/tEMFDHvjbjUVcSVlP++d7wo1OY879LcD6eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764167; 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=60+xKA/67igTXxh0/5hU5BvL5mR9x75/acnCrmjVziU=; b=pXxs2PBojzR6I96pgOUjjCL1Yy8e/xQFdH68az/ZdQW+0K/bGpc6nESoN5rDaEU96tg/Vs JSjqkvlVWpAxjP2XFBE36PAeo5V7KKNZvc4ZBQSQ0C22dOe8189PsPVyFEy7WkkOllmoOK YEqNfRdJrH7RK31q0kyUyATgmYI64NgoB9XKgGSIGjyJZiqiRoLHClonrDLJP0XdDfQy4Z 2elANBBSP2W2tSEnJ/xXrs0VYbEDiN5YPFxiUucZDD+Yr6zfjLIsbaR3OV+DkWg72xwhId Ou/EsCez732K+oLgu5vsosDCc4hE/bEV1EjWryEJKDCAFAiRSdEjMaBfk19Kzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759764167; a=rsa-sha256; cv=none; b=TPKS3Y+c/q6qIVNbia/iI9ub/+zRrOSMgF5QAc6Omc/kofXiIz5/PKrpTM4fFKiqYDicK5 0EM1QBQW38J5eczH9I7OPa0gvk4gC6Fy0jslFUfWZomXJEemL1MN/LERvL5qt1r8iuwudg mRdVIVsNbyKo7PWTAg6pVN4wZ6ckE2LtobImMoK+BcgaG9waBYERG5bddLmSC1NGwIeAbp wISm5LhUJqanIQbgRRq/ycddgeDXpCecERuCfUXbbhuAFG0lh5LzNEiTI74Sbs546jxJYS HWM8v9IbP2izL2eLwfSXYthQdXXU4xvaNfHh9I1luXv0TTm4D4dUAErm5IMZhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgNLb0Fvyz13SB; Mon, 06 Oct 2025 15:22:47 +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 596FMkOG043855; Mon, 6 Oct 2025 15:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596FMk6Q043852; Mon, 6 Oct 2025 15:22:46 GMT (envelope-from git) Date: Mon, 6 Oct 2025 15:22:46 GMT Message-Id: <202510061522.596FMk6Q043852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 09f925b57aeb - main - nullfs: Slightly reduce contention by reducing concurrent sections 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09f925b57aeb171318a9d54df500bf22b4cdd986 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=09f925b57aeb171318a9d54df500bf22b4cdd986 commit 09f925b57aeb171318a9d54df500bf22b4cdd986 Author: Olivier Certner AuthorDate: 2025-10-06 13:22:13 +0000 Commit: Olivier Certner CommitDate: 2025-10-06 15:21:45 +0000 nullfs: Slightly reduce contention by reducing concurrent sections In null_lock_prep_with_smr(), initialize 'lvp' outside of the SMR-protected section. In null_lock(), if after locking the lower vnode we notice that we have been reclaimed, we have to unlock the lower vnode and then relock our own now that the lock isn't shared anymore. Call VOP_UNLOCK() on the lower vnode as soon as this condition is known. This applies comments from D38761, one of which was missed and the other added too late. Reviewed by: kib MFC with: 641a58239520 ("nullfs: avoid the interlock in null_lock with smr") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52935 --- sys/fs/nullfs/null_vnops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 375b6aa27531..ec8a6b10b13f 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -788,10 +788,10 @@ null_lock_prep_with_smr(struct vop_lock1_args *ap) struct null_node *nn; struct vnode *lvp; - vfs_smr_enter(); - lvp = NULL; + vfs_smr_enter(); + nn = VTONULL_SMR(ap->a_vp); if (__predict_true(nn != NULL)) { lvp = nn->null_lowervp; @@ -855,6 +855,8 @@ null_lock(struct vop_lock1_args *ap) * case by reacquiring correct lock in requested mode. */ if (VTONULL(ap->a_vp) == NULL && error == 0) { + VOP_UNLOCK(lvp); + flags = ap->a_flags; ap->a_flags &= ~LK_TYPE_MASK; switch (flags & LK_TYPE_MASK) { @@ -869,7 +871,6 @@ null_lock(struct vop_lock1_args *ap) panic("Unsupported lock request %d\n", flags); } - VOP_UNLOCK(lvp); error = vop_stdlock(ap); } vdrop(lvp); From nobody Mon Oct 6 15:31:22 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 4cgNXW0l7Xz69X9T; Mon, 06 Oct 2025 15:31:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgNXW0FYyz3fTb; Mon, 06 Oct 2025 15:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764683; 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=5OC3EAEQvxpmxv9G0RyB4Pk9+ympnQDCgGbm8A3evhQ=; b=j1723qglN15C2pweBf0/m8SZZ9Vb6mjnAKX4RImr8uOUaWcdAAEyvv2F9NRnfwDxFQz8tc oYrxfet7TA0Pt8Sdp6ilMo1W6YolZBNXOj1JucOob9HWeyI2eGIBOjyKu/qwKybbGnc3P8 yNUR7cmbC0PWz5uzN/dEmezUPbFs8q/sXD0J4/sumWC28HSn9EPetky7tezGqEF9bPsEs8 MaFBsg3c3mUU7//ijBhIRD+LqVVXZuo0q27xfyMRIgU8EjmqzIrQx6044y5fUwf0KNQHwT /oQpGspfa9O0IwTxHtyYGMbgwAOvwX2buWaxc1Wg5URYsdWecYKC3GELiW16uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764683; 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=5OC3EAEQvxpmxv9G0RyB4Pk9+ympnQDCgGbm8A3evhQ=; b=gxY49ji4b9DIjaBKWMVSlo5MEu8aisDpJznfOpLKOI8E2Y0XeyQSKY8UttphvEcZnOt3EO pCutPrEWa87XK4SyGnc9Ozn4ZPB4cwkrMBzKLYqT6zUdjXkmLNbWQQCkoCHdgBhVIQy4zF 9FnHUBUtYmLmUVQbidBNzRiCtsSLA8IxxBIayZciLYClGtBIW0fcEipabwPozERkj+X7o+ +hJWP5Nn4ki+5b9MIJVo4GhLE8nE1GIstJt1vSB6HpNqH9SH+LQt0+ZunfHS97rFrxG7cT DjXSdyk81XFTyIIlFab2E31A23iZAKvj16W2pCPLIqXRRzAyXDxHx+roewh6rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759764683; a=rsa-sha256; cv=none; b=jlOIpoajUX0GtIMaP3r11OPp6S3H8bs/hOA7d5OQSao3l4EjOhqxlTrPyNGBUvhe2c8cZk kTCAZLuloVA/aPgOnatJlVotNjoNMr1TmkNCbJUQwwmg6gmAsErLPPBd/o0OkGH0e5IZZ1 OYb18APCimeC05KyvtMuHpZbYl6aKi9ZYpfmI0+SCQ93Smq914as/VQS4u71XRAEbb3EGE zA/pfVTuC4SPxjCJHjufTmdLlMA7MYc6BM2kdGTybBycvqDR5jZe5f2I3jEIE8+2Ue7VvT WLb33XBvs17l4K2mNlZKh0WGI3KpZ4DsAE2HIYEXQOOJmjhR4vVr62SDbCAx5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgNXV6cbWz13rG; Mon, 06 Oct 2025 15:31:22 +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 596FVMRJ060357; Mon, 6 Oct 2025 15:31:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596FVMQ2060354; Mon, 6 Oct 2025 15:31:22 GMT (envelope-from git) Date: Mon, 6 Oct 2025 15:31:22 GMT Message-Id: <202510061531.596FVMQ2060354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: a0c709ab5af4 - main - lsvfs(1): Capsicumise 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0c709ab5af4e87ce4579404c4ffbd4295ad12c5 Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=a0c709ab5af4e87ce4579404c4ffbd4295ad12c5 commit a0c709ab5af4e87ce4579404c4ffbd4295ad12c5 Author: Faraz Vahedi AuthorDate: 2025-08-11 17:53:55 +0000 Commit: Mariusz Zaborski CommitDate: 2025-10-06 15:30:17 +0000 lsvfs(1): Capsicumise Signed-off-by: Faraz Vahedi Reviewed by: asomers, markj Pull Request: https://github.com/freebsd/freebsd-src/pull/1498 --- usr.bin/lsvfs/lsvfs.c | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c index 5477d96434ac..8925b8988cd3 100644 --- a/usr.bin/lsvfs/lsvfs.c +++ b/usr.bin/lsvfs/lsvfs.c @@ -5,10 +5,12 @@ * */ +#include #include #include #include +#include #include #include #include @@ -38,41 +40,42 @@ static const char *fmt_flags(int); int main(int argc, char **argv) { - struct xvfsconf vfc, *xvfsp; + struct xvfsconf *xvfsp; size_t cnt, buflen; int rv = 0; argc--, argv++; + if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) + err(EXIT_FAILURE, "sysctl(vfs.conflist)"); + if ((xvfsp = malloc(buflen)) == NULL) + errx(EXIT_FAILURE, "malloc failed"); + if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) + err(EXIT_FAILURE, "sysctl(vfs.conflist)"); + cnt = buflen / sizeof(struct xvfsconf); + + caph_cache_catpages(); + if (caph_enter() != 0) + err(EXIT_FAILURE, "failed to enter capability mode"); + printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags"); fputs(DASHES, stdout); - if (argc > 0) { - for (; argc > 0; argc--, argv++) { - if (getvfsbyname(*argv, &vfc) == 0) { - printf(FMT, vfc.vfc_name, vfc.vfc_typenum, - vfc.vfc_refcount, fmt_flags(vfc.vfc_flags)); - } else { - warnx("VFS %s unknown or not loaded", *argv); - rv++; + for (size_t i = 0; i < cnt; i++) { + if (argc > 0) { + int j; + for (j = 0; j < argc; j++) { + if (strcmp(argv[j], xvfsp[i].vfc_name) == 0) + break; } + if (j == argc) + continue; } - } else { - if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) - err(EXIT_FAILURE, "sysctl(vfs.conflist)"); - if ((xvfsp = malloc(buflen)) == NULL) - errx(EXIT_FAILURE, "malloc failed"); - if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) - err(EXIT_FAILURE, "sysctl(vfs.conflist)"); - cnt = buflen / sizeof(struct xvfsconf); - - for (size_t i = 0; i < cnt; i++) { - printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum, - xvfsp[i].vfc_refcount, - fmt_flags(xvfsp[i].vfc_flags)); - } - free(xvfsp); + + printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum, + xvfsp[i].vfc_refcount, fmt_flags(xvfsp[i].vfc_flags)); } + free(xvfsp); return (rv); } From nobody Mon Oct 6 16:00:17 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 4cgP9s65Fdz69Zlj; Mon, 06 Oct 2025 16:00:17 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgP9s5Zsxz3hSy; Mon, 06 Oct 2025 16:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759766417; 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=bjCCmnsh86Utx/fCJi05hfwcabbftHgNxqSSCcqILzM=; b=NdOvwxQjYRUBmUVqm+iHCmawUeykPc2KKn9fIGs0N5OATIpQdS+Qh8XoLImqxSr0Lld9yD tPU2KNE2r8idsbOydPPcD1BXle35Kl0KZW3Yf4iEt0c5OtSZhPfiZT+qZN1W84fhaEVIw4 58K+ORgvnEnLAcnZ/vSkSEp4zvIMc1/VkNwIELJiP2430ZdsLNx7ejM3yi4PoEtKJM18/i O3nkhqO1koqLN+VyAi3t9aCzN1tUmIdZvD+fUjImnrvzZOSXIHf9BObNz06gAHONFY2qLw CQAngx84k6dqfcJ4goWTDVcF5YlQ65KBNqX3h9/xHyp+bPmbCWTHuBYtNKiC5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759766417; 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=bjCCmnsh86Utx/fCJi05hfwcabbftHgNxqSSCcqILzM=; b=t5pIFsKv+OcFE7Y41q05iE6IIVBT0bptxJk3l0FjYzg1V5zzr2MnvpGkmUnNVo9uCPJmsp MXluvoHWbI742Xw9KkReEDJrPfGqQCY5WDmmCXivCcLjtOksXY1BCCZv0UiLtI8tN1Ev/0 3r4VOt5qQFvX7r5CY8HFd/E/DZhhHDyyYbk5SUh7UIFTFfJlBa5faT+AHd5+mwkm7QjxrK i7zkI+XWD8vpAEMmsY98yofJWlyq4I/dLNRoDphMpQrHnuUNrUN3vsfw3UFwhAlK6b6aFB DaTeMfmLmqcZT02X+oR2Th21cq8+AIj2Jth0JxZluAROtC7oEtsNFqnMndRcqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759766417; a=rsa-sha256; cv=none; b=oxZNXHKHFM7sa4xiYrxd9QFs3K6P60C5oZTOkqoDYuUysNFkvI0fSFrqzkfcS1q0GP8Hta SZvAURq0FukQVzn/6d3sinJ9ciEWDB6xaZYUJT74wtbL2LZAVnKVZlxcKMIAUxRI9+/XML VyWLL7IzcC/p41oqh9Hj9HSVChY32TbQqFzhjrUjY4Hb32R/geg11r5lwPLi2/UL7yq97f QtUauA2Aao+SBsl9h7W820XHqvtYlg3MU5ndvw7eBr8zvLxTDVGWpBAosgdHsf2/a2PKZt uAqMXcGMIttD/Y6eW7AquPPB3qDDbdIegmMrW9TGt+3nOZqG3KnFEPAVtE2fcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgP9s59zZz14TZ; Mon, 06 Oct 2025 16:00:17 +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 596G0HOh011419; Mon, 6 Oct 2025 16:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596G0HvD011410; Mon, 6 Oct 2025 16:00:17 GMT (envelope-from git) Date: Mon, 6 Oct 2025 16:00:17 GMT Message-Id: <202510061600.596G0HvD011410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jonathan T. Looney" Subject: git: 4a5d8670a7d5 - main - x86: Close race condition on MCA task queues at startup 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: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a5d8670a7d58b04913fd90aae85a1e35236ca3d Auto-Submitted: auto-generated The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=4a5d8670a7d58b04913fd90aae85a1e35236ca3d commit 4a5d8670a7d58b04913fd90aae85a1e35236ca3d Author: Jonathan T. Looney AuthorDate: 2025-10-03 16:23:07 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-06 15:59:31 +0000 x86: Close race condition on MCA task queues at startup Currently, the CMCI handler checks the cold variable to determine whether it can schedule a task. The task queue is setup as part of the mca_startup() function, which is run well after the configure_final() function sets the cold variable to 0. Therefore, if an MCA arrives in the window between configure_final() and mca_startup() running, the code could try to schedule a task on an unintitalized task queue. Close the race by specifically checking whether the mca_startup() function has run. Reviewed by: markj MFC after: 1 week Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D12276 --- sys/x86/x86/mca.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 1851df8d00a0..933d10e52187 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -133,6 +133,7 @@ static struct taskqueue *mca_tq; static struct task mca_resize_task; static struct timeout_task mca_scan_task; static struct mtx mca_lock; +static bool mca_startup_done = false; /* Statistics on number of MCA events by type, updated atomically. */ static uint64_t mca_stats[MCA_T_COUNT]; @@ -1025,7 +1026,7 @@ mca_process_records(enum scan_mode mode) mtx_unlock_spin(&mca_lock); if (mode == POLLED) mca_resize_freelist(); - else if (!cold) + else if (mca_startup_done) taskqueue_enqueue(mca_tq, &mca_resize_task); } @@ -1097,7 +1098,7 @@ sysctl_mca_maxcount(SYSCTL_HANDLER_ARGS) doresize = true; } mtx_unlock_spin(&mca_lock); - if (doresize && !cold) + if (doresize && mca_startup_done) taskqueue_enqueue(mca_tq, &mca_resize_task); return (error); } @@ -1115,6 +1116,7 @@ mca_startup(void *dummy) taskqueue_start_threads(&mca_tq, 1, PI_SWI(SWI_TQ), "mca taskq"); taskqueue_enqueue_timeout_sbt(mca_tq, &mca_scan_task, mca_ticks * SBT_1S, 0, C_PREL(1)); + mca_startup_done = true; } SYSINIT(mca_startup, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, mca_startup, NULL); From nobody Mon Oct 6 16:03:36 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 4cgPFh6rpKz69ZgQ; Mon, 06 Oct 2025 16:03:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgPFh6Ml6z3jgY; Mon, 06 Oct 2025 16:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759766616; 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=G0Kc4XA1E4akG7jgYkye1Ammb81sgVSsXKK/cLnNdG4=; b=fANLbptCEkaEEAXoS+Ez+QbkWY3GiXVfVpwBnXZ1IhX/bJ8q6fKqZlXMLru1XuUEfjIi2D yj2s3I8KRPvtrUn36c5P11unndJ4wWGH28NoBfHM/EJ8L8oA2dR2J7Ithmb0fbhgdnE/C+ pR1lwFU96Fn/fTiGySLD4Fu5pjdtIFxjpb5zRGj1rrD9tD/2430hATftsddY3QMpNecACH 7VCDe8HImEvXygYvSBzXermdbV63U+VLB9IZF2V+XGySmr2oPaft+vJBgkzr5IPZVU5bXr X+Y8xlsh8dyTiGoX3ox9HMBMhaWz6px5flQumy4TvV50p5lECbjTSyLggTkEfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759766616; 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=G0Kc4XA1E4akG7jgYkye1Ammb81sgVSsXKK/cLnNdG4=; b=PRFjiVCSiZmuA83tmr04/WIq1PQkB8mH4yYXlTCcx6rB5/yLyhwT1whvO6fHP0lWH7MAV4 hKnFtwj4MRSyBItnht4WQGCooy/WL15aGUz6G3qVZDA9yl9Oq3c52kaOYlQkDa/uaUxETs 60vBuHjj6LgPHrv2K/wneKIkfnIdylsgzdx+14H2AZbx7D598zNd1+26cUAHqASGXGtbB+ HN1K1848f2IdoCcNMCjJeDxlyCrhplZx5ZH8kdUwUSzAqKYIwwn90qXz3DAckDe0LfWEIX fpj5iOSvtsg7IQfCYwyLpWYRUgXWvnn55dIsxSr+kBqAL6XcArtlHujZf1eIxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759766616; a=rsa-sha256; cv=none; b=vi2fQXb+TdYbFBFVxkxOgRJcTYU9C0RuqwbXK84nLYATHhl7bW3Cg1FvoSoyNAOtk2fZI+ WHxL09tRj1zHj9MDoy+e9gX0ay66JGD4KloDxJZiI6pHQUCOD2u9a9JeOY9V2ep8ykgAL0 yQEDyByqVn664I9oQy9sN7o9nDS2SW+D0dY8+blzSQKjwrwOuiYf3oRjzdxB5/JdV0x4kR bPZKalMv2hTi6WqjAOmf4hw34aqgX3KpZ0F/GuMuDCwfjTKpqC0hwcPmuA/iWZNjTTsUfe kD0x2hAV0K+ndPUG/bPw6/XCEjeXfzblyZAzDdnOZrqBsixDCySh9W50YnZt7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgPFh5xrbz14wH; Mon, 06 Oct 2025 16:03:36 +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 596G3aqH020891; Mon, 6 Oct 2025 16:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596G3aD9020888; Mon, 6 Oct 2025 16:03:36 GMT (envelope-from git) Date: Mon, 6 Oct 2025 16:03:36 GMT Message-Id: <202510061603.596G3aD9020888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jonathan T. Looney" Subject: git: 5e1611a37a02 - main - x86: Defer non-fatal MCA message output from the HW interrupt context 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: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e1611a37a02076180ccea1506713b8c9628779e Auto-Submitted: auto-generated The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=5e1611a37a02076180ccea1506713b8c9628779e commit 5e1611a37a02076180ccea1506713b8c9628779e Author: Jonathan T. Looney AuthorDate: 2025-10-03 18:26:37 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-06 16:00:26 +0000 x86: Defer non-fatal MCA message output from the HW interrupt context When processing recoverable MCA events in a hardware interrupt context, defer logging the messages to a task queue. Reviewed by: markj MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D12275 --- sys/x86/x86/mca.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 933d10e52187..e43c88b3a27b 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -131,6 +131,7 @@ static STAILQ_HEAD(, mca_internal) mca_pending; static int mca_ticks = 300; static struct taskqueue *mca_tq; static struct task mca_resize_task; +static struct task mca_postscan_task; static struct timeout_task mca_scan_task; static struct mtx mca_lock; static bool mca_startup_done = false; @@ -1017,6 +1018,16 @@ mca_process_records(enum scan_mode mode) { struct mca_internal *mca; + /* + * If in an interrupt context, defer the post-scan activities to a + * task queue. + */ + if (mode != POLLED) { + if (mca_startup_done) + taskqueue_enqueue(mca_tq, &mca_postscan_task); + return; + } + mtx_lock_spin(&mca_lock); while ((mca = STAILQ_FIRST(&mca_pending)) != NULL) { STAILQ_REMOVE_HEAD(&mca_pending, link); @@ -1024,10 +1035,19 @@ mca_process_records(enum scan_mode mode) mca_store_record(mca); } mtx_unlock_spin(&mca_lock); - if (mode == POLLED) - mca_resize_freelist(); - else if (mca_startup_done) - taskqueue_enqueue(mca_tq, &mca_resize_task); + mca_resize_freelist(); +} + +/* + * Emit log entries and resize the free list. This is intended to be called + * from a task queue to handle work which does not need to be done (or cannot + * be done) in an interrupt context. + */ +static void +mca_postscan(void *context __unused, int pending __unused) +{ + + mca_process_records(POLLED); } /* @@ -1110,13 +1130,16 @@ mca_startup(void *dummy) if (mca_banks <= 0) return; - /* CMCIs during boot may have claimed items from the freelist. */ - mca_resize_freelist(); - taskqueue_start_threads(&mca_tq, 1, PI_SWI(SWI_TQ), "mca taskq"); taskqueue_enqueue_timeout_sbt(mca_tq, &mca_scan_task, mca_ticks * SBT_1S, 0, C_PREL(1)); mca_startup_done = true; + + /* + * CMCIs during boot may have recorded entries. Conduct the post-scan + * activities now. + */ + mca_postscan(NULL, 0); } SYSINIT(mca_startup, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, mca_startup, NULL); @@ -1176,6 +1199,7 @@ mca_setup(uint64_t mcg_cap) TIMEOUT_TASK_INIT(mca_tq, &mca_scan_task, 0, mca_scan_cpus, NULL); STAILQ_INIT(&mca_freelist); TASK_INIT(&mca_resize_task, 0, mca_resize, NULL); + TASK_INIT(&mca_postscan_task, 0, mca_postscan, NULL); mca_resize_freelist(); SYSCTL_ADD_INT(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO, "count", CTLFLAG_RD, (int *)(uintptr_t)&mca_count, 0, @@ -1579,6 +1603,9 @@ mca_intr(void) panic("Unrecoverable machine check exception"); } + if (count) + mca_process_records(MCE); + /* Clear MCIP. */ wrmsr(MSR_MCG_STATUS, mcg_status & ~MCG_STATUS_MCIP); } From nobody Mon Oct 6 16:16:02 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 4cgPXQ0KvKz69bv2; Mon, 06 Oct 2025 16:16:22 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgPXL52xYz3mdJ; Mon, 06 Oct 2025 16:16:18 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zabbadoz.net header.s=20240622 header.b=QVpNU7zt; dmarc=pass (policy=none) header.from=zabbadoz.net; spf=pass (mx1.freebsd.org: domain of bzeeb-lists@lists.zabbadoz.net designates 2003:a:140a:2200:6:594:fffe:19 as permitted sender) smtp.mailfrom=bzeeb-lists@lists.zabbadoz.net Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 32502A64808; Mon, 06 Oct 2025 16:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1759767361; bh=bubsFdxEWfGvltPaNZkoR8yGPbgZEvzG+5oARnseIc0=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=QVpNU7ztc0nx1CPEif3MqS92z9SXLbXrfpKQ1ozbXA97O5InlIlEmLAPlb4PKWTq3 WCn+aQSpmDiy0BDAHaS33iVIWjpDEybvVh1odS3AGt55rzb6Nf9IBP0wVSjh5G+f9G VR7HC5e0JYjQ2lTFxE+BgtX1fxNe11AVZ/uT8Afur4jN5HjtjBHDORMR8aNVMwHwze chC22r1AjMLlI6sYQWFpF8GFWIF2UrhefacpqnZgmehnJ/to8WtigBiEL4UO1yCS+4 BmfFMn0PDOMEgThVbEtOecUYaDgWAhi5bvf64gJjegACN+FI3CjRZBdnaSD2/hU0rR Cu2Ibc4NOhzLGhYJP2kihtFoJ3Z8IzE5z8P7LZrWXs1XMOCDrdvzm/xpwHRQxr/6Gd VRDmPMo+BpsrUaRYqUeawi58dCap9hSLZZlgVtuOpW1S3Q9P9Ex8MaSEjJh2QeitCF Ni/0X73r708O6iuvhdQYov7kElKsb7aOUAqwf+yZvNSPpzAlybmu0ANbbu22Yc3eL6 LzvylgwAceH+GBx1Et7k+zkT68Dy2V1MuI6YZq+2fuc/bro4vIq60btoVH15OBnAz4 lABqag/uraWr0QfhCsLy8+N3YR9BJplNVku17RTB9qPfu/EG5ilT/5I7WqUCE8nXUr veArqCCkv2T4pX66wZXye8qA= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 22A672D029D8; Mon, 6 Oct 2025 16:16:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id zmJZO9ut3WOo; Mon, 6 Oct 2025 16:16:02 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 286492D029E7; Mon, 6 Oct 2025 16:16:02 +0000 (UTC) Date: Mon, 6 Oct 2025 16:16:02 +0000 (UTC) From: "Bjoern A. Zeeb" To: Aymeric Wibo cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2ed9833791f2 - main - thunderbolt: Import USB4 code In-Reply-To: <202509271713.58RHDTTL008060@gitrepo.freebsd.org> Message-ID: <8sr48s9-253p-3p8n-q171-s95939973q56@mnoonqbm.arg> References: <202509271713.58RHDTTL008060@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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=US-ASCII; format=flowed X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[zabbadoz.net,none]; R_DKIM_ALLOW(-0.20)[zabbadoz.net:s=20240622]; R_SPF_ALLOW(-0.20)[+ip6:2003:a:140a:2200:6:594:fffe:19]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; DKIM_TRACE(0.00)[zabbadoz.net:+] X-Rspamd-Queue-Id: 4cgPXL52xYz3mdJ On Sat, 27 Sep 2025, Aymeric Wibo wrote: > The branch main has been updated by obiwac: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2ed9833791f28e14843ac813f90cb030e45948dc > > commit 2ed9833791f28e14843ac813f90cb030e45948dc > Author: Aymeric Wibo > AuthorDate: 2025-09-27 11:50:43 +0000 > Commit: Aymeric Wibo > CommitDate: 2025-09-27 17:13:13 +0000 > > thunderbolt: Import USB4 code > > Add initial USB4 code written by Scott Long and originally passed on to > HPS (source: https://github.com/hselasky/usb4), minus the ICM code and > with some small fixes. > > For context, older TB chips implemented the connection manager in > firmware (ICM) instead of in the OS (HCM), but maintaining the ICM code > would be a huge burden for not many chips. I cannot find a better reference currently to reply to. This seems to be one of the ICM cases given the warning? [44.426631] nhi0: mem 0xda000000-0xda03ffff,0xda040000-0xda040fff at device 0.0 on pci5 [44.426653] nhi0: Cannot find Upstream Facing Port [44.426668] nhi0: attempting to allocate 16 MSI-X vectors (16 supported) [44.426677] msi: routing MSI-X IRQ 146 to local APIC 0 vector 56 [44.426685] msi: routing MSI-X IRQ 147 to local APIC 2 vector 54 [44.426693] msi: routing MSI-X IRQ 148 to local APIC 4 vector 54 [44.426700] msi: routing MSI-X IRQ 149 to local APIC 6 vector 56 [44.426708] msi: routing MSI-X IRQ 150 to local APIC 0 vector 57 [44.426716] msi: routing MSI-X IRQ 151 to local APIC 2 vector 55 [44.426724] msi: routing MSI-X IRQ 152 to local APIC 4 vector 55 [44.426731] msi: routing MSI-X IRQ 153 to local APIC 6 vector 57 [44.426739] msi: routing MSI-X IRQ 154 to local APIC 0 vector 58 [44.426747] msi: routing MSI-X IRQ 155 to local APIC 2 vector 56 [44.426755] msi: routing MSI-X IRQ 156 to local APIC 4 vector 56 [44.426762] msi: routing MSI-X IRQ 157 to local APIC 6 vector 58 [44.426770] msi: routing MSI-X IRQ 158 to local APIC 0 vector 59 [44.426778] msi: routing MSI-X IRQ 159 to local APIC 2 vector 57 [44.426786] msi: routing MSI-X IRQ 160 to local APIC 4 vector 57 [44.426793] msi: routing MSI-X IRQ 161 to local APIC 6 vector 59 [44.426798] nhi0: using IRQs 146-161 for MSI-X [44.426976] nhi0: WARN: device uses an internal connection manager [46.426984] nhi0: tb_router_attach_root() error. The driver should be loaded at boot [46.427115] device_attach: nhi0 attach returned 60 .. [46.431111] acpi_wmi0: on acpi0 [46.431148] nhi_wmi0: on acpi_wmi0 Rather than going through all the resource allocations, can we (if detected to be not supported) just barf and exit or remove the device IDs and not probe at all to avoid all the delay on boot? That said, the check in nhi_attach can never work as nothing seems to ever set NHI_CAP_ICM? So the warning presumably comes from nhi_init() which happens at the end of nhi_attach() but it doesn't actually do anything about it and lets it run into follow-up problems? Maybe the warning should say something about "ICM device. Will never be supported on FreeBSD" or the like? Another thing that I found non-intuitive for an "nhi" driver was the check: if (resource_disabled("tb", 0)) I understand it's not your code, but I hope we can improve this case a bit given the decision? /bz -- Bjoern A. Zeeb r15:7 From nobody Mon Oct 6 16:49:03 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 4cgQG761Z2z69fch; Mon, 06 Oct 2025 16:49:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgQG74mmQz3qc2; Mon, 06 Oct 2025 16:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759769343; 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=clMkZyOlSf5S2gXdgTaPu7UN5DLqUZk4E3o+jT90ECc=; b=wuPOLJh42A+qm65uhWueCIsf52/Vit+DUtzZtzh8Lxcber4XCcSIaaIsxtq24MK5nmDJY4 /Nbe9N+X/pHtJ4TRFs7kZjJTNaAIytHS4xK7I8es6f5sNEEr2tu+YV8bvo8TWD5amrhitw Lsh5YDyknsyNFBGe1sIR9VWP5QV17G1gBmJv6ctS6/jxyQ/NKEkB4bTIwXtnK05xiKmBiU 1d8YaE/Q8j8UAn1sXfxUASamVzRPyDdDTvExBbUaGQd3hd+TZ5qk5xlFxKiOhrZuM+19ct IWxY3eH4HQsQmjCm3d0P7fddjc0++M551OHMC7UYywQPeINsZMcdWtevuXzBpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759769343; 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=clMkZyOlSf5S2gXdgTaPu7UN5DLqUZk4E3o+jT90ECc=; b=B9mPkwGmIRps5IcEE3ymz6REDk8ps92GY51ElTWi3qN36rhoA/QD+5HNvELIlW+KAYS7h+ 35lmASVQqOztrFsj5FmcB5/5UTbVtJyieRuMcnP3vHhWO0fE7LWcc1+TEk5l+8j8+DpbcJ ba0tSAPdnIopW8kM3vtXYapDWXeaXoypBO/tZdCMtbM7OfU6RwlUHrqGpGY4GdJCkfFVfy 40QdmOWVLH26ycUjuRevamQ2zKtLu5E4QakM5BRi6znKY+WW9e2lVO7/UNl8jdWeZsDGjs sRXeH0qtgFsyITmVx8X0iD9dzkQQqBacqu2nmgKhj4IDfH1bpx5m4Q+Zu2xcuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759769343; a=rsa-sha256; cv=none; b=FnmrKjnM3AbjMgzzw1wgm/LeRCPsKUpNkAW9426AfmnHPT0DCE8HCyohO/Bxqg8y+4l91Y xDmscDM+AwzfN4gU4h0qJ4ntyhtMVhl9dLMFTVcP53YMgZ2oE0kWKJctetOXd8I+/Quy7J k8gQAV59T9bnuepqSYNzuoNqKmw9/34UfJrY7igh4AHsEF9Zdzpy8Jf2/8W/ZQCEOfuJT3 Cz31hM1Jki4UmdaGN6wl544vm0oI+EXIrfCmNT2hmfOJWGzyjkQoU2OhmAEgoqVMZ2+rD2 zQAq70oAwsWdGh4P7dmcWMagRJvKuxWeXsJzpAVgL/HhVrCXcQ2VUgMMYtu5uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgQG74NjVz16Yf; Mon, 06 Oct 2025 16:49:03 +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 596Gn3AH097558; Mon, 6 Oct 2025 16:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Gn30N097555; Mon, 6 Oct 2025 16:49:03 GMT (envelope-from git) Date: Mon, 6 Oct 2025 16:49:03 GMT Message-Id: <202510061649.596Gn30N097555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f19ef352ec63 - main - kern_exit.c: do not leak reaper bitmap busy bits 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f19ef352ec63f9fcc10076a263b8ce402ba31379 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f19ef352ec63f9fcc10076a263b8ce402ba31379 commit f19ef352ec63f9fcc10076a263b8ce402ba31379 Author: Konstantin Belousov AuthorDate: 2025-10-01 03:17:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-06 16:48:26 +0000 kern_exit.c: do not leak reaper bitmap busy bits When re-assigning p_reapsubtree value, we must check if the result of obliterating the old value would free the corresponding pid in the proc_id_reap bitmap, and indeed free it when needed. PR: 289917 Reported by: avg Reviewed by: avg, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52814 --- sys/kern/kern_exit.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index a32b5a1b3354..ab8ed32ad189 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -127,6 +127,27 @@ proc_realparent(struct proc *child) return (parent); } +static void +reaper_clear(struct proc *p, struct proc *rp) +{ + struct proc *p1; + bool clear; + + sx_assert(&proctree_lock, SX_XLOCKED); + LIST_REMOVE(p, p_reapsibling); + if (p->p_reapsubtree == 1) + return; + clear = true; + LIST_FOREACH(p1, &rp->p_reaplist, p_reapsibling) { + if (p1->p_reapsubtree == p->p_reapsubtree) { + clear = false; + break; + } + } + if (clear) + proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); +} + void reaper_abandon_children(struct proc *p, bool exiting) { @@ -138,7 +159,7 @@ reaper_abandon_children(struct proc *p, bool exiting) return; p1 = p->p_reaper; LIST_FOREACH_SAFE(p2, &p->p_reaplist, p_reapsibling, ptmp) { - LIST_REMOVE(p2, p_reapsibling); + reaper_clear(p2, p); p2->p_reaper = p1; p2->p_reapsubtree = p->p_reapsubtree; LIST_INSERT_HEAD(&p1->p_reaplist, p2, p_reapsibling); @@ -152,27 +173,6 @@ reaper_abandon_children(struct proc *p, bool exiting) p->p_treeflag &= ~P_TREE_REAPER; } -static void -reaper_clear(struct proc *p) -{ - struct proc *p1; - bool clear; - - sx_assert(&proctree_lock, SX_LOCKED); - LIST_REMOVE(p, p_reapsibling); - if (p->p_reapsubtree == 1) - return; - clear = true; - LIST_FOREACH(p1, &p->p_reaper->p_reaplist, p_reapsibling) { - if (p1->p_reapsubtree == p->p_reapsubtree) { - clear = false; - break; - } - } - if (clear) - proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); -} - void proc_clear_orphan(struct proc *p) { @@ -972,7 +972,7 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) sx_xunlock(PIDHASHLOCK(p->p_pid)); LIST_REMOVE(p, p_sibling); reaper_abandon_children(p, true); - reaper_clear(p); + reaper_clear(p, p->p_reaper); PROC_LOCK(p); proc_clear_orphan(p); PROC_UNLOCK(p); From nobody Mon Oct 6 17:52:00 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 4cgRfn3s3qz6BGGm; Mon, 06 Oct 2025 17:52:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgRfn0rfdz3xHZ; Mon, 06 Oct 2025 17:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773121; 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=5nc0VZ/baKkwMmWZccthVFDlraEaaawdcD2rbABdttM=; b=P+oO8dHPtOhozCCmXn9HtgL/LqRhtp4IxhFgYLLXXdxP9yzOCGWOG78MDZKSmBkKOnrPyh +bh2B3XvGy0EVM7+eLHRcpsalISlRmhi41y7nvy1/YQu8m2oJ07ubqh7i8/69oUfoz5R97 lqSshZIl8bsJLQiG3lEcyf6HzMrgaoBrqfsyTnAIhZ+LQ40deWHMTnLGsfHBjNlBiP8AFE SleJqqr/wWqZvAH2QFPQgrjofUhAUZFnP4eBtbXuT+4LoKUGlOKih52RrKwy2p/tPmmZXt FXmP6DIlJWs4ynfMThAp80v8FSb5v+D8HrckdecqXUSdTm5Q5lVymtoo8HVDxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773121; 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=5nc0VZ/baKkwMmWZccthVFDlraEaaawdcD2rbABdttM=; b=S71HmXP71FpE/ir6rwUjBS2F9mNpUL0XCwjCFazWOs5STX9rWCxDLlyxdOX/W53CVsjCnw 3rHHAeu9z+UEzZMx5QwWq4MQDo3HG/hjX2t+CnyU21jOqrgx65Cc/RI+KO9Qb2rCc47Vwi fJkl2nAQgGXai5X2anhWzHWHaOvCV1zu+tsFb7OF7ejZULE6H2zf2auq4MVaT54ghMOlEU bZ0UhzYqq09X+/1QA8yUMJc9iFUQWNbrofWecdgPKg1+nZjoj9AvkBaWGNY1WBOzKFZNUE KQHX/Gs58ceRzuLbDpRA1U3ys42NbR8FiCiedElP5r5SD29yRwdYSEQMIi4faw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759773121; a=rsa-sha256; cv=none; b=j2ylqDG2VnKA+PUnemd191XMmgwlC++BflBK5i74pZ+n54nCwZ0ChjO7kci4lEk5dKp6Vg udY+VB6drbjaIykp7TcNCyWeSdpLmUSGbkUsbZMxl55OVLsgnvAp4OhNRqyHidPhE5bezv f/+a2eb5NMrfq91yV57P8v16tPeWoQAwdUnMDgynePyxSbjrUJuYveJBN8IYpCea3VUIaX SPnenVSeOlJqCQ0hyYiwVms/o2kD8X4yt9yxnJRQJ1Gc6vaB6Yb4O9wrOK3bG4y3ROP/vR 3sXykqjDCrDlXjw75amqJkESsTMq/2DuzAb+mvtPD23IpnyCcJy8yfoZwLjwnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgRfn00gGz18Kd; Mon, 06 Oct 2025 17:52: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 596Hq0mP024991; Mon, 6 Oct 2025 17:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Hq0dh024988; Mon, 6 Oct 2025 17:52:00 GMT (envelope-from git) Date: Mon, 6 Oct 2025 17:52:00 GMT Message-Id: <202510061752.596Hq0dh024988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: ab492c08fc3c - main - build: don't create duplicate bootstrap-tools targets 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab492c08fc3cbf4fb5d569663c0751bc2a41cb1f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ab492c08fc3cbf4fb5d569663c0751bc2a41cb1f commit ab492c08fc3cbf4fb5d569663c0751bc2a41cb1f Author: Kyle Evans AuthorDate: 2025-10-06 17:50:22 +0000 Commit: Kyle Evans CommitDate: 2025-10-06 17:51:29 +0000 build: don't create duplicate bootstrap-tools targets The general problem is that we might have a somewhat complicated dependency tree depending on bootstrap version requirements. We could document when multiple bootstrap tools might have a shared dependency and be careful to add them only once to the list, but that is a little more fragile- particularly if we purge some bootstrap tools and need to re-work the logic a little bit. Just avoid redefining the build commands as we're iterating over the list so that we can keep the actual requirements intact. PR: 289997 Reported by: dhw, others Reviewed by: imp Fixes: 151bd3516b5 ("flua: support our flua modules in [...]") Differential Revision: https://reviews.freebsd.org/D52904 --- Makefile.inc1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6ace6a6b5eaf..9dc4f2db4a6c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2842,6 +2842,15 @@ bootstrap-tools: ${_bt}-links .PHONY ${_mkesdb} \ ${_zic} \ ${LOCAL_BSTOOL_DIRS} +# We don't enforce any particular uniqueness of targets in the above list; it +# may be the case that different bootstrap tools may have shared dependencies +# at different BOOTSTRAPPING points, so we don't object to them using their own +# conditionals and duplicating them into their ${_foo} variable to ease future +# maintenance if we purge some entries. These target names are purposefully +# unique and this is the only place that should be generating commands for them, +# but the target may have been defined earlier to express dependencies -- thus, +# we specifically want commands() here. +.if !commands(${_bt}-${_tool}) ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -2851,8 +2860,8 @@ ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install - bootstrap-tools: ${_bt}-${_tool} +.endif .endfor .if target(${_bt}-lib/libmd) # If we are bootstrapping libmd (e.g. when building on macOS/Linux) add the From nobody Mon Oct 6 17:57:02 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 4cgRmZ4Rqtz6BGwr; Mon, 06 Oct 2025 17:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgRmZ3r9Cz40T6; Mon, 06 Oct 2025 17:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773422; 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=O+Uc9FpGz6Cygi4vUsINBp8Nc9TqWvwZ+lGBtc85BxU=; b=GwucuDM3x3GLrOKNLfSrqHeGd2dZt0YzIwhfz4uIGtSOffQZ3fND9WruXuJ/Pt887h1X5v ewvyiEjkUmdg3U8eCoXH3DKFJ5SgOr10BAkqfKwwJ7GxctkOIYywGwno528pGrofL0gJAp hxLmSrich9nAFgOC/qdUaLEiyy3KiIop5i6IAnmBoPtPRPMswPLNv9/+1xFrQFb3sXfBO0 sSwvHtyRhwVJoODCTVn5l61zvcT4sB/gUODljqu3cP0UngzvS7fexXowvuGFyJ3MHs+1Ek VRdbgnilGIf3H+ZVCw/yHoGclCpaMfDkVMpv9+qum+Zl70Jr3ACeMffFyAPOag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773422; 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=O+Uc9FpGz6Cygi4vUsINBp8Nc9TqWvwZ+lGBtc85BxU=; b=qo8h37p90XTxF8TnMhpNGuJHMA+Vt6gsWwLNIIBq7V1hQfry7tHFoTVKr3knBs/DvYYqsm n1fWTCwq20mN84umh2Fqb84tWgHp37W36Gs2Cz8iC0LJ0jVcRMXLObKaFrBNIGDydSTG3P zoXp13+J95QXQTFCUa2SzIY+q3/JRivVv0KXMnCrVnW48P0cJnSr077DvpFoYdob1pzNxT A5VUsEOsOuO9Xuxs36aZ0QV2yotXGcvPo8bqokjjJB40PaEGQ/n8SHK3hhOLiaD/0w0ong F2oLQKkTxtb0LBSlyKJM/ktYDor9wRxmqWZ0FWgHgCNRcaBP6yYy3CKzLdFWGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759773422; a=rsa-sha256; cv=none; b=xgfJn5wSdD1k+HcSoLpI8eY7T0sD1RImENFo4eo2S2zKzAbj4lmK+1wIrTr+fdgOU4oE9x WXFuEb0yHAWeA585Kg5F+S5L64BHL0dyLYBRMCuXKV2yinv28IC0kZJ2zqO2c7LRly4X3r WAEF6avfEGcRHDT/FaTSfEbYzYkwrjdFsquIDoRk6ra/QFX9K705oORk+6aF0E+GSW2RS8 bPQu5SFedxm1B4Aces6acA4Ko2zKU7L1rn6lmXmmvLKtvu1IVjjFVwcyYLSXFXzX0BZir6 Xhkj0EtgJyCqVFnYOCgIIUGGVXQNmF1S5wz9ML/whw9pQnwYq62V8a2cvdzQVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgRmZ3Q91z17Nh; Mon, 06 Oct 2025 17:57:02 +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 596Hv2HC029009; Mon, 6 Oct 2025 17:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Hv23l029006; Mon, 6 Oct 2025 17:57:02 GMT (envelope-from git) Date: Mon, 6 Oct 2025 17:57:02 GMT Message-Id: <202510061757.596Hv23l029006@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: 762f1c7c6cde - main - ahci: Use pci_msix_*_bar instead of reading config registers directly 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: 762f1c7c6cded9242956c2c35c772dff9b5d155b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=762f1c7c6cded9242956c2c35c772dff9b5d155b commit 762f1c7c6cded9242956c2c35c772dff9b5d155b Author: John Baldwin AuthorDate: 2025-10-06 17:56:47 +0000 Commit: John Baldwin CommitDate: 2025-10-06 17:56:47 +0000 ahci: Use pci_msix_*_bar instead of reading config registers directly Reported by: avg Reviewed by: avg, imp Differential Revision: https://reviews.freebsd.org/D52888 --- sys/dev/ahci/ahci_pci.c | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 82f56fc0d19e..80547d178cd6 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -466,28 +466,6 @@ ahci_ata_probe(device_t dev) return (BUS_PROBE_DEFAULT); } -static int -ahci_pci_read_msix_bars(device_t dev, uint8_t *table_bar, uint8_t *pba_bar) -{ - int cap_offset = 0, ret; - uint32_t val; - - if ((table_bar == NULL) || (pba_bar == NULL)) - return (EINVAL); - - ret = pci_find_cap(dev, PCIY_MSIX, &cap_offset); - if (ret != 0) - return (EINVAL); - - val = pci_read_config(dev, cap_offset + PCIR_MSIX_TABLE, 4); - *table_bar = PCIR_BAR(val & PCIM_MSIX_BIR_MASK); - - val = pci_read_config(dev, cap_offset + PCIR_MSIX_PBA, 4); - *pba_bar = PCIR_BAR(val & PCIM_MSIX_BIR_MASK); - - return (0); -} - static int ahci_pci_attach(device_t dev) { @@ -496,7 +474,6 @@ ahci_pci_attach(device_t dev) uint32_t devid = pci_get_devid(dev); uint8_t revid = pci_get_revid(dev); int msi_count, msix_count; - uint8_t table_bar = 0, pba_bar = 0; uint32_t caps, pi; msi_count = pci_msi_count(dev); @@ -584,20 +561,11 @@ ahci_pci_attach(device_t dev) if (ctlr->quirks & AHCI_Q_NOMSIX) msix_count = 0; - /* Read MSI-x BAR IDs if supported */ - if (msix_count > 0) { - error = ahci_pci_read_msix_bars(dev, &table_bar, &pba_bar); - if (error == 0) { - ctlr->r_msix_tab_rid = table_bar; - ctlr->r_msix_pba_rid = pba_bar; - } else { - /* Failed to read BARs, disable MSI-x */ - msix_count = 0; - } - } - /* Allocate resources for MSI-x table and PBA */ if (msix_count > 0) { + ctlr->r_msix_tab_rid = pci_msix_table_bar(dev); + ctlr->r_msix_pba_rid = pci_msix_pba_bar(dev); + /* * Allocate new MSI-x table only if not * allocated before. From nobody Mon Oct 6 17:57:03 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 4cgRmb5gtdz6BGqm; Mon, 06 Oct 2025 17:57:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgRmb4v68z40WW; Mon, 06 Oct 2025 17:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773423; 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=cZ9R+CYWX65ZDF1QV3ousg5RjlFZpCRybdIecVQmTWE=; b=XUj3EwypMu3xH4lGEsJXpVO46H+rpQWklEfWR0zdoCmPmOQiBYyiebjlSxEGzSwfpmwUG4 9IcYPfb3c6HgUxpdusB8l4cv28o7MFlaPlWWDfc9H9+Yb4Kv6+meP/cNFSng8+iNilB6It G+FTKZ3ReAMibsM3FrN0SLHTiAU+h5xmE8tK278JTltJ6f9yKtxqeUV1fkxd7gmkCYtEv+ p5i4Rm0dkqfyOz50yR1u7ZjyfebTIsY6U/FQ19pJnYFj5J71qIkq/PmYDlVPvs5oJtuu1R edILLsEkWSRGNnmPqZVxBok3UhWuYIptc4FQHKscJHxzOPKeLw0K35O7aG5fdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759773423; 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=cZ9R+CYWX65ZDF1QV3ousg5RjlFZpCRybdIecVQmTWE=; b=sfNF9mNctw/KYT/6Tsr6YyaGNlECHfh2PDGjGzf9QeyGOiTeeTNMlfNKdG7FnVdsM3QJCa Qj2PXZxyMkCwUu2vI6+w5VRbCfuRXFh8bfq+ef0gqJ0FbZPXl9RukO/RNIIv6zvlKBMkxI lnhoTRVOyhUT5po1r6H16IrWOFxyF9DMKB0ms3s/NuiIqYgNMmyIhn9JuSv8hTyenm8wh9 OZCfVUEMN/IbddckSF9QoIXR89PXReuiUVMxhZZ5NBc8aHFyx6OpgfKnqG2CIy8wtv2Mzt aQpD/NuI8ML4n7hF9lzTAl4C2aemBV/wCHJZ0n8JAzyf3lL5kIKryoPLitoD5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759773423; a=rsa-sha256; cv=none; b=MMc5xl0Pp+kjmiNr+RkY4DHTT6FtltGsGn5c4UoGoEJyZKmDfqfE7U3CQMEF9aMwb5j0AF 1Q3eJj++SFkwZLJtN5cGITXIrGzsaylNOMVcVU/ujkKgZf6wEWCqWvtz/sjMHSlqFGXbtm GDyzfTxatCJuuSeeGBjpX6QlhI71G/65jsevkmoAbc5qHhXhjAIX2JAwZ+9lxRtVUEM25O IqdcaaOpJ9vwWBuohEIaGHTgmopvzamPvDsdCalDL7L6PrMOLg0i6mX5FCAQBpKs+4vnL/ thBGiEAZ9mKkD+uQU6nU7nwVYAN8yLhU3m7LXMiWzQXaMUA1eI1WV9f5Z6mTfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgRmb4KP5z17y1; Mon, 06 Oct 2025 17:57:03 +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 596Hv35m029049; Mon, 6 Oct 2025 17:57:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596Hv3Hj029046; Mon, 6 Oct 2025 17:57:03 GMT (envelope-from git) Date: Mon, 6 Oct 2025 17:57:03 GMT Message-Id: <202510061757.596Hv3Hj029046@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: b658158e9396 - main - ahci: Don't fail attach if the MSI-X BARs cannot be allocated 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: b658158e9396848d3963e9555d356d0f4ca6900a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b658158e9396848d3963e9555d356d0f4ca6900a commit b658158e9396848d3963e9555d356d0f4ca6900a Author: John Baldwin AuthorDate: 2025-10-06 17:56:47 +0000 Commit: John Baldwin CommitDate: 2025-10-06 17:56:47 +0000 ahci: Don't fail attach if the MSI-X BARs cannot be allocated If the MSI-X table and/or PBA live in separate BAR(s) and those BAR(s) cannot be allocated, fall back to using MSI or INTx instead of failing attach. PR: 289748 Reported by: Vitalij Satanivskij Reviewed by: avg, imp Differential Revision: https://reviews.freebsd.org/D52889 --- sys/dev/ahci/ahci_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 80547d178cd6..2b4cb37275a6 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -576,8 +576,8 @@ ahci_pci_attach(device_t dev) ctlr->r_msix_table = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &ctlr->r_msix_tab_rid, RF_ACTIVE); if (ctlr->r_msix_table == NULL) { - ahci_free_mem(dev); - return (ENXIO); + msix_count = 0; + goto no_msix; } } @@ -592,12 +592,12 @@ ahci_pci_attach(device_t dev) ctlr->r_msix_pba = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &ctlr->r_msix_pba_rid, RF_ACTIVE); if (ctlr->r_msix_pba == NULL) { - ahci_free_mem(dev); - return (ENXIO); + msix_count = 0; } } } +no_msix: pci_enable_busmaster(dev); /* Reset controller */ if ((error = ahci_pci_ctlr_reset(dev)) != 0) { From nobody Mon Oct 6 18:23:07 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 4cgSLg4yp4z6BJn2; Mon, 06 Oct 2025 18:23:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgSLg2XcSz444C; Mon, 06 Oct 2025 18:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759774987; 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=0hvGrro6Zm5mDazGAzW2/Aen3zqmz+XGm2U8aSQJw2A=; b=pkrqB8Wx7UKM8OpKcusPA0eZ5PvidhARFsZW2WvSl2zPYQVyNC094VJqtN280eJhJfB8T/ g5dbSmocizl86RIuRZiYkx/iQla9d9qTsVEi7lTNYPsO/SvUSViDtIuCcEE9HZe3Tmx/ll XIBZ0mq+sBxrWcWAC9vtnSo1ewB4Ljeiu1qe8H7yjkglJHV8Iw5xoZVl49V+v6lUcO3kxB b8eKbr3H/v8tpo+LyMbzmPCCF1ByeXoI3MqwWuGiZuGtbTHwELvwQ8Mlq/hdnal6Edfb3T V9A9tLeE9O9aFYwLSmI9u5zeOR1N3rFWUw9h9+aN9qS7Npa7WGhWC1qf0ZVcyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759774987; 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=0hvGrro6Zm5mDazGAzW2/Aen3zqmz+XGm2U8aSQJw2A=; b=IKXE13/V852h+qyBo7VR2G7s2rGrozxMg+Rol+Mo3AsCp3sLxPoBYgYFhRZ9ZP/5OTkJj3 CBqGkunTlTiMzPuKne8ImeCSLa2sxIBwch8JtGeciX7emxVTM9MCtgQSceM3JNJ9IjEBgv PDrY6DHDgtPMAoK3uw8+UX5AO9C2ujJQnzf+WnXQkvRv6P22cfgAl7PMesK/D8CGAal9Lg 8KqZQRVzqBTi8LLHntEKVggVYZCzz3DTySGBAI0OAR5tH6ZHvTqdPvNoE4+XweqEjqgDr+ MZQFm6YC8TbSfRwaWpGlLQF33+pNe/30ntTmrV12MOL9pXYpVg9lwFFrFuy2LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759774987; a=rsa-sha256; cv=none; b=AF8uC8i037a4BfyLEq8aMbzcqJFUN/cFvPCU5kWmawuEV71qeu/vdbEBee6BhbZSX7jaOl CYM6G71tV15wckyLPB8NKZeNTligytEtkHdzZeZa0JBx3F97BVxKX0Fzc8BkHL1AEg7dmX Xk9i6WT87TSTRaOVj+QYxSOEH3mYjVQU94X/fQuKonxwrAlL9Gzep5kGm/GbPvFiAnXD3q neWXJzKzSAVQzIiXeMga95681zy3RMEpg4JqoJLkgmOzZMXDzeDw/dgAFsXCznExN4Q84o MeZun+CD8Dzke63dlKYGZ54EPPoJ/rg68NmDgfPCMDTwJBYPmMRhIfshNBe/KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgSLg265Tz198k; Mon, 06 Oct 2025 18:23:07 +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 596IN7VR084718; Mon, 6 Oct 2025 18:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596IN7oZ084715; Mon, 6 Oct 2025 18:23:07 GMT (envelope-from git) Date: Mon, 6 Oct 2025 18:23:07 GMT Message-Id: <202510061823.596IN7oZ084715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 84f981ba57e7 - main - nullfs: shrink null_node to 32 bytes 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b commit 84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b Author: Mateusz Guzik AuthorDate: 2025-10-06 17:59:17 +0000 Commit: Mateusz Guzik CommitDate: 2025-10-06 18:23:01 +0000 nullfs: shrink null_node to 32 bytes --- sys/fs/nullfs/null.h | 2 +- sys/fs/nullfs/null_subr.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h index aa7a689bec34..ad3f7779e108 100644 --- a/sys/fs/nullfs/null.h +++ b/sys/fs/nullfs/null.h @@ -53,7 +53,7 @@ struct null_mount { * A cache of vnode references */ struct null_node { - CK_LIST_ENTRY(null_node) null_hash; /* Hash list */ + CK_SLIST_ENTRY(null_node) null_hash; /* Hash list */ struct vnode *null_lowervp; /* VREFed once */ struct vnode *null_vnode; /* Back pointer */ u_int null_flags; diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index ad8cd08279cc..bb0ff9966dfd 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -59,7 +59,7 @@ VFS_SMR_DECLARE; #define NULL_NHASH(vp) (&null_node_hashtbl[vfs_hash_index(vp) & null_hash_mask]) -static CK_LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; +static CK_SLIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; static struct rwlock null_hash_lock; static u_long null_hash_mask; @@ -116,7 +116,7 @@ null_hashget_locked(struct mount *mp, struct vnode *lowervp) * reference count (but NOT the lower vnode's VREF counter). */ hd = NULL_NHASH(lowervp); - CK_LIST_FOREACH(a, hd, null_hash) { + CK_SLIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp != lowervp) continue; /* @@ -148,7 +148,7 @@ null_hashget(struct mount *mp, struct vnode *lowervp) vfs_smr_enter(); hd = NULL_NHASH(lowervp); - CK_LIST_FOREACH(a, hd, null_hash) { + CK_SLIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp != lowervp) continue; /* @@ -189,7 +189,7 @@ null_hashins(struct mount *mp, struct null_node *xp) } } #endif - CK_LIST_INSERT_HEAD(hd, xp, null_hash); + CK_SLIST_INSERT_HEAD(hd, xp, null_hash); } static void @@ -305,9 +305,11 @@ null_nodeget(struct mount *mp, struct vnode *lowervp, struct vnode **vpp) void null_hashrem(struct null_node *xp) { + struct null_node_hashhead *hd; + hd = NULL_NHASH(xp->null_lowervp); rw_wlock(&null_hash_lock); - CK_LIST_REMOVE(xp, null_hash); + CK_SLIST_REMOVE(hd, xp, null_node, null_hash); rw_wunlock(&null_hash_lock); } From nobody Mon Oct 6 18:49:21 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 4cgSwx2ny1z6BMGN; Mon, 06 Oct 2025 18:49:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgSwx2Hxxz45qq; Mon, 06 Oct 2025 18:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759776561; 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=AaXO9kVZzFdDY6zg9GC8baYVHqZ8XGFZxF9cPau3bdo=; b=hm9unDEtlzSyq5KnEerFwCfoeCcbYGr6U98acP0bE25TGzZu9i0YHh2HlIFBK63BsP3vIA qziqJXhPUW03QyumE5LCKSWpS3i4sJwr/OO32dWzzdo9BNYKB8uBtzODXjL8WKyNjRqgeN 4t1wvRH301bdIifrZr1TF9YKaZlKy33Uqh7y7GvT4N/Ez6V5XBYGvGM4aPRKEpTbzzPMrA j1HgcUX/Qt5BFmc/p/fcJDuRUhDtIE3VGkSz5YhkU5rGwd75kflrJOOGK3cSYkiKqdiYtN nryw4GQu8LKtHOu4c8Uk2OR56YtECJyZBZunvjjGRePnH5R3ET5Jw1wtYXTsCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759776561; 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=AaXO9kVZzFdDY6zg9GC8baYVHqZ8XGFZxF9cPau3bdo=; b=bdmYBTtACUeVGfFjU0PsF0yj5BDXuMGAFwec8U5cq9JWiBVsV1YfcXrXEW5/zTJFbKTFWi 96lBFi4P5QG1cf/vdMVLdVa2FGvhUvG1/JKLpp0Vunu5vFHjENwaR6vMf9Li8rxEMDS/42 El6YXS914eFsNNwdyxSybWqBdmGSdo2MJ2yV5Jrc5JtkVlvNvjUqvBPRE9/IWmXM1ShTMC U18F9EpiDlRHNsXeGy6Q3THrbN7EsCCDpOpPvklMfYeQYkujOq8bmtd8cyft04ZhjvEi3E RaCMMxKOuTaHTG0KiGS/vT2aEOOboqebDH+dorL8fOEqarwjYrqw1zRq3G0c2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759776561; a=rsa-sha256; cv=none; b=IRD2ybSBxEYfG21EpCd9ynGq/+BruhOhUEfW8EK2rbnN9P16nPY84tt0wyVMAxb884TnZD ku1muUrI95M2IisPZvQ0mQ0SnQ9HwhvJbiw+g6EVNpGX5NJqDzxD6bNS7wzQkA/8k4y6lj LBbIywTxms0EccWTlet5xp2CB+YpcuzgkYKIi+rNFE4T/Cx33LKepGkQTBOVUZHU8cWi0U H3etiNwOX62RiZtYseCdocFlAsizUWS2tmuvxZY1cFUiP+mjD0VHTJPstpE1U3swJs7U+f 9dDkqrg7DPd/w6Rnj7I5UERtYb8pa7CPsgA85jOacqNPJN4tT4yM1TwoOTMFqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgSwx1tFXz18y7; Mon, 06 Oct 2025 18:49:21 +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 596InL3d024604; Mon, 6 Oct 2025 18:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596InL6w024601; Mon, 6 Oct 2025 18:49:21 GMT (envelope-from git) Date: Mon, 6 Oct 2025 18:49:21 GMT Message-Id: <202510061849.596InL6w024601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 17085d8eb120 - main - iovctl.8: Fix missing xref section number 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17085d8eb1207aa925ca5eeda1d5ba132f1dd163 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=17085d8eb1207aa925ca5eeda1d5ba132f1dd163 commit 17085d8eb1207aa925ca5eeda1d5ba132f1dd163 Author: Alexander Ziaee AuthorDate: 2025-10-06 18:48:06 +0000 Commit: Alexander Ziaee CommitDate: 2025-10-06 18:48:06 +0000 iovctl.8: Fix missing xref section number MFC after: 3 days --- usr.sbin/iovctl/iovctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/iovctl/iovctl.8 b/usr.sbin/iovctl/iovctl.8 index 5c7b01c249a0..2574503e5ae7 100644 --- a/usr.sbin/iovctl/iovctl.8 +++ b/usr.sbin/iovctl/iovctl.8 @@ -95,7 +95,7 @@ and options, this file will only be used to specify the name of the PF device. .Pp See -.Xr iovctl.conf +.Xr iovctl.conf 5 for a description of the config file format and documentation of the configuration parameters that apply to all PF drivers. See the PF driver manual page for configuration parameters specific to From nobody Mon Oct 6 18:49:22 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 4cgSwy3XKxz6BMHj; Mon, 06 Oct 2025 18:49:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgSwy2z87z45lm; Mon, 06 Oct 2025 18:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759776562; 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=aGhVnqOLKXyy1WXuDx5qORNqP2GiLvUKpPhrzAA/SRo=; b=qbaRtWV8Dglu/31Sf6PrceUOh2jcG4PYwshZBi8tvRHD6Y7A2QV+zeXatM4Fwy1WOIkv+s j91Fql29zXyWK20mA/GFVxq54nDdE4nENiWgxMSpGWqEfCll+Q4cVHM7eZZPKyEOHWsWHk nFsSDY2unsL/SUMCH9+3isOr8CE4WvxpLSooC5s2B0VcEe5e8eNS+JGNQX1olGCcv9c+zX dmP2O1626H8C/Sfb91KNbhj18/Wkadys0evJuMrf6g5WUIkBdzkqZ7UrwiqnvvcpPxah87 Nu1GdeHZmYk2TTm8M7pGGEIE7sw4ptvSKfqlUDaDbcdC/XH0DOmPfnVWf+zvSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759776562; 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=aGhVnqOLKXyy1WXuDx5qORNqP2GiLvUKpPhrzAA/SRo=; b=qFOouEBIPO31F6YSqf1P59Hl+x84Lue2DXuiOb0qfKQrorL3Gu0lbn42YjV/6IjqQOf7xQ HPHHxMXRORpjA1dWf4UMbRynETUhfyf/agS0O8OaIMuFI4wra7sc9UUV5kVtnaJMq6XdSH 6pzGdNngudxcwRclIitH9eV1NzRNy/1MJeuyRl7sCslDnY5VV6xsFE2eekjfxQju1X8EQ2 /vMq0pI1OB+Xwq52P26Oqhl1LgBcGfpFyus382HIDtY/MYbVhVKSW4lVh1j/CUww7A5tvy rRsP7MHsr5jW6tPu12U2Dblgb9t3fBKLgJSfwh3xXsUAYQl8BShgWxwDx+3WIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759776562; a=rsa-sha256; cv=none; b=yvSfZMsX2/G/4xbNCePIYwuSzaO4b3X8UnAUrXYxoDq5OBCC/LvsXbvQlH5WgWbSQDlW9h sY1E8ojRz5fSz+0tIZUN1kvFzFn8+nKsvWWC0TRRiu13g8ZSvCaLCRihNSohQ14kSiFP+l 0vBXR7+7w+iAZL8LMJ5nsRLxC1SWwvQGiSE1ycwvfdlfVqCakelqeC68NGgjpZzZDzC+Ru KA3geyP4o7ZjHhTJL2s4OHsZ6U+nH5ysplR4Yw4ihZz8T0asskqFNMMlsCXd6m6CMT/vBf Nmv6ODMxfd8Gm471x18xnWXUSJ8fNJqJxi0OmPB8dWQ4ZK5rqR0oauMN9139Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgSwy2YXxz19cF; Mon, 06 Oct 2025 18:49:22 +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 596InMnP024643; Mon, 6 Oct 2025 18:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596InMve024640; Mon, 6 Oct 2025 18:49:22 GMT (envelope-from git) Date: Mon, 6 Oct 2025 18:49:22 GMT Message-Id: <202510061849.596InMve024640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 45f8336f3a31 - main - ice.4: Improve SYNOPSIS 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45f8336f3a3128c4c935a192e621c4882d6499be Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=45f8336f3a3128c4c935a192e621c4882d6499be commit 45f8336f3a3128c4c935a192e621c4882d6499be Author: Alexander Ziaee AuthorDate: 2025-10-06 18:48:50 +0000 Commit: Alexander Ziaee CommitDate: 2025-10-06 18:48:53 +0000 ice.4: Improve SYNOPSIS Remove prose from synopsis, adding sysctls and tunables. MFC after: 3 days Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D52913 --- share/man/man4/ice.4 | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/share/man/man4/ice.4 b/share/man/man4/ice.4 index 13ad304a2d5a..c7675e627726 100644 --- a/share/man/man4/ice.4 +++ b/share/man/man4/ice.4 @@ -39,18 +39,28 @@ .Nm ice .Nd Intel Ethernet 800 Series Driver .Sh SYNOPSIS -To compile this driver into the kernel, place the following lines in your -kernel configuration file: -.Bd -literal -offset indent .Cd device iflib .Cd device ice -.Ed .Pp -To load the driver as a module at boot time, place the following lines in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -if_ice_load="YES" -.Ed +.Cd if_ice_load +.Cd hw.ice.enable_health_events +.Cd hw.ice.irdma +.Cd hw.ice.irdma_max_msix +.Cd hw.ice.debug.enable_tx_fc_filter +.Cd hw.ice.debug.enable_tx_lldp_filter +.Cd hw.ice.debug.ice_tx_balance_en +.Pp +In +.Xr sysctl.conf 5 +or +.Xr loader.conf 5 : +.Cd dev.ice.#.current_speed +.Cd dev.ice.#.fw_version +.Cd dev.ice.#.ddp_version +.Cd dev.ice.#.pba_number +.Cd dev.ice.#.hw.mac.* .Sh DESCRIPTION .Ss Features The From nobody Mon Oct 6 19:21:39 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 4cgTfC4pzpz6BQD7; Mon, 06 Oct 2025 19:21:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgTfC4GFPz3Blq; Mon, 06 Oct 2025 19:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759778499; 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=ps7aF0MH3Ji0MLMboVoJvjlSV5RaicnWxa6e/Qeu7Rg=; b=yhEochXv38Myyxtc/mOeqS658FitjblI7ITuBbutosq9MITlTTzHs2TrdJwv9t0bCyrZ84 KYKfEob4jkPN+oQMlQvrcuT6X68HAoKwbPJYiX9pLOybdWBTcditMwqu4n/L7l7+9qUiW0 2+ejQXTRds4nVuujiToksiErHYMZZNTfWI+wrq7L0GAQSgirmB3wOfUUKmXXulyFTx1XZN hLtZsHbUDrBALFrjtLdPoTyKkh0+DbZd/oP2TDqpkl84aVe04J5O/FfajxEjSKx89WzVvu 3Wgifpc98/HB73FiWEkFUQjxd3D1zIpAckGtCfqdPZ0WJ8wtm70nzwIJ+Cnfig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759778499; 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=ps7aF0MH3Ji0MLMboVoJvjlSV5RaicnWxa6e/Qeu7Rg=; b=LIMt4JetmjLaDXbF3E3k38fJmg4EPD1H77y4fbjodEdY7tqlSxu3xFSsfb44ASXz0ImyKf dcER4ch+2S3X+0VRgeihZ1X8tunl1QlZnkxkDb92VTps8UaFje6r2R+O83xVPFJlsleSMa JQKeewE1JHGKCONP2OH4Mc9W49WSNNlc6pUK4kHPPMyr4K2N8pnykm4qHL+alrwO7MQr4L 0v5cUeMH4Em/PrEM/dmSSF7y4Vxmlj5qPS4srVwjgGKAlYpekP+5aDH2/M9rVv6kbCvLPQ 0zw7pcYj7Pi5jCFcyWuHSDbcwMN1PaaL7PghOGM9TMfVs0pYd4t9pyKbkRRrGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759778499; a=rsa-sha256; cv=none; b=C1pvFYnfn5EUrHi2yRTRNmBIPGGWR0CKpCqTvUx8KKdbjWbjobkTbEeAiAgSd2urOUoKYg JhgWUtbVPuv7OtdaYVo61BCxtblkLqIoD5vBOr6DtSV+6y+AkXhx77FmhL0sHOmWOHnN9u 69m/EBdOJDWuLs2PGyyDVvR3yHsI+tMjxlp+RJE1yr6jgGM8tWRumydarq9Ev1B4kRdMKQ Np1dpxLP5XodGcD2LFjQyWFpbf5FR914B23/NZOaV9di1Fo9hNiZBGAJGnno1hH5akAMn9 /fJS8vgLcM9KwbBLltXtTi4A7mO1O2psBTG/jNnldDgOky0R5jMLl5ivLHQ8iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgTfC3slqz1BN0; Mon, 06 Oct 2025 19:21:39 +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 596JLd4k092990; Mon, 6 Oct 2025 19:21:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596JLdmZ092987; Mon, 6 Oct 2025 19:21:39 GMT (envelope-from git) Date: Mon, 6 Oct 2025 19:21:39 GMT Message-Id: <202510061921.596JLdmZ092987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2ba20004ef76 - main - libc: Reimplement the *rand48 family of functions 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ba20004ef7649db7654520e8376927c4410d9c3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba20004ef7649db7654520e8376927c4410d9c3 commit 2ba20004ef7649db7654520e8376927c4410d9c3 Author: Mark Johnston AuthorDate: 2025-09-04 19:34:17 +0000 Commit: Mark Johnston CommitDate: 2025-10-06 19:20:39 +0000 libc: Reimplement the *rand48 family of functions Rather than implementing the recurrence using 3 16-bit integers, as was done in _dorand48() before this patch, provide an equivalent implementation using 64-bit integers. For drand48() and erand48(), replace the use of ldexp() with bit-twiddling assuming IEEE 754 double-precision float layout. This implementation is significantly faster and requires less code, while producing identical outputs on supported platforms. While here, add a STANDARDS section to rand48.3. Obtained from: https://github.com/apple-oss-distributions/libc MFC after: 3 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52429 --- lib/libc/gen/_rand48.c | 34 +++------------------------- lib/libc/gen/drand48.c | 6 ++--- lib/libc/gen/erand48.c | 9 ++++---- lib/libc/gen/jrand48.c | 7 +++--- lib/libc/gen/lcong48.c | 12 ++-------- lib/libc/gen/lrand48.c | 6 ++--- lib/libc/gen/mrand48.c | 8 ++----- lib/libc/gen/nrand48.c | 6 +++-- lib/libc/gen/rand48.3 | 5 ++++- lib/libc/gen/rand48.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- lib/libc/gen/seed48.c | 18 ++++----------- lib/libc/gen/srand48.c | 13 +++-------- 12 files changed, 95 insertions(+), 90 deletions(-) diff --git a/lib/libc/gen/_rand48.c b/lib/libc/gen/_rand48.c index 990e2c86949b..114c1595b33d 100644 --- a/lib/libc/gen/_rand48.c +++ b/lib/libc/gen/_rand48.c @@ -13,34 +13,6 @@ #include "rand48.h" -unsigned short _rand48_seed[3] = { - RAND48_SEED_0, - RAND48_SEED_1, - RAND48_SEED_2 -}; -unsigned short _rand48_mult[3] = { - RAND48_MULT_0, - RAND48_MULT_1, - RAND48_MULT_2 -}; -unsigned short _rand48_add = RAND48_ADD; - -void -_dorand48(unsigned short xseed[3]) -{ - unsigned long accu; - unsigned short temp[2]; - - accu = (unsigned long) _rand48_mult[0] * (unsigned long) xseed[0] + - (unsigned long) _rand48_add; - temp[0] = (unsigned short) accu; /* lower 16 bits */ - accu >>= sizeof(unsigned short) * 8; - accu += (unsigned long) _rand48_mult[0] * (unsigned long) xseed[1] + - (unsigned long) _rand48_mult[1] * (unsigned long) xseed[0]; - temp[1] = (unsigned short) accu; /* middle 16 bits */ - accu >>= sizeof(unsigned short) * 8; - accu += _rand48_mult[0] * xseed[2] + _rand48_mult[1] * xseed[1] + _rand48_mult[2] * xseed[0]; - xseed[0] = temp[0]; - xseed[1] = temp[1]; - xseed[2] = (unsigned short) accu; -} +uint48 _rand48_seed = RAND48_SEED; +uint48 _rand48_mult = RAND48_MULT; +uint48 _rand48_add = RAND48_ADD; diff --git a/lib/libc/gen/drand48.c b/lib/libc/gen/drand48.c index cec04a6a2425..f7f43ff20468 100644 --- a/lib/libc/gen/drand48.c +++ b/lib/libc/gen/drand48.c @@ -13,10 +13,10 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; - double drand48(void) { - return erand48(_rand48_seed); + ERAND48_BEGIN; + _DORAND48(_rand48_seed); + ERAND48_END(_rand48_seed); } diff --git a/lib/libc/gen/erand48.c b/lib/libc/gen/erand48.c index 286904c27839..38d4774a9fe6 100644 --- a/lib/libc/gen/erand48.c +++ b/lib/libc/gen/erand48.c @@ -16,8 +16,9 @@ double erand48(unsigned short xseed[3]) { - _dorand48(xseed); - return ldexp((double) xseed[0], -48) + - ldexp((double) xseed[1], -32) + - ldexp((double) xseed[2], -16); + uint48 tmp; + + ERAND48_BEGIN; + DORAND48(tmp, xseed); + ERAND48_END(tmp); } diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c index 0a9f780a9e5c..93442439d49e 100644 --- a/lib/libc/gen/jrand48.c +++ b/lib/libc/gen/jrand48.c @@ -11,14 +11,13 @@ * to anyone/anything when using this software. */ -#include - #include "rand48.h" long jrand48(unsigned short xseed[3]) { + uint48 tmp; - _dorand48(xseed); - return ((int32_t)(((uint32_t)xseed[2] << 16) | (uint32_t)xseed[1])); + DORAND48(tmp, xseed); + return ((int)((tmp >> 16) & 0xffffffff)); } diff --git a/lib/libc/gen/lcong48.c b/lib/libc/gen/lcong48.c index f13826b3d3f3..871b2110ed94 100644 --- a/lib/libc/gen/lcong48.c +++ b/lib/libc/gen/lcong48.c @@ -13,18 +13,10 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; -extern unsigned short _rand48_mult[3]; -extern unsigned short _rand48_add; - void lcong48(unsigned short p[7]) { - _rand48_seed[0] = p[0]; - _rand48_seed[1] = p[1]; - _rand48_seed[2] = p[2]; - _rand48_mult[0] = p[3]; - _rand48_mult[1] = p[4]; - _rand48_mult[2] = p[5]; + LOADRAND48(_rand48_seed, &p[0]); + LOADRAND48(_rand48_mult, &p[3]); _rand48_add = p[6]; } diff --git a/lib/libc/gen/lrand48.c b/lib/libc/gen/lrand48.c index a3d0111cf4d5..cc07044b8af9 100644 --- a/lib/libc/gen/lrand48.c +++ b/lib/libc/gen/lrand48.c @@ -13,11 +13,9 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; - long lrand48(void) { - _dorand48(_rand48_seed); - return ((long) _rand48_seed[2] << 15) + ((long) _rand48_seed[1] >> 1); + _DORAND48(_rand48_seed); + return (_rand48_seed >> 17) & 0x7fffffff; } diff --git a/lib/libc/gen/mrand48.c b/lib/libc/gen/mrand48.c index 15b0bfb1bd6e..f9128a6d4188 100644 --- a/lib/libc/gen/mrand48.c +++ b/lib/libc/gen/mrand48.c @@ -15,13 +15,9 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; - long mrand48(void) { - - _dorand48(_rand48_seed); - return ((int32_t)(((uint32_t)_rand48_seed[2] << 16) | - (uint32_t)_rand48_seed[1])); + _DORAND48(_rand48_seed); + return ((int)((_rand48_seed >> 16) & 0xffffffff)); } diff --git a/lib/libc/gen/nrand48.c b/lib/libc/gen/nrand48.c index 6c54065e7e0f..f6f4e231105c 100644 --- a/lib/libc/gen/nrand48.c +++ b/lib/libc/gen/nrand48.c @@ -16,6 +16,8 @@ long nrand48(unsigned short xseed[3]) { - _dorand48(xseed); - return ((long) xseed[2] << 15) + ((long) xseed[1] >> 1); + uint48 tmp; + + DORAND48(tmp, xseed); + return ((tmp >> 17) & 0x7fffffff); } diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3 index 1e47c843058e..3ea649354270 100644 --- a/lib/libc/gen/rand48.3 +++ b/lib/libc/gen/rand48.3 @@ -9,7 +9,7 @@ .\" of any kind. I shall in no event be liable for anything that happens .\" to anyone/anything when using this software. .\" -.Dd September 4, 2012 +.Dd September 11, 2025 .Dt RAND48 3 .Os .Sh NAME @@ -183,5 +183,8 @@ generator calls. .Xr arc4random 3 , .Xr rand 3 , .Xr random 3 +.Sh STANDARDS +The functions described in this page are expected to conform to +.St -p1003.1-2008 . .Sh AUTHORS .An Martin Birgmeier diff --git a/lib/libc/gen/rand48.h b/lib/libc/gen/rand48.h index 9861e99683cb..d3326e851491 100644 --- a/lib/libc/gen/rand48.h +++ b/lib/libc/gen/rand48.h @@ -14,10 +14,11 @@ #ifndef _RAND48_H_ #define _RAND48_H_ +#include #include #include -void _dorand48(unsigned short[3]); +#include "fpmath.h" #define RAND48_SEED_0 (0x330e) #define RAND48_SEED_1 (0xabcd) @@ -27,4 +28,62 @@ void _dorand48(unsigned short[3]); #define RAND48_MULT_2 (0x0005) #define RAND48_ADD (0x000b) +typedef uint64_t uint48; + +extern uint48 _rand48_seed; +extern uint48 _rand48_mult; +extern uint48 _rand48_add; + +#define TOUINT48(x, y, z) \ + ((uint48)(x) + (((uint48)(y)) << 16) + (((uint48)(z)) << 32)) + +#define RAND48_SEED TOUINT48(RAND48_SEED_0, RAND48_SEED_1, RAND48_SEED_2) +#define RAND48_MULT TOUINT48(RAND48_MULT_0, RAND48_MULT_1, RAND48_MULT_2) + +#define LOADRAND48(l, x) do { \ + (l) = TOUINT48((x)[0], (x)[1], (x)[2]); \ +} while (0) + +#define STORERAND48(l, x) do { \ + (x)[0] = (unsigned short)(l); \ + (x)[1] = (unsigned short)((l) >> 16); \ + (x)[2] = (unsigned short)((l) >> 32); \ +} while (0) + +#define _DORAND48(l) do { \ + (l) = (l) * _rand48_mult + _rand48_add; \ +} while (0) + +#define DORAND48(l, x) do { \ + LOADRAND48(l, x); \ + _DORAND48(l); \ + STORERAND48(l, x); \ +} while (0) + +#define ERAND48_BEGIN \ + union { \ + union IEEEd2bits ieee; \ + uint64_t u64; \ + } u; \ + int s + +/* + * Optimization for speed: assume doubles are IEEE 754 and use bit fiddling + * rather than converting to double. Specifically, clamp the result to 48 bits + * and convert to a double in [0.0, 1.0) via division by 2^48. Normalize by + * shifting the most significant bit into the implicit one position and + * adjusting the exponent accordingly. The store to the exponent field + * overwrites the implicit one. + */ +#define ERAND48_END(x) do { \ + u.u64 = ((x) & 0xffffffffffffULL); \ + if (u.u64 == 0) \ + return (0.0); \ + u.u64 <<= 5; \ + for (s = 0; !(u.u64 & (1LL << 52)); s++, u.u64 <<= 1) \ + ; \ + u.ieee.bits.exp = 1022 - s; \ + return (u.ieee.d); \ +} while (0) + #endif /* _RAND48_H_ */ diff --git a/lib/libc/gen/seed48.c b/lib/libc/gen/seed48.c index 258c4bac3c9f..f57656ce1121 100644 --- a/lib/libc/gen/seed48.c +++ b/lib/libc/gen/seed48.c @@ -13,24 +13,14 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; -extern unsigned short _rand48_mult[3]; -extern unsigned short _rand48_add; - unsigned short * seed48(unsigned short xseed[3]) { static unsigned short sseed[3]; - sseed[0] = _rand48_seed[0]; - sseed[1] = _rand48_seed[1]; - sseed[2] = _rand48_seed[2]; - _rand48_seed[0] = xseed[0]; - _rand48_seed[1] = xseed[1]; - _rand48_seed[2] = xseed[2]; - _rand48_mult[0] = RAND48_MULT_0; - _rand48_mult[1] = RAND48_MULT_1; - _rand48_mult[2] = RAND48_MULT_2; + STORERAND48(_rand48_seed, sseed); + LOADRAND48(_rand48_seed, xseed); + _rand48_mult = RAND48_MULT; _rand48_add = RAND48_ADD; - return sseed; + return (sseed); } diff --git a/lib/libc/gen/srand48.c b/lib/libc/gen/srand48.c index fd369a094c51..4b82ece72db8 100644 --- a/lib/libc/gen/srand48.c +++ b/lib/libc/gen/srand48.c @@ -13,18 +13,11 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; -extern unsigned short _rand48_mult[3]; -extern unsigned short _rand48_add; - void srand48(long seed) { - _rand48_seed[0] = RAND48_SEED_0; - _rand48_seed[1] = (unsigned short) seed; - _rand48_seed[2] = (unsigned short) (seed >> 16); - _rand48_mult[0] = RAND48_MULT_0; - _rand48_mult[1] = RAND48_MULT_1; - _rand48_mult[2] = RAND48_MULT_2; + _rand48_seed = TOUINT48(RAND48_SEED_0, (unsigned short)seed, + (unsigned short)(seed >> 16)); + _rand48_mult = RAND48_MULT; _rand48_add = RAND48_ADD; } From nobody Mon Oct 6 19:22:33 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 4cgTgF4B69z6BQVn; Mon, 06 Oct 2025 19:22:33 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgTgF3Mtlz3CVM; Mon, 06 Oct 2025 19:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759778553; 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=My7xY+nURa1Tcvb8rks0iWONEQQPHEXOWNnI5MKbsXg=; b=rNFCrP7k+CnDl1C8NXzc4566lmfiWTuR+r7KFKewnrqQfDbYs41MOgqJJ670MnmV7yqpXL zcjM87tHYoGFPZzV8tiVGqxzj8YhtX+t+fro5hvq9YOB3R3SSOrA6f+QolVuDpC27uiWur OIbNZwE5zYmTCuuuwSK7F0WJ8zGlJ0pNdO3zwwPXyDKRdVPUOUKZCrk0uVM9rJXq/jjmNh PzhnJczf1iAXeVi9rMX3+pJ0/zj2TtnNV/rq/Si/5YFI/BAJQ+tOr1AUbH4re2ythGwLL9 QTNUffhhnpI8dve6AfI81ay/JK/ySTmT3CVab+Krz/i4tLQ4Sgws97ZXwhjdQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759778553; 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=My7xY+nURa1Tcvb8rks0iWONEQQPHEXOWNnI5MKbsXg=; b=EUm3tn4GqdsyF6AXJxZcosLDGK7ZUcja/VOy0qaLzDnckkjSPo6rSsbx7f81eUfK8PZ7si W2J1u1GbmHs8mF6iOb47/ugO6ybP4wNw345vy7rZhCA8yrZCVMmrw+WaQ3l3xzDa1wX4mS bC0tr5TvtKcLkcjz7FgNLHfELYQgXI/YYNOYrlK8OuNxGETNLG3WDs/M+3Cw32/rpg1/zu RsxxnZ+qqpSP4NtSpDHgPA8fM173E71EbBK1GKsma5SOr53bcCOLJvH7+PZ9Zxcr08YPi0 sSFEFHMpOGxLQr6bpNaYTRGUE/U7+9F3j43thhHj7x7Xt/OHhdUeZdHzFHUrhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759778553; a=rsa-sha256; cv=none; b=B2X1/UwJDpfa19aBM1BCYc3HVh6xPjlyErQE6fAmLB2GfkdTb2RV5LCUgufivUBfHHzyp5 lYbJKWIEgf2difqHM69VL/2sC3kZqQU+o6rVE8vpc7IED1jt+rHkY/bU4Gmj8tQuf2p3oj 3oR0+T74i+FqRKVtigj+C3exc0vRrv8mhS+DjNZcty6Rg0wIPgPXrW3eBY0CGyc7iuFanH zegQhaF7dx5Il9F669MiJYALtyOW92ndeah/JG2KTQz4TfRzmOYIaLl11yrhxXvS4izJ3u apWEZw5LJp2I/vB3XV1mAMBz0HkDX3J7goJJQaWHbV47WHGpCQBo8MMVQ/1xyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgTgF2yY0z19xG; Mon, 06 Oct 2025 19:22:33 +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 596JMXvF098996; Mon, 6 Oct 2025 19:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596JMXBR098993; Mon, 6 Oct 2025 19:22:33 GMT (envelope-from git) Date: Mon, 6 Oct 2025 19:22:33 GMT Message-Id: <202510061922.596JMXBR098993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 0ecbc335daa8 - main - nullfs: fix up build with INVARIANTS after previous 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ecbc335daa8caac8b5952d83e821533c99de6ea Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=0ecbc335daa8caac8b5952d83e821533c99de6ea commit 0ecbc335daa8caac8b5952d83e821533c99de6ea Author: Mateusz Guzik AuthorDate: 2025-10-06 19:21:38 +0000 Commit: Mateusz Guzik CommitDate: 2025-10-06 19:22:29 +0000 nullfs: fix up build with INVARIANTS after previous --- sys/fs/nullfs/null_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index bb0ff9966dfd..d7f847d449d0 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -181,7 +181,7 @@ null_hashins(struct mount *mp, struct null_node *xp) hd = NULL_NHASH(xp->null_lowervp); #ifdef INVARIANTS - CK_LIST_FOREACH(oxp, hd, null_hash) { + CK_SLIST_FOREACH(oxp, hd, null_hash) { if (oxp->null_lowervp == xp->null_lowervp && NULLTOV(oxp)->v_mount == mp) { VNASSERT(0, NULLTOV(oxp), From nobody Mon Oct 6 19:33:05 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 4cgTvm1lYhz6BRPk for ; Mon, 06 Oct 2025 19:33:24 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgTvl6kPTz3DVw for ; Mon, 06 Oct 2025 19:33:23 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-b00a9989633so713151066b.0 for ; Mon, 06 Oct 2025 12:33:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759779198; x=1760383998; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=8gNuIH7hFkdJfYxSs2JF8VmNzFHstUAixARC6/lOWT0=; b=IF7wgnKrHqaldSKY0zuL9491zZ+65B/IjjtWsgJFeN5sInSL4lp7tgw9fdfu4/mEJq Kud0EZl7ZCqmozosf3jVzWfzvLDbc4BDPusItz0aJFUVVnwdiTLkPG0fAAZ3smOMDO0l s5URkAOh4RUtzVnD+qru8AXtzaZhFiikjDRvfPIxjiXDj9YDRdFXNIvKCJGqQby4o5EJ x+QkgaMfW3gEeXq0H42JTwU7zuv2daoiClFE3KbFF00POYVkImMyhRRQmsEejg/zlChY LKG7jHVL+j8cEljiPi8Rb+l2KMqS/dHhcRQINE1RryQgAfLXYHbCciuCgqu4H4oHdIEb V4lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759779198; x=1760383998; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8gNuIH7hFkdJfYxSs2JF8VmNzFHstUAixARC6/lOWT0=; b=nLL0HKV91jsqBqQLVQiw2lpi8RKNydJf3zAKrwlvmAhK8v4RhuLpcmaSJ5AL6aDXAV Qqsxy4TPKJukSf9goTEjoLW5/qU2tD+IUSKKI5RUnJmxth4Q3Y70IspWKdh44ek0eRCE hz7mRntNHSbRLx91NMuy2fNPsoqXVXyPYhhXxelZCeyQBVjZZW8o4S0jYSrrg3j45kJf oDV8hw2Lqg2BUKfanrLI0T0HpPYI6wwJACTBegWKcOZiohlRBWqYKC6h9Twp8+BUt+Y7 5BBpn9g4pi9JNdMXf9agKx4yQwtEgbvYhRy/BUp3+1cxCNjcmJ+3Km6or5F61/A3Sr5H pYXg== X-Forwarded-Encrypted: i=1; AJvYcCVBZKXjoSALy8amTiFaGC3E+DrFI/HCMQ0swXCf2kGb+p6D+nfd+Y38iKwANRR/1Z8hrS76WtAGOUysR4NIMJ67xN5H1g==@freebsd.org X-Gm-Message-State: AOJu0YxqtSoehw9LzBDr6p5qtLbZD8FOgQFsHqCHicJkQzvCy0aXhi9c WT4kbfDLnbjqJHi/hkafgc1jABPGJqD+Lzs6ONSgWaeefdPSMS9Z2/AINSZ+pqmYrXaadHeZdx2 nADbb6ApdMV9FjvsrA/VNYLUFpBoLU8U= X-Gm-Gg: ASbGncsolVr2cCfd13IahGvN15RI9gq0dyCqWFpqZCO7M75gg35jA6XAd3wQ9FYkCjE l0pZw/gRJnKJYQin0KHOuyKKYYUjYeMBgR7oiq+ISvgA4o6vODTdNZkqBuU9XfP47PzB4Kfkbyg XXA89xZSMXtVfPMxWy4BxyQsXXcGAVBTn2krU9YEu0/RJSjQFOoDFgjqM/P+y6ckYp9zl+aYh4S CH7ciFM7PM+cUsBS0xkV4sDIpBMSViBLhTV535F1QUpOj4GFDhtNV0j0dcuvdC5ghYswgVDIg== X-Google-Smtp-Source: AGHT+IETT/Ydf64xdeK8TsYBFX5mMGpmL777brIj1G4uxulKLPxyUGYVd09Kagqg3GAMAMDlGJCUQb5mfsUfVl7NrNc= X-Received: by 2002:a17:907:ca20:b0:b3a:8d34:7f71 with SMTP id a640c23a62f3a-b4f42dfccbemr73171166b.32.1759779197342; Mon, 06 Oct 2025 12:33:17 -0700 (PDT) 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 References: <202510061522.596FMk6Q043852@gitrepo.freebsd.org> In-Reply-To: <202510061522.596FMk6Q043852@gitrepo.freebsd.org> From: Mateusz Guzik Date: Mon, 6 Oct 2025 21:33:05 +0200 X-Gm-Features: AS18NWAQcJ83J7VI2f6FznMWeA4SFhTbTU93RK2I7rjDc_GA-AbiI95yrqPbhSs Message-ID: Subject: Re: git: 09f925b57aeb - main - nullfs: Slightly reduce contention by reducing concurrent sections To: Olivier Certner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cgTvl6kPTz3DVw On Mon, Oct 6, 2025 at 5:22=E2=80=AFPM Olivier Certner w= rote: > > The branch main has been updated by olce: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D09f925b57aeb171318a9d54df5= 00bf22b4cdd986 > > commit 09f925b57aeb171318a9d54df500bf22b4cdd986 > Author: Olivier Certner > AuthorDate: 2025-10-06 13:22:13 +0000 > Commit: Olivier Certner > CommitDate: 2025-10-06 15:21:45 +0000 > > nullfs: Slightly reduce contention by reducing concurrent sections > > In null_lock_prep_with_smr(), initialize 'lvp' outside of the > SMR-protected section. > > In null_lock(), if after locking the lower vnode we notice that we ha= ve > been reclaimed, we have to unlock the lower vnode and then relock our > own now that the lock isn't shared anymore. Call VOP_UNLOCK() on the > lower vnode as soon as this condition is known. > [snip] > diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c > index 375b6aa27531..ec8a6b10b13f 100644 > --- a/sys/fs/nullfs/null_vnops.c > +++ b/sys/fs/nullfs/null_vnops.c > @@ -788,10 +788,10 @@ null_lock_prep_with_smr(struct vop_lock1_args *ap) > struct null_node *nn; > struct vnode *lvp; > > - vfs_smr_enter(); > - > lvp =3D NULL; > > + vfs_smr_enter(); > + This bit is basically cosmetics. > nn =3D VTONULL_SMR(ap->a_vp); > if (__predict_true(nn !=3D NULL)) { > lvp =3D nn->null_lowervp; > @@ -855,6 +855,8 @@ null_lock(struct vop_lock1_args *ap) > * case by reacquiring correct lock in requested mode. > */ > if (VTONULL(ap->a_vp) =3D=3D NULL && error =3D=3D 0) { > + VOP_UNLOCK(lvp); > + > flags =3D ap->a_flags; > ap->a_flags &=3D ~LK_TYPE_MASK; > switch (flags & LK_TYPE_MASK) { > @@ -869,7 +871,6 @@ null_lock(struct vop_lock1_args *ap) > panic("Unsupported lock request %d\n", > flags); > } > - VOP_UNLOCK(lvp); > error =3D vop_stdlock(ap); > } > vdrop(lvp); This does not shorten the hold time in any capacity for real workloads because the vnode getting doomed from under you is a just a corner case you are not expected to run into. If someone is looking to microoptimize this, __predict true/false could be sprinkled through the entire thing. If someone is looking to create a speed up measurable in a microbenchmark, then nullfs vs vhold/vdrop business could be reworked so that locking always holds and unlocking always vdrops. Then any lock-protected VOP does not have to repeat the dance. A real-world win would come from implementing write-free lookup (modulo the last path component), like for zfs/ufs/tmpfs. It could work by lower filesystems opting it with a dedicated vop for lookups. Then you would do the lookup using the namecache entry from the lower fs and use the nullfs hash to get back to a nullfs vnode. Rinse & repeat until encountering a mount point or finding the final vnode. From nobody Mon Oct 6 19:40:20 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 4cgV3m6WtPz6BRby; Mon, 06 Oct 2025 19:40:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgV3m62lrz3FSp; Mon, 06 Oct 2025 19:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759779620; 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=h9AwF/uw34SUaLCccIqLkry3MEdxgIEkT4F91pZ8fXU=; b=Qi7X+NoJsMbUITvG19VJ8NyrVhYOtIgX+qHC8MUnILBVemJbmUWdt+fL4/kEdIsCkBWHUL LsvIky8SctkKIypvg7Xw5fJK9BwDpkfCrgP056EaxrWOCpNTrKvwor+fFTDnf5hqHzxTL+ 5/MChG2ybhjjJoKfFORiBda4ryUr1mldF8MblG1192mwwEJ9ZzCigVEpawdR3I5sSSKsce gommmK6g4vUT+iivz4sQXo3YVSkWeseeAa6VIMCs4QNXd6Vv/Tvt6RKGscygxOHdDDaawl g1YAQm7kxi+rtAtFYrA4gDf/Soww+NwKGLjVg7bhDldbgFVuu2rpY77hKzqNjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759779620; 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=h9AwF/uw34SUaLCccIqLkry3MEdxgIEkT4F91pZ8fXU=; b=rd2KVU4NyP/Lt+A9WI0+/dtqb7bK3wMhmJHVsOHiB/AlOI8JNNKCDU3J1VKz+QqSpK9Eu9 dteG6vYavYDPTmNaoWuT8MYWsSnTft8ywkxI1vhsf7p2PLbM0EDpldq5E4qbKLdTP+0S4u 5fD6lAsurZknzUD0Adq1zjgIEHohgh/6uI4LsntY7dGoQEsuK8DlmKgUqY7xLignnNxCPh HM/W4u19voveo5NS4uoQXa5SgLYZxiP4UBJArcO3SxqC0oZFDKAmVrNwr09dCSEZy1pHUi 6NJfmij2t1DMmCndMsgLHeRhpEYWUOkEvWEDgUex/Zz06XL1Co6D+uqTShulqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759779620; a=rsa-sha256; cv=none; b=Dlu2N4MbPTL2ODSNQt2Ck7Lj0Hd+Ku3mmq5JuaV/Blv69Do+CYp//3j/PrJ9/mRWMwEEPz kLjPZzRzkbj9iVXOILwa6c7Wmn/kQIbNyEiNZtkr0zQf7vGpTBC0hZzIhUhyM4I3EcEXTo m/bXuWg0w8degB5HOUQ9WYcx+YObq4z7A+jyg5N+u5NREF4nAHOFx4P307XKJtiXB9ZEEs Jgri3exuBWKTv/y7jLjvesNNIxDv2u9q1Q1UYXPynDezqGsf2irKp0rrVCSA8NGPoiEtll FgPcR3gjf7XUTfoH32jIOmH/19/YCwrsGnpHsY3l7KEFKRdvdJwbepmxkEEqRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgV3m5bGMz1Bhd; Mon, 06 Oct 2025 19:40:20 +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 596JeKZn029337; Mon, 6 Oct 2025 19:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596JeK0G029334; Mon, 6 Oct 2025 19:40:20 GMT (envelope-from git) Date: Mon, 6 Oct 2025 19:40:20 GMT Message-Id: <202510061940.596JeK0G029334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2b6c5f041f29 - main - EC2: Include LLDB in small and builder AMIs 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b6c5f041f29523acd34c2a107772f04e3d1f6b3 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2b6c5f041f29523acd34c2a107772f04e3d1f6b3 commit 2b6c5f041f29523acd34c2a107772f04e3d1f6b3 Author: Colin Percival AuthorDate: 2025-10-06 05:11:34 +0000 Commit: Colin Percival CommitDate: 2025-10-06 19:40:01 +0000 EC2: Include LLDB in small and builder AMIs I excluded lldb from the "small" and "builder" flavours of EC2 AMIs because on FreeBSD 14.x the lldb binary was 100 MB, as a result of statically linking in lots of LLVM code; but we now have libprivatellvm as a shared library and lldb is much smaller so there's no significant benefit to excluding it. Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52921 --- release/tools/ec2-builder.conf | 7 +++---- release/tools/ec2-small.conf | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/release/tools/ec2-builder.conf b/release/tools/ec2-builder.conf index cf4276fc80ec..36837fd86f9c 100644 --- a/release/tools/ec2-builder.conf +++ b/release/tools/ec2-builder.conf @@ -7,17 +7,16 @@ export VMSIZE=8000m # Flags to installworld/kernel: We don't want debug symbols (kernel or -# userland), 32-bit libraries, tests, or the debugger. +# userland), 32-bit libraries, or tests. export INSTALLOPTS="WITHOUT_DEBUG_FILES=YES WITHOUT_KERNEL_SYMBOLS=YES \ - WITHOUT_LIB32=YES WITHOUT_TESTS=YES WITHOUT_LLDB=YES" + WITHOUT_LIB32=YES WITHOUT_TESTS=YES" # Equivalent to INSTALLOPTS for pkgbase vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' \ - -e '^FreeBSD-lldb.*' + -e '^FreeBSD-tests.*' } # Packages to install into the image we're creating. In addition to packages diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 32d02cbb79e4..9b64c215d8a5 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -10,17 +10,16 @@ export VMSIZE=5000m # Flags to installworld/kernel: We don't want debug symbols (kernel or -# userland), 32-bit libraries, tests, or the debugger. +# userland), 32-bit libraries, or tests. export INSTALLOPTS="WITHOUT_DEBUG_FILES=YES WITHOUT_KERNEL_SYMBOLS=YES \ - WITHOUT_LIB32=YES WITHOUT_TESTS=YES WITHOUT_LLDB=YES" + WITHOUT_LIB32=YES WITHOUT_TESTS=YES" # Equivalent to INSTALLOPTS for pkgbase vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' \ - -e '^FreeBSD-lldb.*' + -e '^FreeBSD-tests.*' } # Packages to install into the image we're creating. In addition to packages From nobody Mon Oct 6 19:40:21 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 4cgV3p1dJyz6BRht; Mon, 06 Oct 2025 19:40:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgV3n6wGGz3FLx; Mon, 06 Oct 2025 19:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759779622; 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=sW6N8sJSl83yPDd3CVDOYYXvr2pcqfC7C4CGO9015ik=; b=Ls5K/qGW1DZkNzeS0k5J1MkelllEdRxwPTFvYaYXdj3TXfRk9T0S8WhoIJ2YSZIfjP0H8N 7NE9JZmDUUyhn0P8khn8AnXEqNj2rNd+Z1PkANeNFWXJQHbX32QWjHDk/U8ZXdbFzTcw2D gMpKHRoW3//LfG/GBkOW+CxKIUDCP1GDQPmInWa/JIOkBn6BmfHjt8gIXU2t4BCNW8Ap6w JTq90bOVerec6M12KxAsujLhg0r+qUkPZ/JJ2FE27yA1hfQlOYDXWUfbT61e/49hN7Q3RQ Q3UOyi6U4Bae96ZcIlYKi+d+GrISgVN6fsnayakQpp03UuI/tOo/cadxu7iOTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759779622; 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=sW6N8sJSl83yPDd3CVDOYYXvr2pcqfC7C4CGO9015ik=; b=RoPIDG+oNIjqPnLNqtnR/EhyL8bvyiNPilw3pUlWstO8O4rSCmajODwVZbZ71Pe/93+cxW 90o0scPnpV1jM/voBnMLQRYx4K8xRgCgal7v914+A6CMSo+J1rAIJp823P+zR6j2ZjNmpb FWfPRO4nMflHrJyUM5FtqaXqaIZfxOjlnwt5VJIwOyS3ynLFO7AOdw/QZJOAQxPRQO/kC9 i0ujuX1FCT47qM1jG1fw7BXEF7ncwuJe6DicG+uvu+Cn4oJxVWeeou/LQCmtqMpCe/dERP h4xDovjmZAO+PuQKR4hBMELBtsf9ggdyQVh+x5f7FepMkAjR58P07c3UavaHmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759779622; a=rsa-sha256; cv=none; b=id422hslqeEFxGx/jZfpViCCbegksdGAxv+NX5zatxqwb1axIxxXCTUEMJiLxLVsOhCVdm 0Uo5NuqO1yXG7UhhjXE5asKiavVP4TFpYo8GPjih/7bAAmF/Tu3+qGLZt1tw5MTCTqRgHZ xPGYb3fr9sQuL2armqM9wsN1HGW9aBSMVwxKLMHwMarJcy6LKgh1IO4sng+olzY3V5dbiE CabJzjC2Txxbx4m1xIaQ2i4uZ2B5C1kvkzgBo1/fwjgUTYDGHkloOj/Xz/U3Wb90XLtAP7 qJDnpMwtIKdv/xs6buP/3DVOy2F6bl+1xCW04qwWVwP1v/e6759Cc5ixYqG9VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgV3n6WFLz1BfP; Mon, 06 Oct 2025 19:40:21 +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 596JeL01029373; Mon, 6 Oct 2025 19:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596JeLev029370; Mon, 6 Oct 2025 19:40:21 GMT (envelope-from git) Date: Mon, 6 Oct 2025 19:40:21 GMT Message-Id: <202510061940.596JeLev029370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2d184465e8bb - main - release: Rework VM package selection using sets 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d184465e8bb77d4620f509b04f19ea22656f28e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2d184465e8bb77d4620f509b04f19ea22656f28e commit 2d184465e8bb77d4620f509b04f19ea22656f28e Author: Colin Percival AuthorDate: 2025-10-06 05:25:08 +0000 Commit: Colin Percival CommitDate: 2025-10-06 19:40:07 +0000 release: Rework VM package selection using sets Filtering the list of packages broke with the introduction of package sets, since we excluded FreeBSD-src.* but still included FreeBSD-set-src, which transitively included the FreeBSD-src and FreeBSD-src-sys packages. This could be fixed by excluding package sets, but that would be fragile, potentially breaking upgrades if new packages are introduced. Instead, start with an explicit set of package sets: base, base-dbg lib32, lib32-dbg kernels, kernels-dbg tests and filter the package sets; the EC2 "small" and "builder" AMIs filter out everything except "base" and "kernels". Note that using FreeBSD-set-kernels may pose a problem in the future if we start shipping packages for multiple differently-configured kernels. That will be addressed if and when that problem arises. Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52922 --- release/tools/ec2-builder.conf | 2 +- release/tools/ec2-small.conf | 2 +- release/tools/vmimage.subr | 21 ++++++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/release/tools/ec2-builder.conf b/release/tools/ec2-builder.conf index 36837fd86f9c..a55485fec0cd 100644 --- a/release/tools/ec2-builder.conf +++ b/release/tools/ec2-builder.conf @@ -16,7 +16,7 @@ vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' + -e '^FreeBSD-set-tests' } # Packages to install into the image we're creating. In addition to packages diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 9b64c215d8a5..acaffbbc0c42 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -19,7 +19,7 @@ vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' + -e '^FreeBSD-set-tests' } # Packages to install into the image we're creating. In addition to packages diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index cae8a113871e..131ebe37db6c 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -70,15 +70,15 @@ vm_copy_base() { return 0 } -vm_filter_base_packages() { - # Reads a list of all base system packages from stdin. - # Writes a list of base system packages to install to stdout. - grep -v -e '^FreeBSD-src.*' -e '^FreeBSD-kernel.*' - # There are several kernel variants available in separate packages. - # For VMs it is sufficient to install only the generic kernel. - echo "FreeBSD-kernel-man" - echo "FreeBSD-kernel-generic" - echo "FreeBSD-kernel-generic-dbg" +vm_base_packages_list() { + # Output a list of package sets equivalent to what we get from + # "installworld installkernel distribution", aka. the full base + # system. + for S in base lib32 kernels; do + echo FreeBSD-set-$S + echo FreeBSD-set-$S-dbg + done + echo FreeBSD-set-tests } vm_extra_filter_base_packages() { @@ -99,8 +99,7 @@ vm_install_base() { pkg_cmd="$pkg_cmd -o METALOG=METALOG" fi $pkg_cmd update - selected=$($pkg_cmd rquery -U -r FreeBSD-base %n | \ - vm_filter_base_packages | vm_extra_filter_base_packages) + selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected else cd ${WORLDDIR} && \ From nobody Mon Oct 6 19:54:02 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 4cgVMm0jL7z6BSw5; Mon, 06 Oct 2025 19:54:12 +0000 (UTC) (envelope-from cyric@mm.st) Received: from fhigh-a1-smtp.messagingengine.com (fhigh-a1-smtp.messagingengine.com [103.168.172.152]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4cgVMl1Sp2z3Hg4; Mon, 06 Oct 2025 19:54:11 +0000 (UTC) (envelope-from cyric@mm.st) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=mm.st header.s=fm2 header.b=G2dHsvoP; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=e8MFwToD; dmarc=pass (policy=none) header.from=mm.st; spf=pass (mx1.freebsd.org: domain of cyric@mm.st designates 103.168.172.152 as permitted sender) smtp.mailfrom=cyric@mm.st Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfhigh.phl.internal (Postfix) with ESMTP id 9B917140016F; Mon, 6 Oct 2025 15:54:10 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Mon, 06 Oct 2025 15:54:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mm.st; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1759780450; x=1759866850; bh=mkRf7/L0JQYzjbtNw+L55eQFaMJHlx21UjARDkcNZYY=; b= G2dHsvoPaEOlErR++qNwKaUG8npB6/hvSANcqKsEtqdf98hci5cIWFLC1rBSxDxo mBTMboxBiom/swPU2qHIJHdiQLm3CSWsDurlyK7t67Jn/46LWXQ6HpIRSd5WPta8 MseF+C/nIRevzdy35imHwGPFcXd+lpzeSU7WTY0Jdpk3n5XldezHtXNgaO4mo+Bs U59J5YufiEABtMs+4kRoaMSc/Ml6sMTC3yEikl6PAkjLSxH1tYebysIlU0c8OGlm qFcFfLYIviBTtlKlfgI8fb8L+Hh0PAjT0M4kkE0Bvt8ZXvJTavvJNojYd9vds0Wz m4VCk4XOp1WtpsCSv1tR9Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1759780450; x=1759866850; bh=m kRf7/L0JQYzjbtNw+L55eQFaMJHlx21UjARDkcNZYY=; b=e8MFwToD+sKEDwD6q skWd/HOLO82/N2XmAmxQMoJ7xrvIvIqOAMLQINrxWlHIZE0XDowMwaSMzdWcuXZL 2hOic53J4uBQe8fbVAyY/OnsaQrD2IAhkzCGD0ubvJ4E/uw82UJOmvXGvlrSIk7D eT3El1kfc98UFjum5GbMvv9oUl5mkEp7lDNnrpVsdYBsWHyM6yVeTgo9FQHzQMgp rmZaePk8Dhtk+nSpNlYdygycg6Ur+JT1uCFplNja+TGDJ0xXJ1+HcL/iLYd+wgv4 js2K25Aa2k/J+XsRKWwKHtk0H2hxJGG3x7flvakAsDe5SYHPkV0T3w58BrI3U0s7 3QC+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggdelkeegfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefkffggfgfuvfhfhfgjtgfgsehtjeertddtvdejnecuhfhrohhmpegthihrihgtsehm mhdrshhtnecuggftrfgrthhtvghrnhepveevlefggfduffeggffhfeetffeludfhkefgve eltdehfeelfeetgfehgffggeegnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptgihrhhitg esmhhmrdhsthdpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtohepmhgrgihimhesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgtoh hmmhhithhtvghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhm mhhithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggvvh dqtghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: icc3648d4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Oct 2025 15:54:08 -0400 (EDT) Message-ID: <7505e59d-7c89-466f-a773-08443b3bee79@mm.st> Date: Tue, 7 Oct 2025 02:54:02 +0700 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 2ed9abe1d873 - main - snl.3: escape \n propertly To: Maxim Konovalov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510021817.592IHYaU082357@gitrepo.freebsd.org> Content-Language: en-US From: cyric@mm.st In-Reply-To: <202510021817.592IHYaU082357@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.10 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[mm.st,none]; R_DKIM_ALLOW(-0.20)[mm.st:s=fm2,messagingengine.com:s=fm2]; R_SPF_ALLOW(-0.20)[+ip4:103.168.172.128/27]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[103.168.172.152:from]; FROM_NO_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[mm.st]; FREEMAIL_ENVFROM(0.00)[mm.st]; ASN(0.00)[asn:151847, ipnet:103.168.172.0/24, country:AU]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; DKIM_TRACE(0.00)[mm.st:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4cgVMl1Sp2z3Hg4 Maxim Konovalov wrote: > The branch main has been updated by maxim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2ed9abe1d873465d375b47ece0a379e1dbd99719 > > commit 2ed9abe1d873465d375b47ece0a379e1dbd99719 > Author: Maxim Konovalov > AuthorDate: 2025-10-02 18:15:16 +0000 > Commit: Maxim Konovalov > CommitDate: 2025-10-02 18:15:16 +0000 > > snl.3: escape \n propertly > > Reported by: Bruno Silvestre > --- > share/man/man3/snl.3 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/share/man/man3/snl.3 b/share/man/man3/snl.3 > index 9a6eceb66a32..f678d6cb2cea 100644 > --- a/share/man/man3/snl.3 > +++ b/share/man/man3/snl.3 > @@ -288,7 +288,7 @@ main(int ac, char *argv[]) > struct nl_parsed_link link = {}; > if (!snl_parse_nlmsg(&ss, hdr, &link_parser, &link)) > continue; > - printf("Link#%u %s mtu %u\n", link.ifi_index, link.ifla_ifname, link.ifla_mtu); > + printf("Link#%u %s mtu %u\\n", link.ifi_index, link.ifla_ifname, link.ifla_mtu); > } > > return (0); Just for the record, the proper sequence for literal backslash would be \e, see mandoc_char(7). From nobody Mon Oct 6 20:43:26 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 4cgWSZ61T3z6BXVq; Mon, 06 Oct 2025 20:43:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgWSZ5FB6z3MR9; Mon, 06 Oct 2025 20:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759783406; 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=Of/toFp1oRDKtfWh4F1FSVRvgA/43tX5ozpmbi6POho=; b=iZEpb/uksBorjYaurnHvRjvOYu9oQxRK0F3KSpkG5fOPgz33UCN3dZFy+mHyyoa5B1e0uX YDfuxzdGnCs2U/roiaz5KpGMIErFpsfIB6SJm4U1qF6s5y+N5htMFDKpAhW5AKMrW3Itaa zetXdo3x32agJhDPYevT44k2QrDl9mpSw5jyIJKH66zyFS9MgXWGHZtifJbgn7TqjK3Csa Iz32mC9TGLsfMM6C2oUkofmVggUFBLz2nDrZGN/S9ifdi1/LdV6CtdtPRULAwLpAjUhjCP jOmum6XuWbacc2YIiOPTKT6tduHUBM35vbwyl1MNzRpmnopCdT4GyUi6yRpNYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759783406; 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=Of/toFp1oRDKtfWh4F1FSVRvgA/43tX5ozpmbi6POho=; b=qq2O+HgLMuCxGKUF0ypy0fMtV/C1G4Zr9RsA0RLoyrDss0dQCbYyw0//9uiUAT6THLL4FC goV1vTC6YYwsUUgudYq3rPDlgOlGH+5HwBGqFrkt+VRkBppfv7WrmOOnmr4H/ZbHW5WhvJ bj9bTAXNQ/drt0cFWQJBhML0fpAa1XVCSEnSfKXyC+qJjabZgoUUka6FhhLMJ/zkHh8z4d b9ytFlx8fVgwS1S+HNQZc2SQgmIsQi7vwrgu7aB/iC5nDMI8GgjAnmr6KmFV3t3eK48sT5 QLSmv7N5ZvyIBlc3nqdhpJxy6KxqZFTZTjfE2SdXUI4jIk6AKNgFV24Tlsg/eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759783406; a=rsa-sha256; cv=none; b=EhEjl1L9qNO+UgkQNCrw+RsfMrbPQj/ql/a8Q/ciqfH2hXLdlMbsXWQT3hu9qTJFDg0pYX vjY4YqmM+aurJmeP0CVhO2BCMAopPKJcQKb9Hi1eqwnFQIxC2XRdty1D7p4yOQpSM1sPqH TfrLzUSq968lzkK7tfgSnKXMudPOznuTRKs6Lr64xjtpnR8zSCWWvti9ffFlz8f+ucNVHT /HmF5Q1NqkitFpWw7rLEpAUuJtMXTmpLs0L+7ot4m9UA0NRluF0SWPEENNy/o1Rl1gkkF4 vLOJYK+Ub8LYPfblZQKZN0/9y9+X0MX8PipeMQR/TFt3Yg1Kp7RtgT30oCNNOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgWSZ4fG8zSb; Mon, 06 Oct 2025 20:43:26 +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 596KhQLi050885; Mon, 6 Oct 2025 20:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596KhQcu050882; Mon, 6 Oct 2025 20:43:26 GMT (envelope-from git) Date: Mon, 6 Oct 2025 20:43:26 GMT Message-Id: <202510062043.596KhQcu050882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 8af2f06a99b1 - main - tcp: improve SEG.ACK validation in SYN-RECEIVED 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8af2f06a99b10c0d3ab9021949e750852662672a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8af2f06a99b10c0d3ab9021949e750852662672a commit 8af2f06a99b10c0d3ab9021949e750852662672a Author: Michael Tuexen AuthorDate: 2025-10-06 20:39:31 +0000 Commit: Michael Tuexen CommitDate: 2025-10-06 20:43:11 +0000 tcp: improve SEG.ACK validation in SYN-RECEIVED According to the fifth step in SEGMENT ARRIVES, send a RST segment in response to an ACK segment which fails the SEG.ACK check, but leave the endpoint state unchanged. FreeBSD handles this correctly when entering the SYN-RECEIVED state via the SYN-SENT state, but not in the SYN-cache code, which handles the SYN-RECEIVED state via the LISTEN state. This also fixes a panic reported by Alexander Leidinger. Reviewed by: jtl, glebius MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52934 --- sys/netinet/tcp_syncache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 2bb99596f965..1fb6104a2944 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1285,7 +1285,8 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, "segment rejected\n", s, __func__, th->th_ack, sc->sc_iss + 1); SCH_UNLOCK(sch); - goto failed; + free(s, M_TCPLOG); + return (0); /* Do send RST, do not free sc. */; } TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash); From nobody Mon Oct 6 21:14:48 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 4cgX8n0K4Zz6BbDP; Mon, 06 Oct 2025 21:14:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgX8m6qgtz3RBc; Mon, 06 Oct 2025 21:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759785289; 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=Ynt761v9NTsWIal9iHNJhLW9fNLWut2+0O8sL2bz2U0=; b=dQdTCxndr21bYrblIU2F+JxmW5Kw7piHtKk+nMI+JgglXbapUflNoyKI3zLYY1CsqHDGor pBCgylvlP/m80iRFyWwT45vPgkzaH79RUva3rFUdG6+r14A6CPnLxEBoFdIfmR1WJhJgbM 9juXmj76uattfcslxMj07ZeoB0pKlaJ6ru/VtYEhBEIdBrNlnS6EVhJdg74HkPvNrSvvZO L7GWIHVVnysPv8MQG5fI3SaVtmnhNxsRRFqNYDKFMABj9nRo/4yi7Wht72VIYZOMDqDbZR yVa0OrkWeVHPVpNKhlZOieId5LRm+7DAl7VRmwGPHOIydiopRDlYUPq/THxsfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759785289; 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=Ynt761v9NTsWIal9iHNJhLW9fNLWut2+0O8sL2bz2U0=; b=xZxuu2Hq0vJV7r3wAOfX5JhXS/yLC10kr11hcnUAKZJ/YdB+r7Mekyafidv83sm7GgQ6sx FP8pIvaV5hpJsjLX7xq1q3C42E4nsaVmH2ijNEVcD9e7P69dOo+/0UYJtTdRVtXSVI1iRO mw802z9NM2K+WVx3ebuJ/jquk5tWUmIH2r4Qtf1KZE6mk9/CwfUFA8F8f/mtjP+McfinpC NORQmGznevwFqgR76r4L9OMqinSmHcg5PiwDzAJLoNf58zRNOnvVtKHCpSBmltZ3DIHrlt VkCOqxN0ALTsvJmoptJK9tRcwpJ5iMqS4qBlqvF5xeXykCnM9RNtr5tfULwFZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759785289; a=rsa-sha256; cv=none; b=WEPcJPISLljJBo45P4VqFGn6vYGKQrGcz2WLoLLKC1DFlsql/MQEe0WT3edsoXU0Vi62B6 EI4pAes2mz8iBQyVD+/VVZ5tdfYftoMwjX9TP4ccIt+y94GXI65oco+Grwea6AOY2s1ML9 LeJ7En+r1k8asSndl8U+BpJMgJFC53VFVvDVwekLAJsSoxOyp/f0F/yD8fbbQ9TsieC68v CEslchhBeOlz16QjKWwAg9BTsbG9CiTc01PMDgrEDEDKq0BtrzgeD07CwukheHljj6zPkt lebbjsv2cMMIVbJY7Pwkkk1Evqwgu8WcTZ1Yqg9bu06Z5xRTLQSqijClNhYlAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgX8m67VMz1Sl; Mon, 06 Oct 2025 21:14:48 +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 596LEm9v008108; Mon, 6 Oct 2025 21:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596LEmOK008105; Mon, 6 Oct 2025 21:14:48 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:14:48 GMT Message-Id: <202510062114.596LEmOK008105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: dcb5ee48960a - main - snl.3: use \e esc sequence for \ as per mandoc_char(7) 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb5ee48960a3c1d0120be0524d4c81f831d23a3 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb5ee48960a3c1d0120be0524d4c81f831d23a3 commit dcb5ee48960a3c1d0120be0524d4c81f831d23a3 Author: Maxim Konovalov AuthorDate: 2025-10-06 21:10:26 +0000 Commit: Maxim Konovalov CommitDate: 2025-10-06 21:12:15 +0000 snl.3: use \e esc sequence for \ as per mandoc_char(7) Suggested by: cyric@mm.st --- share/man/man3/snl.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man3/snl.3 b/share/man/man3/snl.3 index f678d6cb2cea..04bae46691bf 100644 --- a/share/man/man3/snl.3 +++ b/share/man/man3/snl.3 @@ -288,7 +288,7 @@ main(int ac, char *argv[]) struct nl_parsed_link link = {}; if (!snl_parse_nlmsg(&ss, hdr, &link_parser, &link)) continue; - printf("Link#%u %s mtu %u\\n", link.ifi_index, link.ifla_ifname, link.ifla_mtu); + printf("Link#%u %s mtu %u\en", link.ifi_index, link.ifla_ifname, link.ifla_mtu); } return (0); From nobody Mon Oct 6 21:35:11 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 4cgXcJ1MhCz6BbvP; Mon, 06 Oct 2025 21:35:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgXcJ0YqRz3SHV; Mon, 06 Oct 2025 21:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786512; 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=lILK/HL2AszJILf2MGALv9vYJox2yE07Y/3vVegOxWw=; b=s2/YmjWzPhBdQb7B9jPae3udh5yHlAqOokJE3vuiExjlKgvIOMgPmPjCa37cIb5SQjBtSW oFyCaHQas9wgc/9zp9wpcEk+JjbPdlum/oxKFiEcWySr0XxJOitVNMOa4yVgmrNoZgAGpm ibnNkwIFtGdkQSfaUJHTbzYtIS1k9PJ5DR9Qbt1C5YjagLvZ/Ij/8asDHcFfNYcIHDpqQg Wj/vcm7OPI0SCIC/CJifOyzsEZ6VTx87fwkvuM8gOfMfy13ezn4Zdnn48Wga9p4jjMprPZ CuSSqakIXNc1FYgWLHEs6FT2k5/p0V7P1sOZ+1J+5VPsM4+q5ja2SFgUyoTTDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786512; 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=lILK/HL2AszJILf2MGALv9vYJox2yE07Y/3vVegOxWw=; b=KjibZ249eikl2eVkA8wlGco8DPdk9KTOjId6mHWeKf2kVXo4HQtp/Fke/AbjwmJVemmlmL UPuhsCo9VYke6WxmrwFmH5AN1MfH/Ehxf6XiVC/O5w5mQCPQjhCbh1hfRSMbBa7LFqajtW K0dDNuSP090efRxwPT3j38adDxE+F7UThgMjBDozZSXLZFzCc6yMrwsV+WkFXD3pzm8y40 4emPyLxMfXotbfaPlVMpQSVeCNDbS5umM1J3cJW9Ng4uJsQFsMoEF898KQanlpPsm/Ks0J O8OPENtZ39kfB2QVOZZOZrGO7beVmE8K9wusCVM4yQIjuLQMoYNfvL3ogRs+Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759786512; a=rsa-sha256; cv=none; b=HXrdRB7dJ3zClS6cKccwFOeZJBYJAdwd7RgaBO0Xq1gw36kBjP83nqDPr924Q51IW+bY8q 9vMh2Ly7aB5oVoTc2dPtv0m9Qly3dY5bZxOWYplfwsS0u0qAIgFj+VjBkajXyhie1GLuma l9aLX8nD/j1waVqfoniTY2rCc2eSXMnxl3B14UsGqK2SuU/qpM5LRnABb03p0lDxfcdLk6 1HEPBFWvxFRdO3zAi0xO766uGcuLW7mjmnjmbYu0hoPOJmwpLb/jGzJLkd60xo/OMqJLEZ 9fTqqavUQrJVHX/JNuSdtF3/I5oIwUc3WI0X3sr7D8flLUeh41t7e96iE1bB7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgXcJ03z8z1VT; Mon, 06 Oct 2025 21:35:12 +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 596LZBEc045042; Mon, 6 Oct 2025 21:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596LZB0x045039; Mon, 6 Oct 2025 21:35:11 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:35:11 GMT Message-Id: <202510062135.596LZB0x045039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c943e6ff9ab0 - main - release: Fix pkgbase tarball names on FTP site 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c943e6ff9ab0ce823e8ac51a6a17789a1945925f Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c943e6ff9ab0ce823e8ac51a6a17789a1945925f commit c943e6ff9ab0ce823e8ac51a6a17789a1945925f Author: Colin Percival AuthorDate: 2025-10-06 21:33:06 +0000 Commit: Colin Percival CommitDate: 2025-10-06 21:35:07 +0000 release: Fix pkgbase tarball names on FTP site These need to have names like FreeBSD-15.0-ALPHA5-amd64-pkgbase-repo.tar not just "pkgbase-repo.tar". Fixes: d0ff67db2908 ("release: Publish pkgbase-repo.tar") MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva --- release/Makefile.mirrors | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 6778b86873e6..ed9420e926ce 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -382,16 +382,16 @@ pkgbase-repo-stage: mkdir -p ${PKGBASE_DIR}/Latest mkdir -p ${PKGBASE_DIR}/${BUILDDATE} cd ${RELEASEDIR}/pkgbase && \ - mv pkgbase-repo.tar pkgbase-repo-${SNAP_SUFFIX}.tar - cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo-${SNAP_SUFFIX}.tar \ - ${PKGBASE_DIR}/${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar + mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar + cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \ + ${PKGBASE_DIR}/${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar cd ${PKGBASE_DIR}/Latest && \ - ln -s ../${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar \ - pkgbase-repo.tar + ln -s ../${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \ + ${OSRELEASE}-pkgbase-repo.tar cd ${RELEASEDIR}/pkgbase && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/pkgbase && \ - ${CHECKSUM:tl} pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + ${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ ${PKGBASE_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} cd ${PKGBASE_DIR}/Latest && \ @@ -403,10 +403,14 @@ pkgbase-repo-stage: rm -rf ${PKGBASE_DIR}/Latest . endif mkdir -p ${PKGBASE_DIR}/Latest - cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo.tar \ - ${PKGBASE_DIR}/Latest/pkgbase-repo.tar + cd ${RELEASEDIR}/pkgbase && \ + mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo.tar + cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo.tar \ + ${PKGBASE_DIR}/Latest/${OSRELEASE}-pkgbase-repo.tar . endfor . for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/pkgbase && \ + ${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo.tar > CHECKSUM.${CHECKSUM} cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM} \ ${PKGBASE_DIR}/Latest/CHECKSUM.${CHECKSUM} . endfor From nobody Mon Oct 6 21:35:11 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 4cgXcc4yxgz6BcJW for ; Mon, 06 Oct 2025 21:35:28 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-24.consmr.mail.gq1.yahoo.com (sonic312-24.consmr.mail.gq1.yahoo.com [98.137.69.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgXcc3633z3Sx8 for ; Mon, 06 Oct 2025 21:35:28 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=eZ8zvifP; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1759786522; bh=gJzcE9wrluPlC4Og5aCTh/+7hZMeQ6F0P09PIiHc37U=; h=From:Subject:Date:Cc:To:References:From:Subject:Reply-To; b=eZ8zvifPzd/5x50NFHb7WArMu5ZrHOjwRwTQDQ0qzghG9jPWRRNzVxdog3O4Ng8g47h9TE6y4KVEGxoI6nGmxkOF16ifhRFelORZqc1kLQcWl+RYfxnU4uPutNzOvt7+nuUufrj15Xvz+j/MXPNVOJ1/j3EsglERoFL3RGfWMLYGbf56wvbX/VxUGiD6eNm5DXlaTq4bk+mcXIhw0MV890YRg/mDEAkM5r3zqkwohfRXQZbACVjZxQLZvzAr8CK3JHEIwN3brza1U5grBnXTmR3TxyH0ym8up3rR7JSMhgq+G02eUc65ItCO8Zkv2W0tVkxr/71voraQoQm4vOD/uQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1759786522; bh=cBiSFQktB6Fb+m+ugneMG4qQZn6/zo3yf0s77UdxOsU=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=ihK35ysFVH1nuqOoKRiWTlPREIHMsM8DFjznS3dtsz3eFapM9Mfvkb8/CGtdKvDfvc+d3rdzR3RNj/ySpniQK0ts4WuEvbPAVER3bBQHpWGPIZ+EBUegyEgHIrbfcbNPRk4BJE5ZlwGy9bF9DdIrH80xtNXxhW4FVZ2Z5jebNQiEYsu4CsdE9UlwyqwqZcICUEccq77uGJs3+tDE+lUNggGuni6hWxR86ISR4QO4YYECjf25XsnrofMT6ezDIBL2VF4GcbbbLdIOfcdmv059OEf01/zXijjbkI4bupPeV3p/lC6FqY4nUwaGB3yZSfMi5C5VxDprwgJa2QSEarCciQ== X-YMail-OSG: CDHPoWwVM1l1c00JnwDRMDftEcImRAkPyepJxgYADJk5OYxvooolLv6kd5ppAGS gEPSgkYFo4lK5TW1OBVCMkMB4sSy8.ukmpnkk1k5EUsmTuZYH2oeW46C3eCHkZfjtahkCD4ATpJz 3eZyhyf85IpDZ0dWGiVhbds2eSxlseRODrEqjzkCPWOEWhYHCBr1Yf9X8_wM4xrwKUNcRtZDy_Gc kTdHLxWd2XHHNNlljj4LlBVPOzJpl0Ie9ID57OgWl0TOOaIsntTCpZFWcBDne1BQB6ZgdZ.JmKkH npmkpu.aXsLGy85uOPCGOBmxz7ekWY.5ReK6JOVw12HKF2bvdw3WgcRVSjUAk1htD6YTKT1RDbHn qiQbxfd4ccMHy2QdoDs4LxDLB1cmGaG.P9UKxwKXyTTbapIqiiRIPlIJ4xUPNqGmrPE_K4DNaW5w 48abx9txUcsuSmYUgX4EN2utLdZp1LxzCW.Tx2Fl.pvulTtz7BBRIIlGyTZx4UqOSmSJQNGQhxk0 TyckGto04lVqnVTQBhEXMRkDR3m2x495248nywNM.hPMwheou0bkIyAVrUKFWf2a4itRDDT5DxHi Jad4lSwSInO.iYyLEMMB5VgFPVPaDlB3DxcBCobKerkhD0mH1jX0poL60LNz331OojSDkQgrdxpM XysEzGXTKZb_j9.83PXMhA1PTMpcYk1djQx4ni8Cjsy04aiZ6J7LI7i5Y9uOBWNrIBeGYe7U7Se_ NpWrr3Ac2Un95WtXL6a7XjG7qIVuEKyPWAVPmwFyA50sfwxgid2p8MMZ4hRsk1PggTaZifC6US0A 7N1p9TaaM4yVaTRV993Gjys15eAYgovkpJWfQefR478VcaO__dunPAu5aKKo87PtlDz8OLWv7W8p 4axuZ22VfvXDF0SLWTe7fYXMaxKLdn3cEXY1phu2CXIbDkDsml.LTD7JCE0onKnqrhSj2q4YPANe QA1Z2w.Hw5OxW__Ijtynzkxrrgw9L31YB6g6vP7ccHYTmShVE2fZthKEfxs5Z26RQ32cjhcbZhJC 6cPlhwrBkQKHInmbp2xcZNWRyJIbNLt50PKQthr7gRu7gYDb8HGTs9xrFkJOv674tQnIZz9uDalu W7vGfDQGZPaQwCKEjQuXUNsBzAI7VcSQn93oRmd_yKBXTTd_xxkK7W3StGVblqs25SIzrF5q9BS7 wIumxABQufNQ1dpvPXfTtyPTR196s0YRtwBFoyiz3X7V.V0fzgyDY0VJwXRh45Z5pYi7k9AOHOlL vFwuTUCndriCd_WpBDzhbgG5eFgNnwSvaB_aJ_ivOvO_latm4O.IF0hydkQV2jgDHg1PGAwcwqeW Fxqitm9FfiTxdLpWYRq6lWxY.rqK3qSePZwbsxP5UwdKsa7Ut0ruXdfUjERwuAm9maAXRSyc.vou c03eXrJiLtvBGWmQL83Msve12lAQLRLMIibQ1ka.PMs6Xyy9H0JWe8IipytniWl_XTxQMd7_OR60 _MCdnSVllJ1Vebjch8u9_OZ5TnAufil15YkPBvSp0ltWEy4skAbHRTEC68IKXswOKCxITobGBl2C DjMgyxcH8CHa6NDcV8OGIhIXDcEGyD7oHEzyti7QadqyYiL1WhYFKLrovX1TQgsEJu0pVyS54qS2 IXRemxzla7XPF9z_NOnWx1PD17Rshv2RSpt99MHkIajsmkfI6leeg2EAND8H5pj5o9d8LaRai78n CDzJyxB8H2eaTWQp8lOzoXLDfuPKlTuEn3VRUhUwlE2a_lNcXGkzGSFwqDrgcmegdobKVESREy.D iIuO87gE8tr123lc2kRpdd3H3GJB2pcf7TazXbb73B.JFHW4u6wMiEb26x8HRMQHj3r9z3L8JXHk _DFbCtHbaflBJhShKdkAnG1.T.F2OgDnqO2YJ8rSz7Fa02FK0TLJ7vOqVuyOkBZFT89vN7NoMX68 JVUKMTOIq_nBKTcOH2wb5ANNuFBS.hY23cblNlY.8c08wSr8dLus30UhFXMfW.LzFy4x4vCY4hzE nN5TIVr._s54g3xmwvEzeqXutNTSldivus.5exrbOV6CKq0AWV4SXbzZMBuk_.DrtgxihTKaarFc tGj55xLhZMisg7gmTJ3V_jwhFPi9tay7j6GZMS8.jlFbWPo9TG9DzKJ1Dcyfcs.CH.W.ZXXKrdQn 8zZHSUu8AfFUw9D3eSoSfZTC_gBHe934lxShIxtFzOsgeETyGnfb7RY9du_Fa2PML_ywRRDU2BXM YqQDQhwFUDkys85.4thBSZ983SqYcd4ZpQTCqWnW8kPsSXnJCvMFvCH0Bb017uff0ALj0UFVwo_b oHqbGPfWxA80m5CDWCHWu66fcYABhKzvMdd4tBlhmH8DhUg-- X-Sonic-MF: X-Sonic-ID: 704928b9-2013-4a06-b5d3-f25802a134a8 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Mon, 6 Oct 2025 21:35:22 +0000 Received: by hermes--production-gq1-66b66ffd5-xwkq7 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 486f8fae488933ae5f0ce71601dc900a; Mon, 06 Oct 2025 21:35:21 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 2ed9833791f2 - main - thunderbolt: Import USB4 code Message-Id: Date: Mon, 6 Oct 2025 14:35:11 -0700 Cc: "obiwac@freebsd.org" To: "Bjoern A. Zeeb" , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.205:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.205:from] X-Rspamd-Queue-Id: 4cgXcc3633z3Sx8 Bjoern A. Zeeb wrote on Date: Mon, 06 Oct 2025 16:16:02 UTC : > On Sat, 27 Sep 2025, Aymeric Wibo wrote: >=20 > > The branch main has been updated by obiwac: > > > > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ed9833791f28e14843ac813f90cb030= e45948dc > > > > commit 2ed9833791f28e14843ac813f90cb030e45948dc > > Author: Aymeric Wibo > > AuthorDate: 2025-09-27 11:50:43 +0000 > > Commit: Aymeric Wibo > > CommitDate: 2025-09-27 17:13:13 +0000 > > > > thunderbolt: Import USB4 code > > > > Add initial USB4 code written by Scott Long and originally passed on = to > > HPS (source: https://github.com/hselasky/usb4), minus the ICM code = and > > with some small fixes. > > > > For context, older TB chips implemented the connection manager in > > firmware (ICM) instead of in the OS (HCM), but maintaining the ICM = code > > would be a huge burden for not many chips. I'll note that ACPI 6.4 appears to have a way for the OS to indicate that it it wants to do its own handling of connection management, even for when ICM is available. So to say that ICM use will not be supported need not be an indication of if the context will have its own support of connection management in the OS. (I seem to remember seeing _OSC notation in the context I was reading. I also think that I remember: Query Flag being 0 and Native USB4 Support being 1 for the call in something I was reading.) I've always found figuring out the binding of loose wording relative to support for optional USB4 things difficult to well identify any detailed meaning in the USB4 specification(s) (V1 and/or V2). USB4 does not require hosts to have Thunderbolt 3 interoperability: such is optional. (Note is about intent for the future for FreeBSD. The lack of existing support seems clear.) > I cannot find a better reference currently to reply to. >=20 > This seems to be one of the ICM cases given the warning? >=20 > [44.426631] nhi0: mem = 0xda000000-0xda03ffff,0xda040000-0xda040fff at device 0.0 on pci5 > [44.426653] nhi0: Cannot find Upstream Facing Port > [44.426668] nhi0: attempting to allocate 16 MSI-X vectors (16 = supported) > [44.426677] msi: routing MSI-X IRQ 146 to local APIC 0 vector 56 > [44.426685] msi: routing MSI-X IRQ 147 to local APIC 2 vector 54 > [44.426693] msi: routing MSI-X IRQ 148 to local APIC 4 vector 54 > [44.426700] msi: routing MSI-X IRQ 149 to local APIC 6 vector 56 > [44.426708] msi: routing MSI-X IRQ 150 to local APIC 0 vector 57 > [44.426716] msi: routing MSI-X IRQ 151 to local APIC 2 vector 55 > [44.426724] msi: routing MSI-X IRQ 152 to local APIC 4 vector 55 > [44.426731] msi: routing MSI-X IRQ 153 to local APIC 6 vector 57 > [44.426739] msi: routing MSI-X IRQ 154 to local APIC 0 vector 58 > [44.426747] msi: routing MSI-X IRQ 155 to local APIC 2 vector 56 > [44.426755] msi: routing MSI-X IRQ 156 to local APIC 4 vector 56 > [44.426762] msi: routing MSI-X IRQ 157 to local APIC 6 vector 58 > [44.426770] msi: routing MSI-X IRQ 158 to local APIC 0 vector 59 > [44.426778] msi: routing MSI-X IRQ 159 to local APIC 2 vector 57 > [44.426786] msi: routing MSI-X IRQ 160 to local APIC 4 vector 57 > [44.426793] msi: routing MSI-X IRQ 161 to local APIC 6 vector 59 > [44.426798] nhi0: using IRQs 146-161 for MSI-X > [44.426976] nhi0: WARN: device uses an internal connection manager "has a"? "allows use of its"? > [46.426984] nhi0: tb_router_attach_root() error. The driver should be = loaded at boot > [46.427115] device_attach: nhi0 attach returned 60 > .. > [46.431111] acpi_wmi0: on acpi0 > [46.431148] nhi_wmi0: on acpi_wmi0 >=20 >=20 > Rather than going through all the resource allocations, can we (if = detected to be not supported) just barf and exit or remove the device = IDs and not probe at all to avoid all the delay on boot? >=20 > That said, the check in nhi_attach can never work as nothing seems to = ever set NHI_CAP_ICM? >=20 > So the warning presumably comes from nhi_init() which happens at the = end of nhi_attach() but it doesn't actually do anything about it and = lets it run into follow-up problems? >=20 > Maybe the warning should say something about "ICM device. Will never = be supported on FreeBSD" or the like? May well be true but it seems that disabling ICM and having support without using the ICM is a technical possibility. > Another thing that I found non-intuitive for an "nhi" driver was the = check: > if (resource_disabled("tb", 0)) >=20 >=20 > I understand it's not your code, but I hope we can improve this case a = bit given the decision? Side note for reference: I took a stab at finding and listing some required vs. optional USB4 functionality for USB4 Hosts, mostly based on USB4 V2 criteria in the V2 specification. What I managed to identify in my one pass at finding such was: Required for USB4 Host (by contrast to the later optional list): ) Host router ) USB 2.0 Host ) Enhanced SuperSpeed Host (with 1+ USB3 Gen X Ports) ) A DisplayPort Source ) DisplayPort Alt Mode on all Downstream Facing Ports ) USB3 Gen X tunneling ) DisplayPort Tunneling (DP 2.1 for V2) ) Host to Host tunneling ) Gen 2 speed (10 Gbps per Lane) [Router Assemblies] ) Contain and support 1+ DisplayPort IN Adapters [Host Router] ) NVM DROM Read Router Operation [Standalone Add In Card Host Router] Optional for USB4 Host: ) optionally support Gen 3 speed (20 Gps per Lane) [Router Assmeblies] ) optionally support 40G USB4 operation (Gen 3) and 80G USB4 operation = (Gen 4) ) optionally support USB3 Gen T Tunneling ) optionally support 1+ DisplayPort OUT adapters [Host Router] ) optionally support DisplayPort UHBR, 8b/10b MST, Panel Replay = Optimization, DPTX Discovery, ALPM ) optionally support PCIe Tunneling (via a switch or Root Ports to a = Root Complex) ) Optionally support PCI Compatible INTx interrupt emulation [PCIe Host = Router] ) optionally support NVM Set Offset Router Operation [Host Router] ) optionally support NVM Write Router Operation [Host Router] ) optionally support NVM Authenticate Write Router Operation [Host = Router] ) optionally support NVM Read Router Operation [Host Router] ) optionally support NVM DROM Read Router Operation [Platform Integrated = Host Router] ) optionally support NVM Get Sector Size Operation [Host Router] ) optionally support interoperability with Thunderbolt 3 (TBT3) products Note: Such a product "can operate in a USB4 Fabric that includes any combination of the following: A Thunderbolt 3 Router, a Thunderbolt 3 Connection Manager, A Thunderbolt 3 Active Cable". (Chapter 13 --but it references material in other chapters as well.) The wording is more general than just "host" products and so is not a direct list of just what a host has to support of itself. Note: Such support involves Thunderbolt Alt Mode (from USB Type C). Note: USB4 V2 Docks and Hubs optionally support TBT3-compatibility on = their upstream facing port. (V1 had Docks being required to have = support.) ) optionally support interoperability with other USB Type-C Alternate = Modes as defined by the USB Type-C Specification ) optionally support Inter-domain Time Synchronization [Host Router] Some subset of all this is likely to be developed in some sequence. I would not claim to have found everything that might be of interest. Nor do I have a clear understanding of what of this FreeBSD intends to support (or in what sequence support would gradually appear in). =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Mon Oct 6 21:35:38 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 4cgXcp2y7xz6BcMd; Mon, 06 Oct 2025 21:35:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgXcp2Lpbz3T59; Mon, 06 Oct 2025 21:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786538; 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=cbZ6RbwsUVUOhKcKYIEvOHKkLNx+mxUoITGcuKkvhuk=; b=tvJYQWTCyWBJdmU+/bpQef09duxO/dYPrR4/qcOKXiyrytFpxs1S1JmEaqQ90UaC42IDKm c/XCaIJ6ETu5uMhq6UysCKu8Fqhqb/TqnWHigGoVseQELc5Nd1uwQc3+GidNWF0zOYgfrk XTuxNDQsLnnvjsm1TcpZxPEPEA0FwEDKKlqi/IBj3uNqKfuYYTgXj2vPSxsyDKKKH/6j18 FwRO/FBdMm+nKg5Jq1IHp8Fl9BfTNASSAilXm2x54G048fNmkpKEnKdsl+6azuQc3i/YSl /bMO157M2S4Gqhotj2zggAs4bgQ2ufS28peqISPfW/peOwPxTIW2QOTGTy1qXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786538; 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=cbZ6RbwsUVUOhKcKYIEvOHKkLNx+mxUoITGcuKkvhuk=; b=Q3Jv5BJwicKdMHy7nCn9A1JfPTqdG6RU8F12hcbsNcmhyqIKVVrPQLowExDcOxPG1G8zOx ygBHQCRAb9tkEc9r/pC80XO5tC6n3JV0tFK/ei079cGOu4u4Hl97lQJ6osObxGMlTQF6It lSN1cOUZMyPtwh6SpzS19+XRl0TBtBWg1K7/XH+sCZ2qRCHOs3uo9opY63afTR3fIAkDtY nqIzGRzLN61IZnK8PEKJlef2mCRs6q+s0Pz0C+mS85KhFesnX51nh9fl3L4hi9HeNFuG84 rnwuLnpqeN5W45bQZt6rEFEFTvDW0jd2wBKFDqUm9KK3W/k2Xfqp7duVYnnxjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759786538; a=rsa-sha256; cv=none; b=YDQlXAIIfG7TA6rS9r6kHuEwi1o/OAEzrwisDihFfRBpYamUkXitk72od08nUSe2zZdqhh Z952BCKyjQVtFarYS3zyt/8H3/UP2SRdUguFcFF6EDxW32IAenc8zuRqib9sNN6YG81eoj NEt1Hov5aKIC4o8t8FDKwU0IDl0oCmz6IvvUtTmy0VqTc0V5cPmLKh/dUcMFVb4jcu1ARB Kox2Io39Q4mKUHok75feRk8YSPNRZVhD3WmfgxkXdxPAjqCPO9uPWh9YzA+nmVLSub8gMq h7sbAE36Cd+nsoScViJ8HYxgs2pSalX4ADQMd/FCLZN5PR48xJI3wImJ+zQM+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgXcp1dv3z1qB; Mon, 06 Oct 2025 21:35:38 +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 596LZcBY045297; Mon, 6 Oct 2025 21:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596LZcv6045294; Mon, 6 Oct 2025 21:35:38 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:35:38 GMT Message-Id: <202510062135.596LZcv6045294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 8fecb09bc58e - main - pfctl: store correct ticket type 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fecb09bc58ea39833b57c88637036124d71e0ce Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8fecb09bc58ea39833b57c88637036124d71e0ce commit 8fecb09bc58ea39833b57c88637036124d71e0ce Author: Kristof Provost AuthorDate: 2025-10-06 09:45:59 +0000 Commit: Kristof Provost CommitDate: 2025-10-06 21:35:29 +0000 pfctl: store correct ticket type When loading a new rule only persist the ticket if we're actually looking at a filter rule. We need that ticket type later if we have to create tables, but we need the ticket for the correct ruleset. Fixes: 9dfc5e03da50 ("pfctl: allow tables to be defined inside anchors") Reported by: Florian Smeets MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 21562fa03e0d..998148f5e75f 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2183,6 +2183,7 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth) { u_int8_t rs_num = pf_get_ruleset_number(r->action); char *name; + uint32_t ticket; char anchor[PF_ANCHOR_NAME_SIZE]; int len = strlen(path); int error; @@ -2192,7 +2193,9 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth) if ((pf->opts & PF_OPT_NOACTION) == 0) { if (pf->trans == NULL) errx(1, "pfctl_load_rule: no transaction"); - pf->anchor->ruleset.tticket = pfctl_get_ticket(pf->trans, rs_num, path); + ticket = pfctl_get_ticket(pf->trans, rs_num, path); + if (rs_num == PF_RULESET_FILTER) + pf->anchor->ruleset.tticket = ticket; } if (strlcpy(anchor, path, sizeof(anchor)) >= sizeof(anchor)) errx(1, "pfctl_load_rule: strlcpy"); @@ -2225,7 +2228,7 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth) return (1); if (pfctl_add_pool(pf, &r->route, PF_RT)) return (1); - error = pfctl_add_rule_h(pf->h, r, anchor, name, pf->anchor->ruleset.tticket, + error = pfctl_add_rule_h(pf->h, r, anchor, name, ticket, pf->paddr.ticket); switch (error) { case 0: From nobody Mon Oct 6 21:35:39 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 4cgXcq3sLdz6Bc8F; Mon, 06 Oct 2025 21:35:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgXcq2kNbz3T17; Mon, 06 Oct 2025 21:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786539; 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=/nvWu+0KCp7UtXh0y2TZQnoKqS17qBg4ONYniU24l34=; b=jWhedD8cgJarz8MJkGz1RHE3Wxwaop0P0wsLTqkHs5qPO5QCImSBcuFBVMBn/Uq/j1geJs 1FRNE5J+XzsMlJJpMiO/lUwpnUpnb/ETTLixeflDvhY3R1LzauNicrOpnR0Tyh8DI3ZJp7 Nl+yn16/F3PqMlT3meDHnEK+NJyu1U/sNVqYJ0/M2exntnUO1UmtERO//xRGytAHDL9utg 1YFnFD/QjiGrkzN+FCQAs21g/UHUE8UY5SHvROkwDHhqJrZZXKZw4xHtdF2Z5Ottvsness xxfwTRZe+7iaIwSnXbSCYcNH8C+OLdCztwp1V9SZ71skJytBw5qApH4YuIk70w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786539; 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=/nvWu+0KCp7UtXh0y2TZQnoKqS17qBg4ONYniU24l34=; b=d5MByY5visYcXfoVmuM3+HN8CtQLDjk/MxOwUAYlMxEAVfGBLYGj4M9tmybRbov+uWfDvv YHxwFgh60o1oJvnTXwSGJqwJEaEU53W0i2GptdVkJHRnlwIVbKF7egd/a4X2YRFFfpPzoa S+XkgSfl9BNDSXls637V4eO3gzYS2e9I7pVul2/4GPSMSvFK9bkqKXnV9QTfeMjiGHRVXH Bp7c+xZDKPHhs8Q7fSzQpPE3ubO06d7lwvLb2F/Km/UARt8almdq9ell99tYr8e50Uf/1H jJtGSbdiMKqVGJfg37MbdXjawmnDxSncnuPqVMqtqHVl51JgQAfVh0BDL8k3/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759786539; a=rsa-sha256; cv=none; b=uVJ9voZOYEnsxLTvDYAXuNbCQK4LzZzEEs+EqY591g7+gdPsZVfNT5G3aQ+WZYgC6BMzkd DK6Ob3EQymSDnWcmtYYmb2XOh5lXuKPsGMTPk8jkq1luF6TC/J/N2POnSZ/KsQmOtPQudR U8KX0rnUXhzF5P3RCxXi6BNwQzbDBSzbRfcXNFrXVqAeFnMRgphCRmbwqWu888vehFsK87 A6SiRFG/stJ3LPqGcG5hfcsw/qmNNmuaJbwVR6WMnwlsaVF9zirqiQ6r1/jZP+GdZGLf0s bs1hHsdyTEnLvSljrXa3tFdfm4XQblmoGWJLoB2P2gC5A56sM2buTE6HuBRLYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgXcq2LFQz13m; Mon, 06 Oct 2025 21:35:39 +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 596LZdXG045331; Mon, 6 Oct 2025 21:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596LZd5U045328; Mon, 6 Oct 2025 21:35:39 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:35:39 GMT Message-Id: <202510062135.596LZd5U045328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b476593519e9 - main - pfctl: check if the anchor exists before we attempt to flush anything from it 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b476593519e98c11752a207e7cb121fba5c1961b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b476593519e98c11752a207e7cb121fba5c1961b commit b476593519e98c11752a207e7cb121fba5c1961b Author: Kristof Provost AuthorDate: 2025-10-06 15:57:44 +0000 Commit: Kristof Provost CommitDate: 2025-10-06 21:35:30 +0000 pfctl: check if the anchor exists before we attempt to flush anything from it PR: 289994 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 998148f5e75f..ed317495c2e0 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3585,6 +3585,12 @@ main(int argc, char *argv[]) } if (clearopt != NULL) { + int mnr; + + /* Check if anchor exists. */ + if ((pfctl_get_rulesets(pfh, anchorname, &mnr)) == ENOENT) + errx(1, "No such anchor %s", anchorname); + switch (*clearopt) { case 'e': pfctl_flush_eth_rules(dev, opts, anchorname); From nobody Mon Oct 6 21:36:08 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 4cgXdN4rpCz6Bc8V; Mon, 06 Oct 2025 21:36:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgXdN2clXz3Tnc; Mon, 06 Oct 2025 21:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786568; 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=ycPMOuwmKLL2lxnckgQWlpRJn/ssxywNzolohXMwh4I=; b=yHCzeKGsWSUUwWk30L4AfvaNEj1qr9xmqSDPk8wipMKtDZ936zzc3u77uC3KlQfirXZZfX M8XCAdxH1Pg/P3ueoCffLYVkTeuCHXjHa92/IKQJs/G1ZCEim+jH51E8SZvZ7piu1KzZEu NVDFoxR8sI5E0mhoxTY3vRWkEK5uLs2N7dV8GL5SgBF5RNtKjolI8PbMJmRRIIaCJLvUSa wV5lSoyBnz5w9VYsGFdDTgd8xj0firW5yuAXYiWswWcBRTeJiR/E6OU3t9uoTUwuwTXJBS X2HrS7GqYfSipdimx4PkD1l0/qKoQ4ewLvTGdCWI13Yrnq1biX77L7TIgFFWpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786568; 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=ycPMOuwmKLL2lxnckgQWlpRJn/ssxywNzolohXMwh4I=; b=WDUSXddLQb4VAnjya7Nfw0kYmfwMv5a7yQ3LsfLHFqwqjwjOk4kwGvA74UdtRUuHKyczyP U52XQBtiZKEhGZskk+tfc3gTlEVL7dDCKqfc8pg/kEJcsd9+rFD3KEZEDEf7bnLAnts9Ke 7j1Up1NaPji9H7ON5Ah7qzBgBgIpWlxGsto9QFJTgcDiHreu5fp2CMIQhdWQvxFo46MsIb D+rDiQifTtOqtt7PtHrqcTwrA3aGW9ZNifEywXK4nwL3A2f5xuJ+H/LNuOTnftd4OZ5lJg zDoP0Aldo3mSeifyfrIukUJ811irgiYYygVY7h72NWbIO5Nor6LgCoRH1f6vMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759786568; a=rsa-sha256; cv=none; b=IwMOGf/HOUAViHLrRmSkiRefMZ6eE/XmD3PJeWn7kaOi+oUXUkTduUwJWF3eHMq2QjVI+G ZtWtNsegxVTBtPoiqkSK2CmI2gFiGs2hMA8xJIS9w6LFKhhCGmWtqUrMsfwV+tk50yR3sN 7itl/Nx3SK+2QBEcwWkYsEP+WXmlSOhMje66EmHV0q6EsPf4r5wcrpBJcjtp9uC4MMqop8 teu8d65t19pvvwSwBfBg417TVJIwFjBez18bkpVUWFo4xMfJbvbv2P6iGz7Rp1rJw+lTUz 3iGVDxoB7JVzQ76btNozRNmYSqzz/uZWWaKSg0miZpmq2UYYNQTDB1sFURHFWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgXdN2Czhz1v6; Mon, 06 Oct 2025 21:36:08 +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 596La8lN045623; Mon, 6 Oct 2025 21:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596La8di045620; Mon, 6 Oct 2025 21:36:08 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:36:08 GMT Message-Id: <202510062136.596La8di045620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 0faa9ca827a5 - main - tcp: remove stray ; 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0faa9ca827a5e91273ba757bd87bd9e8179a0862 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0faa9ca827a5e91273ba757bd87bd9e8179a0862 commit 0faa9ca827a5e91273ba757bd87bd9e8179a0862 Author: Michael Tuexen AuthorDate: 2025-10-06 21:34:38 +0000 Commit: Michael Tuexen CommitDate: 2025-10-06 21:35:57 +0000 tcp: remove stray ; MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp_syncache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 1fb6104a2944..f842a5678fa1 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1286,7 +1286,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, s, __func__, th->th_ack, sc->sc_iss + 1); SCH_UNLOCK(sch); free(s, M_TCPLOG); - return (0); /* Do send RST, do not free sc. */; + return (0); /* Do send RST, do not free sc. */ } TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash); From nobody Mon Oct 6 21:50:12 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 4cgXxc3sTJz6BdKt; Mon, 06 Oct 2025 21:50:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgXxc3KfDz3X5v; Mon, 06 Oct 2025 21:50:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759787412; 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=erFGO+vYj8jPdcCszKHqzCkZgTG8d9KZ5YdII+Z/aAA=; b=emF3vzFQVistund3i9qfV0jyq0O89xLMrloNWeJnpI1drYn2cwdaF8Lhzrq1e+9ImoC30T 5dngLqUTVOxujpdRV4bU5bZBttJdMTy4u3RSCEJwUmyHLlCOKDLx+hHksiN1l0A/DT7opQ n/12y/EYueFs0rsHyRpfn7hMNT5NwiKiotLZ7RaApFB/wWIIbKlqh4iGoML4miFz3VzrI3 AShcIILNMcrCEBWep2/Yzu5SulFFBlXc9nRjcteJpvY47hTTT6RXTo/YI3zy8pnEJkgYPh F7aB5K1j3znsZiwCzgFQpQ6zg4RMw/KvUIm1Sodc1hTjCECmyQacQp6asrwMZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759787412; 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=erFGO+vYj8jPdcCszKHqzCkZgTG8d9KZ5YdII+Z/aAA=; b=yWqWy9x1c40llRTMFF/VvzqsCEIDnw+i15634zWrKtXR+l9CY8BnKeJfIr6xjC34Al/dLO dxmAmbr+REcN4t+2mwZMHcgF3aiiQGsQE7P0cYBsJggdUyed/UnAEcZanyuaaabapJ96Gl lBOkBQLvQJkJhMBj6JGflRd9qB16JbQz9btqjEwR27idEKt5ytdlAdzj8knDheDNhab2Qt fGHOWhmycITUfqKQbJrviUtwZceJOjUjSqzm4BOe42i4mk1/3tZ7TWqWeA0abxAwbu4Fgp nECCw+d/q2bkyAx5HFUBcrt2Te4eIQ9KIFElIdbuMH7taIlwpzQsasv+13LBkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759787412; a=rsa-sha256; cv=none; b=sc56OFYGRj5sqlXQdzDvzEvRf0G/s8oNBy1N1UJTOWEGf5OPOnwjzMuBzLOvHOl7oTkACt 18VQlne//jE2TXC71wTP1K86E5+qR/whLwtqs5CadRpy/Lcgf/0hPTZkTBQoGiSvH2fPyz J/Nb5pLGzk3nom2OUOS3lWJtgkQioNghHI4wp9ka+QD2X9tl3q0hGq26Xka2lYNQDhpVaB lAecnGMR2OrQ42QOi2FySYRMGvXGRrzscIjStQCRaawZc064+Y9OOUoW8VZI/LublsJYe8 VSJFVJPmvWXRQxd1YIma1rAEnyDFstj6dALa745ffJULbTm8ifsA/j2GpFTQrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgXxc2fgPz1x2; Mon, 06 Oct 2025 21:50:12 +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 596LoC5d071574; Mon, 6 Oct 2025 21:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596LoCw6071559; Mon, 6 Oct 2025 21:50:12 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:50:12 GMT Message-Id: <202510062150.596LoCw6071559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: fc2ed9d96804 - main - power: Add stype parameter in power_suspend/resume eventhandlers 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc2ed9d9680461937c7ffa4cc77fa38e656deb8b Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=fc2ed9d9680461937c7ffa4cc77fa38e656deb8b commit fc2ed9d9680461937c7ffa4cc77fa38e656deb8b Author: Aymeric Wibo AuthorDate: 2025-10-06 21:30:54 +0000 Commit: Aymeric Wibo CommitDate: 2025-10-06 21:49:41 +0000 power: Add stype parameter in power_suspend/resume eventhandlers Add enum sleep_type stype parameter in power_suspend/resume event handlers, as with the introduction of s2idle there are more than one type of suspend. Reviewed by: bz Approved by: bz Sponsored by: The FreeBSD Foundation --- sys/amd64/acpica/acpi_wakeup.c | 4 ++-- sys/cam/ata/ata_da.c | 9 +++++---- sys/cam/nvme/nvme_da.c | 5 +++-- sys/compat/linuxkpi/common/src/linux_acpi.c | 7 +++++-- sys/dev/acpica/acpi.c | 6 +++--- sys/dev/acpica/acpi_timer.c | 11 +++++++---- sys/dev/vt/vt_core.c | 8 ++++---- sys/dev/xen/control/control.c | 7 ++++--- sys/i386/acpica/acpi_wakeup.c | 4 ++-- sys/sys/eventhandler.h | 3 ++- 10 files changed, 37 insertions(+), 27 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 99565fbb69ca..8cada2f4f911 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -74,7 +74,7 @@ extern int acpi_susp_bounce; extern struct susppcb **susppcbs; static cpuset_t suspcpus; -static void acpi_stop_beep(void *); +static void acpi_stop_beep(void *, enum power_stype); static int acpi_wakeup_ap(struct acpi_softc *, int); static void acpi_wakeup_cpus(struct acpi_softc *); @@ -88,7 +88,7 @@ static void acpi_wakeup_cpus(struct acpi_softc *); } while (0) static void -acpi_stop_beep(void *arg) +acpi_stop_beep(void *arg, enum power_stype stype) { if (acpi_resume_beep != 0) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 1facab47473c..0d844a6fbf9e 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -878,8 +879,8 @@ static int adaerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags); static callout_func_t adasendorderedtag; static void adashutdown(void *arg, int howto); -static void adasuspend(void *arg); -static void adaresume(void *arg); +static void adasuspend(void *arg, enum power_stype stype); +static void adaresume(void *arg, enum power_stype stype); #ifndef ADA_DEFAULT_TIMEOUT #define ADA_DEFAULT_TIMEOUT 30 /* Timeout in seconds */ @@ -3747,7 +3748,7 @@ adashutdown(void *arg, int howto) } static void -adasuspend(void *arg) +adasuspend(void *arg, enum power_stype stype) { adaflush(); @@ -3760,7 +3761,7 @@ adasuspend(void *arg) } static void -adaresume(void *arg) +adaresume(void *arg, enum power_stype stype) { struct cam_periph *periph; struct ada_softc *softc; diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 1c0d5e8381d8..9c4707da482c 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -159,7 +160,7 @@ static void ndadone(struct cam_periph *periph, static int ndaerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags); static void ndashutdown(void *arg, int howto); -static void ndasuspend(void *arg); +static void ndasuspend(void *arg, enum power_stype stype); #ifndef NDA_DEFAULT_SEND_ORDERED #define NDA_DEFAULT_SEND_ORDERED 1 @@ -1365,7 +1366,7 @@ ndashutdown(void *arg, int howto) } static void -ndasuspend(void *arg) +ndasuspend(void *arg, enum power_stype stype) { ndaflush(); diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index 43783bb8727b..60e14cfc98c5 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -118,7 +119,8 @@ acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, } static void -linux_handle_power_suspend_event(void *arg __unused) +linux_handle_power_suspend_event(void *arg __unused, + enum power_stype stype __unused) { /* * Only support S3 for now. @@ -131,7 +133,8 @@ linux_handle_power_suspend_event(void *arg __unused) } static void -linux_handle_power_resume_event(void *arg __unused) +linux_handle_power_resume_event(void *arg __unused, + enum power_stype stype __unused) { linux_acpi_target_sleep_state = ACPI_STATE_S0; pm_suspend_target_state = PM_SUSPEND_ON; diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 7f9ca6e39df8..3f0a7b40245d 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -3468,10 +3468,10 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) return_ACPI_STATUS (AE_OK); } - EVENTHANDLER_INVOKE(power_suspend_early); + EVENTHANDLER_INVOKE(power_suspend_early, stype); stop_all_proc(); suspend_all_fs(); - EVENTHANDLER_INVOKE(power_suspend); + EVENTHANDLER_INVOKE(power_suspend, stype); #ifdef EARLY_AP_STARTUP MPASS(mp_ncpus == 1 || smp_started); @@ -3632,7 +3632,7 @@ backout: resume_all_fs(); resume_all_proc(); - EVENTHANDLER_INVOKE(power_resume); + EVENTHANDLER_INVOKE(power_resume, stype); /* Allow another sleep request after a while. */ callout_schedule(&acpi_sleep_timer, hz * ACPI_MINIMUM_AWAKETIME); diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 3d51a4211b80..b20912e2f5fb 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -69,8 +70,10 @@ bool acpi_timer_disabled = false; static void acpi_timer_identify(driver_t *driver, device_t parent); static int acpi_timer_probe(device_t dev); static int acpi_timer_attach(device_t dev); -static void acpi_timer_resume_handler(struct timecounter *); -static void acpi_timer_suspend_handler(struct timecounter *); +static void acpi_timer_resume_handler(struct timecounter *, + enum power_stype); +static void acpi_timer_suspend_handler(struct timecounter *, + enum power_stype); static u_int acpi_timer_get_timecount(struct timecounter *tc); static u_int acpi_timer_get_timecount_safe(struct timecounter *tc); static int acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS); @@ -235,7 +238,7 @@ acpi_timer_attach(device_t dev) } static void -acpi_timer_resume_handler(struct timecounter *newtc) +acpi_timer_resume_handler(struct timecounter *newtc, enum power_stype stype) { struct timecounter *tc; @@ -251,7 +254,7 @@ acpi_timer_resume_handler(struct timecounter *newtc) } static void -acpi_timer_suspend_handler(struct timecounter *newtc) +acpi_timer_suspend_handler(struct timecounter *newtc, enum power_stype stype) { struct timecounter *tc; diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index b51ef6766de4..bcf67ddc9689 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -195,8 +195,8 @@ static void vt_update_static(void *); #ifndef SC_NO_CUTPASTE static void vt_mouse_paste(void); #endif -static void vt_suspend_handler(void *priv); -static void vt_resume_handler(void *priv); +static void vt_suspend_handler(void *priv, enum power_stype stype); +static void vt_resume_handler(void *priv, enum power_stype stype); SET_DECLARE(vt_drv_set, struct vt_driver); @@ -3330,7 +3330,7 @@ vt_replace_backend(const struct vt_driver *drv, void *softc) } static void -vt_suspend_handler(void *priv) +vt_suspend_handler(void *priv, enum power_stype stype) { struct vt_device *vd; @@ -3341,7 +3341,7 @@ vt_suspend_handler(void *priv) } static void -vt_resume_handler(void *priv) +vt_resume_handler(void *priv, enum power_stype stype) { struct vt_device *vd; diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 123df4992894..2c61b48c0451 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -91,6 +91,7 @@ #include #include #include +#include #include @@ -175,12 +176,12 @@ xctrl_suspend(void) cpuset_t cpu_suspend_map; #endif - EVENTHANDLER_INVOKE(power_suspend_early); + EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_SUSPEND_TO_MEM); xs_lock(); stop_all_proc(); xs_unlock(); suspend_all_fs(); - EVENTHANDLER_INVOKE(power_suspend); + EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_SUSPEND_TO_MEM); #ifdef EARLY_AP_STARTUP MPASS(mp_ncpus == 1 || smp_started); @@ -297,7 +298,7 @@ xctrl_suspend(void) resume_all_fs(); resume_all_proc(); - EVENTHANDLER_INVOKE(power_resume); + EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_SUSPEND_TO_MEM); if (bootverbose) printf("System resumed after suspension\n"); diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 2d60d5e037a0..96be64de017b 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -84,7 +84,7 @@ static cpuset_t suspcpus; static struct susppcb **susppcbs; #endif -static void acpi_stop_beep(void *); +static void acpi_stop_beep(void *, enum power_stype); #ifdef SMP static int acpi_wakeup_ap(struct acpi_softc *, int); @@ -100,7 +100,7 @@ static void acpi_wakeup_cpus(struct acpi_softc *); } while (0) static void -acpi_stop_beep(void *arg) +acpi_stop_beep(void *arg, enum power_stype stype) { if (acpi_resume_beep != 0) diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index c0d9811dd1b9..29a16b393b52 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -33,6 +33,7 @@ #include #include #include +#include #include #ifdef VIMAGE @@ -201,7 +202,7 @@ EVENTHANDLER_DECLARE(shutdown_post_sync, shutdown_fn); /* after fs sync */ EVENTHANDLER_DECLARE(shutdown_final, shutdown_fn); /* Power state change events */ -typedef void (*power_change_fn)(void *); +typedef void (*power_change_fn)(void *, enum power_stype stype); EVENTHANDLER_DECLARE(power_resume, power_change_fn); EVENTHANDLER_DECLARE(power_suspend, power_change_fn); EVENTHANDLER_DECLARE(power_suspend_early, power_change_fn); From nobody Mon Oct 6 21:50:13 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 4cgXxd4qQPz6BdYM; Mon, 06 Oct 2025 21:50:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgXxd3ZtGz3WyH; Mon, 06 Oct 2025 21:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759787413; 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=jJ+TgInlCs9pOXKgQVDNOC4VXwNQEAShRrg4PJkoO7Q=; b=vNpz2EAWaupvWZiBt36kRGQlPJw+P7/SnKWiKBkzsbZBuRR5+516QHwEkZYt8ThUq6E2eg ISTQ/ATNJYsifbG3sgthxY++Uztg6uJEgSF0Led+LwMwwzawY042RqrUmxCBMDsqJEarBR QIiJV+DgPk8Re7MOJifRLC2WstCMgysdrbEkJmP2glxBwjLjw0P2DVhtWXqydu7IKU/QSS aTs1so19r7RnyJ9dGQCx/xUlBQQhjs4GdhrUYj6Yh42/VkNxOfeqvM2Xa5rXLo/bhFKlgI B/xuTo83PBb4j9HQ0Bu2xQ7S007KJ4oHGx0HU66E0a5SDKCGq5iRQqXEnWNYqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759787413; 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=jJ+TgInlCs9pOXKgQVDNOC4VXwNQEAShRrg4PJkoO7Q=; b=X6E/x9xf32aggnORitCVCRa4pJJrMC8JOqnJ4I/7dElc4oP9hyOhieMFz7x0vVpms6S+/z 54TgfQdcF31Qr3W5UQXjaUT+awp3p6XrSX1A3pEUOMyN78KPY8QcgzyFqqjp8gRuW810sU yQXtaajlbGG+U7/CDesMHM02LpMIt6UWezCgrUVg1x7iBdjNwGa9UZ4MJJXpAunCz6TyEz sl/eGgSFgxy0LQIITkPqFRzQP8Pmp/ke2eGswHkPcIBEF/tJ//iNKUDK17S3eTEm230BV8 TmxqBq0exq3wqgPtBs+yZw6tKlWefGqsVfPIm/R/9p6VG+MEO4M8Z8y1krp+iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759787413; a=rsa-sha256; cv=none; b=LFTgzSmbIvntSBsyTKvTzWBFCvOkKdaEBduzK+UCY/353albuy/3SxfrSBCP6yaPzOlv/E jHmNldcGgKrNIqzbdyTCWp/Lnm5TNNVHP1irL1Bf+6gDVViU9+QrpGwSUSwZnuyRL7pB0R l6Hvy7I7M3b8AngPFRYi/+lZNIMTljUOLnFeGX5i7p8M9+bu6LLVWj23CfngdfEQ6J93jt r2MZpoNcFw4dROAb82VNNV2GouwDOt9VyeJIEc5iC2PIuHzXBIQRJNHbShTmKlvzPsutZS bRaJMfPc2DG/ZrF3i0KXYM88gOHroCmlYflGnAR6J8SE+bxY7hrIkUWLuFsUAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgXxd39Ncz1xv; Mon, 06 Oct 2025 21:50:13 +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 596LoD93072202; Mon, 6 Oct 2025 21:50:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596LoDYv072197; Mon, 6 Oct 2025 21:50:13 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:50:13 GMT Message-Id: <202510062150.596LoDYv072197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: a25cfcab9a9d - main - linuxkpi: Support s2idle in `pm_suspend_target_state` 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a25cfcab9a9d2c7d733b85bf04b504369623de1c Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=a25cfcab9a9d2c7d733b85bf04b504369623de1c commit a25cfcab9a9d2c7d733b85bf04b504369623de1c Author: Aymeric Wibo AuthorDate: 2025-10-06 21:38:58 +0000 Commit: Aymeric Wibo CommitDate: 2025-10-06 21:49:54 +0000 linuxkpi: Support s2idle in `pm_suspend_target_state` When going to s2idle, set Linux' pm_suspend_target_state to PM_SUSPEND_TO_IDLE instead of setting PM_SUSPEND_MEM (for S3) in all cases. This is necessary because more recent versions of the amdgpu DRM drivers have different paths for when entering s2idle & S0ix is supported than S3. Reviewed by: bz Approved by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51591 --- sys/compat/linuxkpi/common/src/linux_acpi.c | 30 +++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index 60e14cfc98c5..c7d62c745c7e 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -119,17 +119,27 @@ acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, } static void -linux_handle_power_suspend_event(void *arg __unused, - enum power_stype stype __unused) +linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype) { - /* - * Only support S3 for now. - * acpi_sleep_event isn't always called so we use power_suspend_early - * instead which means we don't know what state we're switching to. - * TODO: Make acpi_sleep_event consistent - */ - linux_acpi_target_sleep_state = ACPI_STATE_S3; - pm_suspend_target_state = PM_SUSPEND_MEM; + switch (stype) { + case POWER_STYPE_SUSPEND_TO_IDLE: + /* + * XXX: obiwac Not 100% sure this is correct, but + * acpi_target_sleep_state does seem to be set to + * ACPI_STATE_S3 during s2idle on Linux. + */ + linux_acpi_target_sleep_state = ACPI_STATE_S3; + pm_suspend_target_state = PM_SUSPEND_TO_IDLE; + break; + case POWER_STYPE_SUSPEND_TO_MEM: + linux_acpi_target_sleep_state = ACPI_STATE_S3; + pm_suspend_target_state = PM_SUSPEND_MEM; + break; + default: + printf("%s: sleep type %d not yet supported\n", + __func__, stype); + break; + } } static void From nobody Mon Oct 6 22:02:51 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 4cgYDG6Kpkz6Bfcg; Mon, 06 Oct 2025 22:02:54 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgYDG5KTZz3Z8f; Mon, 06 Oct 2025 22:02:54 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759788174; 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: in-reply-to:in-reply-to:references:references; bh=Ibc/geYUiUOjKIQ58ePzUMJlGND+Ru+wg7pclmYR6/Q=; b=veMVIE9R+HGWPHRfRkF/27FRsvnTpTbB3y2GknUik/Ahwa3W7voKCczt9t1de1UBNifTog II19sKDllwKWHoFShSlHl8Q99TnqldWyxTLOWMDeVVlLD9J5RAw7ws1ynz3KrUA5zE5qx7 oQTwRR7brTG5nLSvaKepNjCLVo990CZL4UBXDcq67yFmyAGxqs1Bi8rfoSWWo1Exx/o8SN 5eqQ4bDJg27r9N0RLU8zDZbUz6Myu003oULOTyfSSkgPsmzJpV4qC36VF1345Z0IU/gjQo sP7pH+G9cXYq3SHVQVkWa2ta7lLPWNqPCARnlDWoZDBGF3H2Rli9YS6yjT5JSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759788174; 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: in-reply-to:in-reply-to:references:references; bh=Ibc/geYUiUOjKIQ58ePzUMJlGND+Ru+wg7pclmYR6/Q=; b=ptqs1/353Byyl/NNP1Gmc6mqO4axMYWpG4YHb3nSeDhJ27cCx7411ZEoScNHbLaJqDCRt0 +Sgla7Db0U3Xpojgqj6aiYqmdrhpezwwcApbYr+68rChCegEa26U3ooWB2vpZYNBVwP+BB +hExltnxKyUjNg0y12c8WK14VI4c+rbV9fHcANQZQ+8x0a6OWMJHgTMw2HZ3uPcSaLjCOs CVP2UcwogSYbnTDL6ifI9lnOwGOgRcI3/0/VJCJW+Ii9zDPDqmhYm4uju7mK3VAIxMnZIP AfK9/F0iU0WkiqFo4EznlUosKHB8cYK2t4Mlch2dImghlNmxHoPooU+PDOWfIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759788174; a=rsa-sha256; cv=none; b=qNtZSIibDm9pKcAOIVOMalj+JrGqkVK9cTeKuU1GngqNii6K4+N3vuc7w0zIcfQNqAKkgS Bn2/MnXnIg1SszOEABZwU35vmlv3S0JfespRucOE2G5/c5xlwF+WVPpjL/vEH9xTtCmL9C VEx7a0xbV2MKoTZA+4B9MTPTkE1hLNK8UHPahjxI9YgmsHUQMJT6bRvxikGzhQGmnN0Vuv FlzmcTj0vNoSvnq7+ASJukeEt5Y1BwYlBmcDOpa9L4yZ1u3QUNLA02vl0ex4E6r5SC2Wmx WLkEzfeNmRhaTbWZkQyabvT1wCGd62qFp6J9oSvvCWwMhFc/igzEUoh0rsVHKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cgYDG47rLz10dW; Mon, 06 Oct 2025 22:02:54 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id D3A24A64808; Mon, 06 Oct 2025 22:02:42 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id C82242D029E7; Mon, 6 Oct 2025 22:02:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 2LuSTh7y1eJp; Mon, 6 Oct 2025 22:02:51 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 423462D029D8; Mon, 6 Oct 2025 22:02:51 +0000 (UTC) Date: Mon, 6 Oct 2025 22:02:51 +0000 (UTC) From: "Bjoern A. Zeeb" To: Aymeric Wibo cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a25cfcab9a9d - main - linuxkpi: Support s2idle in `pm_suspend_target_state` In-Reply-To: <202510062150.596LoDYv072197@gitrepo.freebsd.org> Message-ID: References: <202510062150.596LoDYv072197@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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=US-ASCII; format=flowed On Mon, 6 Oct 2025, Aymeric Wibo wrote: > The branch main has been updated by obiwac: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a25cfcab9a9d2c7d733b85bf04b504369623de1c > > commit a25cfcab9a9d2c7d733b85bf04b504369623de1c > Author: Aymeric Wibo > AuthorDate: 2025-10-06 21:38:58 +0000 > Commit: Aymeric Wibo > CommitDate: 2025-10-06 21:49:54 +0000 > > linuxkpi: Support s2idle in `pm_suspend_target_state` > > When going to s2idle, set Linux' pm_suspend_target_state to > PM_SUSPEND_TO_IDLE instead of setting PM_SUSPEND_MEM (for S3) in all > cases. > > This is necessary because more recent versions of the amdgpu DRM drivers > have different paths for when entering s2idle & S0ix is supported than > S3. > > Reviewed by: bz > Approved by: bz I cannot apporve them; I am neither a mentor, srcmgr, re, or other entity in this case. But thank you for splitting them up into two logical chunks (with the only bit that adding the enum here should have been part of the other half so each of them would have compiled independently). > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D51591 > --- > sys/compat/linuxkpi/common/src/linux_acpi.c | 30 +++++++++++++++++++---------- > 1 file changed, 20 insertions(+), 10 deletions(-) > > diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c > index 60e14cfc98c5..c7d62c745c7e 100644 > --- a/sys/compat/linuxkpi/common/src/linux_acpi.c > +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c > @@ -119,17 +119,27 @@ acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, > } > > static void > -linux_handle_power_suspend_event(void *arg __unused, > - enum power_stype stype __unused) > +linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype) > { > - /* > - * Only support S3 for now. > - * acpi_sleep_event isn't always called so we use power_suspend_early > - * instead which means we don't know what state we're switching to. > - * TODO: Make acpi_sleep_event consistent > - */ > - linux_acpi_target_sleep_state = ACPI_STATE_S3; > - pm_suspend_target_state = PM_SUSPEND_MEM; > + switch (stype) { > + case POWER_STYPE_SUSPEND_TO_IDLE: > + /* > + * XXX: obiwac Not 100% sure this is correct, but > + * acpi_target_sleep_state does seem to be set to > + * ACPI_STATE_S3 during s2idle on Linux. > + */ > + linux_acpi_target_sleep_state = ACPI_STATE_S3; > + pm_suspend_target_state = PM_SUSPEND_TO_IDLE; > + break; > + case POWER_STYPE_SUSPEND_TO_MEM: > + linux_acpi_target_sleep_state = ACPI_STATE_S3; > + pm_suspend_target_state = PM_SUSPEND_MEM; > + break; > + default: > + printf("%s: sleep type %d not yet supported\n", > + __func__, stype); > + break; > + } > } > > static void > -- Bjoern A. Zeeb r15:7 From nobody Mon Oct 6 22:17:35 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 4cgYYT6q9pz6BgrS for ; Mon, 06 Oct 2025 22:17:49 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgYYT3BzJz3dCX for ; Mon, 06 Oct 2025 22:17:49 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-46e4f2696bdso66748075e9.0 for ; Mon, 06 Oct 2025 15:17:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759789068; x=1760393868; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RJ7oQ8PIKurEDWjjjW2bzlEXykU2GVSJ7ABZFfsW/pQ=; b=P31bH82/48rNEP8c36S5W8rh2xQ1pb5RslMXZUPvMZUSuHWkZl+VluanjED0NdtLBY +JgsPx5WHB8qRC3JorUTH/nl39C8xhMjrV051qWG3bAkhbLXOWZ4pwrd+qFZRR0iNZrM 8Y0OMpE5KUHVdQ24L97NWUMGdNPRBMgPRqi/lZefjPI33I1TumpsF8/4LdjGVQuge3bg WixHnRuO14m7Ba60ljAeauhpMtLUFH1q+dDGtLOj2U4V6ff2uKyEXTTUJuALNx2YXL2s uZEdCvo4Q9gb3zxBOSG7HZ7DuHaUZnTVdEyxPF4mctDrShl6u4UC2kwqNHmKwRlge0TU ELWQ== X-Forwarded-Encrypted: i=1; AJvYcCX4k4q8yeua32ivXxxaxmegDdlNj5dvW1p2Cbd02h2wHsEyekjhrATtTaKDBU5v3mI11xAe18DC0njn5RzzVLCE2DIHAw==@freebsd.org X-Gm-Message-State: AOJu0YyaLfDzPRZPZBj+c07cXQ0urSkQORuAJ2fp8DSJdTDo48KPEsg9 WzukScn5+uS/MSepnJj4MJAFDHjx/BqVwkoMo2Osu3hd7BKCPCGtueO0FEzncjoH2vvtqX2GH0e 5fgG0EHU= X-Gm-Gg: ASbGnctkEejqcQrnnoPEZeDTJJzot1wAk0pxJsN+ffYLjQyiPIWQYdsi9QUWSfskeXI AtzzigA0092bZs3pnHWNjI2usrWiz0om3JyIPIqiGXSfhlJYfyUrBnR/5h3l8V8WYk8EjDCM1lS Lv1nnbQKtTH6xEhvO0M7ya+rKHqE40H7+Xas4SX/cEkjPDVI7vipaq9ArnFlOoQBJWfNPFI823s 8lpsg1QhTKErP/ev2YyrkBnR/SvAtAO2V9AVY4h7bLSiBXESFUQyDejKvRUu4XpLti0x07OdFBO 936G5H1zb5c3WtD4FfTk3lKXxw5H8weTZDR5VmZLZGCHiSvT9oCWlUPIGmsGStjpN+CmNmjwSbv fulYBTsf5+s4jLUavbCn/HOU6zzNwql3RXwChqwJcUl7IlxiZcUdpSJi6Ha63zgI6Fw4THUyOPZ n8fUQxHl9c5DGv1CU6Q7jGg80= X-Google-Smtp-Source: AGHT+IHfYCjq/7e9ydOTIUiGGl3L6DXDa3O6QZ0esNuReZ9UIMR3t6li6hY9QUkrbiIS5hcZS1IqVw== X-Received: by 2002:a05:600c:c092:b0:46e:36f9:c574 with SMTP id 5b1f17b1804b1-46e717411b9mr69226845e9.23.1759789067113; Mon, 06 Oct 2025 15:17:47 -0700 (PDT) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8f0170sm23133611f8f.49.2025.10.06.15.17.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Oct 2025 15:17:46 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3864.100.1.1.5\)) Subject: Re: git: a25cfcab9a9d - main - linuxkpi: Support s2idle in `pm_suspend_target_state` From: Jessica Clarke In-Reply-To: Date: Mon, 6 Oct 2025 23:17:35 +0100 Cc: Aymeric Wibo , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <579A2FBE-5EBD-41D4-97D4-14638A6120D4@freebsd.org> References: <202510062150.596LoDYv072197@gitrepo.freebsd.org> To: "Bjoern A. Zeeb" X-Mailer: Apple Mail (2.3864.100.1.1.5) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cgYYT3BzJz3dCX On 6 Oct 2025, at 23:02, Bjoern A. Zeeb wrote: >=20 > On Mon, 6 Oct 2025, Aymeric Wibo wrote: >=20 >> The branch main has been updated by obiwac: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da25cfcab9a9d2c7d733b85bf04b50436= 9623de1c >>=20 >> commit a25cfcab9a9d2c7d733b85bf04b504369623de1c >> Author: Aymeric Wibo >> AuthorDate: 2025-10-06 21:38:58 +0000 >> Commit: Aymeric Wibo >> CommitDate: 2025-10-06 21:49:54 +0000 >>=20 >> linuxkpi: Support s2idle in `pm_suspend_target_state` >>=20 >> When going to s2idle, set Linux' pm_suspend_target_state to >> PM_SUSPEND_TO_IDLE instead of setting PM_SUSPEND_MEM (for S3) in = all >> cases. >>=20 >> This is necessary because more recent versions of the amdgpu DRM = drivers >> have different paths for when entering s2idle & S0ix is supported = than >> S3. >>=20 >> Reviewed by: bz >> Approved by: bz >=20 > I cannot apporve them; I am neither a mentor, srcmgr, re, or other = entity in this case. Having a src commit bit not under mentorship is enough. Jessica > But thank you for splitting them up into two logical chunks (with the = only bit that adding > the enum here should have been part of the other half so each of them = would have compiled > independently). >=20 >=20 >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D51591 >> --- >> sys/compat/linuxkpi/common/src/linux_acpi.c | 30 = +++++++++++++++++++---------- >> 1 file changed, 20 insertions(+), 10 deletions(-) >>=20 >> diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c = b/sys/compat/linuxkpi/common/src/linux_acpi.c >> index 60e14cfc98c5..c7d62c745c7e 100644 >> --- a/sys/compat/linuxkpi/common/src/linux_acpi.c >> +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c >> @@ -119,17 +119,27 @@ acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const = guid_t *guid, >> } >>=20 >> static void >> -linux_handle_power_suspend_event(void *arg __unused, >> - enum power_stype stype __unused) >> +linux_handle_power_suspend_event(void *arg __unused, enum = power_stype stype) >> { >> - /* >> - * Only support S3 for now. >> - * acpi_sleep_event isn't always called so we use = power_suspend_early >> - * instead which means we don't know what state we're switching to. >> - * TODO: Make acpi_sleep_event consistent >> - */ >> - linux_acpi_target_sleep_state =3D ACPI_STATE_S3; >> - pm_suspend_target_state =3D PM_SUSPEND_MEM; >> + switch (stype) { >> + case POWER_STYPE_SUSPEND_TO_IDLE: >> + /* >> + * XXX: obiwac Not 100% sure this is correct, but >> + * acpi_target_sleep_state does seem to be set to >> + * ACPI_STATE_S3 during s2idle on Linux. >> + */ >> + linux_acpi_target_sleep_state =3D ACPI_STATE_S3; >> + pm_suspend_target_state =3D PM_SUSPEND_TO_IDLE; >> + break; >> + case POWER_STYPE_SUSPEND_TO_MEM: >> + linux_acpi_target_sleep_state =3D ACPI_STATE_S3; >> + pm_suspend_target_state =3D PM_SUSPEND_MEM; >> + break; >> + default: >> + printf("%s: sleep type %d not yet supported\n", >> + __func__, stype); >> + break; >> + } >> } >>=20 >> static void >>=20 >=20 > --=20 > Bjoern A. Zeeb = r15:7 From nobody Mon Oct 6 22:25: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 4cgYk370tgz6BhP6; Mon, 06 Oct 2025 22:25:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4cgYk33qkdz3ftr; Mon, 06 Oct 2025 22:25:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 596MP1Y3081336; Tue, 7 Oct 2025 01:25:04 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 596MP1Y3081336 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 596MP1Tm081335; Tue, 7 Oct 2025 01:25:01 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 7 Oct 2025 01:25:01 +0300 From: Konstantin Belousov To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 84f981ba57e7 - main - nullfs: shrink null_node to 32 bytes Message-ID: References: <202510061823.596IN7oZ084715@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202510061823.596IN7oZ084715@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cgYk33qkdz3ftr On Mon, Oct 06, 2025 at 06:23:07PM +0000, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b > > commit 84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b > Author: Mateusz Guzik > AuthorDate: 2025-10-06 17:59:17 +0000 > Commit: Mateusz Guzik > CommitDate: 2025-10-06 18:23:01 +0000 > > nullfs: shrink null_node to 32 bytes > --- > sys/fs/nullfs/null.h | 2 +- > sys/fs/nullfs/null_subr.c | 12 +++++++----- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h > index aa7a689bec34..ad3f7779e108 100644 > --- a/sys/fs/nullfs/null.h > +++ b/sys/fs/nullfs/null.h > @@ -53,7 +53,7 @@ struct null_mount { > * A cache of vnode references > */ > struct null_node { > - CK_LIST_ENTRY(null_node) null_hash; /* Hash list */ > + CK_SLIST_ENTRY(null_node) null_hash; /* Hash list */ > struct vnode *null_lowervp; /* VREFed once */ > struct vnode *null_vnode; /* Back pointer */ > u_int null_flags; > diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c > index ad8cd08279cc..bb0ff9966dfd 100644 > --- a/sys/fs/nullfs/null_subr.c > +++ b/sys/fs/nullfs/null_subr.c > @@ -59,7 +59,7 @@ VFS_SMR_DECLARE; > > #define NULL_NHASH(vp) (&null_node_hashtbl[vfs_hash_index(vp) & null_hash_mask]) > > -static CK_LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; > +static CK_SLIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; > static struct rwlock null_hash_lock; > static u_long null_hash_mask; > > @@ -116,7 +116,7 @@ null_hashget_locked(struct mount *mp, struct vnode *lowervp) > * reference count (but NOT the lower vnode's VREF counter). > */ > hd = NULL_NHASH(lowervp); > - CK_LIST_FOREACH(a, hd, null_hash) { > + CK_SLIST_FOREACH(a, hd, null_hash) { > if (a->null_lowervp != lowervp) > continue; > /* > @@ -148,7 +148,7 @@ null_hashget(struct mount *mp, struct vnode *lowervp) > > vfs_smr_enter(); > hd = NULL_NHASH(lowervp); > - CK_LIST_FOREACH(a, hd, null_hash) { > + CK_SLIST_FOREACH(a, hd, null_hash) { > if (a->null_lowervp != lowervp) > continue; > /* > @@ -189,7 +189,7 @@ null_hashins(struct mount *mp, struct null_node *xp) > } > } > #endif > - CK_LIST_INSERT_HEAD(hd, xp, null_hash); > + CK_SLIST_INSERT_HEAD(hd, xp, null_hash); > } > > static void > @@ -305,9 +305,11 @@ null_nodeget(struct mount *mp, struct vnode *lowervp, struct vnode **vpp) > void > null_hashrem(struct null_node *xp) > { > + struct null_node_hashhead *hd; > > + hd = NULL_NHASH(xp->null_lowervp); > rw_wlock(&null_hash_lock); > - CK_LIST_REMOVE(xp, null_hash); > + CK_SLIST_REMOVE(hd, xp, null_node, null_hash); This changes O(1) removal into O(N), for N being the size of the hash chain length for specific hash. I.e. it is on par with the lookup. Why it is fine? Why it was not mentioned and explained in the commit message? > rw_wunlock(&null_hash_lock); > } > From nobody Mon Oct 6 22:30:45 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 4cgYrm6TD8z6BhpJ for ; Mon, 06 Oct 2025 22:31:04 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgYrm4Ld4z3gJy for ; Mon, 06 Oct 2025 22:31:04 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-b4c89df6145so386576366b.3 for ; Mon, 06 Oct 2025 15:31:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759789857; x=1760394657; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=bw9BN23UVr6tCmqNvU4R/2nA26f7qMIEeLkO4bu361Y=; b=XGr7GuUVGLdx6jJQyX7tEkBQOVs9Yq5lmux2jHSIFungnFgzfpqFc0GqFJZwVAtboy d0On0GzIS97Hoj3BgreIhHHMgI6gciCKB9brK5wiCWUIx4H5G+2JclNmFN6EdPLcjYcP yoGSHsJjX43yvJh/8XBN4R1x80fSWBIFElijR2YIvV8JXgLFkBV8kCWTFgYezl2XQTMU nl/2o0GXHsdj/KZ0Q+PwOwBgEfnq6W65p+9C+nHdaNdV2xY8WwuQTiIHcQFux69MXimP sAxolokXCYornWE7lZSQRq9MpT/NuiEF8IHJz0Zmxc42t8rr6FgN4bIJEqxhKNQ0eONX 2HeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759789857; x=1760394657; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bw9BN23UVr6tCmqNvU4R/2nA26f7qMIEeLkO4bu361Y=; b=ZnXDY3SDazNtZIMfXVhXUehv6NYYDT+7ZrwAUHulcQM3opp1TuCQep0KJLh1ZHTuUy diVCVMz1fhUUbwc8LcttzywQNlWNUHU4klECbwjBHmkuXJGjp6l0YA0trjz569ED/jqd znkFbg2mLLALkMRLqP+1MtvbvcfDNoUn4BUnZBAXo3T1Rsd109VHdZniGUFwkFS0wwF6 fhS2N8fyClC95jJ3drAE2FErOI3J3eyJmaJfdH51tYDzt4Ps3FYQlnovew/A0LvQY0Tl LYjK3TdO2MlarMaFhcts2V3bX6CXLaTp31f6nGg9TqouIpQ13cL2Pn3TRnfTRWAA+dzd nkqw== X-Forwarded-Encrypted: i=1; AJvYcCUqtgV94X/tM5DZGqcby+dXlc72d6EVGuaZfqU13z72BI88TB9+8NrHhGouFrnBdKZzmPBh2SNhuK9PM2FVgznAXKSCOQ==@freebsd.org X-Gm-Message-State: AOJu0Ywd4c8pGlg846Sk90ycY73ltZ14wzJA+90wAWQ8Iw8tMAPO7rK2 jP6SPMACRbY1Mu3SWaw02YjIAR3uYBayIqYEwgt0GVNj6/MR797OOBgdx4rSGcKc+5rZmy2N9OU kAfa7wWfwFl509ahxm2BEJLBCYKR74Bk= X-Gm-Gg: ASbGncvHoDu+j/H669dkzvZw1KtW6owVIoDNtpkY79KX2BrdiP/C54Glglk90IACuEc bX/ar2rsckFU+YJAkWtvkAUs1wiaqY4ned7m52A6FIephqMXv8tnZu58N9ReEIuqKmb69LCT05d k15/7jtuM58CRBn7ddxVtxkWC7L8vZw3eudsIKSpA0/vKOUHxnptidFuBWWdVz+hHPVGtzlgGlC JY+8WvglZENJxnEe7lgZs3SnZnhg3YX645w5dXrGaomD2nHWqTaeqDY5Py9PPQ= X-Google-Smtp-Source: AGHT+IHrN4XLy6baAvL2sYsxB4kprrHaBBXpQU4gZHuaI3e1rmp8pFrKAJACzNs1oB7fmWL3Rw0WIwSAZbWETVrj1Os= X-Received: by 2002:a17:907:3e92:b0:b3e:580a:184f with SMTP id a640c23a62f3a-b49c1b6bf0bmr1685248166b.4.1759789856982; Mon, 06 Oct 2025 15:30:56 -0700 (PDT) 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 References: <202510061823.596IN7oZ084715@gitrepo.freebsd.org> In-Reply-To: From: Mateusz Guzik Date: Tue, 7 Oct 2025 00:30:45 +0200 X-Gm-Features: AS18NWBIFNwJWknlADZcL4p4v0fxbKhewG1EW_Ksu6ncrqhlhNGRcGIt3w-akx4 Message-ID: Subject: Re: git: 84f981ba57e7 - main - nullfs: shrink null_node to 32 bytes To: Konstantin Belousov Cc: Mateusz Guzik , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cgYrm4Ld4z3gJy On Tue, Oct 7, 2025 at 12:25=E2=80=AFAM Konstantin Belousov wrote: > > On Mon, Oct 06, 2025 at 06:23:07PM +0000, Mateusz Guzik wrote: > > The branch main has been updated by mjg: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D84f981ba57e77bd3c3d0fbf1= 469ce51bfd132a6b > > > > commit 84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b > > Author: Mateusz Guzik > > AuthorDate: 2025-10-06 17:59:17 +0000 > > Commit: Mateusz Guzik > > CommitDate: 2025-10-06 18:23:01 +0000 > > > > nullfs: shrink null_node to 32 bytes > > --- > > sys/fs/nullfs/null.h | 2 +- > > sys/fs/nullfs/null_subr.c | 12 +++++++----- > > 2 files changed, 8 insertions(+), 6 deletions(-) > > > > diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h > > index aa7a689bec34..ad3f7779e108 100644 > > --- a/sys/fs/nullfs/null.h > > +++ b/sys/fs/nullfs/null.h > > @@ -53,7 +53,7 @@ struct null_mount { > > * A cache of vnode references > > */ > > struct null_node { > > - CK_LIST_ENTRY(null_node) null_hash; /* Hash list */ > > + CK_SLIST_ENTRY(null_node) null_hash; /* Hash list */ > > struct vnode *null_lowervp; /* VREFed once */ > > struct vnode *null_vnode; /* Back pointer */ > > u_int null_flags; > > diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c > > index ad8cd08279cc..bb0ff9966dfd 100644 > > --- a/sys/fs/nullfs/null_subr.c > > +++ b/sys/fs/nullfs/null_subr.c > > @@ -59,7 +59,7 @@ VFS_SMR_DECLARE; > > > > #define NULL_NHASH(vp) (&null_node_hashtbl[vfs_hash_index(vp) & n= ull_hash_mask]) > > > > -static CK_LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; > > +static CK_SLIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl= ; > > static struct rwlock null_hash_lock; > > static u_long null_hash_mask; > > > > @@ -116,7 +116,7 @@ null_hashget_locked(struct mount *mp, struct vnode = *lowervp) > > * reference count (but NOT the lower vnode's VREF counter). > > */ > > hd =3D NULL_NHASH(lowervp); > > - CK_LIST_FOREACH(a, hd, null_hash) { > > + CK_SLIST_FOREACH(a, hd, null_hash) { > > if (a->null_lowervp !=3D lowervp) > > continue; > > /* > > @@ -148,7 +148,7 @@ null_hashget(struct mount *mp, struct vnode *lowerv= p) > > > > vfs_smr_enter(); > > hd =3D NULL_NHASH(lowervp); > > - CK_LIST_FOREACH(a, hd, null_hash) { > > + CK_SLIST_FOREACH(a, hd, null_hash) { > > if (a->null_lowervp !=3D lowervp) > > continue; > > /* > > @@ -189,7 +189,7 @@ null_hashins(struct mount *mp, struct null_node *xp= ) > > } > > } > > #endif > > - CK_LIST_INSERT_HEAD(hd, xp, null_hash); > > + CK_SLIST_INSERT_HEAD(hd, xp, null_hash); > > } > > > > static void > > @@ -305,9 +305,11 @@ null_nodeget(struct mount *mp, struct vnode *lower= vp, struct vnode **vpp) > > void > > null_hashrem(struct null_node *xp) > > { > > + struct null_node_hashhead *hd; > > > > + hd =3D NULL_NHASH(xp->null_lowervp); > > rw_wlock(&null_hash_lock); > > - CK_LIST_REMOVE(xp, null_hash); > > + CK_SLIST_REMOVE(hd, xp, null_node, null_hash); > This changes O(1) removal into O(N), for N being the size of the hash > chain length for specific hash. I.e. it is on par with the lookup. > > Why it is fine? Why it was not mentioned and explained in the commit > message? > For the hash to be at all useful the chains are supposed to be short. Or to put it differently, a sensibly sized hash with a sensible hashing function makes it automatically fine. This was worthwhile to do because the original size of 40 bytes is a very poor fit for the allocator. fwiw the namecache already works this way for few years. the regular vnode hash should probably get the same treatment, saving 8 bytes off of struct vnode From nobody Mon Oct 6 22:31:37 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 4cgYsj1WPSz6BhpM for ; Mon, 06 Oct 2025 22:31:53 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgYsh4Rtxz3gtR for ; Mon, 06 Oct 2025 22:31:52 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=QmdkEQGx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) smtp.mailfrom=mjguzik@gmail.com Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b456d2dc440so874733366b.0 for ; Mon, 06 Oct 2025 15:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759789910; x=1760394710; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=qVQzZOpWC9C3KNoZycIyaPHaIcN9bixgRAkeepdzoww=; b=QmdkEQGx2v1dBksbSZV2DJCacrjO38dmwNTf6dFy8wn3m6FnBwLdrgA24zUQ+/llaW fo2XCBA7dmYjnoaQkeOOBzf+1Vo/tHC241iuQyY4YHG2wfeDnjYfRRrKOwk7sup0q9G8 peVpbOSnbiq0RNLpvKhTYmlX1YbrY8rfWFqsdtqtjtqvnel6OS/QKdw7PQYCH2SVx9n3 G5OyFu9vySzcNcuMGAEhYHNeHQV6j+dieR1J8XxkByEBP4a8D8JMPoNYdPTJhoClZKhj FCgpFZ9dMeDEc890RAePwjemQ2hNMdIeDjQJHCeh/TU0EaOqiWck2F5dnyKgicMA7PPW SK7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759789910; x=1760394710; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qVQzZOpWC9C3KNoZycIyaPHaIcN9bixgRAkeepdzoww=; b=SJ/8HByPaPu25qk/QIywrBFh6gfHsskE5OqD+/2arluhew9+nqJvj02EMcbimaQaE6 TTAREmqtlR1oK4WgHL/1nayTh7SWbKbcFsvgirDgED8HOZWqWDuXURbc6AK2+C8j4r/5 H/3CX7uxhBgNnxErFxuJVwFv7B25L/x55Mp/mo1MxM1xvnVzLF/HZQPUzHC6YyhgWsMU CkmvujNJY5OvQcDkuO0+Kp11wpH7eURhJmkPmkq96pt9tSAapK+e+VvDJqxweaGZk01x cv6AYmYsxqPq7XIwedcue2HiEYXFJooF2rIGXs4Us7HFUS2+bpbAvOGRXmjWKuAaN1GU iPXg== X-Forwarded-Encrypted: i=1; AJvYcCWVzCfCnOh3ImV/bK0ydHKbFyyQ9ZWE6M2pEqjZwICaePxQMdUPrkfLlRfoQRGTSiJ5L1GuN1u+rsYuXKVB1nvt57pUmg==@freebsd.org X-Gm-Message-State: AOJu0YxzSwpa6HxBx8uyQx4Tca9fcx/pA0Lfqq10xcQfbqz6pp+xhzp7 Wfucf3I7Hw+hNeVH7rLn4qiiN7ZpFNMW5x04En7BLdXBgw7GGamIfEZDgF92sdjusvy9mIMj3YV 3v43UsT9psra1z/NOxchDboRV1rZsYO8= X-Gm-Gg: ASbGncvnqz30129quA1jJbQvHx7LoW9cU0mqBCmHcgAlDRGsdFwLlEFo4rIO0lvrwrq xjZ4BsaBLaIyNcGALT8K6DznDhPru8vg4Pj8DN0gGnUSzYDIy6ysF60dZc+5yzSdKxAIXxAHWwl taoQcgBUIAyDWwYoGSXIB+QGY2eLMCckXlZt3iEHWmZfMtY/QhF85QdoPf5Tj/FEaTuJB5SVadw zRofbVx7X4bY97QLBQMskNO3l8hZDbHrg2D8NbVjzEiJxDS31pdiO6P4M/MiWk= X-Google-Smtp-Source: AGHT+IFAjzYwDXxqjdDHrkR5N0faIyT3IHxYoJu5LZaKcdFGbVG73RcCsr8ym+65nAvGqvHJhY3IkhQBll+SYDaGLfI= X-Received: by 2002:a17:906:c102:b0:b0d:416e:2892 with SMTP id a640c23a62f3a-b49c3932c40mr1826880766b.32.1759789909492; Mon, 06 Oct 2025 15:31:49 -0700 (PDT) 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 References: <202510061823.596IN7oZ084715@gitrepo.freebsd.org> In-Reply-To: From: Mateusz Guzik Date: Tue, 7 Oct 2025 00:31:37 +0200 X-Gm-Features: AS18NWA88MmsniLXuCRKRWw8VtVhD4fUjKSLSxvuBX61P6jOk9DRxqZw1SZIFCk Message-ID: Subject: Re: git: 84f981ba57e7 - main - nullfs: shrink null_node to 32 bytes To: Konstantin Belousov Cc: Mateusz Guzik , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::631:from]; RCVD_TLS_LAST(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; FREEMAIL_FROM(0.00)[gmail.com]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MID_RHS_MATCH_FROMTLD(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com] X-Rspamd-Queue-Id: 4cgYsh4Rtxz3gtR On Tue, Oct 7, 2025 at 12:30=E2=80=AFAM Mateusz Guzik w= rote: > > On Tue, Oct 7, 2025 at 12:25=E2=80=AFAM Konstantin Belousov wrote: > > > > On Mon, Oct 06, 2025 at 06:23:07PM +0000, Mateusz Guzik wrote: > > > The branch main has been updated by mjg: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D84f981ba57e77bd3c3d0fb= f1469ce51bfd132a6b > > > > > > commit 84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b > > > Author: Mateusz Guzik > > > AuthorDate: 2025-10-06 17:59:17 +0000 > > > Commit: Mateusz Guzik > > > CommitDate: 2025-10-06 18:23:01 +0000 > > > > > > nullfs: shrink null_node to 32 bytes > > > --- > > > sys/fs/nullfs/null.h | 2 +- > > > sys/fs/nullfs/null_subr.c | 12 +++++++----- > > > 2 files changed, 8 insertions(+), 6 deletions(-) > > > > > > diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h > > > index aa7a689bec34..ad3f7779e108 100644 > > > --- a/sys/fs/nullfs/null.h > > > +++ b/sys/fs/nullfs/null.h > > > @@ -53,7 +53,7 @@ struct null_mount { > > > * A cache of vnode references > > > */ > > > struct null_node { > > > - CK_LIST_ENTRY(null_node) null_hash; /* Hash list */ > > > + CK_SLIST_ENTRY(null_node) null_hash; /* Hash list */ > > > struct vnode *null_lowervp; /* VREFed once */ > > > struct vnode *null_vnode; /* Back pointer */ > > > u_int null_flags; > > > diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c > > > index ad8cd08279cc..bb0ff9966dfd 100644 > > > --- a/sys/fs/nullfs/null_subr.c > > > +++ b/sys/fs/nullfs/null_subr.c > > > @@ -59,7 +59,7 @@ VFS_SMR_DECLARE; > > > > > > #define NULL_NHASH(vp) (&null_node_hashtbl[vfs_hash_index(vp) &= null_hash_mask]) > > > > > > -static CK_LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtb= l; > > > +static CK_SLIST_HEAD(null_node_hashhead, null_node) *null_node_hasht= bl; > > > static struct rwlock null_hash_lock; > > > static u_long null_hash_mask; > > > > > > @@ -116,7 +116,7 @@ null_hashget_locked(struct mount *mp, struct vnod= e *lowervp) > > > * reference count (but NOT the lower vnode's VREF counter). > > > */ > > > hd =3D NULL_NHASH(lowervp); > > > - CK_LIST_FOREACH(a, hd, null_hash) { > > > + CK_SLIST_FOREACH(a, hd, null_hash) { > > > if (a->null_lowervp !=3D lowervp) > > > continue; > > > /* > > > @@ -148,7 +148,7 @@ null_hashget(struct mount *mp, struct vnode *lowe= rvp) > > > > > > vfs_smr_enter(); > > > hd =3D NULL_NHASH(lowervp); > > > - CK_LIST_FOREACH(a, hd, null_hash) { > > > + CK_SLIST_FOREACH(a, hd, null_hash) { > > > if (a->null_lowervp !=3D lowervp) > > > continue; > > > /* > > > @@ -189,7 +189,7 @@ null_hashins(struct mount *mp, struct null_node *= xp) > > > } > > > } > > > #endif > > > - CK_LIST_INSERT_HEAD(hd, xp, null_hash); > > > + CK_SLIST_INSERT_HEAD(hd, xp, null_hash); > > > } > > > > > > static void > > > @@ -305,9 +305,11 @@ null_nodeget(struct mount *mp, struct vnode *low= ervp, struct vnode **vpp) > > > void > > > null_hashrem(struct null_node *xp) > > > { > > > + struct null_node_hashhead *hd; > > > > > > + hd =3D NULL_NHASH(xp->null_lowervp); > > > rw_wlock(&null_hash_lock); > > > - CK_LIST_REMOVE(xp, null_hash); > > > + CK_SLIST_REMOVE(hd, xp, null_node, null_hash); > > This changes O(1) removal into O(N), for N being the size of the hash > > chain length for specific hash. I.e. it is on par with the lookup. > > > > Why it is fine? Why it was not mentioned and explained in the commit > > message? > > > > For the hash to be at all useful the chains are supposed to be short. > > Or to put it differently, a sensibly sized hash with a sensible > hashing function makes it automatically fine. > > This was worthwhile to do because the original size of 40 bytes is a > very poor fit for the allocator. > > fwiw the namecache already works this way for few years. > > the regular vnode hash should probably get the same treatment, saving > 8 bytes off of struct vnode I can concede it would make sense to include this in the commit message. From nobody Tue Oct 7 05:49:02 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 4cglZ70My8z69V7F; Tue, 07 Oct 2025 05:49:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cglZ66Vdtz3bvT; Tue, 07 Oct 2025 05:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759816143; 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=QLaqU9+Amx5SFyaHohIOxDw6mPeA/WmkJbrXCuCmbYY=; b=lkxWY+CIhrjy/h6PLn6FHLg/FC1Raonr79SUKOpE2pZgv1yAgMFAhDRJghfocldAPousLk BzqpFePzRUSpbrwwqNaHmLhrmpk183UVynctbeL+GOR3KwDbjWUC5ebcDmu2DHeviMCynW 4sUPV3/0/JeHcupVGcnu3g1wZl10IpzghiDUFgXVM5u16oxgUld9O362B27oa8TP5SiV7E 4q6pZzQlcHjy7CFMQAbMJAw5MOEkpHwhCRgvNSI92YI89RO0BzpBERbwJLDfKjPXEuWLXA 9ucZ/I318F+qg3/+Yyqu5c81WV3V+ALMMGfCiRBF5M3DEPoirYcGes1N0l1IaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759816142; 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=QLaqU9+Amx5SFyaHohIOxDw6mPeA/WmkJbrXCuCmbYY=; b=lcGyMBXIcpqt4iq4nQ2Hmi9a4Ft38yETG4nt2p5Mp/m7/Ex++3zUMgE+UplGdY/eRPReC6 4VyIxFUVEQ+2o9MatoM+/qIBVu1SnR4AD6r9lTGhYWmqags0JB8NE4N9C43wZZawd8qiaM ZenzijVKHG0ygSgfAxUz+0ibUGGo2du/FhZhzj4BDJcWIV4l44KWQqAkszkwqV1SD/swu/ Qu7knfRUrrN7t59BvO0MqdpGuFiWhQBmV1pf3kQ68VCbJLu1Z6xbEypKGrpD/QKbNBCE1q SUk2wU5dNOLV4Ut0XEVwoFajQVQCEIWt75qmdQIbiEVjt0+H9OopvJoRo2/Mbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759816143; a=rsa-sha256; cv=none; b=JgxS893Sisdve9IVh05rBt17q0msMgljDYgcSeeAE9JzNGzC3c7LTx9EBOTxpUXR1UyVCA V+swJ8zfJSB3SQaJdBrc4Itf+zerJ58N0Ij1EwQGaVip8q4X6FaK+NQQmIpIesaOzl59zA wwsuBI5pxVWGwukQ6NtbmqzI0fHNP9J0yqXA3988pa3WNczPQBPc4Wxxwdz+ju/YLTfaxl DfH31HTpBnR9JpexxuLbR8c+nSnfKBi5VZ48t/8ls6mAoezD15VctoVLZKOGOYxMreSMtk o84xbPS93tuAmQNbXc6FzzHDICO65wqaIw0FG6EywNNayj+nZrzL+cw/yk1Sug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cglZ65wFBzXr3; Tue, 07 Oct 2025 05:49:02 +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 5975n2PJ070672; Tue, 7 Oct 2025 05:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5975n2aM070669; Tue, 7 Oct 2025 05:49:02 GMT (envelope-from git) Date: Tue, 7 Oct 2025 05:49:02 GMT Message-Id: <202510070549.5975n2aM070669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 488718ff4234 - main - netlink: in snl_init_writer() don't overwrite error in case of failure 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 488718ff42346888243496c00cbeb42ba004171e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=488718ff42346888243496c00cbeb42ba004171e commit 488718ff42346888243496c00cbeb42ba004171e Author: Bruno Silvestre AuthorDate: 2025-10-07 05:48:28 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-07 05:48:28 +0000 netlink: in snl_init_writer() don't overwrite error in case of failure PR: 290050 --- sys/netlink/netlink_snl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 6dd8a9cbdb35..57f7e1e29d08 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -1068,14 +1068,14 @@ snl_init_writer(struct snl_state *ss, struct snl_writer *nw) { nw->size = SNL_WRITER_BUFFER_SIZE; nw->base = (char *)snl_allocz(ss, nw->size); - if (nw->base == NULL) { + if (__predict_false(nw->base == NULL)) { nw->error = true; nw->size = 0; - } + } else + nw->error = false; nw->offset = 0; nw->hdr = NULL; - nw->error = false; nw->ss = ss; } From nobody Tue Oct 7 08:15:00 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 4cgppY0MX6z69kfN; Tue, 07 Oct 2025 08:15:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgppX6s5nz3sDX; Tue, 07 Oct 2025 08:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759824901; 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=OtEKTn0RvuxfnqonD5ZAsT6BQJU4l5idgN+/E+1VQ0E=; b=OXiMqkJXCfVm/dhU+kpVGS8NR6flbds5+qM4AuQFCn38MG8iT+xYRcEdEpIWySQbDN31wc fre736AphAekTfGL1f25zXRXnjPALNIqaCPquYqnSu/CmOPI0mQ+scLd27fR5DLkWa39LE qPVRI4IKgWv+5gayBs9n9TBtY/kQ7AJAS7/G4IBHrUeCMswUk0Oyp1tZbuq3gBubbnYY93 7XiUXHCU8NZY3IK2I9JHvlrGfCeuRL1BPpqLzH6Z4XUDGqkyvOZuCi2yzwpesyQgiM+/SC AWgsPVQDsVNG5r6rSvCbAOUjI2EJRnZhDf3IdrZCm1zDjwDQzuJ4DpBbRIxNug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759824901; 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=OtEKTn0RvuxfnqonD5ZAsT6BQJU4l5idgN+/E+1VQ0E=; b=PZGJRe0skGDmzs9K681tuEckeTByTkmh02Dcf9hSJ0D8aKXN84u7jabxTaY4OBrcbLRFcK GGOcX16a9NGaB2SPsVsvpRZQLzEM/049geGezFQfIQLKZR2xuzpqx60hmjRq7VJuYZWO25 /jwHQv7YNe7zM2JtMppJcoCgYO3sbi0WT6BnL209OusA83kx8d39DVEb3cmT/jveI0tpc2 6uKPtE7HyK6Qpi+8pAV4ovnOBpvcEh2fj2olq4J43zsB6s8mqzTBeCqkcFQDpuXNT/SCgJ /++8DFapF3Oe1OQ4a1BIHwyDLf1wtR+2ReOq8GKsm0bQDISLJ5SA2DR9er/glg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759824901; a=rsa-sha256; cv=none; b=AFyhvFjyFSh7+ZHBjf4y4dDjSROXvEFIvWFJK+K8zaL5k8SFFXi7rXIyOH7G/Y0ERje2d3 Vl7008VodGDMf4g8KNQb8dvRm2A5qXAy9pyjaOGzkoYq+BY9OQomZ1rjMR60KR22jUsvQm tFfufVoctTKD1GEFemVmS5dTe7vw9kAVdkzx3QneiwDof84MpSb3J6Z5CX5fkudn9mVCOC QSAzKqq+ZAw5DHbOpI28Oyq5s+XvkGqttEBlZYGgdCfC6LeByxnhgqFGA0dXG/V1UwgrNN paA/TgmG2jNk56oY1C+5ys8eX4JFL2zReRCys5b/YgoxsmvwMBIuLn9dxAjc5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgppX6S31zddr; Tue, 07 Oct 2025 08:15:00 +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 5978F0IL051626; Tue, 7 Oct 2025 08:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5978F0Rc051623; Tue, 7 Oct 2025 08:15:00 GMT (envelope-from git) Date: Tue, 7 Oct 2025 08:15:00 GMT Message-Id: <202510070815.5978F0Rc051623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d3bfcd66409b - main - libsa: smbios: Detect less-than-64-bit platforms via __SIZEOF_SIZE_T__ 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3bfcd66409befc2d545e5449963b41c25c369a9 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d3bfcd66409befc2d545e5449963b41c25c369a9 commit d3bfcd66409befc2d545e5449963b41c25c369a9 Author: Olivier Certner AuthorDate: 2025-03-11 16:56:20 +0000 Commit: Olivier Certner CommitDate: 2025-10-07 08:14:41 +0000 libsa: smbios: Detect less-than-64-bit platforms via __SIZEOF_SIZE_T__ What we really want here is to know if pointers can refer to 64-bit addresses, regardless of whether they also hold other information (such as capabilities in CHERI). __SIZEOF_SIZE_T__ is probably the closest indication to that piece of information, so let's use it. __ILP32__ wasn't wrong in practice though, as we don't support 32-bit CHERI hardware (and likely never will). Consistently with this change, test whether we can actually address the 64-bit SMBIOS's structure table by converting the end address to 'size_t' and checking whether its value is preserved. Suggested by: jhb (for the __ILP32__ => __SIZEOF_SIZE_T__ part) Reviewed by: jhb, imp MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49318 --- stand/libsa/smbios.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 32cd198a9537..73b49a111f89 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -186,14 +186,17 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) */ SMBIOS_GET8(cp, 0x0a) != 0 && smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) { -#ifdef __ILP32__ +#if __SIZEOF_SIZE_T__ < 8 uint64_t end_addr; end_addr = SMBIOS_GET64(cp, 0x10) + /* Start address. */ SMBIOS_GET32(cp, 0x0c); /* Maximum size. */ - /* Is the table (or part of it) located above 4G? */ - if (end_addr >= (uint64_t)1 << 32) - /* Can't access it with 32-bit addressing. */ + /* + * Is the table (or part of it) located above what we + * can address? + */ + if ((size_t)end_addr != end_addr) + /* Yes, give it up. */ continue; #endif smbios.is_64bit_ep = 1; From nobody Tue Oct 7 08:21:58 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 4cgpyZ4VdTz69l7P; Tue, 07 Oct 2025 08:21:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgpyZ41f2z3tct; Tue, 07 Oct 2025 08:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759825318; 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=GEUh5iwQIXjNFOz62lrAFEv+77lNDhLNu4kJWR6nOgo=; b=A8NGa0WTav5Qd/2lvIdaVtb31D8iPpziswtxEWt8/GdEyJykgrfpMRaSwKHrqXCyBPw1r0 T0lEnr4nGLJNp9sAr/8zNLwoqR745K3/DkANSQxhmdAoC8KDnGKmbAF7cMuplqQ/S9aBsr ad819m1j1BaKjcq6Uy7a+Rg9Fn6eApzaPUP4ncEFC/WwlgEl170kAr3BRllKej7blDEIJ6 dPRsSU9CMX7LeSxjhNI6LrHVPaUdEHhWozTQPoQ8SnD4zVjV7jAwFgyqJfhpIxOmfUtIuE f437rLcQwNiDSavsPejJgkqukTwIZZ5jxX8Iyw3bAXjb6UvgIsiMNkoyxY7d3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759825318; 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=GEUh5iwQIXjNFOz62lrAFEv+77lNDhLNu4kJWR6nOgo=; b=WoNxQlHtKsMXjH6+SM79xbaeesgDA6G1F/6oxnzzyyK757BwvojN5JmaTxwkBaMaqS/KKX hXIH+efVcr8QYMbFvoanZhERt5WqnlMW8TaBc8v006ECUfpCHWf78GiYx+W4mOZcTjmM/c klT4eGOEa2mzsUyieKdV0xkQcwVkVUx8vZ8pgL9iO/OvTFi/UD47mgrpGDNGp3Xg0ydyKe gz0JR4BAvNx7t4+MhNci7ZB6RkwBY76C4P181pQSIDyen+jO+GqF/2JnWKk1bCGOOWxYBp HQ3BfralOT8mnxzg3KJ1JCJK1eV+ep8yL5aDTaKvp9I5F0A10MDjdD5nb4PNUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759825318; a=rsa-sha256; cv=none; b=tUdFv170TLIRkpgbbJe04Y0pkseKkVEWDeuczRYkjKF5LY2drJ/oi1Ecdlc8oWUdOsDeJB nw6Wbcxe339WGjMnN08HZEO6Dz6nA8wzOpv/S9CD9JIc3wCafGV/ljuOoyadlPI25+/UEW OaA6Bl6uKtlLcVYC4TCHKDzPnDm03ptf6HaRiZBtmA0LYUsh2D6BZC9m2Eikfhn89dGLZK 8bG1Gcm6X27/KO24/cZnAAQM2EzkECbpBJVbCeCDf2BSZ5zqaNqfZ5xt4aLDCmwr1+Cuhb dd3p9anStD64b0Wh6xISBtsnl9X+DoQVJ9QPIocwsV91UGGUJ8LLYroJgMFUbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgpyZ3cqjzd0q; Tue, 07 Oct 2025 08:21:58 +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 5978Lw9x067732; Tue, 7 Oct 2025 08:21:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5978LwXA067729; Tue, 7 Oct 2025 08:21:58 GMT (envelope-from git) Date: Tue, 7 Oct 2025 08:21:58 GMT Message-Id: <202510070821.5978LwXA067729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 306f29475fce - main - pf.conf.5: 'address' is mandatory with route-to 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 306f29475fcefcca0a32d1cd764eabf7b2e441f8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=306f29475fcefcca0a32d1cd764eabf7b2e441f8 commit 306f29475fcefcca0a32d1cd764eabf7b2e441f8 Author: Kristof Provost AuthorDate: 2025-10-07 08:13:23 +0000 Commit: Kristof Provost CommitDate: 2025-10-07 08:21:45 +0000 pf.conf.5: 'address' is mandatory with route-to Adjust the BNF, and don't claim it is optional in the text. PR: 290059 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- share/man/man5/pf.conf.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index da02f10aac01..41410d6bc0fa 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 28, 2025 +.Dd October 7, 2025 .Dt PF.CONF 5 .Os .Sh NAME @@ -2377,7 +2377,7 @@ packets matching the same connection. .It Ar route-to The .Ar route-to -option routes the packet to the specified interface with an optional address +option routes the packet to the specified interface with an address for the next hop. When a .Ar route-to @@ -3552,7 +3552,7 @@ hosts = "all" | ipspec = "any" | host | "{" host-list "}" host = [ "!" ] ( address [ "/" mask-bits ] | "<" string ">" ) redirhost = address [ "/" mask-bits ] -routehost = "(" interface-name [ address [ "/" mask-bits ] ] ")" +routehost = "(" interface-name address [ "/" mask-bits ] ")" address = ( interface-name | interface-group | "(" ( interface-name | interface-group ) ")" | hostname | ipv4-dotted-quad | ipv6-coloned-hex ) From nobody Tue Oct 7 08:41:56 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 4cgqPc5pQxz69n7P; Tue, 07 Oct 2025 08:41:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgqPc58GLz3wnT; Tue, 07 Oct 2025 08:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759826516; 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=ZKpqfWWF8ekR+nvkqx/acqsLYVTG72d06y8AY4QMY0g=; b=MzvL41VCgEU3cPZMCXrXj6YyApEdNynHNkcb/vvMzA48O+XPvZb94ILpwf4PMeQR4OgL/y poXxoKTjv3rxtYm9a16oqki2dVFgtd5H7+Qzkp/oqeKdw1ZM60WbV8N0+ml3nmgUZeFThl AObE3e8Nl9dQMA+1+fnraoiIG8kQfo2GSybklGVhcs2o5kcoNx9MiAW04s1hqTyu5niWs6 n8busSWv8KSvj7i9T620/C7uK5Nhb024y7fQW1/k/n2bfup4SWmB51ndTFTlCrAIDuBhdp D6YjMuNW1qkCSSHiuII+GMVptbFOQXatn8zTDdMudwFjsj07QjEECa5f51ev/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759826516; 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=ZKpqfWWF8ekR+nvkqx/acqsLYVTG72d06y8AY4QMY0g=; b=SOf5IT/U0IZRV4R/227xEqT+j15W+O4XL/23w2WMYNxMdWEwN1yE+yVR8hg8zCvAZygPr8 P/Bkgge5o+7gbha4PVfUgeqrCOTs+umjs3CvN8w6LFMHNeRyVNux6jajMwJ8/ptjgbygmL zP7QPT7mDCaD0ninY4k50UnAtSlowgjs89yDxULrD4dtVJIPO2t/0Uc8pSTTtkDufvyYgE BHejrX4XCjxFDGEee+v5S326FSdyCdqXx2owp/6z6Zyfp4A7mQ65OSiuOWxPVxAtSd8VZV TQQSkAy2Y4VoZs6S0k9XQg7ezTmC8RhH/PV8+7vgsMKxz8nvR4nBp/0aU9HSyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759826516; a=rsa-sha256; cv=none; b=SRX1VOaZB/83GNCfWIkMIegmVch3a3I03D2fZmeP32G84WnBMmqCEpI/bpZ/nbp7gpRn+g uWKpkq2Iq0ly2e459vZByyspR1uJG/AmAVRaPdQOlStGTd2Kg2R3WlNnj5pLamoHj8obSE 5INadCxwlQqC7v6p6RDqLlqh0UEAIBqJ+VsEahBUyF7er3DH0LQyaWd1Yov3FkIkZxhWUg njXvQwET8bjvwiB2vgpsw6sY5J99Cmj69pSja9CUfHw2DDyU07YwruHTN2zbr3QepsjUsW sB76Vntp/W9bpSyLwJp9kMyHopGhvkAOwN/DQKAVd5clY7td+D175l9EVnRVPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgqPc4lwczf6S; Tue, 07 Oct 2025 08:41:56 +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 5978fujM006152; Tue, 7 Oct 2025 08:41:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5978fuLa006149; Tue, 7 Oct 2025 08:41:56 GMT (envelope-from git) Date: Tue, 7 Oct 2025 08:41:56 GMT Message-Id: <202510070841.5978fuLa006149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: fa975e2a5bb2 - main - arm64: Add Debug OS Lock fields 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa975e2a5bb221e2e15305c4c54162f7b9ec062a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fa975e2a5bb221e2e15305c4c54162f7b9ec062a commit fa975e2a5bb221e2e15305c4c54162f7b9ec062a Author: Andrew Turner AuthorDate: 2025-10-07 08:25:25 +0000 Commit: Andrew Turner CommitDate: 2025-10-07 08:25:25 +0000 arm64: Add Debug OS Lock fields Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52930 --- sys/arm64/include/armreg.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index da051e8f7c8a..393d6d89da0c 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2180,6 +2180,7 @@ #define OSLAR_EL1_CRn 1 #define OSLAR_EL1_CRm 0 #define OSLAR_EL1_op2 4 +#define OSLAR_OSLK (0x1ul << 0) /* OSLSR_EL1 */ #define OSLSR_EL1_op0 2 @@ -2187,6 +2188,10 @@ #define OSLSR_EL1_CRn 1 #define OSLSR_EL1_CRm 1 #define OSLSR_EL1_op2 4 +#define OSLSR_OSLM_1 (0x1ul << 3) +#define OSLSR_nTT (0x1ul << 2) +#define OSLSR_OSLK (0x1ul << 1) +#define OSLSR_OSLM_0 (0x1ul << 0) /* PAR_EL1 - Physical Address Register */ #define PAR_F_SHIFT 0 From nobody Tue Oct 7 08:41:57 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 4cgqPf15syz69n7Q; Tue, 07 Oct 2025 08:41:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgqPd6cgjz3wtB; Tue, 07 Oct 2025 08:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759826518; 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=uEG9O6LY4wPYudmrjw2cPxxbfJwFO25rjpgQ7mj6BPo=; b=QmcwwWlWF77JtCbQxBe1SkUx7aN13aoM+xQNpQwWnY5+8JGKaQ5n9hREwplPRXbZ/wEI5J kKV6cvyXlgpaaIKAmIwx5MwlLtJ3i1BdLj22alWrgfKDgbdCGNgs81wn+DWYARocp8qcqf GjnJToLh7q9RQGtAmELnXOsaPnD3sSkEY+bMYxC/xN1LQmuCTJHAgR42jjjWPxX7e5nuUL xZVu7JUnsj2WuUz1R/jUzVIeMgyhwhhbEFnt7MMoMeAeFEFn1rFldmGUBsyjBa8RdTYkq2 tvg9LjVJ/w/j5u1Gm4y6AHIXO04zv59cXxEBQyx9vNz3RNLmXtaumSKneTkR+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759826517; 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=uEG9O6LY4wPYudmrjw2cPxxbfJwFO25rjpgQ7mj6BPo=; b=RSGRsNPAxQSpE85BlKlfYjmJ2eefECbDGiNAHpiVAo75r8mGlxH+UMEM4Vujihopxk+OfS P9Ok4jbabqvVYRCxi/G34ANkjSzUIYrta/U/KMli+ad3wHlgy8Gn923FsyKyGHL/NvuKww MMg2dBOww0MO2+0+61St4WcQr4ildPgO4AX7sf7nwx8F9wZse2qsjXywM3OPBtDavhfg4B oEiVjbW3llO+AQTr6ogVAD2BN6yN8YXGKs1E1+o+qRWh/IaqGb3dUSTqufNWBtT7dJk/fb L/J6V1NCLX26qxZC8OR0CobEy8+QOiCBniCwmToehBSD00sCtnb6G3PLVhXr1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759826517; a=rsa-sha256; cv=none; b=OFuaCIspGOaGSlay1G7xCvAODbZAd0votw+TwH2a4Gn3mllmryJ9fIgUgJzpvg3wpIMNjb xRhXd9ZVjo2v7ymuN9/JtJW7jWBbYBAzVD6XleQT2n8iYk+X3EQ74ZnQM8M32PZcK6DjiJ R0M8LzFmf6w4C5THa1DBn+kT2/khgJONHSxdaRu8nXbmF44+N9MnZGumHETeUKQV8sk1we x/5ZT4WoWhWfyc41oKZVt25JLsLj9qgyzCA4VSUgOTziXiQ9Mv96UaJHm+Mss7pHYJPzjK MI0KL5EA2ZTh0hPsLOZct5XcJq7RcaWAaB3JKnT6R7QLoE149jMCl/Y36/ZTYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgqPd63X1zfBs; Tue, 07 Oct 2025 08:41:57 +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 5978fvpG006186; Tue, 7 Oct 2025 08:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5978fvwv006183; Tue, 7 Oct 2025 08:41:57 GMT (envelope-from git) Date: Tue, 7 Oct 2025 08:41:57 GMT Message-Id: <202510070841.5978fvwv006183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 534aec00976c - main - arm64/vmm: Handle debug exits 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 534aec00976c18c4c4b485b2fade9d5f33de89c8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=534aec00976c18c4c4b485b2fade9d5f33de89c8 commit 534aec00976c18c4c4b485b2fade9d5f33de89c8 Author: Andrew Turner AuthorDate: 2025-10-07 08:26:00 +0000 Commit: Andrew Turner CommitDate: 2025-10-07 08:27:15 +0000 arm64/vmm: Handle debug exits This is enough to boot FreeBSD again. PR: 290044 Reported by: Siva Mahadevan Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52931 --- sys/arm64/vmm/arm64.h | 1 + sys/arm64/vmm/vmm.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h index 334b795832a3..f9b74aef7188 100644 --- a/sys/arm64/vmm/arm64.h +++ b/sys/arm64/vmm/arm64.h @@ -119,6 +119,7 @@ struct hypctx { struct vgic_v3_regs vgic_v3_regs; struct vgic_v3_cpu *vgic_cpu; bool has_exception; + bool dbg_oslock; }; struct hyp { diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 1dcefa1489e9..a551a2807183 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -651,6 +651,33 @@ vmm_reg_wi(struct vcpu *vcpu, uint64_t wval, void *arg) return (0); } +static int +vmm_write_oslar_el1(struct vcpu *vcpu, uint64_t wval, void *arg) +{ + struct hypctx *hypctx; + + hypctx = vcpu_get_cookie(vcpu); + /* All other fields are RES0 & we don't do anything with this */ + /* TODO: Disable access to other debug state when locked */ + hypctx->dbg_oslock = (wval & OSLAR_OSLK) == OSLAR_OSLK; + return (0); +} + +static int +vmm_read_oslsr_el1(struct vcpu *vcpu, uint64_t *rval, void *arg) +{ + struct hypctx *hypctx; + uint64_t val; + + hypctx = vcpu_get_cookie(vcpu); + val = OSLSR_OSLM_1; + if (hypctx->dbg_oslock) + val |= OSLSR_OSLK; + *rval = val; + + return (0); +} + static const struct vmm_special_reg vmm_special_regs[] = { #define SPECIAL_REG(_reg, _read, _write) \ { \ @@ -707,6 +734,13 @@ static const struct vmm_special_reg vmm_special_regs[] = { SPECIAL_REG(CNTP_TVAL_EL0, vtimer_phys_tval_read, vtimer_phys_tval_write), SPECIAL_REG(CNTPCT_EL0, vtimer_phys_cnt_read, vtimer_phys_cnt_write), + + /* Debug registers */ + SPECIAL_REG(DBGPRCR_EL1, vmm_reg_raz, vmm_reg_wi), + SPECIAL_REG(OSDLR_EL1, vmm_reg_raz, vmm_reg_wi), + /* TODO: Exceptions on invalid access */ + SPECIAL_REG(OSLAR_EL1, vmm_reg_raz, vmm_write_oslar_el1), + SPECIAL_REG(OSLSR_EL1, vmm_read_oslsr_el1, vmm_reg_wi), #undef SPECIAL_REG }; From nobody Tue Oct 7 09:00:10 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 4cgqpp4bpYz69pyv; Tue, 07 Oct 2025 09:00:18 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgqpp46qqz41VY; Tue, 07 Oct 2025 09:00:18 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759827618; 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: in-reply-to:in-reply-to:references:references; bh=Encxbs01/VJe48WjO3S3zYP9FKNGFvqmfbjbSG1RgRk=; b=S5PHub196MUcYqr7bBeeKv7nKRhVATl4PUOMk32V28LPZe8sYAm0IMj45JS5rfjCnyH0cW 6ohW5ZJQY+Kcz5pLstli4QM06U8l7f2un5JUbnaiIYxARlky7TTx/ojqckP6TO7GWxF9AD RRdZQ0+EdFVvGt/OCxQo3fb/dJ0f8qAZkkewmOUXVQNNorOdeDgHsztOBcy9g/BorNDp4f BLmqAsGMPV6dQ/sBRufGi9Q9I/5skB7vQzw4B9kqoLs5lde61O5yqC6a7bkf333Tq1z0t8 nkTBJsvgx4WAI6ZxyGLec43kMbTWhvPaui9bVzcYt9gC0dCEGK8zFJyRKPvS3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759827618; 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: in-reply-to:in-reply-to:references:references; bh=Encxbs01/VJe48WjO3S3zYP9FKNGFvqmfbjbSG1RgRk=; b=uB2GI6zBEFWdUrTUd36f+slb9CQytbYv/WwYBDd4+HdQR75DOvq5h8ERynSZJ+be9Skryz a8JO0MDj3pc6xYSXmkza4WCuE8uNr8Di+4IUkRjFdRXlnpIOq+7fACnQf4VXq3h/ivg0x1 cvMsA5VN2qh7Z+eEmJbRrhCgwBAYq+08nhRQltWdS/BumELBw3ktIj6tThd4q61l0LmhAf +6wHH0Xuc4zNCXvfFeeB6l/9np7I2NNkvqh0DgXyU9LyvXCczbiCkKFBxfeDEiDRmchKjP c/KcCYV3HWW0ZTCGc1NjgCn1pJG8gm0axXeEHgF+snDFmq1prCNIUB/yN231Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759827618; a=rsa-sha256; cv=none; b=dPtiQvNIKnV1aKjMb6I06loyYjQrjOmiworSQekVIQiBs+xd0yL0mM9csFGGVwNMjo+QvT eal8+lMzfNwESnLo4uoemfMd+bm4K8LDlH6NIfCvBLBxQuJYmWJDVdM0ARkGeAgB44sPZz vp8hJIVTr0GanZvV0TQJ0rwrXfyAfF6D8wYxq7idjdoJ9Cdcp3HIrbZKR4KPjLhPnW6fs5 G7HxMSMq7S7BYuky9Y+VXyy2r/bBS3g303l8i795QYBOnM/k7wZWuR+9h4e4oA5mpJs0s4 TigNmux6MqOV6WOTJ1dC7iNoLSoFXE86zj/O6Pn8uGzcAnkIqzUgzUKsywnHRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (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) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cgqpn4SyYz2qp; Tue, 07 Oct 2025 09:00:17 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Mateusz Guzik , Mateusz Guzik Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 84f981ba57e7 - main - nullfs: shrink null_node to 32 bytes Date: Tue, 07 Oct 2025 11:00:10 +0200 Message-ID: <2940490.iL6vRArjjl@ravel> In-Reply-To: References: <202510061823.596IN7oZ084715@gitrepo.freebsd.org> 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: multipart/signed; boundary="nextPart88061026.0ko45tJjV3"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart88061026.0ko45tJjV3 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Mateusz Guzik , Mateusz Guzik Date: Tue, 07 Oct 2025 11:00:10 +0200 Message-ID: <2940490.iL6vRArjjl@ravel> MIME-Version: 1.0 > > For the hash to be at all useful the chains are supposed to be short. > > > > Or to put it differently, a sensibly sized hash with a sensible > > hashing function makes it automatically fine. > > > > This was worthwhile to do because the original size of 40 bytes is a > > very poor fit for the allocator. > > > > fwiw the namecache already works this way for few years. > > > > the regular vnode hash should probably get the same treatment, saving > > 8 bytes off of struct vnode > > I can concede it would make sense to include this in the commit message. That's a reasonable trade-off, but it's important that such choices are explained in the commit message and/or code comments. Next time, please consider putting up Phabricator reviews even for such "small" changes, where we would have had the opportunity to mention this before commit. Thanks and regards. -- Olivier Certner --nextPart88061026.0ko45tJjV3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmjk1psACgkQjKEwQJce JicviBAAs01XxVdfCbvErgsCm3v8n9zlp8IJYKL7KKzI1+9eQFRmCR/C735QIcOp 9VSgl35MVL4pm074O79HNn6iNXJCXcqCRFxDKrLWH6afReGQ4CkwhOOFWNBeCrty 037s0d3GaBzOzqxRzbSfEDf9+Yvsc2vKoJGCWmtu4eZ/smz6nGK7AiHCNaW8ldRv zuy0yFhP+gw4OkAm0W6N8a1gLq7/2HT6PdZ3bxGD+ZYXI8mGZ877C44tTqLsAkPZ O89Yw8dGdBCnR2lhr/fcyRYicJa+j92t48CK+h9wdW213evzt+yU/aS/4+HkBznC Tkdw/TlK3k8x6/ECPER09v6XKOVw67z6HxMOf51G+X4Jo3lj+a1LOhcUWNZvSDJw pOmpWBI5UDqNwstUv+BKlND0wbBUCGp5lq/CQcY8XFFn0TWILBR0EeJsXTgLqgPk j1QI4591xT86IUO+L9xyMJ/o9OUhL4L9s1KMNAMBFi0rTPoV72nwJu4QY1Klnc4h jaNc6JKKKPPSPvVIcOFNRs/SDKpCcR8ln0dJ9+PsufIIMcMz9QlX3+zXgheH9ixQ JnFTgM71P1bDKlTXBe1N4nYNl7S2BltwNxwiF/gVG+jFVgTi5iSuhF5YgA8lfg2C cVN7Uz+ccJ6AWCBveqLQJThHGKQeGnp+GUrRhZBh9T4ni/wHX6s= =BPAy -----END PGP SIGNATURE----- --nextPart88061026.0ko45tJjV3-- From nobody Tue Oct 7 09:26:55 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 4cgrPY1gn5z69spx; Tue, 07 Oct 2025 09:26:57 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgrPY14jyz45VP; Tue, 07 Oct 2025 09:26:57 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759829217; 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=A3pJi811lZFmRiF1cniQBo00vy9lMJ0lLHbSLqZQywE=; b=xjia4voq75w1XM+O5nTwhLEzZeqT6KuDBpT0dpFxWLLXKiPKZnXqHhSzGAbNaq/WDruGJc ow2sArB7tbijo8Atxyp4uUAol2IcymLmNY8GdWOqyW0DFCBtjMbdJ/5PAhleLFzOb7q+QZ McmHRwH6fU68tPlMirrOV7dWS3Pm2WUX/a694xDUG3xvZsN2J+k/bxurZg2HONzFDmS3Nf sOU1Hp5WL0RnU7qf3NELojnqbnokSxtC5yFC2Ni6VLvt9uS/mvYQFpIvdzVscBj5E798td zo92i2N8oWIQSoNrNE7mAl4fjV8JxVaAiOeW1xFLsQr0ImbLmbD72Q6S2Oj9bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759829217; 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=A3pJi811lZFmRiF1cniQBo00vy9lMJ0lLHbSLqZQywE=; b=xv4mC5aVVsXt4AfHiYQEvo9C3NHwmVI2IcKumu6bKcWi6KDd/khgXMy7gJ3DDjhKMQoSVY NJDJhSRvK4cbpsiCg2JoR9yc8on6TQ/3j3K7T+6uMepDzrt9MBVGeXJX2v40GToeSJNgv6 yFm0yuWWPXN0PqwA+83BgCQbPsmq/vFGpTI/eQdSe+N74zWOogIDDjh+82/BeFwYse5RP9 fquXJvfsiCo6qGEeCT+qKwGItcjjT+81RelHxPYAw7Ge3O9niRmzGTYQzy/VV3jA+iLzzL exPIopo8MLnqOYWGneB+0dmZej9iwStz27Lf1dttt20aVK7QeRj7nNjeukeU3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759829217; a=rsa-sha256; cv=none; b=LfBEAlLUvxsSmlN8U4tTUVZR48ZGWGavaBek2pcn1QbdPuwafRMqV1AZjSlIfqdoRlrWl1 KIz15K9F+8rPqsXWpnm/LOmbF04Pnm3Y6GrcLesXIg937DaEqXX51umHF6MRnmvRrIELG3 /fdm6/oXu3nY+GGYJvNGWnMRV3DpoovLtx4G5Umh6dbT8dk9oECvtY811ZSVT9qP4mmqc7 FnmQNqJCTOuT8nJBDceVFm4sLjml7DRxd4mgfkrSxcazzhddE5HuriX5s8RJhK7BPyBEs7 2Bgrh9YGNW8SFASeqAE2Lj9cxEIacEPW2ynn+CpcSTLueNN/UIIKPMAoTCR5Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (88-177-82-251.subs.proxad.net [88.177.82.251]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cgrPX6k7qz39n; Tue, 07 Oct 2025 09:26:56 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 9C92688734; Tue, 07 Oct 2025 11:26:55 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Christos Margiolis Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 9cab9fde5eda - main - virtual_oss: Port to base In-Reply-To: <202509280958.58S9wrww083342@gitrepo.freebsd.org> (Christos Margiolis's message of "Sun, 28 Sep 2025 09:58:53 GMT") References: <202509280958.58S9wrww083342@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 07 Oct 2025 11:26:55 +0200 Message-ID: <861pnf83kw.fsf@ltc.des.dev> 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: quoted-printable Christos Margiolis writes: > libexec/rc/rc.d/virtual_oss | 119 + This contains a reference to a non-existent sndiod service. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue Oct 7 13:10:25 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 4cgxMP6JKfz6BFw3; Tue, 07 Oct 2025 13:10:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgxMP5L3Kz3G2V; Tue, 07 Oct 2025 13:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759842625; 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=vmXsk1DX9dyyoOC2C+VGai3DswWBZ0K1Y042mrdOKFs=; b=IH+9xteFdf256pNHvcJ5dPCqEkIA+e/blzWlCIpeFi9hEbLGJYOhm82zNeYKYxwXgxC1TK o4zx7byzBdCFEv/0JoZe4ewYyxxxC5d9HLQFUTkZ724lzX/SMp/ATJSDZ6eNVGdZaVA0vm 2+UjwYoYwgzMwsGh+dsk7Z2bjezaYVlvVYWj/qyswLiFNvl2y3HNBQCf+zhSHSXQxuQ81Q 6aAogwogJqUCy9iTXNrAJqAjYc6weKWOln+NnTUY6NX7NDeO7hvvh2czfE+jExKiGnDVT7 tcxdBlLL9tajagBKr57yBaGBF2FYojECzwJa4l4J+po0i9qr+3o6r4nJ61sZlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759842625; 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=vmXsk1DX9dyyoOC2C+VGai3DswWBZ0K1Y042mrdOKFs=; b=bofCJHPBet4nEXBlmzAUBNwoItXu7tLWFjWTu247dJwBe9oLqVMz37uMxiB9oUSl4etXld R1vwNMlyI23OIMhqt8Sdz2ueYWMZvDDvFHZQ1xUrBBKo9LF+a4HxWTgWm9gQlZGcGD5wTt 9nX4m1WuqQZarQbkSgaFYfby8nXNLhcSD0N5qVKuwPKbhl47cObQatjiSabfZJcH7+BhCX pOuhzHgXwHQ97SBxau9JTGuJIs4KVrWFfGs2rPGbQzcKps6BtGDDYIfY9EpVYywW90odIM 6lHdv2AkX2rXP0BKpuTAon2iJKuLjbMTBKXMXgqY237+n/VfT9X0jgwreh7y8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759842625; a=rsa-sha256; cv=none; b=V0bO3yTNDoKEpN6AiSgylgNh8I92ExTSfYs1UqyO2RnUsABK9OPheswPkZVtuG2BMva5If Vliu/fmp38sK8ENgbl6/AUARrLvWykN+Wbl36VOn+nk6pTzxKLuYYcDeDfnqf6knCo35+9 AsfIsMVbj1vj6DHtBQl0sq7dpvFzkFK8ElywGQA8qjTC/tZh5K3OLNYmiTp6xR7432VsnF 5DTmhAMxedntShNltCHNx3ZSxG9w8AYIEfBCoIgpJjBajvbUAu+WxZP79QxDwdoJ+eV+xW olb56++fEl33bq+jCxIn8gvh+xw9050uYuXkdeYxfIi8tdA4LsVoLHxvevF/WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgxMP4qSSzm7c; Tue, 07 Oct 2025 13:10:25 +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 597DAP9J009758; Tue, 7 Oct 2025 13:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597DAP1A009755; Tue, 7 Oct 2025 13:10:25 GMT (envelope-from git) Date: Tue, 7 Oct 2025 13:10:25 GMT Message-Id: <202510071310.597DAP1A009755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: c4cce0a3e94e - main - ipv6: don't complain when deleting an address with prefix length of 128 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4cce0a3e94e3b22f874508d1a9cd81442648238 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=c4cce0a3e94e3b22f874508d1a9cd81442648238 commit c4cce0a3e94e3b22f874508d1a9cd81442648238 Author: Andrey V. Elsukov AuthorDate: 2025-10-07 13:08:15 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-10-07 13:08:15 +0000 ipv6: don't complain when deleting an address with prefix length of 128 Save prefix length in unused field in6_ifaddr->ia_plen, then on remove check if an address has 128 prefix length, and if so, we don't need to complain that there is none of related prefixes. Reviewed by: kp Obtained from: Yandex LLC MFC after: 1 week Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D52952 --- sys/netinet6/in6.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 4f756a75fac7..b98703bdfbfe 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1295,8 +1295,8 @@ in6_addifaddr(struct ifnet *ifp, struct in6_aliasreq *ifra, struct in6_ifaddr *i */ bzero(&pr0, sizeof(pr0)); pr0.ndpr_ifp = ifp; - pr0.ndpr_plen = in6_mask2len(&ifra->ifra_prefixmask.sin6_addr, - NULL); + pr0.ndpr_plen = ia->ia_plen = + in6_mask2len(&ifra->ifra_prefixmask.sin6_addr, NULL); if (pr0.ndpr_plen == 128) { /* we don't need to install a host route. */ goto aifaddr_out; @@ -1490,16 +1490,16 @@ in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp) * positive reference. */ remove_lle = 0; - if (ia->ia6_ndpr == NULL) { - nd6log((LOG_NOTICE, - "in6_unlink_ifa: autoconf'ed address " - "%s has no prefix\n", ip6_sprintf(ip6buf, IA6_IN6(ia)))); - } else { + if (ia->ia6_ndpr != NULL) { ia->ia6_ndpr->ndpr_addrcnt--; /* Do not delete lles within prefix if refcont != 0 */ if (ia->ia6_ndpr->ndpr_addrcnt == 0) remove_lle = 1; ia->ia6_ndpr = NULL; + } else if (ia->ia_plen < 128) { + nd6log((LOG_NOTICE, + "in6_unlink_ifa: autoconf'ed address " + "%s has no prefix\n", ip6_sprintf(ip6buf, IA6_IN6(ia)))); } nd6_rem_ifa_lle(ia, remove_lle); From nobody Tue Oct 7 13:48:26 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 4cgyCK6GW7z6BK4h; Tue, 07 Oct 2025 13:48:29 +0000 (UTC) (envelope-from christos@FreeBSD.org) Received: from margiolis.net (mail.margiolis.net [95.179.159.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgyCK2Fz5z3MHK; Tue, 07 Oct 2025 13:48:29 +0000 (UTC) (envelope-from christos@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; bh=fx1mSWNoztpP 2zaiQVTOJo7mNqnLOD7LsMgctEeJnx8=; h=in-reply-to:references:to:from: subject:cc:date; d=margiolis.net; b=mPDvAGlJkevXSykPeoGjSqHHwL7dKdP+t2 QEOnE+OMAec4lF/EzgYI61gWwYg3Vj/lOGQiOTKIVwAkmXmWJSMKGXxT7ucI1T9bVDNIRc 7169nZkN34gPSdV+zjarajBaIMT1YQBES1mQTv0sHZrRiphLlQcVBv5Q7OCi97u80tA= Received: from localhost (public-gprs236902.centertel.pl [31.60.72.167]) by margiolis.net (OpenSMTPD) with ESMTPSA id 9916f5a3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 7 Oct 2025 07:48:27 -0600 (MDT) 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Tue, 07 Oct 2025 15:48:26 +0200 Message-Id: Cc: , , , <0mp@freebsd.org> Subject: Re: git: 9cab9fde5eda - main - virtual_oss: Port to base From: "Christos Margiolis" To: =?utf-8?q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: aerc 0.21.0 References: <202509280958.58S9wrww083342@gitrepo.freebsd.org> <861pnf83kw.fsf@ltc.des.dev> In-Reply-To: <861pnf83kw.fsf@ltc.des.dev> X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:20473, ipnet:95.179.144.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cgyCK2Fz5z3MHK On Tue Oct 7, 2025 at 11:26 AM CEST, Dag-Erling Sm=C3=B8rgrav wrote: > Christos Margiolis writes: >> libexec/rc/rc.d/virtual_oss | 119 + > > This contains a reference to a non-existent sndiod service. I am aware. I discussed this with 0mp@ during EuroBSDCon in Zagreb and decided that it probably does not hurt too much to leave it there, at least for now. It's important to note that for most users sndiod actually is not needed. This is only needed when virtual_oss(8) runs with sndio support, which has been moved to a new port: audio/virtual_oss_sndio. Christos From nobody Tue Oct 7 14:10:19 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 4cgyhd4KLLz6BMJx for ; Tue, 07 Oct 2025 14:10:25 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgyhd03gKz3P8j for ; Tue, 07 Oct 2025 14:10:25 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-4dc4afb9e1cso67022571cf.0 for ; Tue, 07 Oct 2025 07:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759846223; x=1760451023; darn=freebsd.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=hgU9gTOk5G/KNjGSMCiGW9c7/TNElF2YRrpHGAI4Mkg=; b=FhNZ4JtW1DiRSoHkbxYj1OCrXRVItrbfivTXvvP0tNT3xqtmdr7mEJ2JAQxN0MyjdZ kPrK7x+7OfOuGi6k6vapvrxg/cInWnLrKayuiw033Xt4NpAGmGdTmgAHVyNdEusPKakW +3wfm2fROXbSrYS4Kc/Rc5Oq//53rGHioMPi+1aEiwWWlp8EkGPGIjv3oS8/R/YWOuJe 2fa7VLPipQmAUmpe/CUh3g6eBCRQgenIM7k4Jr0NJadBS0kzKtdxkwHtGb+Vf5i40/22 OtLL30Lcfpy1E+LSVDsqIOCmaU0fl0XdJvWg6roHe8lwenHal67FUR0u6ezQBX6XgqRm HpIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759846223; x=1760451023; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hgU9gTOk5G/KNjGSMCiGW9c7/TNElF2YRrpHGAI4Mkg=; b=LBlWNVA7Yjfx1SLwii1jMR9NFAemgUwtmf/iiM080JD74XDeoc3tFVCGQqzcIhw15b 2NffJcLhMUvOjwPdqAYv+iMdPlUO3ekAknEOUwVhPxavKlm8eboUxuOaJ7WTEAyxzG9k /LcdvB1tP2DBtuOlS1I1ScfShQo8R2o7qm0M/enjhkvGFK/l6U2bqm0rq+eD8ZAePwhU iVpuFd4il2QyQcU6152aqxholRezZPIItyjncxM4uqFYy9uVvecxV6DNDDFopzXbsw9l btAYwItImwHXejiRo5hbNe9zb23hDKwASLvZZZ1uHzaHejRbCCbUSv5IOqYAiarJMTrT hS4A== X-Forwarded-Encrypted: i=1; AJvYcCXmJnawXNdTrbSqGbCICdr/ko3fm/jvB2LqLXYgAeOPhf9q9Ii0IaQxzvvpa4HKErkzf7MIxJdQLbfBgCtqz7Week676g==@freebsd.org X-Gm-Message-State: AOJu0YwsTR8E5GaxrcadgmmDPRSJoE1scX0npBzzjS0gGdRP/nXX3+p+ SOyByKjp9zNfHHV1ADha/y4TdNlgTCQ86pabjRaB9SAlWjy//AKDaDIU X-Gm-Gg: ASbGncvY3lGmkgSek6a+gJHW/aczthOrzqR9yWTn5RURQoLvlZvR4SiJC2ziiSc5l1Z kuE1wwEtwyOOAbTARHeupnViqji0rh0ufOdvZupVClxClDs3AFh7YW03qkxkpKz/inAwm5qSFBx 2JNcW7AZoPF8QxQTeRKJ3T6LXLqWmWmettOA0PNGWtEDt4eQ10tLuO57GhjFP9eQEBaKjafXAH1 h7lAJfSpfEKLbaDhn5SzWhucinsN295zwLHHhLMffGCKf7ZtulqUUcBOxoyk1knUl53AzX25b1x IbOwYCHTo6xNRbUOq+drff4Y1deyvSBxSJZXMnPyEOrzwwShhplgxMGbqhCCww8yCpoA7KjnRr/ u1gHR6rlVcL125uRwHWmQc4iqxWY0tmi9viY/LKWbAy19nijio2n3cwB1y3Ed X-Google-Smtp-Source: AGHT+IHIWBIoQ9MBqSdG0nQXCIFLfycADhsuw4fXD6xJj81imQNRM8moF0kXLmiXGF+Ldk5pEQ1byg== X-Received: by 2002:ac8:5990:0:b0:4b6:18ff:3630 with SMTP id d75a77b69052e-4e6de868742mr46650171cf.24.1759846222470; Tue, 07 Oct 2025 07:10:22 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4e55d0cb747sm138340461cf.40.2025.10.07.07.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 07:10:22 -0700 (PDT) Date: Tue, 7 Oct 2025 10:10:19 -0400 From: Mark Johnston To: Christos Margiolis Cc: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, 0mp@freebsd.org Subject: Re: git: 9cab9fde5eda - main - virtual_oss: Port to base Message-ID: References: <202509280958.58S9wrww083342@gitrepo.freebsd.org> <861pnf83kw.fsf@ltc.des.dev> 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=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cgyhd03gKz3P8j On Tue, Oct 07, 2025 at 03:48:26PM +0200, Christos Margiolis wrote: > On Tue Oct 7, 2025 at 11:26 AM CEST, Dag-Erling Smørgrav wrote: > > Christos Margiolis writes: > >> libexec/rc/rc.d/virtual_oss | 119 + > > > > This contains a reference to a non-existent sndiod service. > > I am aware. I discussed this with 0mp@ during EuroBSDCon in Zagreb and > decided that it probably does not hurt too much to leave it there, at > least for now. Well, it'll break the test added in https://reviews.freebsd.org/D52954, which will be useful for catching bugs. > It's important to note that for most users sndiod actually is not > needed. This is only needed when virtual_oss(8) runs with sndio support, > which has been moved to a new port: audio/virtual_oss_sndio. Why not just modify the sndiod script to REQUIRE virtual_oss? From nobody Tue Oct 7 14:26:43 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 4cgz3S1X76z6BNtJ; Tue, 07 Oct 2025 14:26:44 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgz3R6wksz3QqS; Tue, 07 Oct 2025 14:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759847204; 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=Lm2PN0SDpNkbNOZc4W4D6Z71GLysQUIYTYgyFv0qjzY=; b=ZdE6X4XPqrIpOrluLcvyjTgv2q1IN4RwUc09o3ifhNGkbczb9Fw2TkzeA42QdmSMAamWSR NOJp6EhnPI8SJEnLd/kZC6G06UUg2qg6ojJVAWLCxTaXJR7e1yZUQZJyu+fBCaVQ1g0BYy oSmvH4FjcpztsEscpYmNwPc83RJeMrrFQYW6PEgT4KQoxIxeFmrVTf0QEfnXLEIwn15k4K WOlpSi3KZLC8KmQmFtUXUs7Ew/jMnoMT8r76gS0RMAwylPJPgV4WQI9u4Pf09ZMDpZhUXU ma0X2FQxKQqIJNpnOGvnFVvnrL8HxqaKganv+SnUH53HEeBdNKYByVQwQL7EKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759847204; 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=Lm2PN0SDpNkbNOZc4W4D6Z71GLysQUIYTYgyFv0qjzY=; b=LFf6DfAVQjvoBpZqe1op9AvZXN6WOlr+PKuKl7p2DfV5DShRHxuafM4GqDSJTKX85WuevI I/Smi3/rw1GOYltDywgCpwG61R5ikDaISfUQPX7ZzZnolEy2CkXzsvWFO5u4J7WjWt3+IM zM4ROhAEpxHwby2ewKSFHDN+sa9hAnx24TnDWuGtUQ1v78iMCvOcocgu2QmDi8qslouwHC 4go4Ifc2FzQcmn8cBCGQ98F2selqZ9+QPFIZlPFHedKZN3XVibw3Wc9mDzD6pONR6l669T fKbp+ApTGEqqmORKh1Vfdvhz6PywbKM6iv7OZjKHwVIE6lB71gnM7LXe/K253Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759847204; a=rsa-sha256; cv=none; b=g8NrKllAxr/hc0C7g4GV041RMGiJpVpJqHqzNLfDSmXwi/vfIHnIYlnKHnsSXSE9qXZ+UI R1z29sN7MR/jVy+mpULflEKEbZL7+rOrytRsUV0PyiSNOy4kwJ6HQUI1igCWae9N/+gONA kMldL9i6F/DY8EAwfkoSRtwMMNniiB4w71OaVI/iSri06JDdu/VfB+V+b44ZHgGsicEbQx ZpA5l9/okiWBg1JOo2/5bsXWTQzaVlnjvvvqrlhHywnkAMWdwfcR14ok2cxnC8SYK+M4TG ENbf7Kenhq/P5EwcymPevFv9OIDeYqRmvkLHGgBDvAY2fVRBIGw+amzswXV8DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgz3R646szq1G; Tue, 07 Oct 2025 14:26:43 +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 597EQhfo050880; Tue, 7 Oct 2025 14:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597EQh3K050877; Tue, 7 Oct 2025 14:26:43 GMT (envelope-from git) Date: Tue, 7 Oct 2025 14:26:43 GMT Message-Id: <202510071426.597EQh3K050877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jonathan T. Looney" Subject: git: e770e32aa3a0 - main - x86: Reduce amount of time the MCA lock is held while emitting records 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: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e770e32aa3a017b35fcf24e7c6f14fc2a209bad5 Auto-Submitted: auto-generated The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=e770e32aa3a017b35fcf24e7c6f14fc2a209bad5 commit e770e32aa3a017b35fcf24e7c6f14fc2a209bad5 Author: Jonathan T. Looney AuthorDate: 2025-10-06 15:07:33 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-07 14:20:12 +0000 x86: Reduce amount of time the MCA lock is held while emitting records The MCA spin lock is acquired in the hardware interrupt context to record MCA messages. It is also acquired by a task handler to emit those messages. Reduce the amount of time the task handler holds the lock to reduce the maximum amount of time the hardware interrupt handler may need to spin on the lock. Reviewed by: glebius, markj MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D52938 --- sys/x86/x86/mca.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index e43c88b3a27b..7ee22895e0a7 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -796,9 +796,9 @@ mca_record_entry(enum scan_mode mode, const struct mca_record *record) mtx_lock_spin(&mca_lock); rec = STAILQ_FIRST(&mca_freelist); if (rec == NULL) { + mtx_unlock_spin(&mca_lock); printf("MCA: Unable to allocate space for an event.\n"); mca_log(record); - mtx_unlock_spin(&mca_lock); return; } STAILQ_REMOVE_HEAD(&mca_freelist, link); @@ -1017,6 +1017,7 @@ static void mca_process_records(enum scan_mode mode) { struct mca_internal *mca; + STAILQ_HEAD(, mca_internal) tmplist; /* * If in an interrupt context, defer the post-scan activities to a @@ -1028,10 +1029,21 @@ mca_process_records(enum scan_mode mode) return; } + /* + * Copy the pending list to the stack so we can drop the spin lock + * while we are emitting logs. + */ + STAILQ_INIT(&tmplist); mtx_lock_spin(&mca_lock); - while ((mca = STAILQ_FIRST(&mca_pending)) != NULL) { - STAILQ_REMOVE_HEAD(&mca_pending, link); + STAILQ_SWAP(&mca_pending, &tmplist, mca_internal); + mtx_unlock_spin(&mca_lock); + + STAILQ_FOREACH(mca, &tmplist, link) mca_log(&mca->rec); + + mtx_lock_spin(&mca_lock); + while ((mca = STAILQ_FIRST(&tmplist)) != NULL) { + STAILQ_REMOVE_HEAD(&tmplist, link); mca_store_record(mca); } mtx_unlock_spin(&mca_lock); From nobody Tue Oct 7 15:24:29 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 4ch0L63SVQz6BTYn; Tue, 07 Oct 2025 15:24:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch0L61xyvz3Wtn; Tue, 07 Oct 2025 15:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759850670; 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=92WbxxL6hzGVZQE0dBAlk+6zEnVWOPAt1ofAbEJaohY=; b=xIRZxUtjvm/dn8QMrcb23dcCb0w7fLOdWtUo+ctNfRHQ7crgY+GliXFIoaYOPW0j2OxLrN ZDk4bazNn1nt+9V8QF2jMqYivhBfVlXh73qp9E7eA1vNfbzrpzBlR6V+Bjx2wLTC6uspNx ugwMoZAHoxNpfHP91Z9IfpQ+VJlfXMX+Z0q/qSI/+wFhkGi9an+dRvQYwNEJTzskN+zqg/ V+qhRGctRrzr+6J4PGECPoJD3cIdsD56yhHWIMSNFiiSnid+FZN/RiT76/1zrEZx4d34sf SbVO5st5+Mc5T8tGb4mopPeMdG09yO4K2Y+EOlaM0Xb/chCVKHYtOezf0Z0v+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759850670; 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=92WbxxL6hzGVZQE0dBAlk+6zEnVWOPAt1ofAbEJaohY=; b=q0pJPvl0qu7KzF4TtAGc8XQOdF1BmNhp2HUap1CHwo8zPeM4+biqpb1DpkkagbRKTXoBtr /iXvwGQAYKCZnzc0k86Z3cgISLuUrmlc+edxXGn2eV+DR0hjaPJ4S+g06sUoLIiNNV4ulF g+Ea82m6qLSwJHlgnkcMasgKcVnopYEQtL3Sa7Xzvc5Mtqsnn6HMLRke70F3af8Hzr/u00 OKSX88iG6z+YpBuqJy0PAd9FDHGPv9pHX26vrFGf7RKxdvHSelb1kqZEnhOyag3L4nDvhV gN1EjjE8uqB0F+C9II4MAL4eNMP8u0Uzhf1JCwVC4jraROgeB8YUmEu3Gb+wbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759850670; a=rsa-sha256; cv=none; b=V8fmd1boiC2k74ExSX7CmWPxGGTRS4B8x9oOjmCAhFzv4QSvxLH5dtdI2r3t/R44rx7bf/ jlL06S/t4HYzsxLnNEPuCPv9tJXRtWxB0JrE2iYotVgvtTkZnv8wc822bV3kZRBBtNA3eU +CKOTjYKQjtD4g4nkFdF59LCHYDfuvkPu5Nycqn13RBBGHGNF/IqSLkniBCAgDrkj/FPpV bFipED0udjfixAzwBw5hqjrkHxSppTJbXIfaoFFUnYEjfwu7I5Ycf+IZzO8Wv3s9+mGHTR p8iioSBilkgk6ajVSgiMXG55fcTk7Nv96ZRcdhO5oDfPE94wTkGG7YiT3NeX3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch0L61FvzzrNg; Tue, 07 Oct 2025 15:24:30 +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 597FOUR8063634; Tue, 7 Oct 2025 15:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597FOTr3063628; Tue, 7 Oct 2025 15:24:29 GMT (envelope-from git) Date: Tue, 7 Oct 2025 15:24:29 GMT Message-Id: <202510071524.597FOTr3063628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2efd602aea8b3cbc3fb215b9611946d04fceb10 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b2efd602aea8b3cbc3fb215b9611946d04fceb10 commit b2efd602aea8b3cbc3fb215b9611946d04fceb10 Merge: e770e32aa3a0 0064eb9cf1c8 Author: Cy Schubert AuthorDate: 2025-10-07 13:58:59 +0000 Commit: Cy Schubert CommitDate: 2025-10-07 15:16:21 +0000 unbound: Vendor import 1.24.0 Release notes at https://nlnetlabs.nl/news/2025/Sep/18/unbound-1.24.0-released/ MFC after: 1 week Merge commit '0064eb9cf1c8d526e87d3149249445d4bc8d0248' contrib/unbound/Makefile.in | 1380 ++-- contrib/unbound/cachedb/redis.c | 144 +- contrib/unbound/compat/fake-rfc2553.c | 6 +- contrib/unbound/config.h.in | 22 +- contrib/unbound/configure | 275 +- contrib/unbound/configure.ac | 31 +- contrib/unbound/contrib/aaaa-filter-iterator.patch | 98 +- contrib/unbound/contrib/unbound.service.in | 6 + contrib/unbound/daemon/cachedump.c | 339 +- contrib/unbound/daemon/remote.c | 769 +- contrib/unbound/daemon/stats.c | 2 + contrib/unbound/daemon/unbound.c | 9 +- contrib/unbound/daemon/worker.c | 19 +- contrib/unbound/dns64/dns64.c | 2 +- contrib/unbound/dnstap/dnstap.c | 4 +- contrib/unbound/dnstap/dnstap.m4 | 39 +- contrib/unbound/dnstap/dnstap.proto | 2 +- contrib/unbound/dnstap/dtstream.c | 2 +- contrib/unbound/doc/Changelog | 311 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/README.man | 16 + contrib/unbound/doc/example.conf.in | 10 +- contrib/unbound/doc/libunbound.3.in | 675 +- contrib/unbound/doc/libunbound.rst | 491 ++ contrib/unbound/doc/unbound-anchor.8.in | 383 +- contrib/unbound/doc/unbound-anchor.rst | 281 + contrib/unbound/doc/unbound-checkconf.8.in | 121 +- contrib/unbound/doc/unbound-checkconf.rst | 98 + contrib/unbound/doc/unbound-control.8.in | 2037 +++-- contrib/unbound/doc/unbound-control.rst | 1374 ++++ contrib/unbound/doc/unbound-host.1.in | 242 +- contrib/unbound/doc/unbound-host.rst | 176 + contrib/unbound/doc/unbound.8.in | 169 +- contrib/unbound/doc/unbound.conf.5.in | 8143 +++++++++++++------- contrib/unbound/doc/unbound.conf.rst | 4997 ++++++++++++ contrib/unbound/doc/unbound.rst | 119 + contrib/unbound/edns-subnet/addrtree.h | 2 +- contrib/unbound/edns-subnet/subnetmod.c | 47 +- contrib/unbound/edns-subnet/subnetmod.h | 4 + contrib/unbound/iterator/iter_delegpt.h | 10 + contrib/unbound/iterator/iter_fwd.c | 32 +- contrib/unbound/iterator/iterator.c | 32 +- contrib/unbound/libunbound/libworker.c | 15 +- contrib/unbound/libunbound/unbound.h | 2 + contrib/unbound/respip/respip.h | 2 +- contrib/unbound/services/authzone.c | 90 +- contrib/unbound/services/authzone.h | 17 +- contrib/unbound/services/cache/rrset.c | 2 + contrib/unbound/services/listen_dnsport.c | 117 +- contrib/unbound/services/listen_dnsport.h | 9 +- contrib/unbound/services/mesh.c | 1 + contrib/unbound/services/mesh.h | 2 + contrib/unbound/services/modstack.c | 4 +- contrib/unbound/services/modstack.h | 2 +- contrib/unbound/services/outside_network.c | 6 +- contrib/unbound/services/rpz.c | 20 +- contrib/unbound/sldns/keyraw.c | 4 +- contrib/unbound/sldns/str2wire.c | 2 +- contrib/unbound/sldns/wire2str.h | 2 +- contrib/unbound/smallapp/unbound-anchor.c | 12 +- contrib/unbound/smallapp/unbound-checkconf.c | 51 +- contrib/unbound/smallapp/unbound-control.c | 3 + contrib/unbound/testcode/doqclient.c | 71 +- contrib/unbound/testcode/fake_event.c | 46 +- contrib/unbound/testcode/testbound.c | 150 +- contrib/unbound/testcode/unitdname.c | 277 + contrib/unbound/testcode/unitinfra.c | 1 + contrib/unbound/testcode/unitmain.c | 24 + contrib/unbound/testcode/unitverify.c | 133 + contrib/unbound/testcode/unitzonemd.c | 1 + .../auth_nsec3_ent_with_out_of_zone_data.rpl | 228 + .../auth_nsec3_wild_with_out_of_zone_data.rpl | 234 + contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl | 163 + contrib/unbound/testdata/iter_minimise_chain.rpl | 623 ++ .../redis_reconnect_interval.tdir/after.zone | 2 + .../redis_reconnect_interval.tdir/before.zone | 2 + .../redis_reconnect_interval.tdir/redis.conf | 583 ++ .../redis_reconnect_interval.conf | 33 + .../redis_reconnect_interval.dsc | 16 + .../redis_reconnect_interval.post | 18 + .../redis_reconnect_interval.pre | 46 + .../redis_reconnect_interval.test | 121 + .../unbound_control.key | 39 + .../unbound_control.pem | 22 + .../unbound_server.key | 39 + .../unbound_server.pem | 22 + contrib/unbound/testdata/rpz_cname_wild.rpl | 190 + .../testdata/stat_values.tdir/stat_values.conf | 2 +- .../testdata/stat_values.tdir/stat_values.test | 3 +- .../testdata/stat_values.tdir/stat_values.testns | 5 + .../subnet_cache_lookup.conf | 36 + .../subnet_cache_lookup.dsc | 16 + .../subnet_cache_lookup.post | 15 + .../subnet_cache_lookup.pre | 42 + .../subnet_cache_lookup.test | 121 + .../subnet_cache_lookup.testns | 181 + .../unbound/testdata/subnet_cached_servfail.crpl | 2 +- contrib/unbound/testdata/subnet_noecs_mult.crpl | 334 + contrib/unbound/testdata/subnet_noecs_refused.crpl | 159 + contrib/unbound/testdata/subnet_noecs_support.crpl | 127 + .../unbound/testdata/subnet_scopezero_global.crpl | 280 + contrib/unbound/testdata/val_failure_dnskey.rpl | 2 +- contrib/unbound/util/config_file.c | 62 +- contrib/unbound/util/config_file.h | 11 + contrib/unbound/util/configparser.c | 1300 ++-- contrib/unbound/util/configparser.y | 12 +- contrib/unbound/util/data/dname.c | 44 +- contrib/unbound/util/data/dname.h | 15 +- contrib/unbound/util/data/msgencode.c | 6 +- contrib/unbound/util/data/msgencode.h | 2 +- contrib/unbound/util/data/msgparse.h | 6 +- contrib/unbound/util/data/msgreply.c | 27 +- contrib/unbound/util/data/msgreply.h | 12 +- contrib/unbound/util/iana_ports.inc | 2 + contrib/unbound/util/mini_event.c | 4 +- contrib/unbound/util/net_help.c | 21 +- contrib/unbound/util/netevent.c | 82 +- contrib/unbound/util/netevent.h | 4 + contrib/unbound/util/random.c | 33 + contrib/unbound/validator/val_sigcrypt.c | 5 + contrib/unbound/validator/validator.c | 19 +- contrib/unbound/winrc/win_svc.c | 1 + lib/libunbound/config.h | 4 +- 123 files changed, 23206 insertions(+), 6159 deletions(-) diff --cc contrib/unbound/config.h.in index 584810398b91,000000000000..a2b3f33c32be mode 100644,000000..100644 --- a/contrib/unbound/config.h.in +++ b/contrib/unbound/config.h.in @@@ -1,1640 -1,0 +1,1650 @@@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* apply the fallthrough attribute. */ +#undef ATTR_FALLTHROUGH + +/* apply the noreturn attribute to a function that exits the program */ +#undef ATTR_NORETURN + +/* apply the weak attribute to a symbol */ +#undef ATTR_WEAK + +/* Directory to chroot to */ +#undef CHROOT_DIR + +/* Define this to enable client subnet option. */ +#undef CLIENT_SUBNET + +/* Do sha512 definitions in config.h */ +#undef COMPAT_SHA512 + +/* Command line arguments used with configure */ +#undef CONFCMDLINE + +/* Pathname to the Unbound configuration file */ +#undef CONFIGFILE + +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work + */ +#undef DARWIN_BROKEN_SETREUID + +/* Whether daemon is deprecated */ +#undef DEPRECATED_DAEMON + +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ +#undef DEPRECATE_RSA_1024 + +/* Define this to enable kernel based UDP source port randomization. */ +#undef DISABLE_EXPLICIT_PORT_RANDOMISATION + +/* default dnstap socket path */ +#undef DNSTAP_SOCKET_PATH + +/* Define if you want to use debug lock checking (slow). */ +#undef ENABLE_LOCK_CHECKS + +/* Define this if you enabled-allsymbols from libunbound to link binaries to + it for smaller install size, but the libunbound export table is polluted by + internal symbols */ +#undef EXPORT_ALL_SYMBOLS + +/* Define to 1 if you have the 'accept4' function. */ +#undef HAVE_ACCEPT4 + +/* Define to 1 if you have the 'arc4random' function. */ +#undef HAVE_ARC4RANDOM + +/* Define to 1 if you have the 'arc4random_uniform' function. */ +#undef HAVE_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Whether the C compiler accepts the "fallthrough" attribute */ +#undef HAVE_ATTR_FALLTHROUGH + +/* Whether the C compiler accepts the "format" attribute */ +#undef HAVE_ATTR_FORMAT + +/* Whether the C compiler accepts the "noreturn" attribute */ +#undef HAVE_ATTR_NORETURN + +/* Whether the C compiler accepts the "unused" attribute */ +#undef HAVE_ATTR_UNUSED + +/* Whether the C compiler accepts the "weak" attribute */ +#undef HAVE_ATTR_WEAK + +/* If we have be64toh */ +#undef HAVE_BE64TOH + +/* Define to 1 if you have the 'BIO_set_callback_ex' function. */ +#undef HAVE_BIO_SET_CALLBACK_EX + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_BSD_STRING_H + +/* Define to 1 if you have the 'chown' function. */ +#undef HAVE_CHOWN + +/* Define to 1 if you have the 'chroot' function. */ +#undef HAVE_CHROOT + +/* Define to 1 if you have the 'CRYPTO_cleanup_all_ex_data' function. */ +#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA + +/* Define to 1 if you have the 'CRYPTO_THREADID_set_callback' function. */ +#undef HAVE_CRYPTO_THREADID_SET_CALLBACK + +/* Define to 1 if you have the 'ctime_r' function. */ +#undef HAVE_CTIME_R + +/* Define to 1 if you have the 'daemon' function. */ +#undef HAVE_DAEMON + +/* Define to 1 if you have the declaration of 'arc4random', and to 0 if you + don't. */ +#undef HAVE_DECL_ARC4RANDOM + +/* Define to 1 if you have the declaration of 'arc4random_uniform', and to 0 + if you don't. */ +#undef HAVE_DECL_ARC4RANDOM_UNIFORM + +/* Define to 1 if you have the declaration of 'evsignal_assign', and to 0 if + you don't. */ +#undef HAVE_DECL_EVSIGNAL_ASSIGN + +/* Define to 1 if you have the declaration of 'inet_ntop', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_NTOP + +/* Define to 1 if you have the declaration of 'inet_pton', and to 0 if you + don't. */ +#undef HAVE_DECL_INET_PTON + +/* Define to 1 if you have the declaration of 'nghttp2_session_server_new', + and to 0 if you don't. */ +#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW + +/* Define to 1 if you have the declaration of 'ngtcp2_conn_server_new', and to + 0 if you don't. */ +#undef HAVE_DECL_NGTCP2_CONN_SERVER_NEW + +/* Define to 1 if you have the declaration of 'ngtcp2_crypto_encrypt_cb', and + to 0 if you don't. */ +#undef HAVE_DECL_NGTCP2_CRYPTO_ENCRYPT_CB + +/* Define to 1 if you have the declaration of 'NID_ED25519', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED25519 + +/* Define to 1 if you have the declaration of 'NID_ED448', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_ED448 + +/* Define to 1 if you have the declaration of 'NID_secp384r1', and to 0 if you + don't. */ +#undef HAVE_DECL_NID_SECP384R1 + +/* Define to 1 if you have the declaration of 'NID_X9_62_prime256v1', and to 0 + if you don't. */ +#undef HAVE_DECL_NID_X9_62_PRIME256V1 + +/* Define to 1 if you have the declaration of 'reallocarray', and to 0 if you + don't. */ +#undef HAVE_DECL_REALLOCARRAY + +/* Define to 1 if you have the declaration of 'redisConnect', and to 0 if you + don't. */ +#undef HAVE_DECL_REDISCONNECT + +/* Define to 1 if you have the declaration of 'sk_SSL_COMP_pop_free', and to 0 + if you don't. */ +#undef HAVE_DECL_SK_SSL_COMP_POP_FREE + +/* Define to 1 if you have the declaration of + 'SSL_COMP_get_compression_methods', and to 0 if you don't. */ +#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS + +/* Define to 1 if you have the declaration of 'SSL_CTX_set_ecdh_auto', and to + 0 if you don't. */ +#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO + - /* Define to 1 if you have the declaration of 'strlcat', and to 0 if you ++/* Define to 1 if you have the declaration of `SSL_CTX_set_tmp_ecdh', and to 0 ++ if you don't. */ ++#undef HAVE_DECL_SSL_CTX_SET_TMP_ECDH ++ ++/* Define to 1 if you have the declaration of `strlcat', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCAT + +/* Define to 1 if you have the declaration of 'strlcpy', and to 0 if you + don't. */ +#undef HAVE_DECL_STRLCPY + +/* Define to 1 if you have the declaration of 'XML_StopParser', and to 0 if + you don't. */ +#undef HAVE_DECL_XML_STOPPARSER + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the 'DSA_SIG_set0' function. */ +#undef HAVE_DSA_SIG_SET0 + +/* Define to 1 if you have the header file. */ +#undef HAVE_ENDIAN_H + +/* Define to 1 if you have the 'endprotoent' function. */ +#undef HAVE_ENDPROTOENT + +/* Define to 1 if you have the 'endpwent' function. */ +#undef HAVE_ENDPWENT + +/* Define to 1 if you have the 'endservent' function. */ +#undef HAVE_ENDSERVENT + +/* Define to 1 if you have the 'ENGINE_cleanup' function. */ +#undef HAVE_ENGINE_CLEANUP + +/* Define to 1 if you have the 'ERR_free_strings' function. */ +#undef HAVE_ERR_FREE_STRINGS + +/* Define to 1 if you have the 'ERR_load_crypto_strings' function. */ +#undef HAVE_ERR_LOAD_CRYPTO_STRINGS + +/* Define to 1 if you have the 'event_assign' function. */ +#undef HAVE_EVENT_ASSIGN + +/* Define to 1 if you have the 'event_base_free' function. */ +#undef HAVE_EVENT_BASE_FREE + +/* Define to 1 if you have the 'event_base_get_method' function. */ +#undef HAVE_EVENT_BASE_GET_METHOD + +/* Define to 1 if you have the 'event_base_new' function. */ +#undef HAVE_EVENT_BASE_NEW + +/* Define to 1 if you have the 'event_base_once' function. */ +#undef HAVE_EVENT_BASE_ONCE + +/* Define to 1 if you have the header file. */ +#undef HAVE_EVENT_H + +/* Define to 1 if you have the 'EVP_aes_256_cbc' function. */ +#undef HAVE_EVP_AES_256_CBC + +/* Define to 1 if you have the 'EVP_cleanup' function. */ +#undef HAVE_EVP_CLEANUP + +/* Define to 1 if you have the 'EVP_default_properties_is_fips_enabled' + function. */ +#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED + +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ +#undef HAVE_EVP_DIGESTVERIFY + +/* Define to 1 if you have the 'EVP_dss1' function. */ +#undef HAVE_EVP_DSS1 + +/* Define to 1 if you have the 'EVP_EncryptInit_ex' function. */ +#undef HAVE_EVP_ENCRYPTINIT_EX + +/* Define to 1 if you have the 'EVP_MAC_CTX_set_params' function. */ +#undef HAVE_EVP_MAC_CTX_SET_PARAMS + +/* Define to 1 if you have the 'EVP_MD_CTX_new' function. */ +#undef HAVE_EVP_MD_CTX_NEW + +/* Define to 1 if you have the 'EVP_sha1' function. */ +#undef HAVE_EVP_SHA1 + +/* Define to 1 if you have the 'EVP_sha256' function. */ +#undef HAVE_EVP_SHA256 + +/* Define to 1 if you have the 'EVP_sha512' function. */ +#undef HAVE_EVP_SHA512 + +/* Define to 1 if you have the 'ev_default_loop' function. */ +#undef HAVE_EV_DEFAULT_LOOP + +/* Define to 1 if you have the 'ev_loop' function. */ +#undef HAVE_EV_LOOP + +/* Define to 1 if you have the header file. */ +#undef HAVE_EXPAT_H + +/* Define to 1 if you have the 'explicit_bzero' function. */ +#undef HAVE_EXPLICIT_BZERO + +/* Define to 1 if you have the 'fcntl' function. */ +#undef HAVE_FCNTL + +/* Define to 1 if you have the 'FIPS_mode' function. */ +#undef HAVE_FIPS_MODE + +/* Define to 1 if you have the 'fork' function. */ +#undef HAVE_FORK + +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ +#undef HAVE_FSEEKO + +/* Define to 1 if you have the 'fsync' function. */ +#undef HAVE_FSYNC + +/* Whether getaddrinfo is available */ +#undef HAVE_GETADDRINFO + +/* Define to 1 if you have the 'getauxval' function. */ +#undef HAVE_GETAUXVAL + +/* Define to 1 if you have the 'getentropy' function. */ +#undef HAVE_GETENTROPY + +/* Define to 1 if you have the 'getifaddrs' function. */ +#undef HAVE_GETIFADDRS + +/* Define to 1 if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the 'getpwnam' function. */ +#undef HAVE_GETPWNAM + +/* Define to 1 if you have the 'getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define to 1 if you have the 'gettid' function. */ +#undef HAVE_GETTID + +/* Define to 1 if you have the 'glob' function. */ +#undef HAVE_GLOB + +/* Define to 1 if you have the header file. */ +#undef HAVE_GLOB_H + +/* Define to 1 if you have the 'gmtime_r' function. */ +#undef HAVE_GMTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_GRP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_HIREDIS_HIREDIS_H + +/* Define to 1 if you have the 'HMAC_Init_ex' function. */ +#undef HAVE_HMAC_INIT_EX + +/* If we have htobe64 */ +#undef HAVE_HTOBE64 + +/* Define to 1 if you have the header file. */ +#undef HAVE_IFADDRS_H + +/* Define to 1 if you have the 'if_nametoindex' function. */ +#undef HAVE_IF_NAMETOINDEX + +/* Define to 1 if you have the 'inet_aton' function. */ +#undef HAVE_INET_ATON + +/* Define to 1 if you have the 'inet_ntop' function. */ +#undef HAVE_INET_NTOP + +/* Define to 1 if you have the 'inet_pton' function. */ +#undef HAVE_INET_PTON + +/* Define to 1 if you have the 'initgroups' function. */ +#undef HAVE_INITGROUPS + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* if the function 'ioctlsocket' is available */ +#undef HAVE_IOCTLSOCKET + +/* Define to 1 if you have the header file. */ +#undef HAVE_IPHLPAPI_H + +/* Define to 1 if you have the 'isblank' function. */ +#undef HAVE_ISBLANK + +/* Define to 1 if you have the 'kill' function. */ +#undef HAVE_KILL + +/* Use portable libbsd functions */ +#undef HAVE_LIBBSD + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBKERN_OSBYTEORDER_H + +/* Define if we have LibreSSL */ +#undef HAVE_LIBRESSL + +/* If we have atomic_store */ +#undef HAVE_LINK_ATOMIC_STORE + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_NET_TSTAMP_H + +/* Define to 1 if you have the 'localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOGIN_CAP_H + +/* If have GNU libc compatible malloc */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the 'memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_TCP_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETIOAPI_H + +/* Use libnettle for crypto */ +#undef HAVE_NETTLE + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_DSA_COMPAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETTLE_EDDSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_IF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_PFVAR_H + +/* Define this to use nghttp2 client. */ +#undef HAVE_NGHTTP2 + +/* Define to 1 if you have the header file. */ +#undef HAVE_NGHTTP2_NGHTTP2_H + +/* Define this to use ngtcp2. */ +#undef HAVE_NGTCP2 + +/* Define to 1 if you have the 'ngtcp2_ccerr_default' function. */ +#undef HAVE_NGTCP2_CCERR_DEFAULT + +/* Define to 1 if you have the 'ngtcp2_conn_encode_0rtt_transport_params' + function. */ +#undef HAVE_NGTCP2_CONN_ENCODE_0RTT_TRANSPORT_PARAMS + +/* Define to 1 if you have the 'ngtcp2_conn_get_max_local_streams_uni' + function. */ +#undef HAVE_NGTCP2_CONN_GET_MAX_LOCAL_STREAMS_UNI + +/* Define to 1 if you have the 'ngtcp2_conn_get_num_scid' function. */ +#undef HAVE_NGTCP2_CONN_GET_NUM_SCID + +/* Define to 1 if you have the 'ngtcp2_conn_in_closing_period' function. */ +#undef HAVE_NGTCP2_CONN_IN_CLOSING_PERIOD + +/* Define to 1 if you have the 'ngtcp2_conn_in_draining_period' function. */ +#undef HAVE_NGTCP2_CONN_IN_DRAINING_PERIOD + +/* Define if ngtcp2_conn_shutdown_stream has 4 arguments. */ +#undef HAVE_NGTCP2_CONN_SHUTDOWN_STREAM4 + +/* Define to 1 if you have the 'ngtcp2_conn_tls_early_data_rejected' function. + */ +#undef HAVE_NGTCP2_CONN_TLS_EARLY_DATA_REJECTED + +/* Define to 1 if you have the 'ngtcp2_crypto_encrypt_cb' function. */ +#undef HAVE_NGTCP2_CRYPTO_ENCRYPT_CB + +/* Define to 1 if you have the + 'ngtcp2_crypto_quictls_configure_client_context' function. */ +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT + +/* Define to 1 if you have the + 'ngtcp2_crypto_quictls_configure_server_context' function. */ +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT + +/* Define to 1 if you have the + 'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL + - /* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */ ++/* Define to 1 if you have the `ngtcp2_crypto_quictls_init' function. */ ++#undef HAVE_NGTCP2_CRYPTO_QUICTLS_INIT ++ ++/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */ +#undef HAVE_NGTCP2_ENCRYPTION_LEVEL + +/* Define to 1 if you have the header file. + */ +#undef HAVE_NGTCP2_NGTCP2_CRYPTO_OPENSSL_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NGTCP2_NGTCP2_CRYPTO_OSSL_H ++ +/* Define to 1 if you have the header file. + */ +#undef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NGTCP2_NGTCP2_H + +/* Use libnss for crypto */ +#undef HAVE_NSS + +/* Define to 1 if you have the 'OpenSSL_add_all_digests' function. */ +#undef HAVE_OPENSSL_ADD_ALL_DIGESTS + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_BN_H + +/* Define to 1 if you have the 'OPENSSL_config' function. */ +#undef HAVE_OPENSSL_CONFIG + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CONF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_CORE_NAMES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DH_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_DSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ENGINE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_ERR_H + +/* Define to 1 if you have the 'OPENSSL_init_crypto' function. */ +#undef HAVE_OPENSSL_INIT_CRYPTO + +/* Define to 1 if you have the 'OPENSSL_init_ssl' function. */ +#undef HAVE_OPENSSL_INIT_SSL + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_PARAM_BUILD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RAND_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_RSA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENSSL_SSL_H + +/* Define to 1 if you have the 'OSSL_PARAM_BLD_new' function. */ +#undef HAVE_OSSL_PARAM_BLD_NEW + +/* Define to 1 if you have the 'poll' function. */ +#undef HAVE_POLL + +/* Define to 1 if you have the header file. */ +#undef HAVE_POLL_H + +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD + +/* Have PTHREAD_PRIO_INHERIT. */ +#undef HAVE_PTHREAD_PRIO_INHERIT + +/* Define to 1 if the system has the type 'pthread_rwlock_t'. */ +#undef HAVE_PTHREAD_RWLOCK_T + +/* Define to 1 if the system has the type 'pthread_spinlock_t'. */ +#undef HAVE_PTHREAD_SPINLOCK_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_PWD_H + +/* Define if you have Python libraries and header files. */ +#undef HAVE_PYTHON + +/* Define to 1 if you have the 'random' function. */ +#undef HAVE_RANDOM + +/* Define to 1 if you have the 'RAND_cleanup' function. */ +#undef HAVE_RAND_CLEANUP + +/* If we have reallocarray(3) */ +#undef HAVE_REALLOCARRAY + +/* Define to 1 if you have the 'recvmsg' function. */ +#undef HAVE_RECVMSG + +/* Define to 1 if you have the 'sendmsg' function. */ +#undef HAVE_SENDMSG + +/* Define to 1 if you have the 'setregid' function. */ +#undef HAVE_SETREGID + +/* Define to 1 if you have the 'setresgid' function. */ +#undef HAVE_SETRESGID + +/* Define to 1 if you have the 'setresuid' function. */ +#undef HAVE_SETRESUID + +/* Define to 1 if you have the 'setreuid' function. */ +#undef HAVE_SETREUID + +/* Define to 1 if you have the 'setrlimit' function. */ +#undef HAVE_SETRLIMIT + +/* Define to 1 if you have the 'setsid' function. */ +#undef HAVE_SETSID + +/* Define to 1 if you have the 'setusercontext' function. */ +#undef HAVE_SETUSERCONTEXT + +/* Define to 1 if you have the 'SHA512_Update' function. */ +#undef HAVE_SHA512_UPDATE + +/* Define to 1 if you have the 'shmget' function. */ +#undef HAVE_SHMGET + +/* Define to 1 if you have the 'sigprocmask' function. */ +#undef HAVE_SIGPROCMASK + +/* Define to 1 if you have the 'sleep' function. */ +#undef HAVE_SLEEP + +/* Define to 1 if you have the 'snprintf' function. */ +#undef HAVE_SNPRINTF + +/* Define to 1 if you have the 'socketpair' function. */ +#undef HAVE_SOCKETPAIR + +/* Using Solaris threads */ +#undef HAVE_SOLARIS_THREADS + +/* Define to 1 if you have the 'srandom' function. */ +#undef HAVE_SRANDOM + +/* Define if you have the SSL libraries installed. */ +#undef HAVE_SSL + +/* Define to 1 if you have the 'SSL_CTX_set_alpn_protos' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_PROTOS + +/* Define to 1 if you have the 'SSL_CTX_set_alpn_select_cb' function. */ +#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB + +/* Define to 1 if you have the 'SSL_CTX_set_ciphersuites' function. */ +#undef HAVE_SSL_CTX_SET_CIPHERSUITES + +/* Define to 1 if you have the 'SSL_CTX_set_security_level' function. */ +#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL + +/* Define to 1 if you have the 'SSL_CTX_set_tlsext_ticket_key_evp_cb' + function. */ +#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB + - /* Define to 1 if you have the 'SSL_CTX_set_tmp_ecdh' function. */ - #undef HAVE_SSL_CTX_SET_TMP_ECDH - - /* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */ ++/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +#undef HAVE_SSL_GET0_ALPN_SELECTED + +/* Define to 1 if you have the 'SSL_get0_peername' function. */ +#undef HAVE_SSL_GET0_PEERNAME + +/* Define to 1 if you have the 'SSL_get1_peer_certificate' function. */ +#undef HAVE_SSL_GET1_PEER_CERTIFICATE + +/* Define to 1 if you have the 'SSL_is_quic' function. */ +#undef HAVE_SSL_IS_QUIC + +/* Define to 1 if you have the 'SSL_set1_host' function. */ +#undef HAVE_SSL_SET1_HOST + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDATOMIC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the 'strftime' function. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the 'strlcat' function. */ +#undef HAVE_STRLCAT + +/* Define to 1 if you have the 'strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the 'strptime' function. */ +#undef HAVE_STRPTIME + +/* Define to 1 if you have the 'strsep' function. */ +#undef HAVE_STRSEP + +/* Define to 1 if 'ipi_spec_dst' is a member of 'struct in_pktinfo'. */ +#undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST + +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_pkt_hd'. */ +#undef HAVE_STRUCT_NGTCP2_PKT_HD_TOKENLEN + +/* Define to 1 if 'max_tx_udp_payload_size' is a member of 'struct + ngtcp2_settings'. */ +#undef HAVE_STRUCT_NGTCP2_SETTINGS_MAX_TX_UDP_PAYLOAD_SIZE + +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_settings'. */ +#undef HAVE_STRUCT_NGTCP2_SETTINGS_TOKENLEN + +/* Define to 1 if 'original_dcid_present' is a member of 'struct + ngtcp2_transport_params'. */ +#undef HAVE_STRUCT_NGTCP2_TRANSPORT_PARAMS_ORIGINAL_DCID_PRESENT + +/* Define to 1 if the system has the type 'struct ngtcp2_version_cid'. */ +#undef HAVE_STRUCT_NGTCP2_VERSION_CID + +/* Define to 1 if 'sun_len' is a member of 'struct sockaddr_un'. */ +#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN + +/* Define if you have Swig libraries and header files. */ +#undef HAVE_SWIG + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if systemd should be used */ +#undef HAVE_SYSTEMD + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_ENDIAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IPC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SHA2_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SHM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TARGETCONDITIONALS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TIME_H + +/* Define to 1 if you have the 'tzset' function. */ +#undef HAVE_TZSET + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the 'usleep' function. */ +#undef HAVE_USLEEP + +/* Define to 1 if you have the 'vfork' function. */ +#undef HAVE_VFORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_VFORK_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINDOWS_H + +/* Using Windows threads */ +#undef HAVE_WINDOWS_THREADS + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINSOCK2_H + +/* Define to 1 if 'fork' works. */ +#undef HAVE_WORKING_FORK + +/* Define to 1 if 'vfork' works. */ +#undef HAVE_WORKING_VFORK + +/* Define to 1 if you have the 'writev' function. */ +#undef HAVE_WRITEV + +/* Define to 1 if you have the header file. */ +#undef HAVE_WS2TCPIP_H + *** 33861 LINES SKIPPED *** From nobody Tue Oct 7 16:24:08 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 4ch1fx1gbKz6BZ04; Tue, 07 Oct 2025 16:24:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch1fw6TYKz3dKd; Tue, 07 Oct 2025 16:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854249; 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=GChcTTXQdKkeaJGwF2pE34SXhx86MV4/+I3r65km7vI=; b=Vaeo3sfzPitWprQlTLhR7gwQTrrN+YHuQiN5f2+pk2NcDPlhr/D4ks5TEHDVClSCIi+i8s wIKKQ7Xvtrp9D48SrNjDDXuYDd4I5nq27kpAtatXYuhUnD4MPNmosc2iJ70s2hcaBT2rhO WTbGa/CIyxxAHKS6ZX6SC8P2bDh1unFhkJgUEULvFVTR1JVl3+JIj1CWp5ARjTeJekmYVq 7meausUJm3j4Sudp85Th3jZUHlhm1uhtsEeWN0WpyWGafpr9Eam/ek5lhX1D3Cp+a7AnkI WLrsfp2A+tDOtRAT2o1yyTnKhHuduxiX1iOllkgrKFzs3ifBADqGOImmD4do3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854249; 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=GChcTTXQdKkeaJGwF2pE34SXhx86MV4/+I3r65km7vI=; b=KhJ1iYuueQftr0irpuLLhq9k8j0df3CEDE4OTmGLOt5KZSN4kw52WCWKoCrNfvBOito7IN yjCglj+kTLf9mSF6KB1ZeZxtPp3lTbxKMJDPLOy3OYv/08yscV7FM8Hw3+g4rGL3FRTdgf /DoDYq0E30mfzCFgStxYXS8s9iItg6vSr2PHY+w6ZlWD3hIOWnlgnF8Olfsbdx1Tp0MImI ImcyXRvEInJLapJkLV97RQD1ZVT7lJrqAdFFLRfQgza7k6GNGnzb3A2qbDkdMvVgQkeFni gfBzz5Uaa+xT9Iad3oP3KrlwcjZpkGOHrHW59pE8XytttzIhha5AbhI8uew3Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759854249; a=rsa-sha256; cv=none; b=ELdnqUOzUgBQoQTQGbYVYTMtd7Vs9Z8WqRDb2UOvIpQ9Qq++mMlQ4sPZmyiXfFbRP9XqYf stPYgYeoU/1wA4JHmAdap+0YhT7ST33EL4hHCt1uE3J1NkSrLgYNW0mkn7JYofnVKjGV8/ pH5D94m0+6Ap7Tal5D6O1MTkPqXMm+vhB6VWORayv4NepbO66/WqbA8dBkLuP2X/sa34Wz U7HAYvnwt1bxOelbXB+4vviV1wMboBW66QAPyN0GwqYJSwfimxg1u3BFxnQ9GeUPhQe3+P wPrVmcmIz1q5CVtbQfwcrrTGy+4Ly15YtRS/NrB27mmAZjHalsfXtt1T2am1MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch1fw64ybzt6G; Tue, 07 Oct 2025 16:24:08 +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 597GO8bD077436; Tue, 7 Oct 2025 16:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GO8U2077434; Tue, 7 Oct 2025 16:24:08 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:24:08 GMT Message-Id: <202510071624.597GO8U2077434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a9c72543d287 - main - tail: Tweak follow_rename test case 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9c72543d287afa8dd30bec0f49873e88057c192 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a9c72543d287afa8dd30bec0f49873e88057c192 commit a9c72543d287afa8dd30bec0f49873e88057c192 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-07 16:23:57 +0000 tail: Tweak follow_rename test case Add a brief sleep to give tail time to start following the file before we rename it. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52887 --- usr.bin/tail/tests/tail_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/tail/tests/tail_test.sh b/usr.bin/tail/tests/tail_test.sh index 74d6908f7568..82c74a0d4da4 100755 --- a/usr.bin/tail/tests/tail_test.sh +++ b/usr.bin/tail/tests/tail_test.sh @@ -341,6 +341,7 @@ follow_create_body() rm -f infile tail -F infile > outfile & pid=$! + sleep 0.1 seq 1 5 >infile sleep 2 atf_check cmp infile outfile @@ -360,6 +361,7 @@ follow_rename_body() seq 1 3 > infile tail -F infile > outfile & pid=$! + sleep 0.1 seq 4 5 > infile_new atf_check mv infile infile_old atf_check mv infile_new infile From nobody Tue Oct 7 16:24:09 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 4ch1fy1VWZz6BYnW; Tue, 07 Oct 2025 16:24:10 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch1fy0j2qz3dNG; Tue, 07 Oct 2025 16:24:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854250; 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=gGkJtQKCxkv1MYQB0Sc4/hXGWRjYELqdA/qWzjzHVP0=; b=sncrkpdBWqmwGiofzUUsdiZ93SgjEBb0ApGnlMGmpf6VozWYONnqaMa2awRMOfA3A3FMgg w32ZcUdLhVQQA8kEUGTCMaQD2RKWNgILJDIufmZW1KqWVnYKEYjumUV19DNk6OhHleLHDb +27zkJf/N/8QbiBgT1enM7YcFQwI0OkHovs22w8jyclIMkUxTgqkbHWAPkTIlsrmULZ6+O QsgvvFQkQmG0P+9ECW747EqxY/X++/jiUBeEwqR6//cmh7UabHE/Ox9xGfVpQHTH7nm2Dp Im8BDVYyt8uHTtd5ZMuBJyAMXODtQFM7JRI8qJ74z1V8sxN3jfOxdb2OYiVW2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854250; 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=gGkJtQKCxkv1MYQB0Sc4/hXGWRjYELqdA/qWzjzHVP0=; b=MEm+di0NxtkJk42g02iMrSy+wIeUpZaV12NaQL/sCncMrFh7CWZY4pwNSTO7FHhz2K/Mlb D5RjVRvzqBj3OzAUaounK/fbiuokTD9LobzS2IiIbGljz7UbTM1u+eyLE4mB7Ak4xGlHg2 xyt7In9aJKWl/c2Zeis6AhTaYe28KrgIgUN1BHvlo274rBU8Flzk/TqIMoXiuO00HBvcT3 Ifs/226qGLim4d/c9ETDSTYV54Tr4ksaqhXrqPMIi5G7cCxL1AGz0H9+E++ENttuqCdc16 YExSFxphixDSB0OhnRzhriNoh8x2fgZYf30seVl1csMXqmQEtBy8MUPDiwogXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759854250; a=rsa-sha256; cv=none; b=YEPyTMd5WXYbFmAm/OVV9wSmFjgDVKrBtM20WoPBWFbEJ3P8mEWF1ThUK+7/GIjfiKPRG4 gvSC2HuGeIQfq+zUwlozqT2PKvafSDAMDt/7IAT/HG6w0rPjEIuf2iY737xqUpRK39oJ5j iCP7zKcgxNy2fBcneU+XzZX8n6ycLvKABKwP9COKCzwR3HkYiBt669KoCO5srILaf+dNaW 1IwxUGM7E1wiDZd/xZb2gddI2CDPwR5wZFSPNqHR2z4Jfc2VebfKfJpvGPVsPGdv0BSsEt lcyMpSbHA2hTTnayPNGxBpFwp3ToPBxkUGVlKY5EVSE6NDbBejokpKdhEoEbTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch1fy0CmnzsvV; Tue, 07 Oct 2025 16:24:10 +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 597GO9gT077471; Tue, 7 Oct 2025 16:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GO9RA077468; Tue, 7 Oct 2025 16:24:09 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:24:09 GMT Message-Id: <202510071624.597GO9RA077468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 31db1582c883 - main - fts: Remove a few stray blank lines 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31db1582c883cbdd151ffacb22829027f23ead40 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=31db1582c883cbdd151ffacb22829027f23ead40 commit 31db1582c883cbdd151ffacb22829027f23ead40 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-07 16:23:57 +0000 fts: Remove a few stray blank lines Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52924 --- lib/libc/gen/fts.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index cce959ba836a..4aa386d777cd 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -106,7 +106,6 @@ struct _fts_private { * This assumption only holds for UFS-like filesystems that implement * links and directories this way, so we must punt for others. */ - static const char *ufslike_filesystems[] = { "ufs", "zfs", @@ -679,7 +678,6 @@ fts_children(FTS *sp, int instr) void * (fts_get_clientptr)(FTS *sp) { - return (fts_get_clientptr(sp)); } @@ -696,7 +694,6 @@ FTS * void fts_set_clientptr(FTS *sp, void *clientptr) { - sp->fts_clientptr = clientptr; } From nobody Tue Oct 7 16:24:11 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 4ch1fz2b27z6BZ0D; Tue, 07 Oct 2025 16:24:11 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch1fz1fz3z3dbx; Tue, 07 Oct 2025 16:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854251; 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=cdtEzMfvPJB7Rm0fDXkLfIhabbLmCP5LB9JdPH/Shmk=; b=WLHoYNQRJhuyoxS3dbUufnoWTjhLlSkIPgn1lzLSUPyV9KRKmAG/YMnam8bMm3JT0hCT6S 8eC/Dhb4I6LIzdBpp8imTOamclxbZxR5esi4yMzDjs+RBiDo1aNDq2fgdrXb1wXG+1JdgH Qe9rOpxYMV000w7c8eraYYIrinuDZDs6tdv/7drQB+/usmrsyo8pQlTyzNScQpaX8ruQta a6pV8tJPLejzgUJtpu0uvsAAqPJX7FWcAFj4kflsWEM9YKQM+wXK1oEzdsBSzkOWTq7eVw XGIjO3LCpbiyJPtcYGyKvh1O2JJtHVmhWRpT8Tk1gvZPpJ4w83pn77ZR09dwjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854251; 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=cdtEzMfvPJB7Rm0fDXkLfIhabbLmCP5LB9JdPH/Shmk=; b=F0zv1mqoV0waPQNstOmjzDHlkGXGgIbYyXHOPHhLR41iIeJGnmoZf0AKtIbXCIXHsMdQ41 h/yheMWQmLvn6MxjtTU4SvjWY4NF1OHvd4fQTNAdHXqXwqu2twMv8mwn4BA/y2caEpL6m2 nifVW8zlcITLrFIZnMtiErPpiSBR8s1xjito8DGHYEQ9avbohPtNJv7jkMMD1kI3/IOC6L smqHk8dYRdhgmGoc7aUdUBculmk9oY0tj/F72AbGc2CYkhh6d0vOPqQH4r38cwmC3NTN37 aiLPrg36kAJwtTNNme/7nIEKjpDxEsSowbSP319nQFvre7FeKzFcVsQHihBDYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759854251; a=rsa-sha256; cv=none; b=a3FKws6VKRlw867btDbKqj71O0dUUV5KqT+1tH4UWkSRqqbHMcg2cOuddXCyiqS7IjIS8p /oPX1FAimDB+JitcxZEKxO5ZUAKYK8/h1leY5iMK8hlSLjTsMxd6HvF2g6TdgLiHrLu/3M 9DK59cCSB5Ysbw7Vgn+bQGVhitXyqxXltJZ7jpFZZX6uWfamr/Srp4xyYp/mI7NHKHJIU4 /bc9WpLhpxatk6Gc+qHVLh8cCIabVu5gUT1/ptdcEH8zFeMN+aSmq6/28ujqKTVkk9AT1L C0i8ZmtQZ5wW4sn619weWxeoAmJL14jaMwpaGHz+zxwiORkpXnZcbUwiQM+J0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch1fz1BRrzsmQ; Tue, 07 Oct 2025 16:24:11 +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 597GOBhk077506; Tue, 7 Oct 2025 16:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GOBb1077503; Tue, 7 Oct 2025 16:24:11 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:24:11 GMT Message-Id: <202510071624.597GOBb1077503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a802334d86c7 - main - fts: Further improve the manual page 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a802334d86c7173ddd7776a20065bd5682f25f67 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a802334d86c7173ddd7776a20065bd5682f25f67 commit a802334d86c7173ddd7776a20065bd5682f25f67 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:33 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-07 16:23:58 +0000 fts: Further improve the manual page * Add subsections for the three functions that didn't already have one. * Add a RETURN VALUES section. * Improve the grammar somewhat. * Clarify that fts_read() will not set errno to 0 if called again after having already returned NULL. Sponsored by: Klara, Inc. Reviewed by: bcr, markj Differential Revision: https://reviews.freebsd.org/D52925 --- lib/libc/gen/fts.3 | 146 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 129 insertions(+), 17 deletions(-) diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3 index b937607b48e0..da304e59ee72 100644 --- a/lib/libc/gen/fts.3 +++ b/lib/libc/gen/fts.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 1, 2025 +.Dd October 6, 2025 .Dt FTS 3 .Os .Sh NAME @@ -69,14 +69,15 @@ on a file hierarchy, which is then supplied to the other .Nm functions. -The function +The .Fn fts_read -returns a pointer to a structure describing one of the files in the file -hierarchy. -The function +function returns a pointer to a structure describing one of the files +in the file hierarchy. +The .Fn fts_children -returns a pointer to a linked list of structures, each of which describes -one of the files contained in a directory in the hierarchy. +function returns a pointer to a linked list of structures, each of +which describes one of the files contained in a directory in the +hierarchy. In general, directories are visited two distinguishable times; in pre-order (before any of their descendants are visited) and in post-order (after all of their descendants have been visited). @@ -544,10 +545,10 @@ from descending into directories that have a different device number than the file from which the descent began. .El .Pp -The argument -.Fn compar -specifies a user-defined function which may be used to order the traversal -of the hierarchy. +The +.Fa compar +argument points to a user-defined function which may be used to order +the traversal of the hierarchy. It takes two pointers to pointers to .Vt FTSENT @@ -625,6 +626,15 @@ structure is returned, and .Va errno may or may not have been set (see .Fa fts_info ) . +Note that +.Fn fts_read +will not set +.Va errno +to 0 if called again with the same +.Fa ftsp +argument after the +.Dv FTS_STOP +flag has been set or the end of the stream has been reached. .Pp The .Vt FTSENT @@ -639,9 +649,9 @@ directory, in which case they will not be overwritten until after a call to .Fn fts_read after the .Vt FTSENT -structure has been returned by the function +structure has been returned by the .Fn fts_read -in post-order. +function in post-order. .Ss Fn fts_children The .Fn fts_children @@ -717,10 +727,10 @@ and fields. .El .Ss Fn fts_set -The function +The .Fn fts_set -allows the user application to determine further processing for the -file +function allows the user application to determine further processing +for the file .Fa f of the stream .Fa ftsp . @@ -786,6 +796,39 @@ The file may be one of those most recently returned by either or .Fn fts_read . .El +.Ss Fn fts_set_clientptr , Fn fts_get_clientptr +The +.Fn fts_set_clientptr +function sets the client data pointer for the stream +.Fa ftsp +to +.Fa clientdata . +The +.Fn fts_get_clientptr +function returns the client data pointer associated with +.Fa ftsp . +This can be used to pass per-stream data to the comparison function. +.Pp +For performance reasons, +.Fn fts_get_clientptr +may be shadowed by a preprocessor macro. +.Ss Fn fts_get_stream +The +.Fn fts_get_stream +function returns the +.Nm +stream associated with the file entry +.Fa f . +A typical use for this would be for a comparison function to first call +.Fn fts_get_stream +on one of its arguments, then call +.Fn fts_get_clientptr +to obtain the client data pointer, which in turn points to information +necessary to correctly order the two entries. +.Pp +For performance reasons, +.Fn fts_get_stream +may be shadowed by a preprocessor macro. .Ss Fn fts_close The .Fn fts_close @@ -797,6 +840,75 @@ or .Fn fts_open_b was called to open .Fa ftsp . +.Sh RETURN VALUES +The +.Fn fts_open +and +.Fn fts_open_b +functions return a pointer to the new +.Nm +stream on success and +.Dv NULL +on failure. +.Pp +The +.Fn fts_read +function returns a pointer to the next file entry on success, or if an +error occurs that relates specifically to that file entry. +On reaching the end of the file hierarchy, it returns +.Dv NULL +and sets the external variable +.Va errno +to 0. +On failure, it returns +.Dv NULL +and sets +.Va errno +to an appropriate non-zero value. +If called again after the +.Dv FTS_STOP +flag has been set or the end of the stream has been reached, +.Fn fts_read +returns +.Dv NULL +and leaves +.Va errno +untouched. +.Pp +The +.Fn fts_children +function returns a pointer to a linked list of file entries on +success. +On reaching the end of the file hierarchy, it returns +.Dv NULL +and sets the external variable +.Va errno +to 0. +On failure, it returns +.Dv NULL +and sets +.Va errno +to an appropriate non-zero value. +.Pp +The +.Fn fts_set +function returns 0 on success and \-1 if its +.Fa instr +argument is invalid. +.Pp +The +.Fn fts_get_clientptr +function returns the client data pointer associated with its argument, +or +.Dv NULL +if none has been set. +.Pp +The +.Fn fts_get_stream +function returns a pointer to the +.Nm +stream associated with its argument. +.Pp The .Fn fts_close function @@ -853,7 +965,7 @@ functions may fail and set as follows: .Bl -tag -width Er .It Bq Er EINVAL -The options were invalid, or the list were empty. +The options were invalid, or the list was empty. .El .Sh SEE ALSO .Xr find 1 , From nobody Tue Oct 7 16:24:12 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 4ch1g04NXZz6BZJ3; Tue, 07 Oct 2025 16:24:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch1g02FFxz3dWR; Tue, 07 Oct 2025 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854252; 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=h65IpwfHiZE8uurW4xpuQSeAHvj7e34tkZjZNr8J0Bk=; b=I2f/QtQyC5+F6gL7d5J5Dgq2KQ5+kzNSW4FEdGF2fA3rwy2JTkeO1GnnLBX0EfcrgxFlRA u8ewi8TQXiQ9jzRFNePmM1/Qek5vP6uDQBZyj9ETvNYI+TIyWmUu0OJa660l5LI1jHKxYb H6iuCaus8TdHu6Bg+YwgAqg0Kr1u8wwoakq1yB3DHVUnzhwgi/Bnyavr+cldvrAoECGzrC dq4PLgP0jsdM6iM++Q2PuM38bXrk9qsn43kTZ88XoqZiOfiZAToQEc2arTf3Kc9AxaNtDT K8QbUI0onzJbuDY4CPEKs3kzxf7NQq+I2i5QUQxwkbYs56neX2Wm9G0r+6vefg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854252; 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=h65IpwfHiZE8uurW4xpuQSeAHvj7e34tkZjZNr8J0Bk=; b=esmvrUgbyvVlaHPuSFkVQckFNMtRy3TG00hbEgnCide69/FPvap/yODabfCljIQYh9dsFY OlkVOJ7t5n5qAzfOQ+mgm+ioCWhEGJhS442izQRoOJR0GHJ1nbikPM8qdN1xzLtLPxtg7u sJs3jjaevAJrEe4HUsZCIRyNfiZtX4CLIxmCpzAfeWZGnjME99Avs01nS8Pp2R9DZiEjMt HPIthmJPoSH4MtnVEooCwjDeX9mAYnA9XxrWUaDyPFgqVDZmUhU/Z4cfDRVo/YtWR7wFmc 6MKIssUYQbFNu/DQ+QKh3IlP1uxxdZpaILaVoOuB4rK9ArZvqUCUWGOgm93RHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759854252; a=rsa-sha256; cv=none; b=DljHdFXywyrj5QCA43Eg2EeHlAXxhTSNQnLV+1qBsnK+8OvRuLZV441yG7uGbLDGG3Z9Al BkS/idk8w2GofcRBMobvsfTRYLXcRUq6TQEaHei+aeCTW2/mMDL+/UxM+AyOGQMok5d0CJ 4yPd3fz8sj5EQpp37OyEv50d/Uxh7B680BD2xDfoFdqATNrZ7/oW3owmXLH2n0bhSk4lcy oXsC6HEmEc6Zz7YhlPlc04eqn5pxD0Yd2R0wnFOYPjoNoFEUEmJ8+HzNHVBaRftIYQdjXL LLkwNjGFd4acCI5e8P2GVcM7tOkm0wydHjPkoZTU8EQESW1AxYgBNCpmBXYQsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch1g01mt4zt8R; Tue, 07 Oct 2025 16:24:12 +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 597GOCZM077541; Tue, 7 Oct 2025 16:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GOCFM077538; Tue, 7 Oct 2025 16:24:12 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:24:12 GMT Message-Id: <202510071624.597GOCFM077538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 95de78614a57 - main - cp: Simplify sameness checks 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95de78614a57733807c28c05125ed0636309d88b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=95de78614a57733807c28c05125ed0636309d88b commit 95de78614a57733807c28c05125ed0636309d88b Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-07 16:23:58 +0000 cp: Simplify sameness checks Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52926 --- bin/cp/tests/cp_test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index fdf50d042f0b..b637f862b7d3 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -90,7 +90,7 @@ hardlink_body() echo "foo" >foo atf_check cp -l foo bar atf_check -o inline:"foo\n" cat bar - atf_check_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test foo -ef bar } atf_test_case hardlink_exists @@ -105,7 +105,7 @@ hardlink_exists_body() echo "bar" >bar atf_check -s not-exit:0 -e match:exists cp -l foo bar atf_check -o inline:"bar\n" cat bar - atf_check_not_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test ! foo -ef bar } atf_test_case hardlink_exists_force @@ -120,7 +120,7 @@ hardlink_exists_force_body() echo "bar" >bar atf_check cp -fl foo bar atf_check -o inline:"foo\n" cat bar - atf_check_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test foo -ef bar } atf_test_case matching_srctgt @@ -389,7 +389,7 @@ file_is_sparse() files_are_equal() { - atf_check_not_equal "$(stat -f%d,%i "$1")" "$(stat -f%d,%i "$2")" + atf_check test ! "$1" -ef "$2" atf_check cmp "$1" "$2" } From nobody Tue Oct 7 16:24:13 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 4ch1g16ZDHz6BZ0J; Tue, 07 Oct 2025 16:24:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch1g138ZHz3dfb; Tue, 07 Oct 2025 16:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854253; 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=sOBQ0gyB0np4lmyuWD1Bd67+6dQLGS4PDGlTASo9FT4=; b=bdfQeODhevMj6kS8nTMW0DXdp/rmUttYv5eN1wLTu3Gfwpxyoy9EAgE+QaixVOVPn8Xw3G gFUoTNpqoceQOTfV6lqfwbl3mJQUMkrgbTFZ/i0/Obt3ypEzC5d/Kb5306uN572lESrDVD ZDkjya0aIjzKtHCl0GmMckoPDDtih8UZKzdyMNfAjgW3Qa7CwSdPYRfjKBJdJirOyaJ9r7 Rn508Ct/R/eJT8w/iP6U+yXdW5AucPll+5aYrBSI65i8Ewody6XtYUShN0or6VMDyNiKok GsjhqDu4ktLs/FWG7ujIbduPXQCu/RkVz/OpOdYTUi8X2T1CZd7yBsBGTCzrRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854253; 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=sOBQ0gyB0np4lmyuWD1Bd67+6dQLGS4PDGlTASo9FT4=; b=dBnaTrGbkuGdB1T4jUI1RwvYsbDGjM4qTcBmahCFfSbWiIsUyWcgqkcVMn2Vu43Exg8X/x 5ObMuJbKcuqw6d9NsrUrwR6augG+ULMjOoXrGYqkeSCC3uvT6ME1ofKftDV53NNJy5zwg1 QqN7IwqBB9LZFdJ/19PAZ6iQ9dEu6FH9jFpPyce6kqpHUsz3xYvmNwHSthSHdNo8PkuK90 wI3vjmD2XE5oEn+SLstpI9pb38tOPnJ0FjoiB6RVf3gvkF+N3Y36vF4kbAdko4DoTH0sX5 Sen94m5oz3Sh32vRWbVaePnO6IVoUyqw+Pzbkty292/c2zO7ucIWDzfNw3tU1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759854253; a=rsa-sha256; cv=none; b=ZPwJ+9+lPR97bXMmnYCNKE7PGvWreZ950iEYS38+J4Mjc0wcDj4KL3KGUm9EQ2fMcxj/5g a0oY4YcYa1GMz+6YIlkEXCZ4GEA9URJCauykLPHlOFVDoBCwUJc7HY7M9SIXt2pw9tVQhM 09oQo/qBSLoQE6ydGRx6578cssBzxGQ4lSnZED9zdLTOMBMbHVi+vhUydZfjHfVgPaFVkS DEk1KqAfPt4vcwW8pwqgY37i4shKGgQPl45UA8vy/o3BTJ3c/Z8J/HdETaH0AD2BoUqtkJ sXidAAm9h1+qjqRnNo2dw/pa75stPwYlWn4fOtqFdkOAFhZF1gUK6Vd3jhN1Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch1g12TNdzt8S; Tue, 07 Oct 2025 16:24:13 +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 597GODWb077582; Tue, 7 Oct 2025 16:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GODOp077579; Tue, 7 Oct 2025 16:24:13 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:24:13 GMT Message-Id: <202510071624.597GODOp077579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 18997fb9eca6 - main - ln: Simplify sameness checks 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18997fb9eca651a7ef13e6755a4d2cdd3ddede10 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=18997fb9eca651a7ef13e6755a4d2cdd3ddede10 commit 18997fb9eca651a7ef13e6755a4d2cdd3ddede10 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-07 16:23:58 +0000 ln: Simplify sameness checks Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52927 --- bin/ln/tests/ln_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ln/tests/ln_test.sh b/bin/ln/tests/ln_test.sh index 78b4074aea18..ac9d785ba1fc 100644 --- a/bin/ln/tests/ln_test.sh +++ b/bin/ln/tests/ln_test.sh @@ -28,7 +28,7 @@ atf_check_same_file() { - atf_check_equal "$(stat -f %d,%i "$1")" "$(stat -f %d,%i "$2")" + atf_check test "$1" -ef "$2" } atf_check_symlink_to() From nobody Tue Oct 7 16:24:14 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 4ch1g25DD2z6BYrB; Tue, 07 Oct 2025 16:24:14 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch1g23nVFz3dfn; Tue, 07 Oct 2025 16:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854254; 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=S+8YKjo7V4YfTenFW8AGjKP6Mb4v8yQUhnEAVRYPJkM=; b=sJ6apGKJRev9qrYfOBvqHRcBOPWnw/kmiFgbvd0acFsphx5lKAoXA9sdHCXjhlocG0zWUG zwr3d6OvbyEmdN5fj6+Sino9R0ydgyHp09YwxHKKUeSUvBLWVtXf7T61dgQSonSSlsplvt dBCf1BLv3O22W8t5GAacXL2zx0wsnUHKoIoxo0Qb33Y3j3D5ujbMR/ULSGL/dpw9t/6BLV iOIm+M72w5j2Ao9mc8IWet5QSEEma/uR2u2Fd8iPzxNbUbf4WQk+RU2WC5gEeg53xkPBJv aUYNkV+TC/Th3mb2UE/iMTa5BKAi3WKn+Z+sVasEbjh9UdGR6Bs8lWBFtQ6qpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759854254; 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=S+8YKjo7V4YfTenFW8AGjKP6Mb4v8yQUhnEAVRYPJkM=; b=XDTntLnZgxOy4KteuPf2DtUrVWleWzxYmV2iwiquF+SSkQ4Kds2ug/DlSQvFLFMelAow3y Gw0hX17WHFtVHmopAK2TX7+0mdeAjk7jzKsNyErtZVtC2NZtwcIRlCsovstOdnjVF/y7bc 9+oHFObRpYsJ177pAzOif+gMEmFkOS+K+EA5WgxxgFOnPKbrtB85WDHMapeBBhctS9iyPU 9oklV7Cn9A3VRGGBIYhFk/qujKHS8qP34C59KeFPQ/7fLR98fsQYm0/GnqVGLDn7Ngi5ty ky8gIfvYsh2ASKubgakBbbkO0/v+BLluKjlJXZ4xhAlEdMOPrgVslF8kFe5wXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759854254; a=rsa-sha256; cv=none; b=O3AR8M7c/pEa297fCbd11KKF4D5KWWpS2zlIKwiXoY7mlXqxtCUD1do9Jf/25UrUhCv5YU 82PdEe6UWgimAPqFrDKYntdo6e4oo+xH6uopto9dy0RlrnY3Ky1c3rtRHg+qMBlMMIhV4x 3pUQsFA9Wj/5B4E74Ay0xGLJKH+s1qT1n8N7DigAuPE9EJj9qtDW89GtEIG2MrbwYxv6MS AL1jZGrKsQrKQos9aIsr0rVe7WCm080s1em4wQXxs4mvgHX1duz1b/w4LWoc3b6enRw+ua ipaDfI2TMYVYhc4mq+htSiwOJuyT170zEAPL3p8eyFRVcOvI2maERPLzBeaI1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch1g23P6nzsRy; Tue, 07 Oct 2025 16:24:14 +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 597GOEn5077618; Tue, 7 Oct 2025 16:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GOEFp077615; Tue, 7 Oct 2025 16:24:14 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:24:14 GMT Message-Id: <202510071624.597GOEFp077615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1b0fce2944e3 - main - tarfs: Simplify sameness checks 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b0fce2944e3ff570b11de05c6a03977ee5b95e6 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0fce2944e3ff570b11de05c6a03977ee5b95e6 commit 1b0fce2944e3ff570b11de05c6a03977ee5b95e6 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-07 16:23:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-07 16:23:58 +0000 tarfs: Simplify sameness checks Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52928 --- tests/sys/fs/tarfs/tarfs_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 20baadfea5c5..d4de71271985 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -67,9 +67,9 @@ tarfs_basic_body() { mktar "${tarball}" atf_check mount -rt tarfs "${tarball}" "${mnt}" atf_check -o match:"^${tarball} on ${mnt} \(tarfs," mount - atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -f%d,%i "${mnt}"/hard_link)" - atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -L -f%d,%i "${mnt}"/short_link)" - atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -L -f%d,%i "${mnt}"/long_link)" + atf_check test "${mnt}"/sparse_file -ef "${mnt}"/hard_link + atf_check test "${mnt}"/sparse_file -ef "${mnt}"/short_link + atf_check test "${mnt}"/sparse_file -ef "${mnt}"/long_link atf_check -o inline:"${sum}\n" sha256 -q "${mnt}"/sparse_file atf_check -o inline:"2,40755\n" stat -f%l,%p "${mnt}"/directory atf_check -o inline:"1,100644\n" stat -f%l,%p "${mnt}"/file From nobody Tue Oct 7 16:41:24 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 4ch22s1Gj6z6BbNh; Tue, 07 Oct 2025 16:41:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch22s0pF9z3gx2; Tue, 07 Oct 2025 16:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759855285; 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=ebECy2ToTPz5WOgXfEKay/P/O6PxvuUxL9eVTSHL/RQ=; b=vZ9cY9QYBw372BAaWspmzVkxffHPgFsOZ+Wu9ov2vh6vGhHRi+KVllcukDNCSetNT4Krvk qOUIWvElz7YBhcLk3nj2WoIzNrQciXQg6Kpit9DBAg6Yduq0snghegccaMbAmI2KGU7hKL /KooZ0uvJZXQlu1bOj/A3sLFdwZCXamYxIgopZ5K04kIgKNN5iO93XioruHwOIWL9zxRTN vmXm2oxM7qQLOVsNtlnoFqs9cLnUh4VJ3Qqy/oZg6vi0o6xhIih0OX3z1Qq1vxRZvI98m4 wT+nxm5IgiUWg0s+gKrbmzSrqSifqwQ+rEntZEXJ5awJhOShMUecbieFxdw5DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759855285; 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=ebECy2ToTPz5WOgXfEKay/P/O6PxvuUxL9eVTSHL/RQ=; b=Dsgwyqrb8rgmkDH6ltnDUSawYdHMTXHbOxTgKtFS9lt54BC4GsYmX6ZF3f+l81R7dTz3Ue ZEWx2QLCicClHl3B/ijCLYZuUrqGzQjbra7O2yU47eO6roAutWZp91Y0KRnBWlbRdiUppc TsOzneSXBoin0S9d2mlgZafSjuZAmnAfbjJ9+qraYgpqO9GUzmDMaZY2FEwmNXfR0oKDZ/ 0u3HMdg7Fc117bzjFxhFIGafiaq0z7ml8K8v7sEgGVHAUS7YqT2GjWCa2PETBIODBYfOGp 8zttSIS7VL1jCP3gvY9iLr33K2Y3UKYlbzrp8t/Qhpvu3UG/jafv8HZ6dM+eeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759855285; a=rsa-sha256; cv=none; b=FAbxpQ7BypXWe0AjTzRXwJBm/yn2/AoNBFNuyc73uoXl16SG4ttgCchrPDTwpT8wNEf6HD hzY1Ala92t6dY1JDL+FJcxEx5OzzegUTRbbY6cMk3OeavsB70412fKnx8TEHV8b/UDzZIS pg2P20ch5AHzkNgnRCuGibi3lyTKwsLbuGuJxZo3pltlBIcGvEASlRsJ3xPEL8i44/1ZgN aebLzC9XECcP9Fft9o9WU6DepKFEVT+HhH7gOWeIiMTwwWjPeT3vkxwog3IiKYBjdaTyHh ecsJRPLJswyCibU/7yuDPdski7zLB//kefXPr3JNxpWC10bpFDGa+7f7GXREjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch22s0PYjztDY; Tue, 07 Oct 2025 16:41:25 +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 597GfO3L010899; Tue, 7 Oct 2025 16:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597GfO6t010896; Tue, 7 Oct 2025 16:41:24 GMT (envelope-from git) Date: Tue, 7 Oct 2025 16:41:24 GMT Message-Id: <202510071641.597GfO6t010896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jonathan T. Looney" Subject: git: 1c2fc62e4a96 - main - x86: Add a way to inject artificial MCA events for testing 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: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c2fc62e4a9689961169be7836038acd5f757be1 Auto-Submitted: auto-generated The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=1c2fc62e4a9689961169be7836038acd5f757be1 commit 1c2fc62e4a9689961169be7836038acd5f757be1 Author: Loic Prylli AuthorDate: 2025-10-06 17:59:41 +0000 Commit: Jonathan T. Looney CommitDate: 2025-10-07 16:36:47 +0000 x86: Add a way to inject artificial MCA events for testing Reviewed by: glebius Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D52942 --- sys/x86/x86/mca.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 7ee22895e0a7..4b40f343ac90 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -124,6 +124,17 @@ SYSCTL_INT(_hw_mca, OID_AUTO, erratum383, CTLFLAG_RDTUN, &workaround_erratum383, 0, "Is the workaround for Erratum 383 on AMD Family 10h processors enabled?"); +#ifdef DIAGNOSTIC +static uint64_t fake_status; +SYSCTL_U64(_hw_mca, OID_AUTO, fake_status, CTLFLAG_RW, + &fake_status, 0, + "Insert artificial MCA with given status (testing purpose only)"); +static int fake_bank; +SYSCTL_INT(_hw_mca, OID_AUTO, fake_bank, CTLFLAG_RW, + &fake_bank, 0, + "Bank to use for artificial MCAs (testing purpose only)"); +#endif + static STAILQ_HEAD(, mca_internal) mca_freelist; static int mca_freecount; static STAILQ_HEAD(, mca_internal) mca_records; @@ -701,8 +712,24 @@ mca_check_status(enum scan_mode mode, uint64_t mcg_cap, int bank, bool mce, recover; status = rdmsr(mca_msr_ops.status(bank)); - if (!(status & MC_STATUS_VAL)) + if (!(status & MC_STATUS_VAL)) { +#ifdef DIAGNOSTIC + /* + * Check if we have a pending artificial event to generate. + * Note that this is potentially racy with the sysctl. The + * tradeoff is deemed acceptable given the test nature + * of the code. + */ + if (fake_status && bank == fake_bank) { + status = fake_status; + fake_status = 0; + } + if (!(status & MC_STATUS_VAL)) + return (0); +#else return (0); +#endif + } recover = *recoverablep; mce = mca_is_mce(mcg_cap, status, &recover); From nobody Tue Oct 7 18:37:51 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 4ch4dC4TF6z6BmhJ; Tue, 07 Oct 2025 18:37:51 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch4dC3rByz3vwP; Tue, 07 Oct 2025 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759862271; 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=7wXkMuRF5lO6cfP5MrQx/uhW2N3wGwADswnadC4Fes0=; b=AYYXbZOtNBQ+4q/NGj2PkCxSQvnMR7LY0Rwtg2qy3kE3KUNCp2uTHykEKHqyDKO8Te4gHN Oma8+G3wAaDIIu/mMCg75AyUgm21L+SCWALS1b5FtLGzZNm/Xwug0Ss3AISwmiLUk6E9wG pTowO2mRVqHy8FX5erPWvkBkn6PbytJvKs7Rh+B8v+KFOd+NIEUxE+a7m9656bSJyDRAUN JvBR/V21yuaJHAKbPHTBJOjj570WgU1S4QS9EYTkJ08pn4GrnIE2RvZ8rkcsD0YECm9AWM FyX3xDlJVnu0cwodfxWdToHpa83HozkJCGmz/m0rAyIaxaP2TUeAcDZ+sK4ZkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759862271; 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=7wXkMuRF5lO6cfP5MrQx/uhW2N3wGwADswnadC4Fes0=; b=IGOkbrFTQyPmfLICgwxmtUuBw/c8Fqpw1E1Z2rZ5ALPlkiiCE+Usozh220rz/figC9TAgc 7rYGKSDmoh5YHQSwXrxnXPl9ejg4MwTOclOdmiMIboE8xh1Zkfj9PVeeCF/bYR5N66+Vfp 8fp7bx8mydx1R3nj7tjdcI3s5PKh8HpUgO173aU1Cfeba3YyYTJc19rKChYHWFr78rby9a hXloWxs2v9NinaLLFCxRRhuqueW1VEKPP0jsmIFBH+24EG84Pgfqw8hI0dwY+YEwBKbcQl ktmt6othnOC0yu78GHxESN5GpE0jvvbrjKLpmUx0Gvy5xmb1c1YWurLdSLXAow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759862271; a=rsa-sha256; cv=none; b=MmGMwZReVxb5yaTCuuFYG5brIZGeFDAmacITPjkJX/P8zdtGuZigKpslzZEH7HvVXOkq1i ASyYS1cfirBRh2sw/1U0Br9aTMwi0IknEU/8tyaVB3Z5m6wjo9LJGXoEuP3zO60cVXUDk5 xz0I3Cz6sc7RwCFKmvPPGxEAHvI+KiyOjS7z3rl00GSGpGV1ni7ooHwXrGJMwu/Ft/wPxg dpmneWch+lBfxmsyeTamItF6E1dloQzcQ5oeiZIQ5I/0aJ9ob/LF6yahZgKfyTLL10qZdC 7tt+MS13ixVX93X93armHC8HHOm/Zuw377tN/FI+roJi9FFeQ9b76JYgjZeGhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch4dC3GM5zwx6; Tue, 07 Oct 2025 18:37:51 +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 597Ibpq6023085; Tue, 7 Oct 2025 18:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597IbpKP023082; Tue, 7 Oct 2025 18:37:51 GMT (envelope-from git) Date: Tue, 7 Oct 2025 18:37:51 GMT Message-Id: <202510071837.597IbpKP023082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d801cc2d8542 - main - sockstat: support reporting of BBLog state 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d801cc2d8542854a5dee9bfb25a15af6fa1dafad Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d801cc2d8542854a5dee9bfb25a15af6fa1dafad commit d801cc2d8542854a5dee9bfb25a15af6fa1dafad Author: Michael Tuexen AuthorDate: 2025-10-06 23:24:43 +0000 Commit: Michael Tuexen CommitDate: 2025-10-06 23:24:43 +0000 sockstat: support reporting of BBLog state Add a -b option to print the BBLog state for TCP sockets. Reviewed by: jtl, rrs MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52944 --- usr.bin/sockstat/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++-- usr.bin/sockstat/sockstat.1 | 11 +++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 2e75e4966d80..3b989c4283e4 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -84,6 +85,7 @@ static bool opt_4; /* Show IPv4 sockets */ static bool opt_6; /* Show IPv6 sockets */ static bool opt_A; /* Show kernel address of pcb */ +static bool opt_b; /* Show BBLog state */ static bool opt_C; /* Show congestion control */ static bool opt_c; /* Show connected sockets */ static bool opt_f; /* Show FIB numbers */ @@ -141,6 +143,7 @@ struct sock { int proto; int state; int fibnum; + int bblog_state; const char *protoname; char stack[TCP_FUNCTION_NAME_LEN_MAX]; char cc[TCP_CA_NAME_MAX]; @@ -738,6 +741,7 @@ gather_inet(int proto) sock->vflag = xip->inp_vflag; if (proto == IPPROTO_TCP) { sock->state = xtp->t_state; + sock->bblog_state = xtp->t_logstate; memcpy(sock->stack, xtp->xt_stack, TCP_FUNCTION_NAME_LEN_MAX); memcpy(sock->cc, xtp->xt_cc, TCP_CA_NAME_MAX); @@ -1056,6 +1060,37 @@ sctp_path_state(int state) } } +static const char * +bblog_state(int state) +{ + switch (state) { + case TCP_LOG_STATE_OFF: + return "OFF"; + break; + case TCP_LOG_STATE_TAIL: + return "TAIL"; + break; + case TCP_LOG_STATE_HEAD: + return "HEAD"; + break; + case TCP_LOG_STATE_HEAD_AUTO: + return "HEAD_AUTO"; + break; + case TCP_LOG_STATE_CONTINUAL: + return "CONTINUAL"; + break; + case TCP_LOG_STATE_TAIL_AUTO: + return "TAIL_AUTO"; + break; + case TCP_LOG_VIA_BBPOINTS: + return "BBPOINTS"; + break; + default: + return "UNKNOWN"; + break; + } +} + static int format_unix_faddr(struct addr *faddr, char *buf, size_t bufsize) { #define SAFEBUF (buf == NULL ? NULL : buf + pos) @@ -1143,6 +1178,7 @@ struct col_widths { int encaps; int path_state; int conn_state; + int bblog_state; int stack; int cc; }; @@ -1485,6 +1521,15 @@ display_sock(struct sock *s, struct col_widths *cw, char *buf, size_t bufsize) xo_emit(" {:conn-state/%-*s}", cw->conn_state, "??"); } + if (opt_b) { + if (s->proto == IPPROTO_TCP) + xo_emit(" {:bblog-state/%-*s}", + cw->bblog_state, + bblog_state(s->bblog_state)); + else if (!is_xo_style_encoding) + xo_emit(" {:bblog-state/%-*s}", + cw->bblog_state, "??"); + } if (opt_S) { if (s->proto == IPPROTO_TCP) xo_emit(" {:stack/%-*s}", @@ -1544,6 +1589,7 @@ display(void) .encaps = strlen("ENCAPS"), .path_state = strlen("PATH STATE"), .conn_state = strlen("CONN STATE"), + .bblog_state = strlen("BBLOG STATE"), .stack = strlen("STACK"), .cc = strlen("CC"), }; @@ -1576,6 +1622,8 @@ display(void) xo_emit(" {T:/%-*s}", cw.path_state, "PATH STATE"); xo_emit(" {T:/%-*s}", cw.conn_state, "CONN STATE"); } + if (opt_b) + xo_emit(" {T:/%-*s}", cw.bblog_state, "BBLOG STATE"); if (opt_S) xo_emit(" {T:/%-*s}", cw.stack, "STACK"); if (opt_C) @@ -1706,7 +1754,7 @@ static void usage(void) { xo_error( -"usage: sockstat [--libxo ...] [-46ACcfIiLlnqSsUuvw] [-j jid] [-p ports]\n" +"usage: sockstat [--libxo ...] [-46AbCcfIiLlnqSsUuvw] [-j jid] [-p ports]\n" " [-P protocols]\n"); exit(1); } @@ -1728,7 +1776,7 @@ main(int argc, char *argv[]) xo_get_style(NULL) != XO_STYLE_HTML) is_xo_style_encoding = true; opt_j = -1; - while ((o = getopt(argc, argv, "46ACcfIij:Llnp:P:qSsUuvw")) != -1) + while ((o = getopt(argc, argv, "46AbCcfIij:Llnp:P:qSsUuvw")) != -1) switch (o) { case '4': opt_4 = true; @@ -1739,6 +1787,9 @@ main(int argc, char *argv[]) case 'A': opt_A = true; break; + case 'b': + opt_b = true; + break; case 'C': opt_C = true; break; diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index 091911cd0879..dabb3042bfd4 100644 --- a/usr.bin/sockstat/sockstat.1 +++ b/usr.bin/sockstat/sockstat.1 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 17, 2025 +.Dd October 7, 2025 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl -libxo -.Op Fl 46ACcfIiLlnqSsUuvw +.Op Fl 46AbCcfIiLlnqSsUuvw .Op Fl j Ar jail .Op Fl p Ar ports .Op Fl P Ar protocols @@ -65,6 +65,9 @@ Show .It Fl A Show the address of a protocol control block (PCB) associated with a socket; used for debugging. +.It Fl b +Show the BBLog state of the socket. +This is currently only implemented for TCP. .It Fl C Display the congestion control module, if applicable. This is currently only implemented for TCP. @@ -206,6 +209,10 @@ is specified (only for SCTP). The connection state if .Fl s is specified (only for SCTP or TCP). +.It Li BBLOG STATE +The BBLog state if +.Fl b +is specified (only for TCP). .It Li STACK The protocol stack if .Fl S From nobody Tue Oct 7 21:07:15 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 4ch7xb5VFyz6C0gL; Tue, 07 Oct 2025 21:07:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch7xb4tFWz3C7G; Tue, 07 Oct 2025 21:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759871235; 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=eqZO8fdWUfeXz3IQ/pYzoGuIzbgbmUD68/G4NTOKYdE=; b=QHV09jW4csR4S7yiuw7p0NTT3wh2qCvn74QT8eeqaRRu/edulnZABzxGBkpMnpabKKFDvP g8Noxb4m4Bvk8ZVyk71cttdIDLU2Misz56sKbTkRI+Va58Wk4mTwN522Vx2nduY3KTTbxU L8H54E1oBEyteYSVAaMMmk6Lzd16ANXkXXdiYvJci+L7GkLVYNNCTcas941U42fxSrUOAq qRDddj2BY2zUhLe2FaqATAA6XQRkPBCus9WMeKG/atmTa9IsWyu+iPAZzln7cDc1ONHCLB NFJE7Eyr0n46v54rLaRRAA6+ZsaCd9UHiVk0UFGRFVyOzRpGT+IZjvCe71hXUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759871235; 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=eqZO8fdWUfeXz3IQ/pYzoGuIzbgbmUD68/G4NTOKYdE=; b=WDw00Mc/dns76FEQydX+85aeBTPHZi1VFNEepHDnP/QxczL8XIOmMLngLqgmZzfe0Wi6eG ijCdxQwLXuSFsJCwmS62JfKOp+xrK8KMf1lFwU52U6bE08YtHFuTldxasVPW7GBBpBNViH Bn7SOObpjTnjD0ty0ZRICep17sT7muHGhzPRtBSSZ5lhs43lCATCzkM7Vy2cIJTr48Wa0o xT9vsyKuyqtD3oio+7zc3sjwDVk3q9SA4BAZv8D7sDlSJPanww361cmrkL+CTNxfEc6Tv/ 6gHRjsGjVqdXiuSou+V+Ax31BxD53i9YqYJsr7toNeRzSHhq9r8nLbysh8384g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759871235; a=rsa-sha256; cv=none; b=ed/D1WWuSgXG+mpvT1WcywUC97cCBfkg/0VT4/aKVTzR0LLaPhE7l85eXwe71ON6UmHrpf AN49JIuXvBTKl+f7aPx/gO2XGOw7UlKhnT0Tyoi0T/Y+BtnmIhzYqY5SMoG0FxFr8eVxd+ 9yCiwmz0lVsgRVpW8xD3FQ4gYQwF2D0mwW/FA6iw6p+Efz0AnqSD8f6sPkt1NUTpefPhIF Hmtv8dfdKEKqff4vIb69i6fGh00zZuxCGyyOcTZSn9l3jaLWIhlcQ3A2h70Um3ExQAbaXX 1tE2qyfGdfeJ57aVZh38ilazyEf9Xpu5uZQ2J116p+FqtcjG9BoJks4S4YpBTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch7xb4TQwz11gF; Tue, 07 Oct 2025 21:07:15 +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 597L7F60006477; Tue, 7 Oct 2025 21:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597L7Fmr006474; Tue, 7 Oct 2025 21:07:15 GMT (envelope-from git) Date: Tue, 7 Oct 2025 21:07:15 GMT Message-Id: <202510072107.597L7Fmr006474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d9c94e5eefc0 - main - tests/netinet: fix so_reuseport_lb_test flakyness 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9c94e5eefc0d1ed772cc3af15d92f1960ba73a6 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d9c94e5eefc0d1ed772cc3af15d92f1960ba73a6 commit d9c94e5eefc0d1ed772cc3af15d92f1960ba73a6 Author: Gleb Smirnoff AuthorDate: 2025-10-07 21:02:29 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-07 21:02:29 +0000 tests/netinet: fix so_reuseport_lb_test flakyness Stop the threads before exiting test body. Otherwise there is a chance threads would use the softc that is stored on the main thread stack after it is destroyed and the test would fail. Stop the threads in the reverse order, so that listener is stopped after all connectors are stopped. Tested by: olivier --- tests/sys/netinet/so_reuseport_lb_test.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index fa9d6e425884..0479bd070ca6 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -375,6 +375,11 @@ ATF_TC_BODY(concurrent_add, tc) usleep(20000); } + + for (size_t j = nitems(threads); j > 0; j--) { + ATF_REQUIRE(pthread_cancel(threads[j - 1]) == 0); + ATF_REQUIRE(pthread_join(threads[j - 1], NULL) == 0); + } } /* From nobody Tue Oct 7 21:50:16 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 4ch8vF0TRqz6C3x9; Tue, 07 Oct 2025 21:50:17 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch8vF00tQz3HVS; Tue, 07 Oct 2025 21:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759873817; 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=FqVSo8C9UuVcW1usGEJB3tlOdFa2FS14uY9xUTdzlA8=; b=OER0S2MYdg0cJOzHH9dzf0/DmiNwADRpEjjQDzQLVCap6cjs47Nnij1vjxg2kPIa/wvLXM h1xZRX7KLiWBN7XqAiHD/lHqW1AWSFvO2Xlofaj8wCcfKXq05cjviYSnXiJ7utk4qIL+04 9B+ZoRWGR/XK085VNfLdG+RY9nKH9axwAYA+ox5qAcp13UgZOG1C/bHEkIs9QIvJn/TL/X B9Sq14JxmHREE5XQJieNaced5B633PHG5TFmMbDquQCRlTb+YFndjiWahSJXdh9nf/7cR7 XFmsJb/lPGlwePCGk7AMxg5yHlEdQqOiks9C1Q7RLRIBuXJ2kthjvC74h99iiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759873817; 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=FqVSo8C9UuVcW1usGEJB3tlOdFa2FS14uY9xUTdzlA8=; b=nTw1D2CjekB77XD30T/oidsZnDBYb3OaGAFJ4CbMsZitX1UQUC++kuxaBr0EuhKo6Jkr41 Z+64bNTzfyRRSoG0hpkakTaGYGg5cSX1rpLKf6CMBrVP1zV/kL1+Gc2t8kMYgMIwnMPPxs OcE/JJkxGF6uUlyRfMcff+/VF22mOR/NMny2yc0gDmaHYLlZottwogb7k7HXqONpkoKYFC tAWHwJ17LvF9JuHVn+pvBVQxIeTyS/OoS4qg+3kT/Fzv5m3cp5+TgzULe1nZXSWc5WOQPt TH2a8tgKiyijrH1MMhaXixa5vqqDZjSPIC+PH15NGBL8b1IMCpQb5ouLYanB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759873817; a=rsa-sha256; cv=none; b=VePLn+bAtPQMzG/chFER/udU3wCIB942zRB4OrsOliWSSaGUbH3lrVjWX4oqwUZOtsoU76 eAxb7hPck7/dNyPM1psdFdBRxnPZHQRnKu3WjGML1rcHS7V2BmRAbLwAQzcKcL3xcKBf0J WveE7xrLdj9AE7pj2b5Q43A0HCCZ6ELP3HaOc0PI+9TngmLurRS3QPZRxiBmYYpQ63O2hj Vc7qYUHIMJnm/xKqcoXRtqTsgqmUD50pMYbrlRZY/5Jfmyjmn6qbsYerFJT/AUgp6WsZS/ tRqO7zy4JAlWbHBtuqhE2ZDhlZpbmu48PLpC5fyGQNc/WsU2fbQYkWGtPi2Jhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch8vD6dGkz13MX; Tue, 07 Oct 2025 21:50:16 +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 597LoGFi089473; Tue, 7 Oct 2025 21:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597LoGVE089465; Tue, 7 Oct 2025 21:50:16 GMT (envelope-from git) Date: Tue, 7 Oct 2025 21:50:16 GMT Message-Id: <202510072150.597LoGVE089465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e7e7bf757ace - main - krb5: create the KDC database directory 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7e7bf757acef3d4e41a6e22f7d04b3df08834cc Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e7e7bf757acef3d4e41a6e22f7d04b3df08834cc commit e7e7bf757acef3d4e41a6e22f7d04b3df08834cc Author: Gleb Smirnoff AuthorDate: 2025-10-07 21:50:07 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-07 21:50:07 +0000 krb5: create the KDC database directory Reviewed by: rmacklem, cy Differential Revision: https://reviews.freebsd.org/D52970 --- etc/mtree/BSD.var.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist index 0845d8a59f65..d8593e61c49e 100644 --- a/etc/mtree/BSD.var.dist +++ b/etc/mtree/BSD.var.dist @@ -45,6 +45,8 @@ .. ipf mode=0700 tags=package=ipf .. + krb5kdc mode=0700 + .. mtree .. ntp uname=ntpd gname=ntpd From nobody Tue Oct 7 21:50:05 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 4ch8vM0ZXTz6C3rk for ; Tue, 07 Oct 2025 21:50:23 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch8vL3yMgz3HnD for ; Tue, 07 Oct 2025 21:50:22 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-85d0740e6b7so99511585a.3 for ; Tue, 07 Oct 2025 14:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759873816; x=1760478616; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Yd9rqJ6YdPXJJxvVJaQkUhwyFiUMIpgUPxqWRy4zEqo=; b=jajo4ks8OUz+0XZYULq5dqa9ZHOjii/tUnIaRrpKbaZYaLgqm2mrkBT7aFzHdgSSp8 k4hMGmSQVqII6cZigauuv0wTgRpV+tlc2we4Q0wNLeK/2c+LW9mdyF3NCDGTgvvCPkn4 biqP4i7ZBSsLtU8NP5XMlwTPNjItOr/hyOEN8QFBKEUyot6l54RZJkLcEDsX57aP1KOn kEaadZQggqdAN6gtnXAMabDBeNuKIYl1u5c2hjip+z46pMtsI69uavubwJoFfE4W5Ghu Y7Pa55zjOUCIGQbmYDZMVT3JTtvBfKLXcfLCX7MV3DHBd+xe8ljpUl594DMWZP8+pIO2 mN/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759873816; x=1760478616; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Yd9rqJ6YdPXJJxvVJaQkUhwyFiUMIpgUPxqWRy4zEqo=; b=B0yhlydi6t460TRpSN1s+vELzr8RLLaKnfhnuZ0JxR4ApWm36T8J2pY3uy/mM4sHbd 3/VGc9Y1s7OOLtk9v++i1fz10PgPcMjTvt101cjoKhitK3m0p8OVxdJuivn//SHnbTBl xjsLQ3kZb0ZWQWyuKwtm5xRMM3DX3MXQbaHBBnP1PCZkbLh0YqQPMIVkpg5XxhtrRUi0 kHVeoB1zu/7ZwPk/dRLcKrddVYCAnxYCFPc2qSstd8iCFbIaq7bYPmtQ6mCgeYok4IDT 9s0UM53SBrQvYwz+g0c0sBf7lO5pXY6PF+ZYraeqzY+Mpz6HdSJ1+/tdaqQOvq+tJtme T7ww== X-Forwarded-Encrypted: i=1; AJvYcCUJVCM7hpLc5PklqfQ6lozJ4TvRZtVq0nueLAG2rTlAMzijSQhVVlUj2C/A1P0JgbUHdJ253oRE+H8ZP4M2Yyb2tlw6yA==@freebsd.org X-Gm-Message-State: AOJu0Yy/+XkWNNDovMY0zM+HRwscBFiWbICsxwlk9K1NY3cMFgYyuaXI Il/9RKHE8K1qf/l8B1ZTSKMRLvCZMcYE7nCkffSjBo5kHEYZZuiRg/S2APg06BXX6tHXfwk4SKX HJpVNcfZITo0pI+ejxcAGP5CoeGUQ3T7FAhGB X-Gm-Gg: ASbGncsoR76liD9wCeHQNvu6Y4fGLoho6v4QImHbourUIi5LekuaGhp9MMay6/07PJT Mq5900Dg0gY6eaAHaIvOqKLEGGNO2/D7SvBaZnZAr3zBCrV5+tO9KGTivQURBvRlX4hWuwpxw/8 CEulF6SIgCDRX/8l5DS1fS4ppWZQCOFGOAGU0HNbN0WmZfbY4MYoID+mAfdStDEWuBEiMsfuGta mwUq9s4OZ4Mn1f5BLq55Ef8vxYSw1A= X-Google-Smtp-Source: AGHT+IGYsXHt3HHlSyabYVkHdAp8L0FoO1US51wPqMqmutS4AFzU74u2iMi7wyZWoYYnA4BvN7AOAhgZV3JMfy6+rsg= X-Received: by 2002:a05:622a:199c:b0:4b5:f4c0:60b with SMTP id d75a77b69052e-4e6ead67a6dmr11635881cf.11.1759873816031; Tue, 07 Oct 2025 14:50:16 -0700 (PDT) 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 References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> In-Reply-To: <202510071524.597FOTr3063628@gitrepo.freebsd.org> Reply-To: jlduran+freebsd@freebsd.org From: Jose Luis Duran Date: Tue, 7 Oct 2025 18:50:05 -0300 X-Gm-Features: AS18NWB1gPoYWRZ8UuiGQfHHv38t03_4NHxTguz_730PfZ1eyzCAM7ds9fkOKzw Message-ID: Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[freebsd]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ch8vL3yMgz3HnD Hello Cy, According to the changelog: "The default value increase for so-sndbuf is to mitigate a cross-layer issue where the UDP socket send buffers are exhausted waiting for ARP/NDP resolution. Thanks to Reflyable for the report. To help the server start more easily, the setsockopt for sndbuf buffer size prints a warning instead of a failure to start the server if it can not set the buffer size." This means so-sndbuf is now 4m. Which triggers a warning, detailed in upstream commit 713b5db5 ("- Fix to print warning for when so-sndbuf setsockopt is not granted."). I wonder if we should revert back to using "so-sndbuf: 0" as the default for FreeBSD? Or is there a better solution/workaround? Regards, On Tue, Oct 7, 2025 at 12:24=E2=80=AFPM Cy Schubert wrote: > > The branch main has been updated by cy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Db2efd602aea8b3cbc3fb215b96= 11946d04fceb10 > > commit b2efd602aea8b3cbc3fb215b9611946d04fceb10 > Merge: e770e32aa3a0 0064eb9cf1c8 > Author: Cy Schubert > AuthorDate: 2025-10-07 13:58:59 +0000 > Commit: Cy Schubert > CommitDate: 2025-10-07 15:16:21 +0000 > > unbound: Vendor import 1.24.0 > > Release notes at > https://nlnetlabs.nl/news/2025/Sep/18/unbound-1.24.0-released= / > > MFC after: 1 week > > Merge commit '0064eb9cf1c8d526e87d3149249445d4bc8d0248' > > contrib/unbound/Makefile.in | 1380 ++-- > contrib/unbound/cachedb/redis.c | 144 +- > contrib/unbound/compat/fake-rfc2553.c | 6 +- > contrib/unbound/config.h.in | 22 +- > contrib/unbound/configure | 275 +- > contrib/unbound/configure.ac | 31 +- > contrib/unbound/contrib/aaaa-filter-iterator.patch | 98 +- > contrib/unbound/contrib/unbound.service.in | 6 + > contrib/unbound/daemon/cachedump.c | 339 +- > contrib/unbound/daemon/remote.c | 769 +- > contrib/unbound/daemon/stats.c | 2 + > contrib/unbound/daemon/unbound.c | 9 +- > contrib/unbound/daemon/worker.c | 19 +- > contrib/unbound/dns64/dns64.c | 2 +- > contrib/unbound/dnstap/dnstap.c | 4 +- > contrib/unbound/dnstap/dnstap.m4 | 39 +- > contrib/unbound/dnstap/dnstap.proto | 2 +- > contrib/unbound/dnstap/dtstream.c | 2 +- > contrib/unbound/doc/Changelog | 311 +- > contrib/unbound/doc/README | 2 +- > contrib/unbound/doc/README.man | 16 + > contrib/unbound/doc/example.conf.in | 10 +- > contrib/unbound/doc/libunbound.3.in | 675 +- > contrib/unbound/doc/libunbound.rst | 491 ++ > contrib/unbound/doc/unbound-anchor.8.in | 383 +- > contrib/unbound/doc/unbound-anchor.rst | 281 + > contrib/unbound/doc/unbound-checkconf.8.in | 121 +- > contrib/unbound/doc/unbound-checkconf.rst | 98 + > contrib/unbound/doc/unbound-control.8.in | 2037 +++-- > contrib/unbound/doc/unbound-control.rst | 1374 ++++ > contrib/unbound/doc/unbound-host.1.in | 242 +- > contrib/unbound/doc/unbound-host.rst | 176 + > contrib/unbound/doc/unbound.8.in | 169 +- > contrib/unbound/doc/unbound.conf.5.in | 8143 +++++++++++++-= ------ > contrib/unbound/doc/unbound.conf.rst | 4997 ++++++++++++ > contrib/unbound/doc/unbound.rst | 119 + > contrib/unbound/edns-subnet/addrtree.h | 2 +- > contrib/unbound/edns-subnet/subnetmod.c | 47 +- > contrib/unbound/edns-subnet/subnetmod.h | 4 + > contrib/unbound/iterator/iter_delegpt.h | 10 + > contrib/unbound/iterator/iter_fwd.c | 32 +- > contrib/unbound/iterator/iterator.c | 32 +- > contrib/unbound/libunbound/libworker.c | 15 +- > contrib/unbound/libunbound/unbound.h | 2 + > contrib/unbound/respip/respip.h | 2 +- > contrib/unbound/services/authzone.c | 90 +- > contrib/unbound/services/authzone.h | 17 +- > contrib/unbound/services/cache/rrset.c | 2 + > contrib/unbound/services/listen_dnsport.c | 117 +- > contrib/unbound/services/listen_dnsport.h | 9 +- > contrib/unbound/services/mesh.c | 1 + > contrib/unbound/services/mesh.h | 2 + > contrib/unbound/services/modstack.c | 4 +- > contrib/unbound/services/modstack.h | 2 +- > contrib/unbound/services/outside_network.c | 6 +- > contrib/unbound/services/rpz.c | 20 +- > contrib/unbound/sldns/keyraw.c | 4 +- > contrib/unbound/sldns/str2wire.c | 2 +- > contrib/unbound/sldns/wire2str.h | 2 +- > contrib/unbound/smallapp/unbound-anchor.c | 12 +- > contrib/unbound/smallapp/unbound-checkconf.c | 51 +- > contrib/unbound/smallapp/unbound-control.c | 3 + > contrib/unbound/testcode/doqclient.c | 71 +- > contrib/unbound/testcode/fake_event.c | 46 +- > contrib/unbound/testcode/testbound.c | 150 +- > contrib/unbound/testcode/unitdname.c | 277 + > contrib/unbound/testcode/unitinfra.c | 1 + > contrib/unbound/testcode/unitmain.c | 24 + > contrib/unbound/testcode/unitverify.c | 133 + > contrib/unbound/testcode/unitzonemd.c | 1 + > .../auth_nsec3_ent_with_out_of_zone_data.rpl | 228 + > .../auth_nsec3_wild_with_out_of_zone_data.rpl | 234 + > contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl | 163 + > contrib/unbound/testdata/iter_minimise_chain.rpl | 623 ++ > .../redis_reconnect_interval.tdir/after.zone | 2 + > .../redis_reconnect_interval.tdir/before.zone | 2 + > .../redis_reconnect_interval.tdir/redis.conf | 583 ++ > .../redis_reconnect_interval.conf | 33 + > .../redis_reconnect_interval.dsc | 16 + > .../redis_reconnect_interval.post | 18 + > .../redis_reconnect_interval.pre | 46 + > .../redis_reconnect_interval.test | 121 + > .../unbound_control.key | 39 + > .../unbound_control.pem | 22 + > .../unbound_server.key | 39 + > .../unbound_server.pem | 22 + > contrib/unbound/testdata/rpz_cname_wild.rpl | 190 + > .../testdata/stat_values.tdir/stat_values.conf | 2 +- > .../testdata/stat_values.tdir/stat_values.test | 3 +- > .../testdata/stat_values.tdir/stat_values.testns | 5 + > .../subnet_cache_lookup.conf | 36 + > .../subnet_cache_lookup.dsc | 16 + > .../subnet_cache_lookup.post | 15 + > .../subnet_cache_lookup.pre | 42 + > .../subnet_cache_lookup.test | 121 + > .../subnet_cache_lookup.testns | 181 + > .../unbound/testdata/subnet_cached_servfail.crpl | 2 +- > contrib/unbound/testdata/subnet_noecs_mult.crpl | 334 + > contrib/unbound/testdata/subnet_noecs_refused.crpl | 159 + > contrib/unbound/testdata/subnet_noecs_support.crpl | 127 + > .../unbound/testdata/subnet_scopezero_global.crpl | 280 + > contrib/unbound/testdata/val_failure_dnskey.rpl | 2 +- > contrib/unbound/util/config_file.c | 62 +- > contrib/unbound/util/config_file.h | 11 + > contrib/unbound/util/configparser.c | 1300 ++-- > contrib/unbound/util/configparser.y | 12 +- > contrib/unbound/util/data/dname.c | 44 +- > contrib/unbound/util/data/dname.h | 15 +- > contrib/unbound/util/data/msgencode.c | 6 +- > contrib/unbound/util/data/msgencode.h | 2 +- > contrib/unbound/util/data/msgparse.h | 6 +- > contrib/unbound/util/data/msgreply.c | 27 +- > contrib/unbound/util/data/msgreply.h | 12 +- > contrib/unbound/util/iana_ports.inc | 2 + > contrib/unbound/util/mini_event.c | 4 +- > contrib/unbound/util/net_help.c | 21 +- > contrib/unbound/util/netevent.c | 82 +- > contrib/unbound/util/netevent.h | 4 + > contrib/unbound/util/random.c | 33 + > contrib/unbound/validator/val_sigcrypt.c | 5 + > contrib/unbound/validator/validator.c | 19 +- > contrib/unbound/winrc/win_svc.c | 1 + > lib/libunbound/config.h | 4 +- > 123 files changed, 23206 insertions(+), 6159 deletions(-) > > diff --cc contrib/unbound/config.h.in > index 584810398b91,000000000000..a2b3f33c32be > mode 100644,000000..100644 > --- a/contrib/unbound/config.h.in > +++ b/contrib/unbound/config.h.in > @@@ -1,1640 -1,0 +1,1650 @@@ > +/* config.h.in. Generated from configure.ac by autoheader. */ > + > +/* apply the fallthrough attribute. */ > +#undef ATTR_FALLTHROUGH > + > +/* apply the noreturn attribute to a function that exits the program */ > +#undef ATTR_NORETURN > + > +/* apply the weak attribute to a symbol */ > +#undef ATTR_WEAK > + > +/* Directory to chroot to */ > +#undef CHROOT_DIR > + > +/* Define this to enable client subnet option. */ > +#undef CLIENT_SUBNET > + > +/* Do sha512 definitions in config.h */ > +#undef COMPAT_SHA512 > + > +/* Command line arguments used with configure */ > +#undef CONFCMDLINE > + > +/* Pathname to the Unbound configuration file */ > +#undef CONFIGFILE > + > +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do no= t work > + */ > +#undef DARWIN_BROKEN_SETREUID > + > +/* Whether daemon is deprecated */ > +#undef DEPRECATED_DAEMON > + > +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ > +#undef DEPRECATE_RSA_1024 > + > +/* Define this to enable kernel based UDP source port randomization. */ > +#undef DISABLE_EXPLICIT_PORT_RANDOMISATION > + > +/* default dnstap socket path */ > +#undef DNSTAP_SOCKET_PATH > + > +/* Define if you want to use debug lock checking (slow). */ > +#undef ENABLE_LOCK_CHECKS > + > +/* Define this if you enabled-allsymbols from libunbound to link binari= es to > + it for smaller install size, but the libunbound export table is poll= uted by > + internal symbols */ > +#undef EXPORT_ALL_SYMBOLS > + > +/* Define to 1 if you have the 'accept4' function. */ > +#undef HAVE_ACCEPT4 > + > +/* Define to 1 if you have the 'arc4random' function. */ > +#undef HAVE_ARC4RANDOM > + > +/* Define to 1 if you have the 'arc4random_uniform' function. */ > +#undef HAVE_ARC4RANDOM_UNIFORM > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_ARPA_INET_H > + > +/* Whether the C compiler accepts the "fallthrough" attribute */ > +#undef HAVE_ATTR_FALLTHROUGH > + > +/* Whether the C compiler accepts the "format" attribute */ > +#undef HAVE_ATTR_FORMAT > + > +/* Whether the C compiler accepts the "noreturn" attribute */ > +#undef HAVE_ATTR_NORETURN > + > +/* Whether the C compiler accepts the "unused" attribute */ > +#undef HAVE_ATTR_UNUSED > + > +/* Whether the C compiler accepts the "weak" attribute */ > +#undef HAVE_ATTR_WEAK > + > +/* If we have be64toh */ > +#undef HAVE_BE64TOH > + > +/* Define to 1 if you have the 'BIO_set_callback_ex' function. */ > +#undef HAVE_BIO_SET_CALLBACK_EX > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_BSD_STDLIB_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_BSD_STRING_H > + > +/* Define to 1 if you have the 'chown' function. */ > +#undef HAVE_CHOWN > + > +/* Define to 1 if you have the 'chroot' function. */ > +#undef HAVE_CHROOT > + > +/* Define to 1 if you have the 'CRYPTO_cleanup_all_ex_data' function. *= / > +#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA > + > +/* Define to 1 if you have the 'CRYPTO_THREADID_set_callback' function.= */ > +#undef HAVE_CRYPTO_THREADID_SET_CALLBACK > + > +/* Define to 1 if you have the 'ctime_r' function. */ > +#undef HAVE_CTIME_R > + > +/* Define to 1 if you have the 'daemon' function. */ > +#undef HAVE_DAEMON > + > +/* Define to 1 if you have the declaration of 'arc4random', and to 0 if= you > + don't. */ > +#undef HAVE_DECL_ARC4RANDOM > + > +/* Define to 1 if you have the declaration of 'arc4random_uniform', and= to 0 > + if you don't. */ > +#undef HAVE_DECL_ARC4RANDOM_UNIFORM > + > +/* Define to 1 if you have the declaration of 'evsignal_assign', and to= 0 if > + you don't. */ > +#undef HAVE_DECL_EVSIGNAL_ASSIGN > + > +/* Define to 1 if you have the declaration of 'inet_ntop', and to 0 if = you > + don't. */ > +#undef HAVE_DECL_INET_NTOP > + > +/* Define to 1 if you have the declaration of 'inet_pton', and to 0 if = you > + don't. */ > +#undef HAVE_DECL_INET_PTON > + > +/* Define to 1 if you have the declaration of 'nghttp2_session_server_n= ew', > + and to 0 if you don't. */ > +#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW > + > +/* Define to 1 if you have the declaration of 'ngtcp2_conn_server_new',= and to > + 0 if you don't. */ > +#undef HAVE_DECL_NGTCP2_CONN_SERVER_NEW > + > +/* Define to 1 if you have the declaration of 'ngtcp2_crypto_encrypt_cb= ', and > + to 0 if you don't. */ > +#undef HAVE_DECL_NGTCP2_CRYPTO_ENCRYPT_CB > + > +/* Define to 1 if you have the declaration of 'NID_ED25519', and to 0 i= f you > + don't. */ > +#undef HAVE_DECL_NID_ED25519 > + > +/* Define to 1 if you have the declaration of 'NID_ED448', and to 0 if = you > + don't. */ > +#undef HAVE_DECL_NID_ED448 > + > +/* Define to 1 if you have the declaration of 'NID_secp384r1', and to 0= if you > + don't. */ > +#undef HAVE_DECL_NID_SECP384R1 > + > +/* Define to 1 if you have the declaration of 'NID_X9_62_prime256v1', a= nd to 0 > + if you don't. */ > +#undef HAVE_DECL_NID_X9_62_PRIME256V1 > + > +/* Define to 1 if you have the declaration of 'reallocarray', and to 0 = if you > + don't. */ > +#undef HAVE_DECL_REALLOCARRAY > + > +/* Define to 1 if you have the declaration of 'redisConnect', and to 0 = if you > + don't. */ > +#undef HAVE_DECL_REDISCONNECT > + > +/* Define to 1 if you have the declaration of 'sk_SSL_COMP_pop_free', a= nd to 0 > + if you don't. */ > +#undef HAVE_DECL_SK_SSL_COMP_POP_FREE > + > +/* Define to 1 if you have the declaration of > + 'SSL_COMP_get_compression_methods', and to 0 if you don't. */ > +#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS > + > +/* Define to 1 if you have the declaration of 'SSL_CTX_set_ecdh_auto', = and to > + 0 if you don't. */ > +#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO > + > - /* Define to 1 if you have the declaration of 'strlcat', and to 0 if yo= u > ++/* Define to 1 if you have the declaration of `SSL_CTX_set_tmp_ecdh', a= nd to 0 > ++ if you don't. */ > ++#undef HAVE_DECL_SSL_CTX_SET_TMP_ECDH > ++ > ++/* Define to 1 if you have the declaration of `strlcat', and to 0 if yo= u > + don't. */ > +#undef HAVE_DECL_STRLCAT > + > +/* Define to 1 if you have the declaration of 'strlcpy', and to 0 if yo= u > + don't. */ > +#undef HAVE_DECL_STRLCPY > + > +/* Define to 1 if you have the declaration of 'XML_StopParser', and to = 0 if > + you don't. */ > +#undef HAVE_DECL_XML_STOPPARSER > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_DLFCN_H > + > +/* Define to 1 if you have the 'DSA_SIG_set0' function. */ > +#undef HAVE_DSA_SIG_SET0 > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_ENDIAN_H > + > +/* Define to 1 if you have the 'endprotoent' function. */ > +#undef HAVE_ENDPROTOENT > + > +/* Define to 1 if you have the 'endpwent' function. */ > +#undef HAVE_ENDPWENT > + > +/* Define to 1 if you have the 'endservent' function. */ > +#undef HAVE_ENDSERVENT > + > +/* Define to 1 if you have the 'ENGINE_cleanup' function. */ > +#undef HAVE_ENGINE_CLEANUP > + > +/* Define to 1 if you have the 'ERR_free_strings' function. */ > +#undef HAVE_ERR_FREE_STRINGS > + > +/* Define to 1 if you have the 'ERR_load_crypto_strings' function. */ > +#undef HAVE_ERR_LOAD_CRYPTO_STRINGS > + > +/* Define to 1 if you have the 'event_assign' function. */ > +#undef HAVE_EVENT_ASSIGN > + > +/* Define to 1 if you have the 'event_base_free' function. */ > +#undef HAVE_EVENT_BASE_FREE > + > +/* Define to 1 if you have the 'event_base_get_method' function. */ > +#undef HAVE_EVENT_BASE_GET_METHOD > + > +/* Define to 1 if you have the 'event_base_new' function. */ > +#undef HAVE_EVENT_BASE_NEW > + > +/* Define to 1 if you have the 'event_base_once' function. */ > +#undef HAVE_EVENT_BASE_ONCE > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_EVENT_H > + > +/* Define to 1 if you have the 'EVP_aes_256_cbc' function. */ > +#undef HAVE_EVP_AES_256_CBC > + > +/* Define to 1 if you have the 'EVP_cleanup' function. */ > +#undef HAVE_EVP_CLEANUP > + > +/* Define to 1 if you have the 'EVP_default_properties_is_fips_enabled' > + function. */ > +#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED > + > +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ > +#undef HAVE_EVP_DIGESTVERIFY > + > +/* Define to 1 if you have the 'EVP_dss1' function. */ > +#undef HAVE_EVP_DSS1 > + > +/* Define to 1 if you have the 'EVP_EncryptInit_ex' function. */ > +#undef HAVE_EVP_ENCRYPTINIT_EX > + > +/* Define to 1 if you have the 'EVP_MAC_CTX_set_params' function. */ > +#undef HAVE_EVP_MAC_CTX_SET_PARAMS > + > +/* Define to 1 if you have the 'EVP_MD_CTX_new' function. */ > +#undef HAVE_EVP_MD_CTX_NEW > + > +/* Define to 1 if you have the 'EVP_sha1' function. */ > +#undef HAVE_EVP_SHA1 > + > +/* Define to 1 if you have the 'EVP_sha256' function. */ > +#undef HAVE_EVP_SHA256 > + > +/* Define to 1 if you have the 'EVP_sha512' function. */ > +#undef HAVE_EVP_SHA512 > + > +/* Define to 1 if you have the 'ev_default_loop' function. */ > +#undef HAVE_EV_DEFAULT_LOOP > + > +/* Define to 1 if you have the 'ev_loop' function. */ > +#undef HAVE_EV_LOOP > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_EXPAT_H > + > +/* Define to 1 if you have the 'explicit_bzero' function. */ > +#undef HAVE_EXPLICIT_BZERO > + > +/* Define to 1 if you have the 'fcntl' function. */ > +#undef HAVE_FCNTL > + > +/* Define to 1 if you have the 'FIPS_mode' function. */ > +#undef HAVE_FIPS_MODE > + > +/* Define to 1 if you have the 'fork' function. */ > +#undef HAVE_FORK > + > +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ > +#undef HAVE_FSEEKO > + > +/* Define to 1 if you have the 'fsync' function. */ > +#undef HAVE_FSYNC > + > +/* Whether getaddrinfo is available */ > +#undef HAVE_GETADDRINFO > + > +/* Define to 1 if you have the 'getauxval' function. */ > +#undef HAVE_GETAUXVAL > + > +/* Define to 1 if you have the 'getentropy' function. */ > +#undef HAVE_GETENTROPY > + > +/* Define to 1 if you have the 'getifaddrs' function. */ > +#undef HAVE_GETIFADDRS > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_GETOPT_H > + > +/* Define to 1 if you have the 'getpwnam' function. */ > +#undef HAVE_GETPWNAM > + > +/* Define to 1 if you have the 'getrlimit' function. */ > +#undef HAVE_GETRLIMIT > + > +/* Define to 1 if you have the 'gettid' function. */ > +#undef HAVE_GETTID > + > +/* Define to 1 if you have the 'glob' function. */ > +#undef HAVE_GLOB > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_GLOB_H > + > +/* Define to 1 if you have the 'gmtime_r' function. */ > +#undef HAVE_GMTIME_R > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_GRP_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_HIREDIS_HIREDIS_H > + > +/* Define to 1 if you have the 'HMAC_Init_ex' function. */ > +#undef HAVE_HMAC_INIT_EX > + > +/* If we have htobe64 */ > +#undef HAVE_HTOBE64 > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_IFADDRS_H > + > +/* Define to 1 if you have the 'if_nametoindex' function. */ > +#undef HAVE_IF_NAMETOINDEX > + > +/* Define to 1 if you have the 'inet_aton' function. */ > +#undef HAVE_INET_ATON > + > +/* Define to 1 if you have the 'inet_ntop' function. */ > +#undef HAVE_INET_NTOP > + > +/* Define to 1 if you have the 'inet_pton' function. */ > +#undef HAVE_INET_PTON > + > +/* Define to 1 if you have the 'initgroups' function. */ > +#undef HAVE_INITGROUPS > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_INTTYPES_H > + > +/* if the function 'ioctlsocket' is available */ > +#undef HAVE_IOCTLSOCKET > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_IPHLPAPI_H > + > +/* Define to 1 if you have the 'isblank' function. */ > +#undef HAVE_ISBLANK > + > +/* Define to 1 if you have the 'kill' function. */ > +#undef HAVE_KILL > + > +/* Use portable libbsd functions */ > +#undef HAVE_LIBBSD > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_LIBKERN_OSBYTEORDER_H > + > +/* Define if we have LibreSSL */ > +#undef HAVE_LIBRESSL > + > +/* If we have atomic_store */ > +#undef HAVE_LINK_ATOMIC_STORE > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_LINUX_NET_TSTAMP_H > + > +/* Define to 1 if you have the 'localtime_r' function. */ > +#undef HAVE_LOCALTIME_R > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_LOGIN_CAP_H > + > +/* If have GNU libc compatible malloc */ > +#undef HAVE_MALLOC > + > +/* Define to 1 if you have the 'memmove' function. */ > +#undef HAVE_MEMMOVE > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_MINIX_CONFIG_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NETDB_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NETINET_IN_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NETINET_TCP_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NETIOAPI_H > + > +/* Use libnettle for crypto */ > +#undef HAVE_NETTLE > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NETTLE_DSA_COMPAT_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NETTLE_EDDSA_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NET_IF_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NET_PFVAR_H > + > +/* Define this to use nghttp2 client. */ > +#undef HAVE_NGHTTP2 > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NGHTTP2_NGHTTP2_H > + > +/* Define this to use ngtcp2. */ > +#undef HAVE_NGTCP2 > + > +/* Define to 1 if you have the 'ngtcp2_ccerr_default' function. */ > +#undef HAVE_NGTCP2_CCERR_DEFAULT > + > +/* Define to 1 if you have the 'ngtcp2_conn_encode_0rtt_transport_param= s' > + function. */ > +#undef HAVE_NGTCP2_CONN_ENCODE_0RTT_TRANSPORT_PARAMS > + > +/* Define to 1 if you have the 'ngtcp2_conn_get_max_local_streams_uni' > + function. */ > +#undef HAVE_NGTCP2_CONN_GET_MAX_LOCAL_STREAMS_UNI > + > +/* Define to 1 if you have the 'ngtcp2_conn_get_num_scid' function. */ > +#undef HAVE_NGTCP2_CONN_GET_NUM_SCID > + > +/* Define to 1 if you have the 'ngtcp2_conn_in_closing_period' function= . */ > +#undef HAVE_NGTCP2_CONN_IN_CLOSING_PERIOD > + > +/* Define to 1 if you have the 'ngtcp2_conn_in_draining_period' functio= n. */ > +#undef HAVE_NGTCP2_CONN_IN_DRAINING_PERIOD > + > +/* Define if ngtcp2_conn_shutdown_stream has 4 arguments. */ > +#undef HAVE_NGTCP2_CONN_SHUTDOWN_STREAM4 > + > +/* Define to 1 if you have the 'ngtcp2_conn_tls_early_data_rejected' fu= nction. > + */ > +#undef HAVE_NGTCP2_CONN_TLS_EARLY_DATA_REJECTED > + > +/* Define to 1 if you have the 'ngtcp2_crypto_encrypt_cb' function. */ > +#undef HAVE_NGTCP2_CRYPTO_ENCRYPT_CB > + > +/* Define to 1 if you have the > + 'ngtcp2_crypto_quictls_configure_client_context' function. */ > +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT > + > +/* Define to 1 if you have the > + 'ngtcp2_crypto_quictls_configure_server_context' function. */ > +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT > + > +/* Define to 1 if you have the > + 'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ > +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL > + > - /* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */ > ++/* Define to 1 if you have the `ngtcp2_crypto_quictls_init' function. *= / > ++#undef HAVE_NGTCP2_CRYPTO_QUICTLS_INIT > ++ > ++/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */ > +#undef HAVE_NGTCP2_ENCRYPTION_LEVEL > + > +/* Define to 1 if you have the header = file. > + */ > +#undef HAVE_NGTCP2_NGTCP2_CRYPTO_OPENSSL_H > + > ++/* Define to 1 if you have the header fil= e. */ > ++#undef HAVE_NGTCP2_NGTCP2_CRYPTO_OSSL_H > ++ > +/* Define to 1 if you have the header = file. > + */ > +#undef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_NGTCP2_NGTCP2_H > + > +/* Use libnss for crypto */ > +#undef HAVE_NSS > + > +/* Define to 1 if you have the 'OpenSSL_add_all_digests' function. */ > +#undef HAVE_OPENSSL_ADD_ALL_DIGESTS > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_BN_H > + > +/* Define to 1 if you have the 'OPENSSL_config' function. */ > +#undef HAVE_OPENSSL_CONFIG > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_CONF_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_CORE_NAMES_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_DH_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_DSA_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_ENGINE_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_ERR_H > + > +/* Define to 1 if you have the 'OPENSSL_init_crypto' function. */ > +#undef HAVE_OPENSSL_INIT_CRYPTO > + > +/* Define to 1 if you have the 'OPENSSL_init_ssl' function. */ > +#undef HAVE_OPENSSL_INIT_SSL > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_PARAM_BUILD_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_RAND_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_RSA_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_OPENSSL_SSL_H > + > +/* Define to 1 if you have the 'OSSL_PARAM_BLD_new' function. */ > +#undef HAVE_OSSL_PARAM_BLD_NEW > + > +/* Define to 1 if you have the 'poll' function. */ > +#undef HAVE_POLL > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_POLL_H > + > +/* Define if you have POSIX threads libraries and header files. */ > +#undef HAVE_PTHREAD > + > +/* Have PTHREAD_PRIO_INHERIT. */ > +#undef HAVE_PTHREAD_PRIO_INHERIT > + > +/* Define to 1 if the system has the type 'pthread_rwlock_t'. */ > +#undef HAVE_PTHREAD_RWLOCK_T > + > +/* Define to 1 if the system has the type 'pthread_spinlock_t'. */ > +#undef HAVE_PTHREAD_SPINLOCK_T > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_PWD_H > + > +/* Define if you have Python libraries and header files. */ > +#undef HAVE_PYTHON > + > +/* Define to 1 if you have the 'random' function. */ > +#undef HAVE_RANDOM > + > +/* Define to 1 if you have the 'RAND_cleanup' function. */ > +#undef HAVE_RAND_CLEANUP > + > +/* If we have reallocarray(3) */ > +#undef HAVE_REALLOCARRAY > + > +/* Define to 1 if you have the 'recvmsg' function. */ > +#undef HAVE_RECVMSG > + > +/* Define to 1 if you have the 'sendmsg' function. */ > +#undef HAVE_SENDMSG > + > +/* Define to 1 if you have the 'setregid' function. */ > +#undef HAVE_SETREGID > + > +/* Define to 1 if you have the 'setresgid' function. */ > +#undef HAVE_SETRESGID > + > +/* Define to 1 if you have the 'setresuid' function. */ > +#undef HAVE_SETRESUID > + > +/* Define to 1 if you have the 'setreuid' function. */ > +#undef HAVE_SETREUID > + > +/* Define to 1 if you have the 'setrlimit' function. */ > +#undef HAVE_SETRLIMIT > + > +/* Define to 1 if you have the 'setsid' function. */ > +#undef HAVE_SETSID > + > +/* Define to 1 if you have the 'setusercontext' function. */ > +#undef HAVE_SETUSERCONTEXT > + > +/* Define to 1 if you have the 'SHA512_Update' function. */ > +#undef HAVE_SHA512_UPDATE > + > +/* Define to 1 if you have the 'shmget' function. */ > +#undef HAVE_SHMGET > + > +/* Define to 1 if you have the 'sigprocmask' function. */ > +#undef HAVE_SIGPROCMASK > + > +/* Define to 1 if you have the 'sleep' function. */ > +#undef HAVE_SLEEP > + > +/* Define to 1 if you have the 'snprintf' function. */ > +#undef HAVE_SNPRINTF > + > +/* Define to 1 if you have the 'socketpair' function. */ > +#undef HAVE_SOCKETPAIR > + > +/* Using Solaris threads */ > +#undef HAVE_SOLARIS_THREADS > + > +/* Define to 1 if you have the 'srandom' function. */ > +#undef HAVE_SRANDOM > + > +/* Define if you have the SSL libraries installed. */ > +#undef HAVE_SSL > + > +/* Define to 1 if you have the 'SSL_CTX_set_alpn_protos' function. */ > +#undef HAVE_SSL_CTX_SET_ALPN_PROTOS > + > +/* Define to 1 if you have the 'SSL_CTX_set_alpn_select_cb' function. *= / > +#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB > + > +/* Define to 1 if you have the 'SSL_CTX_set_ciphersuites' function. */ > +#undef HAVE_SSL_CTX_SET_CIPHERSUITES > + > +/* Define to 1 if you have the 'SSL_CTX_set_security_level' function. *= / > +#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL > + > +/* Define to 1 if you have the 'SSL_CTX_set_tlsext_ticket_key_evp_cb' > + function. */ > +#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB > + > - /* Define to 1 if you have the 'SSL_CTX_set_tmp_ecdh' function. */ > - #undef HAVE_SSL_CTX_SET_TMP_ECDH > - > - /* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */ > ++/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ > +#undef HAVE_SSL_GET0_ALPN_SELECTED > + > +/* Define to 1 if you have the 'SSL_get0_peername' function. */ > +#undef HAVE_SSL_GET0_PEERNAME > + > +/* Define to 1 if you have the 'SSL_get1_peer_certificate' function. */ > +#undef HAVE_SSL_GET1_PEER_CERTIFICATE > + > +/* Define to 1 if you have the 'SSL_is_quic' function. */ > +#undef HAVE_SSL_IS_QUIC > + > +/* Define to 1 if you have the 'SSL_set1_host' function. */ > +#undef HAVE_SSL_SET1_HOST > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STDARG_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STDATOMIC_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STDBOOL_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STDINT_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STDIO_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STDLIB_H > + > +/* Define to 1 if you have the 'strftime' function. */ > +#undef HAVE_STRFTIME > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STRINGS_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_STRING_H > + > +/* Define to 1 if you have the 'strlcat' function. */ > +#undef HAVE_STRLCAT > + > +/* Define to 1 if you have the 'strlcpy' function. */ > +#undef HAVE_STRLCPY > + > +/* Define to 1 if you have the 'strptime' function. */ > +#undef HAVE_STRPTIME > + > +/* Define to 1 if you have the 'strsep' function. */ > +#undef HAVE_STRSEP > + > +/* Define to 1 if 'ipi_spec_dst' is a member of 'struct in_pktinfo'. */ > +#undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST > + > +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_pkt_hd'. */ > +#undef HAVE_STRUCT_NGTCP2_PKT_HD_TOKENLEN > + > +/* Define to 1 if 'max_tx_udp_payload_size' is a member of 'struct > + ngtcp2_settings'. */ > +#undef HAVE_STRUCT_NGTCP2_SETTINGS_MAX_TX_UDP_PAYLOAD_SIZE > + > +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_settings'. *= / > +#undef HAVE_STRUCT_NGTCP2_SETTINGS_TOKENLEN > + > +/* Define to 1 if 'original_dcid_present' is a member of 'struct > + ngtcp2_transport_params'. */ > +#undef HAVE_STRUCT_NGTCP2_TRANSPORT_PARAMS_ORIGINAL_DCID_PRESENT > + > +/* Define to 1 if the system has the type 'struct ngtcp2_version_cid'. = */ > +#undef HAVE_STRUCT_NGTCP2_VERSION_CID > + > +/* Define to 1 if 'sun_len' is a member of 'struct sockaddr_un'. */ > +#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN > + > +/* Define if you have Swig libraries and header files. */ > +#undef HAVE_SWIG > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYSLOG_H > + > +/* Define to 1 if systemd should be used */ > +#undef HAVE_SYSTEMD > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_ENDIAN_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_IPC_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_PARAM_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_RESOURCE_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_SELECT_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_SHA2_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_SHM_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_SOCKET_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_STAT_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_SYSCTL_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_TYPES_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_UIO_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_UN_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_SYS_WAIT_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_TARGETCONDITIONALS_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_TIME_H > + > +/* Define to 1 if you have the 'tzset' function. */ > +#undef HAVE_TZSET > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_UNISTD_H > + > +/* Define to 1 if you have the 'usleep' function. */ > +#undef HAVE_USLEEP > + > +/* Define to 1 if you have the 'vfork' function. */ > +#undef HAVE_VFORK > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_VFORK_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_WCHAR_H > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_WINDOWS_H > + > +/* Using Windows threads */ > +#undef HAVE_WINDOWS_THREADS > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_WINSOCK2_H > + > +/* Define to 1 if 'fork' works. */ > +#undef HAVE_WORKING_FORK > + > +/* Define to 1 if 'vfork' works. */ > +#undef HAVE_WORKING_VFORK > + > +/* Define to 1 if you have the 'writev' function. */ > +#undef HAVE_WRITEV > + > +/* Define to 1 if you have the header file. */ > +#undef HAVE_WS2TCPIP_H > + > *** 33861 LINES SKIPPED *** From nobody Tue Oct 7 21:57:35 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 4ch93h23fZz6C4F0; Tue, 07 Oct 2025 21:57:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch93g6QFgz3JWx; Tue, 07 Oct 2025 21:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759874255; 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=SspvKFNypzb7MuLdW7kwJNHfnlfAuQEnzqAvHj1IlsA=; b=ssAEWTjSRuYi0X3BTBeJHdNd4qtVAVuCV3rlyWJZ5761N0zANvWOaGYfJ7cs7o5k4ce+lC +RzE7zz/QwSmiknFxGY+9lImleSODfFBY8csSqVia/z9B/Qe5qIQt4M2D0xywkIpafBzQo SrhoATd4+j8PU0kS3+EqYXwi+AkQHF2a643107gd9X06nazap3PLslfU7YBe88aPnC2H52 0thHCojdLoNFftcN8o34ebXPRtJlRnwWWRRHaAmAsU3KW0KLdN6VlDfcxX8TH9+BT5QY2v 1UlZu4TfSK3YJr8HZTyt+W1iDMtgHO5k7ipC3PupCTyC9e/PWy+Gm13t4Ds3UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759874255; 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=SspvKFNypzb7MuLdW7kwJNHfnlfAuQEnzqAvHj1IlsA=; b=GzdIXW1HaPmM0Up1bva8vtHrvDESUWsK8ut2Ws7olEyNlUlrzbwRptbeNn4iWiw00jXdim vbgEMdy5LiOuUOBqaH4cK5ALrwbyBN00NdPg8v/wHVyBSobhKD0HM7ifKYcvBYjI+LIJ+R fNeFt7RzPLdY0xxat6LLzk8U9djvisG3TCuFaxU5BhgbKJMweVXcAvq1vTv8sYTRUjCF+q UBkNe61BCMFW2BpGCWCINAQ2vEy1Uv1h172aSDuvCEZRepULvpFfPR6k/rMQFdDHQSwYR6 3Tzyo9AX4wm99jDdTK8nopfV7nMuDOEwqcvFb5eccwznYAkptHHtmJB8Uk3Lzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759874255; a=rsa-sha256; cv=none; b=lB5h5hW+kb1ESp/w0d+ZuhNKniiYyPWSt9yxM5YQWZNoElGnCkYrHZqUY3LytqLWXkLHNC gO0DBY6+y1ltmGnNw4rijdEQ1SlsfWjNliVX2pzyBWrL29KRVD2MpI0+7KcyGjZnEK6kYX 4Zz/oEjD1n8w41o5hoBx0/cTOj0Bgy2yPT98hlIRKPKYRYFDtLr1Ilk8QTUQzHJMMjTgez /vMvPJ2Ljc9NpvoZFamPFqdQhf+FQPhvy5OGH1X8igKfhselOEx6NZ4D4hX52p/Jh1d5C4 CSqr9+QuhL8vxMlUVxcfUjDyBUFCdnZSEd6kp2NOxGWP/bruoHfksJikKpunCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch93g61Lyz13NT; Tue, 07 Oct 2025 21:57:35 +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 597LvZh9099248; Tue, 7 Oct 2025 21:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597LvZWR099245; Tue, 7 Oct 2025 21:57:35 GMT (envelope-from git) Date: Tue, 7 Oct 2025 21:57:35 GMT Message-Id: <202510072157.597LvZWR099245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 2e09ec72417c - main - tests/aio: Add support for larger max_buf_aio to vectored_big_iovcnt test 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e09ec72417c6c2927185f4d63faea9ac7926c2b Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=2e09ec72417c6c2927185f4d63faea9ac7926c2b commit 2e09ec72417c6c2927185f4d63faea9ac7926c2b Author: Olivier Cochard AuthorDate: 2025-10-07 21:45:35 +0000 Commit: Olivier Cochard CommitDate: 2025-10-07 21:56:23 +0000 tests/aio: Add support for larger max_buf_aio to vectored_big_iovcnt test Fix a test failure that occurs when max_buf_aio exceeds 31, as the calculated buffer size exceeds the 16 KB memory disk device. Increase the MD device size to 1 MB to prevent truncation. Rename MD_LEN to DEVICE_IO_LEN for clarity and add a more descriptive error message. Reviewed by: asomers Approved by: asomers Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D52914 --- tests/sys/aio/aio_test.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/sys/aio/aio_test.c b/tests/sys/aio/aio_test.c index b9f8e7062203..def8a9d548d6 100644 --- a/tests/sys/aio/aio_test.c +++ b/tests/sys/aio/aio_test.c @@ -775,7 +775,7 @@ ATF_TC_BODY(pipe_waitcomplete, tc) aio_pipe_test(waitcomplete, NULL); } -#define MD_LEN GLOBAL_MAX +#define DEVICE_IO_LEN GLOBAL_MAX #define MDUNIT_LINK "mdunit_link" static int @@ -794,7 +794,7 @@ aio_md_setup(void) mdio.md_version = MDIOVERSION; mdio.md_type = MD_MALLOC; mdio.md_options = MD_AUTOUNIT | MD_COMPRESS; - mdio.md_mediasize = GLOBAL_MAX; + mdio.md_mediasize = 1024 * 1024; /* 1 MB, enough for max_buf_aio up to 2047 */ mdio.md_sectorsize = 512; strlcpy(buf, __func__, sizeof(buf)); mdio.md_label = buf; @@ -856,7 +856,7 @@ aio_md_test(completion comp, struct sigevent *sev, bool vectored) int fd; fd = aio_md_setup(); - aio_context_init(&ac, fd, fd, MD_LEN); + aio_context_init(&ac, fd, fd, DEVICE_IO_LEN); if (vectored) { aio_writev_test(&ac, comp, sev); aio_readv_test(&ac, comp, sev); @@ -1846,7 +1846,9 @@ ATF_TC_BODY(vectored_big_iovcnt, tc) atf_tc_fail("aio failed: %s", strerror(errno)); if (len != buflen) - atf_tc_fail("aio short write (%jd)", (intmax_t)len); + atf_tc_fail("aio short write: got %jd, expected: %jd " + "(max_buf_aio=%d, iovcnt=%zu)", + (intmax_t)len, (intmax_t)buflen, max_buf_aio, aio.aio_iovcnt); bzero(&aio, sizeof(aio)); aio.aio_fildes = fd; @@ -1995,7 +1997,7 @@ aio_zvol_test(completion comp, struct sigevent *sev, bool vectored, int fd; fd = aio_zvol_setup(unique); - aio_context_init(&ac, fd, fd, MD_LEN); + aio_context_init(&ac, fd, fd, DEVICE_IO_LEN); if (vectored) { aio_writev_test(&ac, comp, sev); aio_readv_test(&ac, comp, sev); From nobody Tue Oct 7 22:12:21 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 4ch9Nn3Jt1z6C5WM; Tue, 07 Oct 2025 22:12:25 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch9Nm22r8z3L0j; Tue, 07 Oct 2025 22:12:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=permerror reason="p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com" header.from=cschubert.com (policy=permerror); spf=pass (mx1.freebsd.org: domain of cy.schubert@cschubert.com designates 3.97.99.33 as permitted sender) smtp.mailfrom=cy.schubert@cschubert.com Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id 67tPvUxdePzKy6FuxvJihN; Tue, 07 Oct 2025 22:12:23 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id 6Fuvvc63SJhC66FuwvMRDD; Tue, 07 Oct 2025 22:12:23 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=erF8zZpX c=1 sm=1 tr=0 ts=68e59047 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=x6icFKpwvdMA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=kyzJ9L_xAAAA:8 a=YxBL1-UpAAAA:8 a=o8OkZ3_wFeIOmqUNb_oA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=GQrHswQfl4I-Q0Y8ISRM:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 2B6DE335; Tue, 07 Oct 2025 15:12:21 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 22BCC29E; Tue, 07 Oct 2025 15:12:21 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: jlduran+freebsd@freebsd.org cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 In-reply-to: References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> Comments: In-reply-to Jose Luis Duran message dated "Tue, 07 Oct 2025 18:50:05 -0300." 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=us-ascii Date: Tue, 07 Oct 2025 15:12:21 -0700 Message-Id: <20251007221221.22BCC29E@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJQOBQzK2Um1nrVtYIVMyQ8niK7fNTYGbUPRjgDeENumbrBvR9Fnz+Rwdbg6a26LCZhYSfW+bfVm+EMmIRf+7BTUufPCNZ7FM9Qk9JwYX8k1kbar1Qmw i6tYJrloH+9HI5snfWzzi4zWu2MIapf68WUICKdI+n2Wlr+fYIHIaJk7MY0dgv0qrCi5GrqztQTqAGHuT/3zE9vGzf8y5ndQEAJTAnYpiuoYWdqauQg2qYsT t39Qqge09PXPfBBb6o7ttKUrG5tduaQXRaqCAUNIDUuXexdWV8EaZ8zP+N0vwNzFC2U6ifptM5jYziGiA+t0n0K+kAP3uP6+gmsFuYqvhqxKN/xVpNC23DXf g3IxGseh+v3bA5yie/2S6wZ1MWaokg== X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.26 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.96)[-0.959]; MV_CASE(0.50)[]; RWL_MAILSPIKE_EXCELLENT(-0.40)[3.97.99.33:from]; R_SPF_ALLOW(-0.20)[+ip4:3.97.99.32/31]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.33:from]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TAGGED_RCPT(0.00)[freebsd]; ARC_NA(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; DMARC_BAD_POLICY(0.00)[cschubert.com : p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com]; R_DKIM_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; REPLYTO_EQ_FROM(0.00)[] X-Rspamd-Queue-Id: 4ch9Nm22r8z3L0j In message , Jose Luis Duran writes: > Hello Cy, > > According to the changelog: > > "The default value increase for so-sndbuf is to mitigate a cross-layer > issue where the UDP socket send buffers are exhausted waiting for > ARP/NDP resolution. Thanks to Reflyable for the report. > > To help the server start more easily, the setsockopt for sndbuf buffer > size prints a warning instead of a failure to start the server if it > can not set the buffer size." > > This means so-sndbuf is now 4m. Which triggers a warning, detailed in > upstream commit 713b5db5 ("- Fix to print warning for when so-sndbuf > setsockopt is not granted."). > > I wonder if we should revert back to using "so-sndbuf: 0" as the > default for FreeBSD? Or is there a better solution/workaround? There are in fact two commits. 1ef7b4a24 adjusted so-sndbuf to default to 4m. 03772d10f changed the default from to 1m. I assume you're suggesting reverting both upstream commits for FreeBSD? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 > > Regards, > > On Tue, Oct 7, 2025 at 12:24=E2=80=AFPM Cy Schubert wrote: > > > > The branch main has been updated by cy: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Db2efd602aea8b3cbc3fb215b96= > 11946d04fceb10 > > > > commit b2efd602aea8b3cbc3fb215b9611946d04fceb10 > > Merge: e770e32aa3a0 0064eb9cf1c8 > > Author: Cy Schubert > > AuthorDate: 2025-10-07 13:58:59 +0000 > > Commit: Cy Schubert > > CommitDate: 2025-10-07 15:16:21 +0000 > > > > unbound: Vendor import 1.24.0 > > > > Release notes at > > https://nlnetlabs.nl/news/2025/Sep/18/unbound-1.24.0-released= > / > > > > MFC after: 1 week > > > > Merge commit '0064eb9cf1c8d526e87d3149249445d4bc8d0248' > > > > contrib/unbound/Makefile.in | 1380 ++-- > > contrib/unbound/cachedb/redis.c | 144 +- > > contrib/unbound/compat/fake-rfc2553.c | 6 +- > > contrib/unbound/config.h.in | 22 +- > > contrib/unbound/configure | 275 +- > > contrib/unbound/configure.ac | 31 +- > > contrib/unbound/contrib/aaaa-filter-iterator.patch | 98 +- > > contrib/unbound/contrib/unbound.service.in | 6 + > > contrib/unbound/daemon/cachedump.c | 339 +- > > contrib/unbound/daemon/remote.c | 769 +- > > contrib/unbound/daemon/stats.c | 2 + > > contrib/unbound/daemon/unbound.c | 9 +- > > contrib/unbound/daemon/worker.c | 19 +- > > contrib/unbound/dns64/dns64.c | 2 +- > > contrib/unbound/dnstap/dnstap.c | 4 +- > > contrib/unbound/dnstap/dnstap.m4 | 39 +- > > contrib/unbound/dnstap/dnstap.proto | 2 +- > > contrib/unbound/dnstap/dtstream.c | 2 +- > > contrib/unbound/doc/Changelog | 311 +- > > contrib/unbound/doc/README | 2 +- > > contrib/unbound/doc/README.man | 16 + > > contrib/unbound/doc/example.conf.in | 10 +- > > contrib/unbound/doc/libunbound.3.in | 675 +- > > contrib/unbound/doc/libunbound.rst | 491 ++ > > contrib/unbound/doc/unbound-anchor.8.in | 383 +- > > contrib/unbound/doc/unbound-anchor.rst | 281 + > > contrib/unbound/doc/unbound-checkconf.8.in | 121 +- > > contrib/unbound/doc/unbound-checkconf.rst | 98 + > > contrib/unbound/doc/unbound-control.8.in | 2037 +++-- > > contrib/unbound/doc/unbound-control.rst | 1374 ++++ > > contrib/unbound/doc/unbound-host.1.in | 242 +- > > contrib/unbound/doc/unbound-host.rst | 176 + > > contrib/unbound/doc/unbound.8.in | 169 +- > > contrib/unbound/doc/unbound.conf.5.in | 8143 +++++++++++++-= > ------ > > contrib/unbound/doc/unbound.conf.rst | 4997 ++++++++++++ > > contrib/unbound/doc/unbound.rst | 119 + > > contrib/unbound/edns-subnet/addrtree.h | 2 +- > > contrib/unbound/edns-subnet/subnetmod.c | 47 +- > > contrib/unbound/edns-subnet/subnetmod.h | 4 + > > contrib/unbound/iterator/iter_delegpt.h | 10 + > > contrib/unbound/iterator/iter_fwd.c | 32 +- > > contrib/unbound/iterator/iterator.c | 32 +- > > contrib/unbound/libunbound/libworker.c | 15 +- > > contrib/unbound/libunbound/unbound.h | 2 + > > contrib/unbound/respip/respip.h | 2 +- > > contrib/unbound/services/authzone.c | 90 +- > > contrib/unbound/services/authzone.h | 17 +- > > contrib/unbound/services/cache/rrset.c | 2 + > > contrib/unbound/services/listen_dnsport.c | 117 +- > > contrib/unbound/services/listen_dnsport.h | 9 +- > > contrib/unbound/services/mesh.c | 1 + > > contrib/unbound/services/mesh.h | 2 + > > contrib/unbound/services/modstack.c | 4 +- > > contrib/unbound/services/modstack.h | 2 +- > > contrib/unbound/services/outside_network.c | 6 +- > > contrib/unbound/services/rpz.c | 20 +- > > contrib/unbound/sldns/keyraw.c | 4 +- > > contrib/unbound/sldns/str2wire.c | 2 +- > > contrib/unbound/sldns/wire2str.h | 2 +- > > contrib/unbound/smallapp/unbound-anchor.c | 12 +- > > contrib/unbound/smallapp/unbound-checkconf.c | 51 +- > > contrib/unbound/smallapp/unbound-control.c | 3 + > > contrib/unbound/testcode/doqclient.c | 71 +- > > contrib/unbound/testcode/fake_event.c | 46 +- > > contrib/unbound/testcode/testbound.c | 150 +- > > contrib/unbound/testcode/unitdname.c | 277 + > > contrib/unbound/testcode/unitinfra.c | 1 + > > contrib/unbound/testcode/unitmain.c | 24 + > > contrib/unbound/testcode/unitverify.c | 133 + > > contrib/unbound/testcode/unitzonemd.c | 1 + > > .../auth_nsec3_ent_with_out_of_zone_data.rpl | 228 + > > .../auth_nsec3_wild_with_out_of_zone_data.rpl | 234 + > > contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl | 163 + > > contrib/unbound/testdata/iter_minimise_chain.rpl | 623 ++ > > .../redis_reconnect_interval.tdir/after.zone | 2 + > > .../redis_reconnect_interval.tdir/before.zone | 2 + > > .../redis_reconnect_interval.tdir/redis.conf | 583 ++ > > .../redis_reconnect_interval.conf | 33 + > > .../redis_reconnect_interval.dsc | 16 + > > .../redis_reconnect_interval.post | 18 + > > .../redis_reconnect_interval.pre | 46 + > > .../redis_reconnect_interval.test | 121 + > > .../unbound_control.key | 39 + > > .../unbound_control.pem | 22 + > > .../unbound_server.key | 39 + > > .../unbound_server.pem | 22 + > > contrib/unbound/testdata/rpz_cname_wild.rpl | 190 + > > .../testdata/stat_values.tdir/stat_values.conf | 2 +- > > .../testdata/stat_values.tdir/stat_values.test | 3 +- > > .../testdata/stat_values.tdir/stat_values.testns | 5 + > > .../subnet_cache_lookup.conf | 36 + > > .../subnet_cache_lookup.dsc | 16 + > > .../subnet_cache_lookup.post | 15 + > > .../subnet_cache_lookup.pre | 42 + > > .../subnet_cache_lookup.test | 121 + > > .../subnet_cache_lookup.testns | 181 + > > .../unbound/testdata/subnet_cached_servfail.crpl | 2 +- > > contrib/unbound/testdata/subnet_noecs_mult.crpl | 334 + > > contrib/unbound/testdata/subnet_noecs_refused.crpl | 159 + > > contrib/unbound/testdata/subnet_noecs_support.crpl | 127 + > > .../unbound/testdata/subnet_scopezero_global.crpl | 280 + > > contrib/unbound/testdata/val_failure_dnskey.rpl | 2 +- > > contrib/unbound/util/config_file.c | 62 +- > > contrib/unbound/util/config_file.h | 11 + > > contrib/unbound/util/configparser.c | 1300 ++-- > > contrib/unbound/util/configparser.y | 12 +- > > contrib/unbound/util/data/dname.c | 44 +- > > contrib/unbound/util/data/dname.h | 15 +- > > contrib/unbound/util/data/msgencode.c | 6 +- > > contrib/unbound/util/data/msgencode.h | 2 +- > > contrib/unbound/util/data/msgparse.h | 6 +- > > contrib/unbound/util/data/msgreply.c | 27 +- > > contrib/unbound/util/data/msgreply.h | 12 +- > > contrib/unbound/util/iana_ports.inc | 2 + > > contrib/unbound/util/mini_event.c | 4 +- > > contrib/unbound/util/net_help.c | 21 +- > > contrib/unbound/util/netevent.c | 82 +- > > contrib/unbound/util/netevent.h | 4 + > > contrib/unbound/util/random.c | 33 + > > contrib/unbound/validator/val_sigcrypt.c | 5 + > > contrib/unbound/validator/validator.c | 19 +- > > contrib/unbound/winrc/win_svc.c | 1 + > > lib/libunbound/config.h | 4 +- > > 123 files changed, 23206 insertions(+), 6159 deletions(-) > > > > diff --cc contrib/unbound/config.h.in > > index 584810398b91,000000000000..a2b3f33c32be > > mode 100644,000000..100644 > > --- a/contrib/unbound/config.h.in > > +++ b/contrib/unbound/config.h.in > > @@@ -1,1640 -1,0 +1,1650 @@@ > > +/* config.h.in. Generated from configure.ac by autoheader. */ > > + > > +/* apply the fallthrough attribute. */ > > +#undef ATTR_FALLTHROUGH > > + > > +/* apply the noreturn attribute to a function that exits the program */ > > +#undef ATTR_NORETURN > > + > > +/* apply the weak attribute to a symbol */ > > +#undef ATTR_WEAK > > + > > +/* Directory to chroot to */ > > +#undef CHROOT_DIR > > + > > +/* Define this to enable client subnet option. */ > > +#undef CLIENT_SUBNET > > + > > +/* Do sha512 definitions in config.h */ > > +#undef COMPAT_SHA512 > > + > > +/* Command line arguments used with configure */ > > +#undef CONFCMDLINE > > + > > +/* Pathname to the Unbound configuration file */ > > +#undef CONFIGFILE > > + > > +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do no= > t work > > + */ > > +#undef DARWIN_BROKEN_SETREUID > > + > > +/* Whether daemon is deprecated */ > > +#undef DEPRECATED_DAEMON > > + > > +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ > > +#undef DEPRECATE_RSA_1024 > > + > > +/* Define this to enable kernel based UDP source port randomization. */ > > +#undef DISABLE_EXPLICIT_PORT_RANDOMISATION > > + > > +/* default dnstap socket path */ > > +#undef DNSTAP_SOCKET_PATH > > + > > +/* Define if you want to use debug lock checking (slow). */ > > +#undef ENABLE_LOCK_CHECKS > > + > > +/* Define this if you enabled-allsymbols from libunbound to link binari= > es to > > + it for smaller install size, but the libunbound export table is poll= > uted by > > + internal symbols */ > > +#undef EXPORT_ALL_SYMBOLS > > + > > +/* Define to 1 if you have the 'accept4' function. */ > > +#undef HAVE_ACCEPT4 > > + > > +/* Define to 1 if you have the 'arc4random' function. */ > > +#undef HAVE_ARC4RANDOM > > + > > +/* Define to 1 if you have the 'arc4random_uniform' function. */ > > +#undef HAVE_ARC4RANDOM_UNIFORM > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_ARPA_INET_H > > + > > +/* Whether the C compiler accepts the "fallthrough" attribute */ > > +#undef HAVE_ATTR_FALLTHROUGH > > + > > +/* Whether the C compiler accepts the "format" attribute */ > > +#undef HAVE_ATTR_FORMAT > > + > > +/* Whether the C compiler accepts the "noreturn" attribute */ > > +#undef HAVE_ATTR_NORETURN > > + > > +/* Whether the C compiler accepts the "unused" attribute */ > > +#undef HAVE_ATTR_UNUSED > > + > > +/* Whether the C compiler accepts the "weak" attribute */ > > +#undef HAVE_ATTR_WEAK > > + > > +/* If we have be64toh */ > > +#undef HAVE_BE64TOH > > + > > +/* Define to 1 if you have the 'BIO_set_callback_ex' function. */ > > +#undef HAVE_BIO_SET_CALLBACK_EX > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_BSD_STDLIB_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_BSD_STRING_H > > + > > +/* Define to 1 if you have the 'chown' function. */ > > +#undef HAVE_CHOWN > > + > > +/* Define to 1 if you have the 'chroot' function. */ > > +#undef HAVE_CHROOT > > + > > +/* Define to 1 if you have the 'CRYPTO_cleanup_all_ex_data' function. *= > / > > +#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA > > + > > +/* Define to 1 if you have the 'CRYPTO_THREADID_set_callback' function.= > */ > > +#undef HAVE_CRYPTO_THREADID_SET_CALLBACK > > + > > +/* Define to 1 if you have the 'ctime_r' function. */ > > +#undef HAVE_CTIME_R > > + > > +/* Define to 1 if you have the 'daemon' function. */ > > +#undef HAVE_DAEMON > > + > > +/* Define to 1 if you have the declaration of 'arc4random', and to 0 if= > you > > + don't. */ > > +#undef HAVE_DECL_ARC4RANDOM > > + > > +/* Define to 1 if you have the declaration of 'arc4random_uniform', and= > to 0 > > + if you don't. */ > > +#undef HAVE_DECL_ARC4RANDOM_UNIFORM > > + > > +/* Define to 1 if you have the declaration of 'evsignal_assign', and to= > 0 if > > + you don't. */ > > +#undef HAVE_DECL_EVSIGNAL_ASSIGN > > + > > +/* Define to 1 if you have the declaration of 'inet_ntop', and to 0 if = > you > > + don't. */ > > +#undef HAVE_DECL_INET_NTOP > > + > > +/* Define to 1 if you have the declaration of 'inet_pton', and to 0 if = > you > > + don't. */ > > +#undef HAVE_DECL_INET_PTON > > + > > +/* Define to 1 if you have the declaration of 'nghttp2_session_server_n= > ew', > > + and to 0 if you don't. */ > > +#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW > > + > > +/* Define to 1 if you have the declaration of 'ngtcp2_conn_server_new',= > and to > > + 0 if you don't. */ > > +#undef HAVE_DECL_NGTCP2_CONN_SERVER_NEW > > + > > +/* Define to 1 if you have the declaration of 'ngtcp2_crypto_encrypt_cb= > ', and > > + to 0 if you don't. */ > > +#undef HAVE_DECL_NGTCP2_CRYPTO_ENCRYPT_CB > > + > > +/* Define to 1 if you have the declaration of 'NID_ED25519', and to 0 i= > f you > > + don't. */ > > +#undef HAVE_DECL_NID_ED25519 > > + > > +/* Define to 1 if you have the declaration of 'NID_ED448', and to 0 if = > you > > + don't. */ > > +#undef HAVE_DECL_NID_ED448 > > + > > +/* Define to 1 if you have the declaration of 'NID_secp384r1', and to 0= > if you > > + don't. */ > > +#undef HAVE_DECL_NID_SECP384R1 > > + > > +/* Define to 1 if you have the declaration of 'NID_X9_62_prime256v1', a= > nd to 0 > > + if you don't. */ > > +#undef HAVE_DECL_NID_X9_62_PRIME256V1 > > + > > +/* Define to 1 if you have the declaration of 'reallocarray', and to 0 = > if you > > + don't. */ > > +#undef HAVE_DECL_REALLOCARRAY > > + > > +/* Define to 1 if you have the declaration of 'redisConnect', and to 0 = > if you > > + don't. */ > > +#undef HAVE_DECL_REDISCONNECT > > + > > +/* Define to 1 if you have the declaration of 'sk_SSL_COMP_pop_free', a= > nd to 0 > > + if you don't. */ > > +#undef HAVE_DECL_SK_SSL_COMP_POP_FREE > > + > > +/* Define to 1 if you have the declaration of > > + 'SSL_COMP_get_compression_methods', and to 0 if you don't. */ > > +#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS > > + > > +/* Define to 1 if you have the declaration of 'SSL_CTX_set_ecdh_auto', = > and to > > + 0 if you don't. */ > > +#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO > > + > > - /* Define to 1 if you have the declaration of 'strlcat', and to 0 if yo= > u > > ++/* Define to 1 if you have the declaration of `SSL_CTX_set_tmp_ecdh', a= > nd to 0 > > ++ if you don't. */ > > ++#undef HAVE_DECL_SSL_CTX_SET_TMP_ECDH > > ++ > > ++/* Define to 1 if you have the declaration of `strlcat', and to 0 if yo= > u > > + don't. */ > > +#undef HAVE_DECL_STRLCAT > > + > > +/* Define to 1 if you have the declaration of 'strlcpy', and to 0 if yo= > u > > + don't. */ > > +#undef HAVE_DECL_STRLCPY > > + > > +/* Define to 1 if you have the declaration of 'XML_StopParser', and to = > 0 if > > + you don't. */ > > +#undef HAVE_DECL_XML_STOPPARSER > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_DLFCN_H > > + > > +/* Define to 1 if you have the 'DSA_SIG_set0' function. */ > > +#undef HAVE_DSA_SIG_SET0 > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_ENDIAN_H > > + > > +/* Define to 1 if you have the 'endprotoent' function. */ > > +#undef HAVE_ENDPROTOENT > > + > > +/* Define to 1 if you have the 'endpwent' function. */ > > +#undef HAVE_ENDPWENT > > + > > +/* Define to 1 if you have the 'endservent' function. */ > > +#undef HAVE_ENDSERVENT > > + > > +/* Define to 1 if you have the 'ENGINE_cleanup' function. */ > > +#undef HAVE_ENGINE_CLEANUP > > + > > +/* Define to 1 if you have the 'ERR_free_strings' function. */ > > +#undef HAVE_ERR_FREE_STRINGS > > + > > +/* Define to 1 if you have the 'ERR_load_crypto_strings' function. */ > > +#undef HAVE_ERR_LOAD_CRYPTO_STRINGS > > + > > +/* Define to 1 if you have the 'event_assign' function. */ > > +#undef HAVE_EVENT_ASSIGN > > + > > +/* Define to 1 if you have the 'event_base_free' function. */ > > +#undef HAVE_EVENT_BASE_FREE > > + > > +/* Define to 1 if you have the 'event_base_get_method' function. */ > > +#undef HAVE_EVENT_BASE_GET_METHOD > > + > > +/* Define to 1 if you have the 'event_base_new' function. */ > > +#undef HAVE_EVENT_BASE_NEW > > + > > +/* Define to 1 if you have the 'event_base_once' function. */ > > +#undef HAVE_EVENT_BASE_ONCE > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_EVENT_H > > + > > +/* Define to 1 if you have the 'EVP_aes_256_cbc' function. */ > > +#undef HAVE_EVP_AES_256_CBC > > + > > +/* Define to 1 if you have the 'EVP_cleanup' function. */ > > +#undef HAVE_EVP_CLEANUP > > + > > +/* Define to 1 if you have the 'EVP_default_properties_is_fips_enabled' > > + function. */ > > +#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED > > + > > +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ > > +#undef HAVE_EVP_DIGESTVERIFY > > + > > +/* Define to 1 if you have the 'EVP_dss1' function. */ > > +#undef HAVE_EVP_DSS1 > > + > > +/* Define to 1 if you have the 'EVP_EncryptInit_ex' function. */ > > +#undef HAVE_EVP_ENCRYPTINIT_EX > > + > > +/* Define to 1 if you have the 'EVP_MAC_CTX_set_params' function. */ > > +#undef HAVE_EVP_MAC_CTX_SET_PARAMS > > + > > +/* Define to 1 if you have the 'EVP_MD_CTX_new' function. */ > > +#undef HAVE_EVP_MD_CTX_NEW > > + > > +/* Define to 1 if you have the 'EVP_sha1' function. */ > > +#undef HAVE_EVP_SHA1 > > + > > +/* Define to 1 if you have the 'EVP_sha256' function. */ > > +#undef HAVE_EVP_SHA256 > > + > > +/* Define to 1 if you have the 'EVP_sha512' function. */ > > +#undef HAVE_EVP_SHA512 > > + > > +/* Define to 1 if you have the 'ev_default_loop' function. */ > > +#undef HAVE_EV_DEFAULT_LOOP > > + > > +/* Define to 1 if you have the 'ev_loop' function. */ > > +#undef HAVE_EV_LOOP > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_EXPAT_H > > + > > +/* Define to 1 if you have the 'explicit_bzero' function. */ > > +#undef HAVE_EXPLICIT_BZERO > > + > > +/* Define to 1 if you have the 'fcntl' function. */ > > +#undef HAVE_FCNTL > > + > > +/* Define to 1 if you have the 'FIPS_mode' function. */ > > +#undef HAVE_FIPS_MODE > > + > > +/* Define to 1 if you have the 'fork' function. */ > > +#undef HAVE_FORK > > + > > +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ > > +#undef HAVE_FSEEKO > > + > > +/* Define to 1 if you have the 'fsync' function. */ > > +#undef HAVE_FSYNC > > + > > +/* Whether getaddrinfo is available */ > > +#undef HAVE_GETADDRINFO > > + > > +/* Define to 1 if you have the 'getauxval' function. */ > > +#undef HAVE_GETAUXVAL > > + > > +/* Define to 1 if you have the 'getentropy' function. */ > > +#undef HAVE_GETENTROPY > > + > > +/* Define to 1 if you have the 'getifaddrs' function. */ > > +#undef HAVE_GETIFADDRS > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_GETOPT_H > > + > > +/* Define to 1 if you have the 'getpwnam' function. */ > > +#undef HAVE_GETPWNAM > > + > > +/* Define to 1 if you have the 'getrlimit' function. */ > > +#undef HAVE_GETRLIMIT > > + > > +/* Define to 1 if you have the 'gettid' function. */ > > +#undef HAVE_GETTID > > + > > +/* Define to 1 if you have the 'glob' function. */ > > +#undef HAVE_GLOB > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_GLOB_H > > + > > +/* Define to 1 if you have the 'gmtime_r' function. */ > > +#undef HAVE_GMTIME_R > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_GRP_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_HIREDIS_HIREDIS_H > > + > > +/* Define to 1 if you have the 'HMAC_Init_ex' function. */ > > +#undef HAVE_HMAC_INIT_EX > > + > > +/* If we have htobe64 */ > > +#undef HAVE_HTOBE64 > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_IFADDRS_H > > + > > +/* Define to 1 if you have the 'if_nametoindex' function. */ > > +#undef HAVE_IF_NAMETOINDEX > > + > > +/* Define to 1 if you have the 'inet_aton' function. */ > > +#undef HAVE_INET_ATON > > + > > +/* Define to 1 if you have the 'inet_ntop' function. */ > > +#undef HAVE_INET_NTOP > > + > > +/* Define to 1 if you have the 'inet_pton' function. */ > > +#undef HAVE_INET_PTON > > + > > +/* Define to 1 if you have the 'initgroups' function. */ > > +#undef HAVE_INITGROUPS > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_INTTYPES_H > > + > > +/* if the function 'ioctlsocket' is available */ > > +#undef HAVE_IOCTLSOCKET > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_IPHLPAPI_H > > + > > +/* Define to 1 if you have the 'isblank' function. */ > > +#undef HAVE_ISBLANK > > + > > +/* Define to 1 if you have the 'kill' function. */ > > +#undef HAVE_KILL > > + > > +/* Use portable libbsd functions */ > > +#undef HAVE_LIBBSD > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_LIBKERN_OSBYTEORDER_H > > + > > +/* Define if we have LibreSSL */ > > +#undef HAVE_LIBRESSL > > + > > +/* If we have atomic_store */ > > +#undef HAVE_LINK_ATOMIC_STORE > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_LINUX_NET_TSTAMP_H > > + > > +/* Define to 1 if you have the 'localtime_r' function. */ > > +#undef HAVE_LOCALTIME_R > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_LOGIN_CAP_H > > + > > +/* If have GNU libc compatible malloc */ > > +#undef HAVE_MALLOC > > + > > +/* Define to 1 if you have the 'memmove' function. */ > > +#undef HAVE_MEMMOVE > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_MINIX_CONFIG_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NETDB_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NETINET_IN_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NETINET_TCP_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NETIOAPI_H > > + > > +/* Use libnettle for crypto */ > > +#undef HAVE_NETTLE > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NETTLE_DSA_COMPAT_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NETTLE_EDDSA_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NET_IF_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NET_PFVAR_H > > + > > +/* Define this to use nghttp2 client. */ > > +#undef HAVE_NGHTTP2 > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NGHTTP2_NGHTTP2_H > > + > > +/* Define this to use ngtcp2. */ > > +#undef HAVE_NGTCP2 > > + > > +/* Define to 1 if you have the 'ngtcp2_ccerr_default' function. */ > > +#undef HAVE_NGTCP2_CCERR_DEFAULT > > + > > +/* Define to 1 if you have the 'ngtcp2_conn_encode_0rtt_transport_param= > s' > > + function. */ > > +#undef HAVE_NGTCP2_CONN_ENCODE_0RTT_TRANSPORT_PARAMS > > + > > +/* Define to 1 if you have the 'ngtcp2_conn_get_max_local_streams_uni' > > + function. */ > > +#undef HAVE_NGTCP2_CONN_GET_MAX_LOCAL_STREAMS_UNI > > + > > +/* Define to 1 if you have the 'ngtcp2_conn_get_num_scid' function. */ > > +#undef HAVE_NGTCP2_CONN_GET_NUM_SCID > > + > > +/* Define to 1 if you have the 'ngtcp2_conn_in_closing_period' function= > . */ > > +#undef HAVE_NGTCP2_CONN_IN_CLOSING_PERIOD > > + > > +/* Define to 1 if you have the 'ngtcp2_conn_in_draining_period' functio= > n. */ > > +#undef HAVE_NGTCP2_CONN_IN_DRAINING_PERIOD > > + > > +/* Define if ngtcp2_conn_shutdown_stream has 4 arguments. */ > > +#undef HAVE_NGTCP2_CONN_SHUTDOWN_STREAM4 > > + > > +/* Define to 1 if you have the 'ngtcp2_conn_tls_early_data_rejected' fu= > nction. > > + */ > > +#undef HAVE_NGTCP2_CONN_TLS_EARLY_DATA_REJECTED > > + > > +/* Define to 1 if you have the 'ngtcp2_crypto_encrypt_cb' function. */ > > +#undef HAVE_NGTCP2_CRYPTO_ENCRYPT_CB > > + > > +/* Define to 1 if you have the > > + 'ngtcp2_crypto_quictls_configure_client_context' function. */ > > +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT > > + > > +/* Define to 1 if you have the > > + 'ngtcp2_crypto_quictls_configure_server_context' function. */ > > +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT > > + > > +/* Define to 1 if you have the > > + 'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ > > +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL > > + > > - /* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */ > > ++/* Define to 1 if you have the `ngtcp2_crypto_quictls_init' function. *= > / > > ++#undef HAVE_NGTCP2_CRYPTO_QUICTLS_INIT > > ++ > > ++/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */ > > +#undef HAVE_NGTCP2_ENCRYPTION_LEVEL > > + > > +/* Define to 1 if you have the header = > file. > > + */ > > +#undef HAVE_NGTCP2_NGTCP2_CRYPTO_OPENSSL_H > > + > > ++/* Define to 1 if you have the header fil= > e. */ > > ++#undef HAVE_NGTCP2_NGTCP2_CRYPTO_OSSL_H > > ++ > > +/* Define to 1 if you have the header = > file. > > + */ > > +#undef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_NGTCP2_NGTCP2_H > > + > > +/* Use libnss for crypto */ > > +#undef HAVE_NSS > > + > > +/* Define to 1 if you have the 'OpenSSL_add_all_digests' function. */ > > +#undef HAVE_OPENSSL_ADD_ALL_DIGESTS > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_BN_H > > + > > +/* Define to 1 if you have the 'OPENSSL_config' function. */ > > +#undef HAVE_OPENSSL_CONFIG > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_CONF_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_CORE_NAMES_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_DH_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_DSA_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_ENGINE_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_ERR_H > > + > > +/* Define to 1 if you have the 'OPENSSL_init_crypto' function. */ > > +#undef HAVE_OPENSSL_INIT_CRYPTO > > + > > +/* Define to 1 if you have the 'OPENSSL_init_ssl' function. */ > > +#undef HAVE_OPENSSL_INIT_SSL > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_PARAM_BUILD_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_RAND_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_RSA_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_OPENSSL_SSL_H > > + > > +/* Define to 1 if you have the 'OSSL_PARAM_BLD_new' function. */ > > +#undef HAVE_OSSL_PARAM_BLD_NEW > > + > > +/* Define to 1 if you have the 'poll' function. */ > > +#undef HAVE_POLL > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_POLL_H > > + > > +/* Define if you have POSIX threads libraries and header files. */ > > +#undef HAVE_PTHREAD > > + > > +/* Have PTHREAD_PRIO_INHERIT. */ > > +#undef HAVE_PTHREAD_PRIO_INHERIT > > + > > +/* Define to 1 if the system has the type 'pthread_rwlock_t'. */ > > +#undef HAVE_PTHREAD_RWLOCK_T > > + > > +/* Define to 1 if the system has the type 'pthread_spinlock_t'. */ > > +#undef HAVE_PTHREAD_SPINLOCK_T > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_PWD_H > > + > > +/* Define if you have Python libraries and header files. */ > > +#undef HAVE_PYTHON > > + > > +/* Define to 1 if you have the 'random' function. */ > > +#undef HAVE_RANDOM > > + > > +/* Define to 1 if you have the 'RAND_cleanup' function. */ > > +#undef HAVE_RAND_CLEANUP > > + > > +/* If we have reallocarray(3) */ > > +#undef HAVE_REALLOCARRAY > > + > > +/* Define to 1 if you have the 'recvmsg' function. */ > > +#undef HAVE_RECVMSG > > + > > +/* Define to 1 if you have the 'sendmsg' function. */ > > +#undef HAVE_SENDMSG > > + > > +/* Define to 1 if you have the 'setregid' function. */ > > +#undef HAVE_SETREGID > > + > > +/* Define to 1 if you have the 'setresgid' function. */ > > +#undef HAVE_SETRESGID > > + > > +/* Define to 1 if you have the 'setresuid' function. */ > > +#undef HAVE_SETRESUID > > + > > +/* Define to 1 if you have the 'setreuid' function. */ > > +#undef HAVE_SETREUID > > + > > +/* Define to 1 if you have the 'setrlimit' function. */ > > +#undef HAVE_SETRLIMIT > > + > > +/* Define to 1 if you have the 'setsid' function. */ > > +#undef HAVE_SETSID > > + > > +/* Define to 1 if you have the 'setusercontext' function. */ > > +#undef HAVE_SETUSERCONTEXT > > + > > +/* Define to 1 if you have the 'SHA512_Update' function. */ > > +#undef HAVE_SHA512_UPDATE > > + > > +/* Define to 1 if you have the 'shmget' function. */ > > +#undef HAVE_SHMGET > > + > > +/* Define to 1 if you have the 'sigprocmask' function. */ > > +#undef HAVE_SIGPROCMASK > > + > > +/* Define to 1 if you have the 'sleep' function. */ > > +#undef HAVE_SLEEP > > + > > +/* Define to 1 if you have the 'snprintf' function. */ > > +#undef HAVE_SNPRINTF > > + > > +/* Define to 1 if you have the 'socketpair' function. */ > > +#undef HAVE_SOCKETPAIR > > + > > +/* Using Solaris threads */ > > +#undef HAVE_SOLARIS_THREADS > > + > > +/* Define to 1 if you have the 'srandom' function. */ > > +#undef HAVE_SRANDOM > > + > > +/* Define if you have the SSL libraries installed. */ > > +#undef HAVE_SSL > > + > > +/* Define to 1 if you have the 'SSL_CTX_set_alpn_protos' function. */ > > +#undef HAVE_SSL_CTX_SET_ALPN_PROTOS > > + > > +/* Define to 1 if you have the 'SSL_CTX_set_alpn_select_cb' function. *= > / > > +#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB > > + > > +/* Define to 1 if you have the 'SSL_CTX_set_ciphersuites' function. */ > > +#undef HAVE_SSL_CTX_SET_CIPHERSUITES > > + > > +/* Define to 1 if you have the 'SSL_CTX_set_security_level' function. *= > / > > +#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL > > + > > +/* Define to 1 if you have the 'SSL_CTX_set_tlsext_ticket_key_evp_cb' > > + function. */ > > +#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB > > + > > - /* Define to 1 if you have the 'SSL_CTX_set_tmp_ecdh' function. */ > > - #undef HAVE_SSL_CTX_SET_TMP_ECDH > > - > > - /* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */ > > ++/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ > > +#undef HAVE_SSL_GET0_ALPN_SELECTED > > + > > +/* Define to 1 if you have the 'SSL_get0_peername' function. */ > > +#undef HAVE_SSL_GET0_PEERNAME > > + > > +/* Define to 1 if you have the 'SSL_get1_peer_certificate' function. */ > > +#undef HAVE_SSL_GET1_PEER_CERTIFICATE > > + > > +/* Define to 1 if you have the 'SSL_is_quic' function. */ > > +#undef HAVE_SSL_IS_QUIC > > + > > +/* Define to 1 if you have the 'SSL_set1_host' function. */ > > +#undef HAVE_SSL_SET1_HOST > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STDARG_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STDATOMIC_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STDBOOL_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STDINT_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STDIO_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STDLIB_H > > + > > +/* Define to 1 if you have the 'strftime' function. */ > > +#undef HAVE_STRFTIME > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STRINGS_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_STRING_H > > + > > +/* Define to 1 if you have the 'strlcat' function. */ > > +#undef HAVE_STRLCAT > > + > > +/* Define to 1 if you have the 'strlcpy' function. */ > > +#undef HAVE_STRLCPY > > + > > +/* Define to 1 if you have the 'strptime' function. */ > > +#undef HAVE_STRPTIME > > + > > +/* Define to 1 if you have the 'strsep' function. */ > > +#undef HAVE_STRSEP > > + > > +/* Define to 1 if 'ipi_spec_dst' is a member of 'struct in_pktinfo'. */ > > +#undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST > > + > > +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_pkt_hd'. */ > > +#undef HAVE_STRUCT_NGTCP2_PKT_HD_TOKENLEN > > + > > +/* Define to 1 if 'max_tx_udp_payload_size' is a member of 'struct > > + ngtcp2_settings'. */ > > +#undef HAVE_STRUCT_NGTCP2_SETTINGS_MAX_TX_UDP_PAYLOAD_SIZE > > + > > +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_settings'. *= > / > > +#undef HAVE_STRUCT_NGTCP2_SETTINGS_TOKENLEN > > + > > +/* Define to 1 if 'original_dcid_present' is a member of 'struct > > + ngtcp2_transport_params'. */ > > +#undef HAVE_STRUCT_NGTCP2_TRANSPORT_PARAMS_ORIGINAL_DCID_PRESENT > > + > > +/* Define to 1 if the system has the type 'struct ngtcp2_version_cid'. = > */ > > +#undef HAVE_STRUCT_NGTCP2_VERSION_CID > > + > > +/* Define to 1 if 'sun_len' is a member of 'struct sockaddr_un'. */ > > +#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN > > + > > +/* Define if you have Swig libraries and header files. */ > > +#undef HAVE_SWIG > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYSLOG_H > > + > > +/* Define to 1 if systemd should be used */ > > +#undef HAVE_SYSTEMD > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_ENDIAN_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_IPC_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_PARAM_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_RESOURCE_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_SELECT_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_SHA2_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_SHM_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_SOCKET_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_STAT_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_SYSCTL_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_TYPES_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_UIO_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_UN_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_SYS_WAIT_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_TARGETCONDITIONALS_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_TIME_H > > + > > +/* Define to 1 if you have the 'tzset' function. */ > > +#undef HAVE_TZSET > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_UNISTD_H > > + > > +/* Define to 1 if you have the 'usleep' function. */ > > +#undef HAVE_USLEEP > > + > > +/* Define to 1 if you have the 'vfork' function. */ > > +#undef HAVE_VFORK > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_VFORK_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_WCHAR_H > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_WINDOWS_H > > + > > +/* Using Windows threads */ > > +#undef HAVE_WINDOWS_THREADS > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_WINSOCK2_H > > + > > +/* Define to 1 if 'fork' works. */ > > +#undef HAVE_WORKING_FORK > > + > > +/* Define to 1 if 'vfork' works. */ > > +#undef HAVE_WORKING_VFORK > > + > > +/* Define to 1 if you have the 'writev' function. */ > > +#undef HAVE_WRITEV > > + > > +/* Define to 1 if you have the header file. */ > > +#undef HAVE_WS2TCPIP_H > > + > > *** 33861 LINES SKIPPED *** From nobody Tue Oct 7 22:27:20 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 4ch9k06CzRz6C6Q7; Tue, 07 Oct 2025 22:27:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ch9k05bx0z3Lx4; Tue, 07 Oct 2025 22:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759876040; 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=b+JrimdL1mrWS2f+00UZVoh0wSxGanT4Fez7BMUG4DQ=; b=Z+6bGmprkTYcvpDTenzsFZixn+fhcfhQv2Dhebbt+LMzzJteJ+ukf6EYZj5vZbI/rhZCVQ AIuwE2eI8A0TvPEo7eVS/NVMudDd9RdJs0CGpnMA4V4RmvieAlfSUfShe8MCnzfssAzzTv EAyCYYPREf12cgIV2crc9ZDgWBdjphIK3ChVbDv2rXNq2zeqkFouwNI1BpDRcgMDSzT5kC JIRwiR4zcetHcHOYpAnIQSajxZPIaQtn8wUfESmHwb9oVusy+uh03tU5QmnzpbBHkdZeKp fKFHzZ7k197WQPCCCvT774F+CoLwNVCyUABxXxx9vlpW2di9soQLUrX0/d6g9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759876040; 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=b+JrimdL1mrWS2f+00UZVoh0wSxGanT4Fez7BMUG4DQ=; b=x4xV6Ik1s9987ffiOV6cwzb2LlFFVryIBAk2J3BRRLMHJFqbFcIQB+pWbF5sqEJhVPsLqN OQDFOgkUl1NmsCe0cPytdCinYUO2CRBBsiwFBlhbUlFP5aDTVgNFzmUZzPmEx3OVS+Sqks 4GljruysoGXqYgunuGul1OZJR49u3KqAQ+8H9H2Q65xwxQCa46w4sHSCkhM6lWM+hf8C5z sqN704a1maHUzyGQjHFoWy8IEORLRvPEk/GtrK1OVSJjOBjyFET4qRweJy3YbMH1J/6UCW 3JJPRGNn7Mn7sUW8CY1drg+mrNMjM0RcQ3NowU8+9BaPJP1L8qTyL8Y0aX8XPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759876040; a=rsa-sha256; cv=none; b=efzCTxMU1YgD6Cu7Mbl+8BR5rHXBpheZSfeFUsdbJFzoX4qozJ61XTYL/3bQ2pIcde/Ep/ hUPhgRvCaPeRE8U0bJbey85fbNdlovG/RTZwFbSUT1kWTaZE2AUhYIR7UB0vTVnUUR4sFe rOuKdkyLht5qbM0mRxD8ldeUckOqEQeZuhXNhl1KZULU3smC7NUYa9sueUByii0UxegOjy F0VtvCG8eCDJb1MBiyUsy/dZjUsyQCs+uZfZmQhepE1f9Zc7lrZpGYhdhqgnONFPpB/zm1 vyIocMDQBMNDrDlzFP+0Sdq5Dwqp76b0MHh6a2FEkM5gpGLEHCYNE4mD3Mu9nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ch9k050s8z14P2; Tue, 07 Oct 2025 22:27:20 +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 597MRKKX056373; Tue, 7 Oct 2025 22:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597MRKsF056370; Tue, 7 Oct 2025 22:27:20 GMT (envelope-from git) Date: Tue, 7 Oct 2025 22:27:20 GMT Message-Id: <202510072227.597MRKsF056370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ce89c8f47a91 - main - cam/iosched: Initialize max_lat 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce89c8f47a91f76b2fdeb1fdb504fd637ce93047 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ce89c8f47a91f76b2fdeb1fdb504fd637ce93047 commit ce89c8f47a91f76b2fdeb1fdb504fd637ce93047 Author: Warner Losh AuthorDate: 2025-10-07 22:20:14 +0000 Commit: Warner Losh CommitDate: 2025-10-07 22:20:55 +0000 cam/iosched: Initialize max_lat Sponsored by: Netflix --- sys/cam/cam_iosched.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index a7b7eb3cc4e9..d50522d331fa 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -864,6 +864,7 @@ cam_iosched_iop_stats_init(struct cam_iosched_softc *isc, struct iop_stats *ios) ios->ema = 0; ios->emvar = 0; ios->bad_latency = SBT_1S / 2; /* Default to 500ms */ + ios->max_lat = 0; ios->softc = isc; cam_iosched_limiter_init(ios); } From nobody Tue Oct 7 23:00:48 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 4chBSg24Qyz6C8dR; Tue, 07 Oct 2025 23:00:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chBSf6hbqz3Ppq; Tue, 07 Oct 2025 23:00:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id 6Fd5vF5zb0ym76GfqvpusF; Tue, 07 Oct 2025 23:00:50 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id 6GfovcGzlJhC66GfpvMYP4; Tue, 07 Oct 2025 23:00:50 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=erF8zZpX c=1 sm=1 tr=0 ts=68e59ba2 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=x6icFKpwvdMA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=uxlWkYqG_5QOJfHO5ycA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 885A93D2; Tue, 07 Oct 2025 16:00:48 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 64C8F39B; Tue, 07 Oct 2025 16:00:48 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: jlduran+freebsd@freebsd.org, Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 In-reply-to: <20251007221221.22BCC29E@slippy.cwsent.com> References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> <20251007221221.22BCC29E@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Tue, 07 Oct 2025 15:12:21 -0700." 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=us-ascii Date: Tue, 07 Oct 2025 16:00:48 -0700 Message-Id: <20251007230048.64C8F39B@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJn9T050vu2eLUsKPe0EoFmyyLl2JLRg9lVVbn3bdNOQTil2i4EZw5/IMzO1cw/oZ/XLkPHPpy7rurIlemGa37uWiVbNnPWX0YnB/h1agSD2/lIqXgIx dC3+O/habjOe2J7cf6YiLcw/hOsThVUbN/41tR9vREko4/CEKR8ZSp2ElRhZC3O5iPGuLd7PzgQ2e44XUSqmCsUel0GyvaA5BNAWXDQ8tNdLU9YL1Frlez/3 xWVPklhtxJ1hG7u0H3m66npr4gWuBeWDfxwH6bZp2a/jdKB48lXOhsOjeD2hza8AzaTOr7Y/Qj02q4yj9d+S0UfSB9wMajS6AuCtvbfhIEgD2cQ1YNVIDnw2 35YDwSQs0dne/rrb1bH2C0L1L3Qo0w== X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[freebsd]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4chBSf6hbqz3Ppq In message <20251007221221.22BCC29E@slippy.cwsent.com>, Cy Schubert writes: > In message om> > , Jose Luis Duran writes: > > Hello Cy, > > > > According to the changelog: > > > > "The default value increase for so-sndbuf is to mitigate a cross-layer > > issue where the UDP socket send buffers are exhausted waiting for > > ARP/NDP resolution. Thanks to Reflyable for the report. > > > > To help the server start more easily, the setsockopt for sndbuf buffer > > size prints a warning instead of a failure to start the server if it > > can not set the buffer size." > > > > This means so-sndbuf is now 4m. Which triggers a warning, detailed in > > upstream commit 713b5db5 ("- Fix to print warning for when so-sndbuf > > setsockopt is not granted."). > > > > I wonder if we should revert back to using "so-sndbuf: 0" as the > > default for FreeBSD? Or is there a better solution/workaround? > > There are in fact two commits. > > 1ef7b4a24 adjusted so-sndbuf to default to 4m. > > 03772d10f changed the default from to 1m. > > I assume you're suggesting reverting both upstream commits for FreeBSD? Looking at the commit that started unbound down this path we see this in their commit log before bumping the default to 4m: - Change default for so-sndbuf to 1m, to mitigate a cross-layer issue where the UDP socket send buffers are exhausted waiting for ARP/NDP resolution. Thanks to Reflyable for the report. I use local_unbound on one of my machines here. It has 8 GB RAM. I don't see any warning messages WRT the socket option not accepted. The first question that comes to mind, to try to understand your environment, how much RAM does this machine have and of that how much is allocated to the kernel? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Tue Oct 7 23:16:40 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 4chBpx2sLLz69Rs1; Tue, 07 Oct 2025 23:16:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chBpx2JPCz3RCC; Tue, 07 Oct 2025 23:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759879001; 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=7Z2YMVwpMfNviFsi8yN9nzu/oUzyYfeCKCcFoFexWVY=; b=hcnLUr3QwcfjMVbpfLLdM+ELjJ94z6KgXap8e39+0LyGZXBTMUUuOF6Gjn/O1Umska/rgn HDXQtrohMC5q/xN6wPKUxRUEQsGgpegPJrtK7jwAtLMH9VFmoogQDhd3Y8xhy3/Mn4qX2Q fib6sGW4tk8GzsfGQ6UtstrMwTXTi4YzpJcsQ7ZF7J7DLE99tB2DpUtgfewkkRUL0VeNoe 7/o6aEV51ClbcvK2/GFLki6k8ie2KlF35dDlsm4YooRa31cpXBqXh/X5LfjB6gVuHqQ2Oe 1LvGGT8WlUZCIijKRDAC/2JKGYsSUrE3UMH7KcqUJtn0JLyBNWPxG0rE0xJiYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759879001; 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=7Z2YMVwpMfNviFsi8yN9nzu/oUzyYfeCKCcFoFexWVY=; b=VDYpkjTMZ1rNUiKa0QviHAStLZvY05AUJYU1dS6T4E3Q7S9L+aEQr9SVZx017BE52crDIA +cXJ4Y+9ARGcfY08VfpfYeoqXtarHBdS3t+SNjL/SqmLRHVxf/DWld12/Z93XIXt56/nyZ bKzm1b1WXpCkn1mtuw6f9IX2tGM9W3E/ThTUzhwEj+bSHrrVFs/77JgnO3OLBhgTDW6f7x 8LKk5QLS0TcciqGZp3tvXPNqSEqFHii2xtBh76GTD2jND38ux38XHyTI2FP7rYhBovojJw D18VZbc53oNfDTpsUVDIgc4mo/Ube6pPkO4QiJL4MpbQl1jdIRK5v60o+3dwFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759879001; a=rsa-sha256; cv=none; b=S1PL2qaM5/n616OBQUsLxrqS0K3Z8ejVNb1ilYGVRmkUDZ1fliCCqGRPAzKvfLLyA+EkNY iKn30GiIFlCqO9dcEgLuACHH4VjOq4v5WpLcbP0Vyg3DToXMdhwhsKmOLMDAycuS/5vmxT boOcK1vSAxniLWRSTFPRnxJjPcdupxZkMZaAGzOAAlNfTBOqgSD9t307z8SrQu0HYAdZKt 9aa/FeJR9TCxXiB7gpBFhaz9cLoj8jpEJ7rDoAkKnZZ5w578M3A1h8sMNveA1CXStEMvWE QPKrk6BGaYbGXlcNfewtr4eqRCgP4mYGXo16LZElBL1Z+tltC2cs/+zf06tY5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chBpx1QxDz15fh; Tue, 07 Oct 2025 23:16:41 +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 597NGfD8050041; Tue, 7 Oct 2025 23:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597NGeAZ050038; Tue, 7 Oct 2025 23:16:40 GMT (envelope-from git) Date: Tue, 7 Oct 2025 23:16:40 GMT Message-Id: <202510072316.597NGeAZ050038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: d4033e6d3774 - main - crypto/openssl: update generated files to match 3.5.4 artifacts 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4033e6d37747f5213bb245c8e605406703a8766 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d4033e6d37747f5213bb245c8e605406703a8766 commit d4033e6d37747f5213bb245c8e605406703a8766 Author: Enji Cooper AuthorDate: 2025-10-07 23:14:13 +0000 Commit: Enji Cooper CommitDate: 2025-10-07 23:14:13 +0000 crypto/openssl: update generated files to match 3.5.4 artifacts MFC with: 046c625e9382 Fixes: 046c625e9382 ("crypto/openssl: update to 3.5.4") Reported by: Herbert J. Skuhra --- crypto/openssl/configdata.pm | 569 ++++++++++++++++++++- crypto/openssl/exporters/libcrypto.pc | 2 +- crypto/openssl/exporters/libssl.pc | 2 +- crypto/openssl/exporters/openssl.pc | 2 +- crypto/openssl/include/openssl/opensslv.h | 14 +- crypto/openssl/libcrypto.pc | 2 +- crypto/openssl/libssl.pc | 2 +- crypto/openssl/openssl.pc | 2 +- crypto/openssl/util/wrap.pl | 6 +- secure/lib/libcrypto/Makefile.version | 4 +- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 2 +- .../libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- .../lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- .../libcrypto/man/man3/BIO_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_dgram_pair.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_sendmmsg.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- secure/lib/libcrypto/man/man3/CMAC_CTX.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EnvelopedData_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- .../libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- .../libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- .../lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- .../libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- .../lib/libcrypto/man/man3/CMS_signed_get_attr.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/COMP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- .../libcrypto/man/man3/CONF_modules_load_file.3 | 2 +- .../libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- .../libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- .../man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- .../libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 21 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- .../libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- .../libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_get_timeout.3 | 2 +- .../lib/libcrypto/man/man3/DTLSv1_handle_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 2 +- .../lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- .../lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- .../lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- .../libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_new.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- .../lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- .../lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get_algor.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 +- .../man/man3/EVP_PKEY_digestsign_supports_digest.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_attr.3 | 2 +- .../man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- .../man/man3/EVP_PKEY_set1_encoded_public_key.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_settable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEY.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SKEYMGMT.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- .../lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- .../lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- .../man/man3/EVP_set_default_properties.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/GENERAL_NAME.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- .../libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- .../libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../man/man3/OPENSSL_load_builtin_modules.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_load_u16_le.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_riscvcap.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ATAV_set0.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 2 +- .../man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_ITAV_new_caCerts.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 2 +- .../libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set0_validity.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 2 +- .../man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 2 +- .../man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ERR_STATE_save.3 | 2 +- .../man/man3/OSSL_ESS_check_signing_certs.3 | 2 +- .../libcrypto/man/man3/OSSL_GENERAL_NAMES_print.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HPKE_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_IETF_ATTR_SYNTAX.3 | 2 +- .../man/man3/OSSL_IETF_ATTR_SYNTAX_print.3 | 2 +- .../man/man3/OSSL_INDICATOR_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 2 +- .../man/man3/OSSL_LIB_CTX_set_conf_diagnostics.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 2 +- .../man/man3/OSSL_PARAM_allocate_from_text.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 2 +- .../libcrypto/man/man3/OSSL_PARAM_print_to_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 2 +- .../libcrypto/man/man3/OSSL_QUIC_client_method.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 2 +- .../man/man3/OSSL_SELF_TEST_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_sleep.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 2 +- .../man/man3/OSSL_trace_get_category_num.3 | 2 +- .../libcrypto/man/man3/OSSL_trace_set_channel.3 | 2 +- .../man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 10 +- .../libcrypto/man/man3/PBMAC1_get1_pbkdf2_param.3 | 2 +- .../libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- .../libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- .../libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- .../man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 2 +- .../man/man3/PKCS12_SAFEBAG_create_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_set0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 2 +- .../libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 2 +- .../man/man3/PKCS12_add_friendlyname_asc.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 2 +- .../libcrypto/man/man3/PKCS12_get_friendlyname.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 2 +- .../libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 2 +- .../libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- .../libcrypto/man/man3/PKCS7_get_octet_string.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 2 +- .../lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 2 +- .../lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- .../lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- .../man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 2 +- .../lib/libcrypto/man/man3/SRP_create_verifier.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 6 +- .../man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- .../man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- .../man/man3/SSL_CTX_set1_cert_comp_preference.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- .../man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- .../man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- .../man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_domain_flags.3 | 2 +- .../man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- .../man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- .../man/man3/SSL_CTX_set_new_pending_conn_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- .../man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- .../man/man3/SSL_CTX_set_security_level.3 | 2 +- .../man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- .../man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 12 +- .../man/man3/SSL_SESSION_get0_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- .../man/man3/SSL_SESSION_get_compress_id.3 | 2 +- .../man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept_stream.3 | 2 +- .../lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- .../man/man3/SSL_export_keying_material.3 | 2 +- .../libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_connection.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get0_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_rpk.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- .../libcrypto/man/man3/SSL_get1_builtin_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- .../libcrypto/man/man3/SSL_get_conn_close_info.3 | 2 +- .../libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_event_timeout.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_handshake_rtt.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- .../man/man3/SSL_get_peer_signature_nid.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- .../libcrypto/man/man3/SSL_get_rpoll_descriptor.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- .../libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_stream_id.3 | 2 +- .../libcrypto/man/man3/SSL_get_stream_read_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_value_uint.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_handle_events.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- .../lib/libcrypto/man/man3/SSL_inject_net_dgram.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- .../libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_domain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_listener.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new_stream.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_poll.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- .../lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- .../man/man3/SSL_set1_initial_peer_addr.3 | 2 +- .../libcrypto/man/man3/SSL_set1_server_cert_type.3 | 2 +- .../libcrypto/man/man3/SSL_set_async_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_blocking_mode.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- .../man/man3/SSL_set_default_stream_mode.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- .../man/man3/SSL_set_incoming_stream_policy.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_quic_tls_cbs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- .../libcrypto/man/man3/SSL_set_session_secret_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- .../lib/libcrypto/man/man3/SSL_stream_conclude.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_stream_reset.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/TS_VERIFY_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_add1_attr.3 | 2 +- .../libcrypto/man/man3/X509_ACERT_add_attr_nconf.3 | 2 +- .../man/man3/X509_ACERT_get0_holder_baseCertId.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_get_attr.3 | 2 +- .../lib/libcrypto/man/man3/X509_ACERT_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ATTRIBUTE.3 | 2 +- .../libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- .../libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- .../man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- .../man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- .../man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_REQ_get_attr.3 | 2 +- .../libcrypto/man/man3/X509_REQ_get_extensions.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- .../man/man3/X509_STORE_CTX_get_by_subject.3 | 2 +- .../libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 +- .../man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- .../man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- .../libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 +- .../man/man3/X509_get0_distinguishing_id.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- .../man/man3/X509_get_default_cert_file.3 | 2 +- .../libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_load_http.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 2 +- .../libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- .../lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 2 +- secure/lib/libcrypto/man/man5/config.5 | 2 +- secure/lib/libcrypto/man/man5/fips_config.5 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-ARGON2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PVKKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 2 +- .../lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-KECCAK.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-ML-KEM.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CRNG-TEST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-JITTER.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ML-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-SLH-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_STORE-winstore.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/fips_module.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 2 +- .../libcrypto/man/man7/openssl-core_dispatch.h.7 | 2 +- .../lib/libcrypto/man/man7/openssl-core_names.h.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-env.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-qlog.7 | 2 +- .../libcrypto/man/man7/openssl-quic-concurrency.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-quic.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-threads.7 | 2 +- .../lib/libcrypto/man/man7/openssl_user_macros.7 | 2 +- .../libcrypto/man/man7/ossl-guide-introduction.7 | 2 +- .../man/man7/ossl-guide-libcrypto-introduction.7 | 2 +- .../man/man7/ossl-guide-libraries-introduction.7 | 2 +- .../man/man7/ossl-guide-libssl-introduction.7 | 2 +- .../lib/libcrypto/man/man7/ossl-guide-migration.7 | 2 +- .../man/man7/ossl-guide-quic-client-block.7 | 2 +- .../man/man7/ossl-guide-quic-client-non-block.7 | 2 +- .../man/man7/ossl-guide-quic-introduction.7 | 2 +- .../man/man7/ossl-guide-quic-multi-stream.7 | 2 +- .../man/man7/ossl-guide-quic-server-block.7 | 2 +- .../man/man7/ossl-guide-quic-server-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-block.7 | 2 +- .../man/man7/ossl-guide-tls-client-non-block.7 | 2 +- .../man/man7/ossl-guide-tls-introduction.7 | 2 +- .../man/man7/ossl-guide-tls-server-block.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- .../lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/property.7 | 2 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-base.7 | 2 +- secure/lib/libcrypto/man/man7/provider-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-decoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-digest.7 | 2 +- secure/lib/libcrypto/man/man7/provider-encoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kem.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-mac.7 | 2 +- secure/lib/libcrypto/man/man7/provider-object.7 | 2 +- secure/lib/libcrypto/man/man7/provider-rand.7 | 2 +- secure/lib/libcrypto/man/man7/provider-signature.7 | 2 +- secure/lib/libcrypto/man/man7/provider-skeymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 2 +- secure/usr.bin/openssl/man/openssl-ca.1 | 2 +- secure/usr.bin/openssl/man/openssl-ciphers.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 2 +- secure/usr.bin/openssl/man/openssl-cms.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-dgst.1 | 2 +- secure/usr.bin/openssl/man/openssl-dhparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-ec.1 | 2 +- secure/usr.bin/openssl/man/openssl-ecparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-enc.1 | 2 +- secure/usr.bin/openssl/man/openssl-engine.1 | 2 +- secure/usr.bin/openssl/man/openssl-errstr.1 | 2 +- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 2 +- .../usr.bin/openssl/man/openssl-format-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-gendsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-genpkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-genrsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-info.1 | 2 +- secure/usr.bin/openssl/man/openssl-kdf.1 | 2 +- secure/usr.bin/openssl/man/openssl-list.1 | 2 +- secure/usr.bin/openssl/man/openssl-mac.1 | 2 +- .../openssl/man/openssl-namedisplay-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-nseq.1 | 2 +- secure/usr.bin/openssl/man/openssl-ocsp.1 | 2 +- .../openssl/man/openssl-passphrase-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-passwd.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-prime.1 | 2 +- secure/usr.bin/openssl/man/openssl-rand.1 | 2 +- secure/usr.bin/openssl/man/openssl-rehash.1 | 2 +- secure/usr.bin/openssl/man/openssl-req.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsautl.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_client.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_server.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_time.1 | 2 +- secure/usr.bin/openssl/man/openssl-sess_id.1 | 2 +- secure/usr.bin/openssl/man/openssl-skeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-smime.1 | 2 +- secure/usr.bin/openssl/man/openssl-speed.1 | 2 +- secure/usr.bin/openssl/man/openssl-spkac.1 | 2 +- secure/usr.bin/openssl/man/openssl-srp.1 | 2 +- secure/usr.bin/openssl/man/openssl-storeutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-ts.1 | 2 +- .../openssl/man/openssl-verification-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-verify.1 | 2 +- secure/usr.bin/openssl/man/openssl-version.1 | 2 +- secure/usr.bin/openssl/man/openssl-x509.1 | 2 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- 903 files changed, 1494 insertions(+), 938 deletions(-) diff --git a/crypto/openssl/configdata.pm b/crypto/openssl/configdata.pm index 8ea23bf8a681..4a2c9307aa86 100755 --- a/crypto/openssl/configdata.pm +++ b/crypto/openssl/configdata.pm @@ -168,7 +168,7 @@ our %config = ( ], "dynamic_engines" => "1", "ex_libs" => [], - "full_version" => "3.5.3", + "full_version" => "3.5.4", "includes" => [], "ktls" => "", "lflags" => [], @@ -232,7 +232,7 @@ our %config = ( "openssl_sys_defines" => [], "openssldir" => "etc", "options" => "enable-ec_nistp_64_gcc_128 enable-ktls enable-sctp --openssldir=etc --prefix=/usr no-acvp-tests no-afalgeng no-aria no-asan no-brotli no-brotli-dynamic no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-demos no-egd no-external-tests no-fips no-fips-jitter no-fips-post no-fips-securitychecks no-fuzz-afl no-fuzz-libfuzzer no-h3demo no-hqinterop no-idea no-jitter no-md2 no-mdc2 no-msan no-pie no-rc5 no-sm2 no-sm3 no-sm4 no-ssl3 no-ssl3-method no-sslkeylog no-tfo no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-winstore no-zlib no-zlib-dynamic no-zstd no-zstd-dynamic", - "patch" => "3", + "patch" => "4", "perl_archname" => "amd64-freebsd-thread-multi", "perl_cmd" => "/usr/local/bin/perl", "perl_version" => "5.40.3", @@ -291,11 +291,11 @@ our %config = ( "prerelease" => "", "processor" => "", "rc4_int" => "unsigned int", - "release_date" => "16 Sep 2025", + "release_date" => "30 Sep 2025", "shlib_version" => "3", "sourcedir" => ".", "target" => "BSD-x86_64", - "version" => "3.5.3" + "version" => "3.5.4" ); our %target = ( "AR" => "ar", @@ -1097,9 +1097,18 @@ our %unified_info = ( "test/buildtest_c_aes" => { "noinst" => "1" }, + "test/buildtest_c_asn1" => { + "noinst" => "1" + }, + "test/buildtest_c_asn1t" => { + "noinst" => "1" + }, "test/buildtest_c_async" => { "noinst" => "1" }, + "test/buildtest_c_bio" => { + "noinst" => "1" + }, "test/buildtest_c_blowfish" => { "noinst" => "1" }, @@ -1121,9 +1130,21 @@ our %unified_info = ( "test/buildtest_c_cmac" => { "noinst" => "1" }, + "test/buildtest_c_cmp" => { + "noinst" => "1" + }, "test/buildtest_c_cmp_util" => { "noinst" => "1" }, *** 13007 LINES SKIPPED *** From nobody Tue Oct 7 23:59:11 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 4chClz6LVkz69W79; Tue, 07 Oct 2025 23:59:11 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chClz5QWGz3V0d; Tue, 07 Oct 2025 23:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759881551; 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=53msI8BnBYyQAdbU6FOAXanfsNwWPEW3XYddzeQJ2pk=; b=kM+AGcow1GOoAG1ehfSVN3BOrIX6gZFoIZp45DFoPrYq8woUCg5hIgNJpZNkDqw0SScPv5 Xq+QiJ1IndMS1dwfxgeVVwC11FInhjcTP2SlvceH394RusaXKijNy6eEGN+4i4KeNURwbw crXgL3PLjyy2foEHtAPN4bVk7xMTIN5kVexmxb+6X0Qty1IxM8P+q9ssKIxD503UnPqabh Vcv7vhNYvlaLbQH8077CDdak8OzQHvOLHkg1hMhWFj0kkm7qwNO1TrCGOTOmglKCu5OMfb C7ztlFErVhcMfrDT1QoX4dgBui06webjLdHhTs1PoF6QImjiT+akh3pFwxVTRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759881551; 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=53msI8BnBYyQAdbU6FOAXanfsNwWPEW3XYddzeQJ2pk=; b=Ob2viRzRsOH5td/E/vrwcnwMPc4z/guSzTBhvF0B8nccmbP+dagKSOIxMzdcLxe+QrP4he Sqi2vSrxdMoB67B6J9T1AJKZzhefw8PuTiOv6eUwrP/GqDkToBMpq2Udny9OTLNyruJ/ns vxEea6jZ2wtlcx1CsJ1uyCBmW++DCnivM/WdMmoEPH1k8ZpG2dwTDSBcjvDfMIyaV9yS9T JFbqjx9Ta86IF+PoE5eypQHz9uSlSQK6Yk3d/F/LQhRfF2lr+IFJEAV380HoKSz7hRS/V6 0amgGWorL2h6qBpSeAZ1dkwcsO9BCUCfBXdCbGVhto72/Wmzcsb8THNvRg72KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759881551; a=rsa-sha256; cv=none; b=cUWJkdAuI9gO5Cb2+smAhyjDQfBRGduo0Qv4QFPmeV2j7HpZl2mFRHK6nmVMStHnL/jMVO 1xl+hYbLIbRIn35xqVTGtAnUIA25THa55rHZrHL2XzsxY9QpXFWGS6mSyU3dQKfaKigF5x pFy4jwlgcnv9WNPIpXQ3ZASzklnmyMHOvEJ4nJlsK+bvF2MwQ3P6Hyt+PAbK95hPoKiDLj aDEYuYF7+6Hd5XUbe8D1+Xg92pBpy3Sy/abBlvaF0dSrejuQPqw7rLPKbvEupaLCJuvgs7 fys3TkSrmb6RfixkRiYYA9TCDeaV0qxJ1+iGuGo+Yfv3/c6Gh1Qu2XPm7u/nmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chClz50L9z16QT; Tue, 07 Oct 2025 23:59:11 +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 597NxB3u026056; Tue, 7 Oct 2025 23:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 597NxBuM026053; Tue, 7 Oct 2025 23:59:11 GMT (envelope-from git) Date: Tue, 7 Oct 2025 23:59:11 GMT Message-Id: <202510072359.597NxBuM026053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 86becbd8c1ce - main - Revert "cam/iosched: Initialize max_lat" 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86becbd8c1ce4393f4e35a9fa6b0e8308f500396 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=86becbd8c1ce4393f4e35a9fa6b0e8308f500396 commit 86becbd8c1ce4393f4e35a9fa6b0e8308f500396 Author: Warner Losh AuthorDate: 2025-10-07 23:57:21 +0000 Commit: Warner Losh CommitDate: 2025-10-07 23:58:12 +0000 Revert "cam/iosched: Initialize max_lat" This reverts commit ce89c8f47a91f76b2fdeb1fdb504fd637ce93047. There's other parts to this, and GENERIC doesn't include iosched so I missed that. Back out while I gather them together. Sponsored by: Netflix --- sys/cam/cam_iosched.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index d50522d331fa..a7b7eb3cc4e9 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -864,7 +864,6 @@ cam_iosched_iop_stats_init(struct cam_iosched_softc *isc, struct iop_stats *ios) ios->ema = 0; ios->emvar = 0; ios->bad_latency = SBT_1S / 2; /* Default to 500ms */ - ios->max_lat = 0; ios->softc = isc; cam_iosched_limiter_init(ios); } From nobody Wed Oct 8 00:44:42 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 4chDmx4Pbkz69Zwb for ; Wed, 08 Oct 2025 00:45:05 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chDmx1zbGz3Yh6 for ; Wed, 08 Oct 2025 00:45:00 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-858888ea508so79119785a.3 for ; Tue, 07 Oct 2025 17:45:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759884294; x=1760489094; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=1zpCPvsxtacTEuTwNv3aHOFW1L2tm68W/iAkPIxBCjc=; b=cjPYjfNKy0fTDTEVepEscbZwiA6+6m2LQrkpFvu2VYV6BUNbJKDFYq15UpPCP9+k2L ZETWrLYLU1c8hPUt9Xo+wPd3O4+L9hzZIE3c36pXjMwvp1ACz7cV5/GhDf6Mou/Kzx/5 8D5XoPEmCbtK5+qoDPdKApMx2FPexmuYSaWdvSl6mt+sEyoMZ1/QnXFhl3J76wIoojEN K3hyz9oP8gyOUkgfQ1UlAXJfUaV2lQEslxKSHyvud3JrvSoHGC4MC9eIgs8XbGQO/KsP dGFCMIPTiZuwD+AHJEtGCuXNWcQaQOFkGnbBE0bk85RkoKqxH34rLYD6XIbuVttxh42B 2b6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759884294; x=1760489094; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1zpCPvsxtacTEuTwNv3aHOFW1L2tm68W/iAkPIxBCjc=; b=O/JBvYGmi0XlE5Xi2o0CzBb46JVAoyH3JUUFLPItVWL3vow+FLwxIHKhai7n5IwEwx 5u4cWp9Q4yaEyxJ1faBMSfuFPVUTq9PLC+OUwJyYgngnWgD6PfVnNnftyZA3zOJQflZJ PVWSqdUTakxyhDo+z4xuFqQobJmtSudUgoJIMZ4X1hD9DxB0TxgJNd1JCmwbENDz0GnV QsPAnKqjcMpdPDEP7K1GSXe+OpVhaIh2leWepp904xVFK7KE2EjC3WJTG6PHqIF1sjLh 7b/vvdFlAN8shhI3y5cJz9HWPAEFLDiYvoFVHyrcwlFFoFCDn3B+ebkzG/VSzxVmEL2s arXQ== X-Forwarded-Encrypted: i=1; AJvYcCVy50tSgfGqRhMGpw9u6CAvokb7asV8T0dYtdN2BLDfOmAiTY5s89nYEfClYM/7rFI9FY/CjLNxRPRLGnISTLZ5KTf9yg==@freebsd.org X-Gm-Message-State: AOJu0YwSHEiTSEnv5RmJJVrLHbEghID8qL0G2+Tgvq+mmcfiF27XN5GH jIWfIMrthssPAg0RT2+qcAA/8olECWqC90wy8XHdyU9TXwbKPNvNG3iAKWLSAo+EygYo/dQ2jx+ nUDLaaFBf2+1I+2E7sfpd9eVKHsazKdA= X-Gm-Gg: ASbGnctJjp04phwAzTprd1AITGS8/9V1PXrk42T5v9kY0aRPbdyE3m/cdPgEMYDGtv7 xokOWGwA4gMvQjdNeBw4TJ7EX7xly/KkupMkPTg5CygOEjOMEfe2wHUam0izvq3bK39QDP+L25Y OQctPuI1Va7yzWBwcRAbwWXYO9lzlF7U0hTEm2Ty3bvSX0wpsVwQvLg+ajustDWC0Z9tRzeX+T/ uOdA7d9D4Gkxk9cYZ6qrKrBPeNBHp8= X-Google-Smtp-Source: AGHT+IHqt2xn7RQN6lyEhmegJrhhix3ClW+MjEQGSEpzMyNuRUBcVpR75LXlOdthCjdROJf7d4tAc4om3eDUd9tIo9E= X-Received: by 2002:a05:620a:2903:b0:864:3585:ccbf with SMTP id af79cd13be357-883547daef1mr198359285a.12.1759884294315; Tue, 07 Oct 2025 17:44:54 -0700 (PDT) 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 References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> <20251007221221.22BCC29E@slippy.cwsent.com> <20251007230048.64C8F39B@slippy.cwsent.com> In-Reply-To: <20251007230048.64C8F39B@slippy.cwsent.com> From: Jose Luis Duran Date: Tue, 7 Oct 2025 21:44:42 -0300 X-Gm-Features: AS18NWDRUqmeXCABPFoNEQnDv6D09JMFXL8l-IP_1BhV8ZL7_TaubcOXVS9kF5Q Message-ID: Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 To: Cy Schubert Cc: jlduran+freebsd@freebsd.org, Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[freebsd]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4chDmx1zbGz3Yh6 On Tue, Oct 7, 2025 at 8:00=E2=80=AFPM Cy Schubert wrote: > > In message <20251007221221.22BCC29E@slippy.cwsent.com>, Cy Schubert write= s: > > In message > om> > > , Jose Luis Duran writes: > > > Hello Cy, > > > > > > According to the changelog: > > > > > > "The default value increase for so-sndbuf is to mitigate a cross-laye= r > > > issue where the UDP socket send buffers are exhausted waiting for > > > ARP/NDP resolution. Thanks to Reflyable for the report. > > > > > > To help the server start more easily, the setsockopt for sndbuf buffe= r > > > size prints a warning instead of a failure to start the server if it > > > can not set the buffer size." > > > > > > This means so-sndbuf is now 4m. Which triggers a warning, detailed in > > > upstream commit 713b5db5 ("- Fix to print warning for when so-sndbuf > > > setsockopt is not granted."). > > > > > > I wonder if we should revert back to using "so-sndbuf: 0" as the > > > default for FreeBSD? Or is there a better solution/workaround? > > > > There are in fact two commits. > > > > 1ef7b4a24 adjusted so-sndbuf to default to 4m. > > > > 03772d10f changed the default from to 1m. > > > > I assume you're suggesting reverting both upstream commits for FreeBSD? > > Looking at the commit that started unbound down this path we see this in > their commit log before bumping the default to 4m: > > > - Change default for so-sndbuf to 1m, to mitigate a cross-layer > issue where the UDP socket send buffers are exhausted waiting > for ARP/NDP resolution. Thanks to Reflyable for the report. > > I use local_unbound on one of my machines here. It has 8 GB RAM. I don't > see any warning messages WRT the socket option not accepted. The first > question that comes to mind, to try to understand your environment, how > much RAM does this machine have and of that how much is allocated to the > kernel? Here is the warning on a fresh VM with 8GB: # sysctl hw.physmem hw.physmem: 8551202816 # service local_unbound onestart Starting local_unbound. [1759883902] local-unbound[3237:0] warning: setsockopt(..., SO_SNDBUF, ...) was not granted: No buffer space available [1759883902] local-unbound[3237:0] warning: so-sndbuf 4194304 was not granted. Got 9216. To fix: start with root permissions(linux) or sysctl bigger net.core.wmem_max(linux) or kern.ipc.maxsockbuf(bsd) values. or set so-sndbuf: 0 (use system value). [1759883902] local-unbound[3237:0] warning: setsockopt(..., SO_SNDBUF, ...) was not granted: No buffer space available [1759883902] local-unbound[3237:0] warning: so-sndbuf 4194304 was not granted. Got 9216. To fix: start with root permissions(linux) or sysctl bigger net.core.wmem_max(linux) or kern.ipc.maxsockbuf(bsd) values. or set so-sndbuf: 0 (use system value). Waiting for nameserver to start... good If we configure it with "so-sndbuf: 0" the warning goes away. But, nevermind if I'm the only one seeing these warnings. It was just a basic local_unbound test. Regards, > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e**(i*pi)+1=3D0 > > From nobody Wed Oct 8 02:30:19 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 4chH6X2pz9z6B1hP; Wed, 08 Oct 2025 02:30:28 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chH6X25N5z3jZD; Wed, 08 Oct 2025 02:30:28 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759890628; 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: in-reply-to:in-reply-to:references:references; bh=NpD7+yIbRyl3mXRhbwCLFJBWZuOXmDwzUGKqvZYhpTI=; b=PIo3PHSMwIEOmxhdDtMHC7SNMSco2do0C7yMKnDyc3Zbz6yrUTx/w2l2ZLbzm/Zuf07RPt Fq1EwuMQPp5BB5ASmBU7GwXDJ2rPdjlilrUVfHldcw4csTs3yKbW8XvdNrrEecCPbHJOS1 +keqQGtq/WrkgC4xLRJdUnph9s8JtlIMVxB8CJFWmZvphfbwYn+0Mq1RIRV62wXHoso0Po Ka0Rcv7P7e9XpXkhIKkMp66b47m/yQCbMeVP1Mw6IDPsZQs7o4q93s23PoMUr7Tz3rAt2U imqMCPmPHeI4PKBoj53eh3Eed0JSux7yof2exoCk+ITvHCa5xnKZGzJPbynQxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759890628; 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: in-reply-to:in-reply-to:references:references; bh=NpD7+yIbRyl3mXRhbwCLFJBWZuOXmDwzUGKqvZYhpTI=; b=W/q7pkJUSbkhHzR8MJ/YSp6MHJD4Fof55Y/1Mq8MwY/AknkSkm3GYCxzRZRb3Z7riaH7dX K0u3Mp/iujSfrplQPR7/BbtFTSmHMaKp3f/wFBjtkO3KfnSYNMLL2GxmZ/0fCCaIaif4xj xOBJMDN8ST5NLNY9KToIe6J1E1VDVyZ+P2HQJCETmMHsMwfXg0/H0CioZ/Aqx+6bBnG+kI /yMm8T3RuornJmZhnx8hO9RS+u1/Wx9QguT5SJAmJRssioHrdwJwddi63NqwH1rKGeBxo4 fam0Ubv3grhqutQTGFD8Xbif7/T/e0Aom8QSCpn8qsab4NqZZHYIrG8xS5yZPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759890628; a=rsa-sha256; cv=none; b=quCjMJQ2/86wCqz+wcqdaE4TEdgKGoyR33HOpJgmsW7J91Nagq8ODgzU/DLXq3Lp3jmr1Z pkU98vg1Gw/Zb6xzMLkPFeROwa/QVahXynhGGHIJE8JMo+iVh5W+YJN8BzM4GN1rSvkfZb I6fEIneYzp1CAAhgbh+2Ps9jBIGdm+1fUHgMQ4mRAzMqLmneE0LqDuMc5MtxzqcDNAnSUs DhVwdu4YMjF86BE7SNazo2SdIRWSOIPNRzBGN8glZw+/5BcdIagxXvAxCr7jb5mUvNod0b wBxcVaIresMSXw4YZT3xoVmeKTW6/m6W/Ddm0ySuXBiAwJ32RQXLZsShvuCfbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (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) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4chH6W5FBxzQ5D; Wed, 08 Oct 2025 02:30:27 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 8 Oct 2025 03:30:19 +0100 From: Lexi Winter To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e7e7bf757ace - main - krb5: create the KDC database directory Message-ID: Mail-Followup-To: Gleb Smirnoff , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510072150.597LoGVE089465@gitrepo.freebsd.org> 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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="qjR/Yjg0dJJqnUf2" Content-Disposition: inline In-Reply-To: <202510072150.597LoGVE089465@gitrepo.freebsd.org> --qjR/Yjg0dJJqnUf2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Gleb Smirnoff wrote in <202510072150.597LoGVE089465@gitrepo.freebsd.org>: > krb5: create the KDC database directory =20 > + krb5kdc mode=3D0700 > + .. this probably wants "tags=3Dpackage=3Dkerberos-kdc", otherwise the directory won't be created for pkgbase users. --qjR/Yjg0dJJqnUf2 Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaOXMtwAKCRD1nT63mIK/ YG4RAP9p8bWFINLDhE2d8QHhfTqgq3ghk3KHrMsK0svTlHN3FwEAp1Ky0Sj/RJsh UpZtdsP03xGqq0KEzxoPOEFaD0nYTg8= =XIIn -----END PGP SIGNATURE----- --qjR/Yjg0dJJqnUf2-- From nobody Wed Oct 8 02:35:31 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 4chHDV5pzrz6B2Gf; Wed, 08 Oct 2025 02:35:38 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chHDV4w3dz3l1R; Wed, 08 Oct 2025 02:35:38 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759890938; 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: in-reply-to:in-reply-to:references:references; bh=jFtlu5xnVYm2104tGJgx+glBW3ZIwJL6NQPm4hxorv0=; b=PJtDMCWJz1l+0LRD79/UwodZU8EXLbnlFUJf8dZUeIdROtI1D2QiiIp6iVtYpgyq8YrM89 O5jdVcH0Lqsjgwj1c4H+Q6nKugMR+R1s563f1iW/7Z7NScC9iOEKg6uc6ynKDU0f1fhtum XYqRpwKpWOlAmgFQSu5Wk+9FIXFz1HnA0NBwRFqO6UobQYJ7IuyLpd3JI+nsxmWcxwiF+I U3CKv1tesG+0zW16sWOAqhpeXIFYuIhlCvAKIr5k0INyGdiaX2kOVYA50E1KSBlXfPGQAm nFb0T+ByLu26B0fQc61A5PyxBOoIdmece+85OwW7ZxAKITQKBu/+pS0797uOYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759890938; 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: in-reply-to:in-reply-to:references:references; bh=jFtlu5xnVYm2104tGJgx+glBW3ZIwJL6NQPm4hxorv0=; b=FTxwpfwxM3qlatLRXtNaCtWPoExZzlnkZdJKfUUkB0YZQl3B1WLrI3JkfPkgfZ2pn2RMsv npCikvuOssbRVPWT3zp1bkvjXRIFi64ozcGxeyW40bEoYM+6H0iy3csWBypehImLtP26XT kMjlmVkj2hSXOw7GB3ZKWyLmKSt3Gh3hv/UGGDLgjC4J/1JSmIz6A5lf4gwrlfz8mhJ6CH DE4JgoRVaxL2bqX3/lTIzespxhOlcAYjiiBXX31dxEXBRZjFJGbjo62xJn4PO3wUy4NQeR FKJ2ggKyefbSydEUHCvut3so0eWwx1kd0S3iydCoIPK313dkfeNcfI1sFptUMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759890938; a=rsa-sha256; cv=none; b=ED+I7zXUUNHZeZvfmt+MLH859CsV+UHpcC23+59T+z8vSIhqRtgNZ6/0cayZkjwfTzZZn6 Pcxw+wniPmbHZqixbsbh/MjcyvGsV6Sjak910hTqn4sqER5FzkinTkyc+HezRPSN6ngulJ ilShU6kiTGHuZlbaVxz8czQVXOTNXJmA303AHGPtHJinZjfzbTmxuiUAzm9FjI68XoUyLa Kt37SFeOIICbjibNTk9u8mvDveTw+A8wdqTwpPv78kK1b9potOI2N1yX3Pn18cLEGxERnx Ni6xnudHTA870jAtdlJQTZZmOH5HK2siMcLuzYlB7OYxZrbWj7S7RnRkeQ/AaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (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) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4chHDT6S3VzQS9; Wed, 08 Oct 2025 02:35:37 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 8 Oct 2025 03:35:31 +0100 From: Lexi Winter To: Jose Luis Duran Cc: Cy Schubert , jlduran+freebsd@freebsd.org, Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 Message-ID: Mail-Followup-To: Jose Luis Duran , Cy Schubert , jlduran+freebsd@freebsd.org, Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> <20251007221221.22BCC29E@slippy.cwsent.com> <20251007230048.64C8F39B@slippy.cwsent.com> 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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="fsIKWKOqZus1STs3" Content-Disposition: inline In-Reply-To: --fsIKWKOqZus1STs3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Jose Luis Duran wrote in : > > > > This means so-sndbuf is now 4m. Which triggers a warning, detailed = in > > > > upstream commit 713b5db5 ("- Fix to print warning for when so-sndbuf > > > > setsockopt is not granted."). > > > > I wonder if we should revert back to using "so-sndbuf: 0" as the > > > > default for FreeBSD? Or is there a better solution/workaround? =20 > If we configure it with "so-sndbuf: 0" the warning goes away. > But, nevermind if I'm the only one seeing these warnings. It was just > a basic local_unbound test. it's not just you, a user on IRC also reported this issue on a system with 256GB memory. i would be inclined to add so-sndbuf: 0 to the default configuration, but i haven't looked at the actual problem here in detail (i don't use local_unbound myself). --fsIKWKOqZus1STs3 Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaOXN8wAKCRD1nT63mIK/ YArMAP9GvEFHOG/dOfs/g/oKh0uBiFS82y0dJRyJjegAp6xizQEAwH04Mg/Fkni3 Do0Az7oUK4XPE6acR4tQiPSYZlLSTgc= =uG20 -----END PGP SIGNATURE----- --fsIKWKOqZus1STs3-- From nobody Wed Oct 8 03:17:23 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 4chJ8g4YSCz6B5vg; Wed, 08 Oct 2025 03:17:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chJ8g3z17z3pDB; Wed, 08 Oct 2025 03:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759893443; 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=1rZWBsdXp/7tA7Tia4MDvUSEJm31JVe5pKJ8WIPuoPE=; b=xJkaUtdja+Vf6qSxjpz7igBo04gxipAz3aAAjdcEeCKf+rfvF17LqHckEcBySk6Qx7YIZx 9JbcmCmSv8t2o0kWpteAJrSgaScXQDgJzsUWDpfyhuRu20OVsVrQMQ9Z7VSL64wSrtcEdt NK2a3HROS8RzlJ8k8FI3CnYIkWtaaghvifNwQGMXR+SSj4IppIKbilrE81SSs71QzT3bgZ kgBzbOjtBDhxrq2P+N+tclnua53HD/37PWD5k5eG/M4HI9FRLX1/6yYTLK40ixgWdKeAAw AH+hebZB1pHtCpH84TI71BZjuPF0f/SoG8FMtbLwpNNdYi2/UwvXZgl62Ni18Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759893443; 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=1rZWBsdXp/7tA7Tia4MDvUSEJm31JVe5pKJ8WIPuoPE=; b=EtCCcCr45rDRGj3eviXs+PhG7OPBatcqUP/o7Ph4l3ujaaVMNq8V14nBfVaAxDFK58fWOy TYECHCMNmDTvIGR8IpFUB8clEveqxJCjwUeQiKaFuQxEPp6VxCWHlfQ4FCY6yWrnDCvnfY Whx3tymRGCCMoKPOtHMCQcUAOL7ebigr5dCAp+b+/bGto7wlQEGGBP50qoIHn32C1qn5xS 35ANsYNK9PsN6mr85WCKz2Ky51WTAUlhQipXiOlpoVw6Pd3+XoYg01k4CTPuf3ofPq7R0z fDb6e95IjkaR6wh7bCP3tcf+UXwMO8LlW8fZyaU8HJPiwTwCnbjbVTmn6ZOi0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759893443; a=rsa-sha256; cv=none; b=xuSrHtwedHLBDj+5ZkYOwPbTu7yREStCcoFQfrofUVHAT9i5K/QjOAw1mFtpq+j6tN3mbC YGqcMaNPPj6uvVLM1x+CXV8efvICeSbej4ffIi0+KRbnguWPJfk2CEGXfl9xPmn7xPFVU4 JT5goquOx0WmJGp4WwBVzUj/SYgA2yo4fxUMrQXbHkmcdD4DA+GyVpoEIs+Nl1KzlrVUZY i+H0vO2mVfaQHDNc0Jvnxlwag7HGcWLkBmUD21AEYz0YMj32o2HpWItjlDR9EMQvNB4Y6n 71IGHu3KRZOQUL9AuSOPgRSg8XzQ9qI3zXidAWTiBmxg3xx43uR8GOzVtIGX+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chJ8g3W5Bz1CZp; Wed, 08 Oct 2025 03:17:23 +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 5983HNAS004525; Wed, 8 Oct 2025 03:17:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5983HNGb004522; Wed, 8 Oct 2025 03:17:23 GMT (envelope-from git) Date: Wed, 8 Oct 2025 03:17:23 GMT Message-Id: <202510080317.5983HNGb004522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 1f76551e1a5e - main - net80211: document some of the crypto/key functions 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f76551e1a5e98673f31043d11366ca41d4f56fe Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=1f76551e1a5e98673f31043d11366ca41d4f56fe commit 1f76551e1a5e98673f31043d11366ca41d4f56fe Author: Adrian Chadd AuthorDate: 2025-09-20 21:30:42 +0000 Commit: Adrian Chadd CommitDate: 2025-10-08 03:17:18 +0000 net80211: document some of the crypto/key functions This documents the following functions: * ieee80211_is_key_global() * ieee80211_is_key_unicast() * ieee80211_crypto_get_key_wepidx() * ieee80211_crypto_get_keyid() * ieee80211_crypto_get_txkey() * ieee80211_crypto_encap() * ieee80211_crypto_decap() Differential Revision: https://reviews.freebsd.org/D52649 --- sys/net80211/ieee80211.c | 28 +++++++++++-- sys/net80211/ieee80211_crypto.c | 87 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 102 insertions(+), 13 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 2b7cf635b9f5..1299f86ebdc7 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -2689,13 +2689,18 @@ ieee80211_channel_type_char(const struct ieee80211_channel *c) return 'f'; } -/* - * Determine whether the given key in the given VAP is a global key. +/** + * @brief Determine whether the given key in the given VAP is a global key. + * * (key index 0..3, shared between all stations on a VAP.) * * This is either a WEP key or a GROUP key. * * Note this will NOT return true if it is a IGTK key. + * + * @param vap the current VAP + * @param key ieee80211_key to use/check + * @returns true if it's a global/WEP key, false otherwise */ bool ieee80211_is_key_global(const struct ieee80211vap *vap, @@ -2705,8 +2710,23 @@ ieee80211_is_key_global(const struct ieee80211vap *vap, key < &vap->iv_nw_keys[IEEE80211_WEP_NKID]); } -/* - * Determine whether the given key in the given VAP is a unicast key. +/** + * @brief Determine whether the given key in the given VAP is a unicast key. + * + * This only returns true if it's a unicast key. + * + * Note: For now net80211 only supports a single unicast key, stored in + * an ieee80211_node entry. + * + * Code should use this to know if it's a unicast key and then call + * ieee80211_crypto_get_keyid() to get the 802.11 key ID (0..3 for + * unicast/global keys, 4..5 for IGTK keys.) Since the unicast + * and global key indexes "overlap", callers will need to check + * both the type and id. + * + * @param vap the current VAP + * @param key ieee80211_key to use/check + * @returns true if the key is a unicast key, false if it is not */ bool ieee80211_is_key_unicast(const struct ieee80211vap *vap, diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 1e63ca46f28f..566f0b2e0c23 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -611,11 +611,15 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) return dev_key_set(vap, key); } -/* - * Return index if the key is a WEP key (0..3); -1 otherwise. +/** + * @brief Return index if the key is a WEP key (0..3); -1 otherwise. * * This is different to "get_keyid" which defaults to returning * 0 for unicast keys; it assumes that it won't be used for WEP. + * + * @param vap the current VAP + * @param k ieee80211_key to check + * @returns 0..3 if it's a global/WEP key, -1 otherwise. */ int ieee80211_crypto_get_key_wepidx(const struct ieee80211vap *vap, @@ -628,8 +632,18 @@ ieee80211_crypto_get_key_wepidx(const struct ieee80211vap *vap, return (-1); } -/* - * Note: only supports a single unicast key (0). +/** + * @brief Return the index of a unicast, global or IGTK key. + * + * Return the index of a key. For unicast keys the index is 0..1. + * For global/WEP keys it's 0..3. For IGTK keys its 4..5. + * + * TODO: support >1 unicast key + * TODO: support IGTK keys + * + * @param vap the current VAP + * @param k ieee80211_key to check + * @returns 0..3 for a WEP/global key, 0..1 for unicast key, 4..5 for IGTK key */ uint8_t ieee80211_crypto_get_keyid(struct ieee80211vap *vap, struct ieee80211_key *k) @@ -641,6 +655,19 @@ ieee80211_crypto_get_keyid(struct ieee80211vap *vap, struct ieee80211_key *k) return (0); } +/** + * @param Return the key to use for encrypting an mbuf frame to a node + * + * This routine chooses a suitable key used to encrypt the given frame with. + * It doesn't do the encryption; it only chooses the key. If a key is not + * available then the routine will return NULL. + * + * It's up to the caller to enforce whether a key is absolutely required or not. + * + * @param ni The ieee80211_node to send the frame to + * @param m the mbuf to encrypt + * @returns the ieee80211_key to encrypt with, or NULL if there's no suitable key + */ struct ieee80211_key * ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) { @@ -676,8 +703,28 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) return &ni->ni_ucastkey; } -/* - * Add privacy headers appropriate for the specified key. +/** + * @brief Privacy encapsulate and encrypt the given mbuf. + * + * This routine handles the mechanics of encryption - expanding the + * mbuf to add privacy headers, IV, ICV, MIC, MMIC, and then encrypts + * the given mbuf if required. + * + * This should be called by the driver in its TX path as part of + * encapsulation before passing frames to the hardware/firmware + * queues. + * + * Drivers/hardware which does its own entirely offload path + * should still call this for completeness - it indicates to the + * driver that the frame itself should be encrypted. + * + * The driver should have set capability bits in the attach / + * key allocation path to disable various encapsulation/encryption + * features. + * + * @param ni ieee80211_node for this frame + * @param mbuf mbuf to modify + * @returns the key used if the frame is to be encrypted, NULL otherwise */ struct ieee80211_key * ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m) @@ -693,9 +740,31 @@ ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m) return NULL; } -/* - * Validate and strip privacy headers (and trailer) for a - * received frame that has the WEP/Privacy bit set. +/** + * @brief Decapsulate and validate an encrypted frame. + * + * This handles an encrypted frame (one with the privacy bit set.) + * It also obeys the key / config / receive packet flags for how + * the driver says its already been processed. + * + * Unlike ieee80211_crypto_encap(), this isn't called in the driver. + * Instead, drivers passed the potentially decrypted frame - fully, + * partial, or not at all - and net80211 will call this as appropriate. + * + * This handles NICs (like ath(4)) which have a variable size between + * the 802.11 header and 802.11 payload due to DMA alignment / encryption + * engine concerns. + * + * If the frame was decrypted and validated successfully then 1 is returned + * and the mbuf can be treated as an 802.11 frame. If it is not decrypted + * successfully or it was decrypted but failed validation/checks, then + * 0 is returned. + * + * @param ni ieee80211_node for received frame + * @param m mbuf frame to receive + * @param hdrlen length of the 802.11 header, including trailing null bytes + * @param key pointer to ieee80211_key that will be set if appropriate + * @returns 0 if the frame wasn't decrypted/validated, 1 if decrypted/validated. */ int ieee80211_crypto_decap(struct ieee80211_node *ni, struct mbuf *m, int hdrlen, From nobody Wed Oct 8 03:54:23 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 4chJzM2kJ2z6B9Hq; Wed, 08 Oct 2025 03:54:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chJzM1djBz3sqv; Wed, 08 Oct 2025 03:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895663; 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=BebHKS9Hf2hj+3RnsrndFiFUuti6eXxmNMiPkqPmJ2g=; b=VzW1n65kurt2feYX0ZgJTyXHFZ0FSAm+Acocv9mNjPssQ07mbAxP2vp53IcJbmDkOGvseq eTH2fquJys9tQHxjtrQAI94thT4UzINeC8LCD30UGxCXesKzFJeP1tS1QH4KdfZ4q/ApPd 36SJSLjPYSwB83lpDG0sgOC7f5qWoLPhIxo+wWQh82HzkP9Exa7VVRSPzd7TLJHAXUr6GI Y2V+USYqg0l+3Pzg/47rEWyleersnX16LkhQ5LrHcAdWUwijoHowID/WUAhvDplQ8KKGcV 4e+dPBiJjy6Wp1EgFgN48yR8ODFGGaZpadjVXr1MRHdU6y54VzYW3DI1oOONHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895663; 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=BebHKS9Hf2hj+3RnsrndFiFUuti6eXxmNMiPkqPmJ2g=; b=Y05OUJ8qmXhhuYC/YtUaLmHOgbFZ/xpp8wzsV/5vkWF61qAQYrCpaJhEklXYcw+KA3HVDv z3OK0bQii4wbzp+7OuwJgskIbMt9KgRMeS7VJuBRadzmOQU89/AjUGCjwXfhnsfn5cQ3wH Qy3hFx2tO15VdKzgMXn8S1osyAVUpX5u3gLie24u8QRWi5B5U8kEhCzGjrZK9EZR7WBcEX 36l2iRj7hdPfPSJI0EUXZvUnEHMtmsu5dpZx4n5u6Wq3MSaMZIw5xUZGuoGh96WuvGRvZ1 sWT0qcrVQqfqMHkI+PRCr5AJRMb4Vj/vzmeovrtMmbDCCDV9rt2Fg/1WCohNSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759895663; a=rsa-sha256; cv=none; b=yt/5cLJwaYzngkZ+w2R4lxH6hEP1devEFKFdbtDsdvQJgyF9jAf45qBILG4Tu11yBYsFVt VcozzF54448os0TAQbT8jYaX+gqmmiX87VT8HcrnxA9czi24PtHdoXzl1+wXl5gHrt2TD6 BoyxSnfZh34lbTh7Q3ELuMH6BWwizXxV/Hm2YXrLQetji3Hw5RwRITnwcYuAjupQYXofK5 mHQqHDlCfqBfQuQjavPSn7f5OmoDjJdnh1PIsMrnuw8W1unQqGdNB5ayjyrPr6BfWzn9uz i4g0UU2LqEfL+k34czW+UjLEESpJ/dYsSqk5xQm9WAA8+ha1AaJFy28ZCXrk3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chJzM14BYzt5; Wed, 08 Oct 2025 03:54:23 +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 5983sNcs078580; Wed, 8 Oct 2025 03:54:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5983sN5E078577; Wed, 8 Oct 2025 03:54:23 GMT (envelope-from git) Date: Wed, 8 Oct 2025 03:54:23 GMT Message-Id: <202510080354.5983sN5E078577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: ecaf90ee03bc - main - ncurses: Move to the minimal set 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecaf90ee03bccc14f7628c1e87ac18e29064c079 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ecaf90ee03bccc14f7628c1e87ac18e29064c079 commit ecaf90ee03bccc14f7628c1e87ac18e29064c079 Author: Lexi Winter AuthorDate: 2025-10-08 03:21:25 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 03:22:03 +0000 ncurses: Move to the minimal set MFC after: 1 day Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52950 --- release/packages/ucl/ncurses-all.ucl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release/packages/ucl/ncurses-all.ucl b/release/packages/ucl/ncurses-all.ucl index c0d52e046e78..3963eb98aa72 100644 --- a/release/packages/ucl/ncurses-all.ucl +++ b/release/packages/ucl/ncurses-all.ucl @@ -17,3 +17,7 @@ curses interface, and is also backward compatible with traditional BSD curses. This package ships with a limited termcap database, but it is designed to use a terminfo database provided by ports, such as in misc/terminfo-db. EOD + +annotations { + set = "minimal,minimal-jail" +} From nobody Wed Oct 8 03:54:24 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 4chJzN4Zv5z6B9Fb; Wed, 08 Oct 2025 03:54:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chJzN2CMQz3tCG; Wed, 08 Oct 2025 03:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895664; 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=B9u4woIZ7w5I8ibVeF4szXRgsexueS/PMnw9MJvhlus=; b=Xs6KUC30eZSU05vwZubQk+st9S0a0vqJeP53GzmymF/qlcuhb/up9U0otabpyR+Uv+RdL0 tuZqzvkx9XTf17lVQzRsrsobwGKSTFpoBayzCPlh+TbozRAAse4W5+suWtxKDzD4OE2jI/ P5mcNM1wlir+Wd88aif/lP8itfmYYPxkv1kgdawlsHxX7EqiV+Avg8rKZeRma/Ayf2YZlh iRd5D3skGZplx4M0uLa6MQ3RLxaqXiHsDvEqb8QcGonlsn/fq9XlMeUfifFU4Tl6rRBzEL aOUmQzdl11cSC2Se+j86lwRGfdXGwIge/0my3rtoemdix37VSDtNfNXJwfWskw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895664; 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=B9u4woIZ7w5I8ibVeF4szXRgsexueS/PMnw9MJvhlus=; b=VExT9HcXUkWAzcznQVzI0rci8fRXi2pq/3xJuWrZCmuKHHmb+nhNYOKSbvPFs613QQqqwL Ct1CG5mshQaMpZ8FgAjIr/lkDCplLoKI04b1lmCeUl0V5lk2/1iGiO7bUrOTdN+wdw2/cv 2yfDikGlF+cLGwjhBXReRgjykbcF5SRejH67oO1LiW2nX8pvABYRkdUQ+f2VRTN8fLs7Lq 3wZZQg/fx1WP5rLh2VfOm+aOgumf/Gs9SigeHxrJJlVJaNSxc1bxAanffRX9HAcOyy63AR Gc4XHEbMHMFHA62c1r0GzDrJhiUfvJem23P/TROMvXkfjnSR1av43rr4w95TCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759895664; a=rsa-sha256; cv=none; b=cjWaAEo3mgCMl86aNfZ4smCwQo6OuB85fdqbIkwdNB7CBuoiq57/qF6E8ZQmNOCpR2MQjC 2XvDPQf+fd/n37Vk0j1t0f1GUthptE88dCtFvWW8h6kxvSNkGe1/X84KaKLC/1hTkfqCXS D202eV+I5p9hiRPDJGHnhSUEaAlFqL2MOedWYfyx1UgBSRe0X5C2FsKvKvlhFV19vSKA4n lzjc68YTNPBbL6eqD70u8QqiNsa9LPUp5AQb3mAE+vJZ0B3nUGkiF0D18gl5PFR9I0YicA 7zDScpaGZu68ESCm4ZahPC7aTOa1PTjSG5MZX0wbF+6/VqmM4MqG+6xZ6h54aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chJzN1jJ3zpJ; Wed, 08 Oct 2025 03:54:24 +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 5983sOZo078617; Wed, 8 Oct 2025 03:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5983sORs078614; Wed, 8 Oct 2025 03:54:24 GMT (envelope-from git) Date: Wed, 8 Oct 2025 03:54:24 GMT Message-Id: <202510080354.5983sORs078614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: f7dc7d7af368 - main - Makefile: Force DISTDIR=/ for (update-)packages 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7dc7d7af3683836fcca68018a678b242d2e2620 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f7dc7d7af3683836fcca68018a678b242d2e2620 commit f7dc7d7af3683836fcca68018a678b242d2e2620 Author: Lexi Winter AuthorDate: 2025-10-08 03:22:32 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 03:22:32 +0000 Makefile: Force DISTDIR=/ for (update-)packages The make(1) variable DISTDIR is used by both ports and src with a different meaning. Some users may set DISTDIR in /etc/make.conf for ports, which previously worked fine when building src since the src targets which used this variable were not very commonly used (mainly, make distributeworld). Unfortunately, with pkgbase becoming the default, this is no longer true since make (update-)packages invokes make stageworld, which is sensitive to DISTDIR, and these users find that their build now fails. A correct fix for this probably requires renaming one or both of the DISTDIR variables, but for now, work around the problem by setting DISTDIR=/ for the user-facing pkgbase targets, packages and update-package. Since setting DISTDIR doesn't work for these targets anyway, this should not break any existing configurations. MFC after: 1 week PR: 290010 Reported by: Oleh Vinichenko Reviewed by: imp, bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52929 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 664f31a48abf..5f27f22d7a3f 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ TGTS= all all-man buildenv buildenvvars buildetc buildkernel buildworld \ create-packages-world create-packages-kernel \ create-packages-kernel-repo create-packages-world-repo \ create-packages-source create-packages \ - update-packages packages installconfig real-packages real-update-packages \ + installconfig real-packages real-update-packages \ sign-packages package-pkg print-dir test-system-compiler test-system-linker \ test-includes @@ -521,6 +521,9 @@ kernels: .PHONY worlds: .PHONY @cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=buildworld universe +packages update-packages: .PHONY + ${_+_}@cd ${.CURDIR}; ${_MAKE} DISTDIR=/ ${.TARGET} + # # universe # From nobody Wed Oct 8 03:54:25 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 4chJzP5lM2z6B93w; Wed, 08 Oct 2025 03:54:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chJzP3YPJz3tRK; Wed, 08 Oct 2025 03:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895665; 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=ZCQrHoAKdl+XdyGgihxsRwpkSsDnYuBtzOche1tde3U=; b=Di7+6ro311ELWyzIssSt4WIf40PyxsGdqakMlWq3pjxMGkhc33fGj56Xk+1wW5V+9CHN7F jGEgWtTv3N462bf0vZrtalRMALE606RvkKB1R3kFA9lqIssRwDL4CxBZfwycI0q6EVv1Nq 9Y1zEhFRb5+KXOCjStO2VYdiU5bQxJzO5FpuIRvTwT1mY6tAz76p122SpuMKGkkVT+sims RhhFFJsjaH3OVPXkuxf1gkBCrCtEZqjhyhpzrbRazKfIv6JbaVyAHbfvQfM8HVjLvCEzce cAbRjvbZK2ylLZejQz2ib8EQ2G/HpkXzw3SPYpATgudiG89wAsd16i1Vdothjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895665; 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=ZCQrHoAKdl+XdyGgihxsRwpkSsDnYuBtzOche1tde3U=; b=KyUnB/BF/9QuHhW920gyuOLqt/9Xi13Th3wfQPamMkQVo1SD/cubGe0sss/MU+YcGCiHHH 6/C8JMi384Ok8WqEOTJYhjs09sH948Usm4gd8NA7atysz7zyyfQYgb3ZY5Sz8TEdAIYBfh nGifL6Mo4oeT17oq8aFzCcsoCEsUiDgekVfvIP05/28V9/iibrT/MfJ3AvW5n/9ACkkaZq t6mshi4wwlgiuvWCfH9SQaXgW4L048m0pQGnHyKwEgrARZXkJaYuqyNis4BbJPBninYb80 sKaPVjpwrOV6H0Y1LDH9cg51VL5AB9PwQ6fYWNHvCQCjuXkyXQdx+WrUOVInWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759895665; a=rsa-sha256; cv=none; b=i16eikk2Mx9+oitXHsxaM9A1U+lKtcq+170OOUGud332js5YDSFVu3k6kqrqrZErZ8jIJR gTDfYxqL2v3bT1QxdPyCRLwstsGwIJgdHhDe8GN2sEimfx3MRJjS8xPiAa9vXliseCdxWg zwUJbABRBM/Guk3I8lO1BZxgzD3Qm1JC/b5iz2lcexh09mlRS5UH7DqApbDyswHpHP/MKM vDfG7F1550a9pEL4HnZmBDzlcmUSyvi915FvUzJQwpcTy6FkWU/+QF6o0fhM/rVFPVEG/4 /HXPsR6Wg/hyD8/7KmNm9xlttHMQ5AGjlkNGnV3jCF8YHyA9Y3IKOP0Su4PFVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chJzP2wMvzML; Wed, 08 Oct 2025 03:54:25 +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 5983sPqo078652; Wed, 8 Oct 2025 03:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5983sPlf078649; Wed, 8 Oct 2025 03:54:25 GMT (envelope-from git) Date: Wed, 8 Oct 2025 03:54:25 GMT Message-Id: <202510080354.5983sPlf078649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 349f4fd3827e - main - libpkgecc: Remove -ffreestanding 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 349f4fd3827e085c1aa8572e7e5276a642077c48 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=349f4fd3827e085c1aa8572e7e5276a642077c48 commit 349f4fd3827e085c1aa8572e7e5276a642077c48 Author: Lexi Winter AuthorDate: 2025-10-08 03:23:32 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 03:23:32 +0000 libpkgecc: Remove -ffreestanding This incorporates pkg(8) commit a31c8c3682a3 for consistency. https://github.com/freebsd/pkg/commit/a31c8c3682a3 MFC after: 1 day Reviewed by: kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52920 --- secure/lib/libpkgecc/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/secure/lib/libpkgecc/Makefile b/secure/lib/libpkgecc/Makefile index 476cd8635aeb..8d18e72e48f7 100644 --- a/secure/lib/libpkgecc/Makefile +++ b/secure/lib/libpkgecc/Makefile @@ -128,7 +128,6 @@ CONFLICTS= -Dsha256_init=_libecc_sha256_init \ -Dsha512_256_init=_libecc_sha512_256_init CFLAGS= -I$(SRCTOP)/crypto/libecc/include \ - -ffreestanding \ -fno-builtin \ -DUSE_WARN_UNUSED_RET \ -DWITH_STDLIB \ From nobody Wed Oct 8 03:54:26 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 4chJzQ63F2z6B8q4; Wed, 08 Oct 2025 03:54:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chJzQ41Xxz3swZ; Wed, 08 Oct 2025 03:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895666; 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=DbeRUdJBAfjeWto22SZ+IHv2ldJ6LjQjBSIjYz03cHc=; b=HITPv4j/K9I9N98TIs/jyzxIBlQNmQygrTbKHFwf0BkMEB6FF6SgEp0AzydZYd1RVIVKc1 v8SCCwsK+L40LqSkFvfJ+Dyq5/RZUopcHCFECK45MWr/4XeobV5i/mHiQJ5NS4GEghWHx+ hUYp+3dFnHeVGkALKx5dGoxqf7DTwqWM/doIJvc3cRhw3SMwV308Y622rOVRcbxkF/YiBn V4efz17asrJ8kvCNLOQSYpZ2+Qehajmr9kd18VJpxI85udzXsnYgH2yDqV3Hp55sYLuX1r 2baFPFHFd+2Xa+L5Pp7kZc3OcJlQetJNr7D7JA8VUj9uH8UXjkYwLcHiwqa+fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895666; 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=DbeRUdJBAfjeWto22SZ+IHv2ldJ6LjQjBSIjYz03cHc=; b=Xbl50pGpwellS7OfREdJfUBxGFOWx9B+6xH2qdb2Rje56wQ384XQAt9jlZBvg8jfnLivfM AqoI8Mg8Sx0DqwLD5Wa/sGOQEQdR1/548vEA3xkLuR+7THWwHJRLMH/8WpHiNqOnuhqREF XDnVmSdBFe2DwRpNJ23//aBi1n7Y9ANhJKwe7ob++sCjYHCwDz787k8aARTMpboxNkWvUu 3qeZ31LOSIzeRvjdjZaBBeJ0aJxhiZKwwhNvBIOJWOCz0vqGP1YL3CLH5fa7EJw3vYdDTv 4Iad2/Bc9dWfakA6j+0jDt3TLsXdxuMszOFu3uYUz5z0tcYUTPr3BJVIC4jqiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759895666; a=rsa-sha256; cv=none; b=eFGiIaoNJZD+sL/0CP+pdEBIqFkSNsImQwF+FQSJXWBZ5ywoLO8Jk5Y/r7y+ePU4gL3RbC IwAnVTxOGJYzEz9CLChqVZgk503gy+Dp8ewJHHXj0h3xGkT4p2mr1Sj4nv3MhJ1eysEDg9 ZtC0A+uP3i47jzrX9VgfUsuBM5ADxmctsRF7uzwaioHVxfhCxpMHB1Znc42LroPCZo4bP2 DTlfUfZxfaluhvTvcPHBKq66bNyZ90NQ5JFOS7nweipiqKxT3yFYajVy0UsysP/CbHndEe +P7+B9koti1tHAr69IQtM0RtCc24q17pl8yrYZDr1FYF/4111WXcDiDtiaLdWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chJzQ3ZBXzbF; Wed, 08 Oct 2025 03:54:26 +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 5983sQwd078685; Wed, 8 Oct 2025 03:54:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5983sQgu078682; Wed, 8 Oct 2025 03:54:26 GMT (envelope-from git) Date: Wed, 8 Oct 2025 03:54:26 GMT Message-Id: <202510080354.5983sQgu078682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: a507a7026c40 - main - packages: Set dependency origin in generate-ucl.lua 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a507a7026c402a4c10902f3aadb3c6a70c442964 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a507a7026c402a4c10902f3aadb3c6a70c442964 commit a507a7026c402a4c10902f3aadb3c6a70c442964 Author: Lexi Winter AuthorDate: 2025-10-08 03:24:25 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 03:24:25 +0000 packages: Set dependency origin in generate-ucl.lua Commit 822fd5606748 changed the origin of packages from "base" to "base/", but the old origin was still used for dependencies. Aside from being wrong, this confuses pkg <= 2.3.1 and causes "pkg info -d" to show the dependencies as "-(null)" instead of the correct version string. Remove the explicit origin from dependencies in the UCL files, and instead populate this during the build in generate-ucl.lua. In the (very unlikely) case that an explicit origin is still needed, don't overwrite one if it's already present. MFC after: 1 day Fixes: 822fd5606748 ("pkgbase: set origin for each packages as base/FreeBSD-*") Reported by: bapt Reviewed by: cperciva, bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52892 --- release/packages/generate-set-ucl.lua | 10 +++++----- release/packages/generate-ucl.lua | 4 +++- release/packages/set-template.ucl | 2 +- release/packages/sets/base-dbg.ucl | 2 -- release/packages/sets/base-jail-dbg.ucl | 2 -- release/packages/sets/base-jail.ucl | 3 --- release/packages/sets/base.ucl | 3 --- release/packages/sets/optional-dbg.ucl | 1 - release/packages/sets/optional-jail-dbg.ucl | 1 - release/packages/sets/optional-jail.ucl | 1 - release/packages/sets/optional.ucl | 1 - release/packages/ucl/at.ucl | 2 -- release/packages/ucl/bluetooth.ucl | 1 - release/packages/ucl/bsdconfig.ucl | 1 - release/packages/ucl/bsdinstall.ucl | 1 - release/packages/ucl/caroot.ucl | 1 - release/packages/ucl/certctl.ucl | 1 - release/packages/ucl/clang.ucl | 2 -- release/packages/ucl/devd.ucl | 1 - release/packages/ucl/newsyslog.ucl | 1 - release/packages/ucl/periodic.ucl | 1 - release/packages/ucl/rc.ucl | 1 - release/packages/ucl/rcmds.ucl | 1 - release/packages/ucl/sendmail.ucl | 1 - release/packages/ucl/tests-all.ucl | 3 --- release/packages/ucl/yp.ucl | 1 - 26 files changed, 9 insertions(+), 40 deletions(-) diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua index 3c8474bf8e68..ab8765c8cf2d 100755 --- a/release/packages/generate-set-ucl.lua +++ b/release/packages/generate-set-ucl.lua @@ -75,15 +75,15 @@ end -- Add dependencies from SET_DEPENDS. for dep in string.gmatch(pkgdeps, "[^%s]+") do obj["deps"][dep] = { - ["origin"] = "base" + ["origin"] = "base/"..dep } end --- Add a version key to all dependencies, otherwise pkg doesn't like it. +-- Add a version and origin key to all dependencies, otherwise pkg +-- doesn't like it. for dep, opts in pairs(obj["deps"]) do - if obj["deps"][dep]["version"] == nil then - obj["deps"][dep]["version"] = pkgversion - end + obj["deps"][dep]["origin"] = obj["deps"][dep]["origin"] or "base/"..dep + obj["deps"][dep]["version"] = obj["deps"][dep]["version"] or pkgversion end -- If there are no dependencies, remove the deps key, otherwise pkg raises an diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index c61cbb251d8b..d9125182a1a4 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -161,7 +161,7 @@ if add_gen_dep(pkgname, pkggenname) then end obj["deps"][pkggenname] = { ["version"] = pkgversion, - ["origin"] = "base" + ["origin"] = "base/"..pkgprefix.."-"..pkggenname, } end @@ -217,6 +217,8 @@ if pkgprefix ~= nil and obj["deps"] ~= nil then newdeps = {} for dep, opts in pairs(obj["deps"]) do local newdep = pkgprefix .. "-" .. dep + -- Make sure origin is set. + opts["origin"] = opts["origin"] or "base/"..newdep newdeps[newdep] = opts end obj["deps"] = newdeps diff --git a/release/packages/set-template.ucl b/release/packages/set-template.ucl index b7ea2b830168..ff2c2d3e6057 100644 --- a/release/packages/set-template.ucl +++ b/release/packages/set-template.ucl @@ -4,7 +4,7 @@ name = "${PKG_NAME_PREFIX}-set-${PKGNAME}" prefix = "/" -origin = "base" +origin = "base/${PKG_NAME_PREFIX}-set-${PKGNAME}" categories = [ base ] version = "${VERSION}" maintainer = "${PKG_MAINTAINER}" diff --git a/release/packages/sets/base-dbg.ucl b/release/packages/sets/base-dbg.ucl index d9eeb2c49677..79e5de22522e 100644 --- a/release/packages/sets/base-dbg.ucl +++ b/release/packages/sets/base-dbg.ucl @@ -25,10 +25,8 @@ EOD deps { "set-minimal-dbg" { version = "${VERSION}" - origin = "base" }, "set-devel-dbg" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/sets/base-jail-dbg.ucl b/release/packages/sets/base-jail-dbg.ucl index 7996b9afbb21..56a130367fa3 100644 --- a/release/packages/sets/base-jail-dbg.ucl +++ b/release/packages/sets/base-jail-dbg.ucl @@ -25,10 +25,8 @@ EOD deps { "set-minimal-jail-dbg" { version = "${VERSION}" - origin = "base" }, "set-devel-dbg" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/sets/base-jail.ucl b/release/packages/sets/base-jail.ucl index d1dc17bc9860..88861510f954 100644 --- a/release/packages/sets/base-jail.ucl +++ b/release/packages/sets/base-jail.ucl @@ -28,14 +28,11 @@ EOD deps { "set-minimal-jail" { version = "${VERSION}" - origin = "base" }, "set-optional-jail" { version = "${VERSION}" - origin = "base" }, "set-devel" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/sets/base.ucl b/release/packages/sets/base.ucl index 823e2342fab8..6a970668c13e 100644 --- a/release/packages/sets/base.ucl +++ b/release/packages/sets/base.ucl @@ -31,14 +31,11 @@ EOD deps { "set-minimal" { version = "${VERSION}" - origin = "base" }, "set-optional" { version = "${VERSION}" - origin = "base" }, "set-devel" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/sets/optional-dbg.ucl b/release/packages/sets/optional-dbg.ucl index a221327518f9..882469c3ad57 100644 --- a/release/packages/sets/optional-dbg.ucl +++ b/release/packages/sets/optional-dbg.ucl @@ -26,6 +26,5 @@ EOD deps { "set-minimal-dbg" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/sets/optional-jail-dbg.ucl b/release/packages/sets/optional-jail-dbg.ucl index 84c76fa407fe..54e7309abdf1 100644 --- a/release/packages/sets/optional-jail-dbg.ucl +++ b/release/packages/sets/optional-jail-dbg.ucl @@ -26,6 +26,5 @@ EOD deps { "set-minimal-jail-dbg" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/sets/optional-jail.ucl b/release/packages/sets/optional-jail.ucl index da6d5fb00825..877023a10eed 100644 --- a/release/packages/sets/optional-jail.ucl +++ b/release/packages/sets/optional-jail.ucl @@ -29,6 +29,5 @@ EOD deps { "set-minimal-jail" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/sets/optional.ucl b/release/packages/sets/optional.ucl index f50fa17e4297..8b44dfe1f3ea 100644 --- a/release/packages/sets/optional.ucl +++ b/release/packages/sets/optional.ucl @@ -28,6 +28,5 @@ EOD deps { "set-minimal" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/ucl/at.ucl b/release/packages/ucl/at.ucl index 25724adfd7af..1e2495028b30 100644 --- a/release/packages/ucl/at.ucl +++ b/release/packages/ucl/at.ucl @@ -20,13 +20,11 @@ deps { # atrun relies on cron to work. "cron" { version = "${VERSION}" - origin = "base" }, # at(1) passes the command to /bin/sh "runtime" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/ucl/bluetooth.ucl b/release/packages/ucl/bluetooth.ucl index c87d5e9c8420..e9c4787fdbfb 100644 --- a/release/packages/ucl/bluetooth.ucl +++ b/release/packages/ucl/bluetooth.ucl @@ -20,7 +20,6 @@ deps { # rfcomm_pppd(8) uses ppp(8) "ppp" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/ucl/bsdconfig.ucl b/release/packages/ucl/bsdconfig.ucl index 752c352ae904..98981f65bea4 100644 --- a/release/packages/ucl/bsdconfig.ucl +++ b/release/packages/ucl/bsdconfig.ucl @@ -20,6 +20,5 @@ deps { # bsdconfig is written in shell script, so it needs /bin/sh "runtime" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl index 6e5cbce4e342..7fe8898b9427 100644 --- a/release/packages/ucl/bsdinstall.ucl +++ b/release/packages/ucl/bsdinstall.ucl @@ -20,6 +20,5 @@ deps { # bsdinstall is written in shell script, so it needs /bin/sh "runtime" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl index 4d2b52d300fc..e43c9d0771f2 100644 --- a/release/packages/ucl/caroot.ucl +++ b/release/packages/ucl/caroot.ucl @@ -1,7 +1,6 @@ deps { "certctl": { version = "${VERSION}" - origin = "base" } } scripts: { diff --git a/release/packages/ucl/certctl.ucl b/release/packages/ucl/certctl.ucl index f12158459c5e..d2b4790946ec 100644 --- a/release/packages/ucl/certctl.ucl +++ b/release/packages/ucl/certctl.ucl @@ -19,6 +19,5 @@ deps { "openssl": { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/clang.ucl b/release/packages/ucl/clang.ucl index 956b769a1ee7..3c15d9b7ef03 100644 --- a/release/packages/ucl/clang.ucl +++ b/release/packages/ucl/clang.ucl @@ -1,11 +1,9 @@ deps { "lld" { version = "${VERSION}" - origin = "base" } "libcompiler_rt-dev" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/devd.ucl b/release/packages/ucl/devd.ucl index 8d83ab9ee020..c5fcfef1c368 100644 --- a/release/packages/ucl/devd.ucl +++ b/release/packages/ucl/devd.ucl @@ -20,6 +20,5 @@ deps { # devd uses /bin/sh to invoke hooks. "runtime" { version = "${VERSION}" - origin = "base" }, } diff --git a/release/packages/ucl/newsyslog.ucl b/release/packages/ucl/newsyslog.ucl index b1dfa8253737..27b212a42b77 100644 --- a/release/packages/ucl/newsyslog.ucl +++ b/release/packages/ucl/newsyslog.ucl @@ -2,6 +2,5 @@ deps { # newsyslog uses bzip2 to compress log files. "bzip2" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/periodic.ucl b/release/packages/ucl/periodic.ucl index c8b8ac57c676..2a8a482f959f 100644 --- a/release/packages/ucl/periodic.ucl +++ b/release/packages/ucl/periodic.ucl @@ -19,6 +19,5 @@ deps { "cron" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/rc.ucl b/release/packages/ucl/rc.ucl index 1a734aaa187c..854963a81ca1 100644 --- a/release/packages/ucl/rc.ucl +++ b/release/packages/ucl/rc.ucl @@ -19,7 +19,6 @@ deps { "runtime": { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/rcmds.ucl b/release/packages/ucl/rcmds.ucl index b572ff25e6c3..de608487e07d 100644 --- a/release/packages/ucl/rcmds.ucl +++ b/release/packages/ucl/rcmds.ucl @@ -20,7 +20,6 @@ deps { # The RPC daemons require rpcbind. "utilities" { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/sendmail.ucl b/release/packages/ucl/sendmail.ucl index 62d0a1f2bc61..318fd5aabbe5 100644 --- a/release/packages/ucl/sendmail.ucl +++ b/release/packages/ucl/sendmail.ucl @@ -20,6 +20,5 @@ deps { # sendmail requires make to build its configuration file. "bmake": { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/tests-all.ucl b/release/packages/ucl/tests-all.ucl index 1f3b027b7037..3ad2d0f50e6b 100644 --- a/release/packages/ucl/tests-all.ucl +++ b/release/packages/ucl/tests-all.ucl @@ -27,20 +27,17 @@ deps { # Nearly all the tests require atf to run. "atf": { version = "${VERSION}" - origin = "base" }, # The test framework requires Kyua. "kyua": { version = "${VERSION}" - origin = "base" }, # Since the purpose of the tests is to test the base system, the base # system must be installed. "set-base": { version = "${VERSION}" - origin = "base" } } diff --git a/release/packages/ucl/yp.ucl b/release/packages/ucl/yp.ucl index be4310c85591..9babdbe98fb1 100644 --- a/release/packages/ucl/yp.ucl +++ b/release/packages/ucl/yp.ucl @@ -20,6 +20,5 @@ deps { # YP requires bmake to rebuild the database. "bmake": { version = "${VERSION}" - origin = "base" } } From nobody Wed Oct 8 03:54:27 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 4chJzR6DH0z6B99L; Wed, 08 Oct 2025 03:54:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chJzR4spSz3swl; Wed, 08 Oct 2025 03:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895667; 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=zZfO0SSCEKVn+1YSTkGWmhaJi/78Kcv0jMNOxnJ+wKk=; b=pRE/1DSMnuQXaCarBUWNsryrDIFVh3Azc0H2vTAolDA7Qtt9EYXUNjrorG9lA46ehmFY+O +GDs9at8iurz2xBP2ZMWQ635t+jo0i7Rj7w/ukOJBY5F71Kp4suTfJYrwXY+T5nrWUw94X C4DbbB189duiIWw0HAQs8VHUfOklVMQ+qtxRoCpGV4tAwYt3PFB/q2Hqmb7gGPbPcM5emT 6L+agvLgJJDLBR5LzvJVXYDMj6hDGMgZhzsnGaCnODtW2h4aX2ayFBlCYDDWfI7jFC+qW/ cxEbpN8HMTv/s9WPPFqEn3xE1iQAytlk/iGp3zEI81+54ag/jqocjPsd1GstQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759895667; 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=zZfO0SSCEKVn+1YSTkGWmhaJi/78Kcv0jMNOxnJ+wKk=; b=qgYoGg5ufIhFsHbkr3azyWukWuaU2j00NTOOCv3v+M7bGOaU+P16mAN5mNoHYjALdyA+XL AH+1gN4BRbpl78gq4HqG33MEBPtjkUiYbNQE5tIX7aj6rzyVzNV2OHtCVMu8YyIWGYfTN/ 4c8YxehPksutF9YB7rXmR03uny/0WmsufzYI2frxqWtlx7nDIyPSzT6nzoYGJ/nQ4ciiK1 STtGa/Gwe5SFfb7mrKWCCuosd0fhlJTDlQarNogs/UpXDYo7ZpAq5iaD8zkD1Xp1k7QbLM VR7LSJgI32Ub/xbF7hhTRbgflGm6vDayHzCRvqjmV1tyl+g6wSAvg3/v/IWuNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759895667; a=rsa-sha256; cv=none; b=Z0hJfCo8BnIXcwBHU98UpBbGYKej5jkaClq3ztXe/Vzm1ygsvg1v5X1PQgsCXuUboS4pSM BMA1nfKNk4fBKLKFGFhgai1DYdQKcw4rUBmulzjb0iJj5IaBH2F76Yta468kTNpoSOWPXi zwyZFD2h54Es0kVdTRVHVaT+dvULBOM7IUgL2GluWYe1BB5i8+EXR14RJfeBzBxJGKzsYr wbdmtqQ1AHt1hyjCF/Yt9Fh7qYKKJIQAqe1vQenLGnL1hYzge6WdtBHdMLrYNuwrAHAthT FZaZfdjOE7xWecjGDmYHx1hIUlhjIkMLyAoVpJVSx4t+nnFxQi6qqOQMoZaMTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chJzR4RJqzw9; Wed, 08 Oct 2025 03:54:27 +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 5983sRdE078718; Wed, 8 Oct 2025 03:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5983sRj1078715; Wed, 8 Oct 2025 03:54:27 GMT (envelope-from git) Date: Wed, 8 Oct 2025 03:54:27 GMT Message-Id: <202510080354.5983sRj1078715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: a6ac2c98c9cb - main - generate-ucl.lua: Add missing copyright header 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6ac2c98c9cb22a4a2efc12cafce2d2ba82b3fdc Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ac2c98c9cb22a4a2efc12cafce2d2ba82b3fdc commit a6ac2c98c9cb22a4a2efc12cafce2d2ba82b3fdc Author: Lexi Winter AuthorDate: 2025-10-08 03:25:24 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 03:25:24 +0000 generate-ucl.lua: Add missing copyright header Add a standard BSD license with a copyright claim for everyone who has modified this file since it was added, excluding users who explicitly declined attribution. MFC after: 3 days Reviewed by: ifreund_freebsdfoundation.org, imp, bapt, markj, emaste Differential Revision: https://reviews.freebsd.org/D52881 --- release/packages/generate-ucl.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index d9125182a1a4..19a9a95d5d38 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -1,4 +1,10 @@ #!/usr/libexec/flua +-- +-- Copyright (c) 2024-2025 Baptiste Daroussin +-- Copyright (c) 2025 Lexi Winter +-- +-- SPDX-License-Identifier: BSD-2-Clause +-- --[[ usage: generate-ucl.lua [ ]... From nobody Wed Oct 8 04:25:20 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 4chKg83mDWz6BD7t; Wed, 08 Oct 2025 04:25:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chKg75NZ1z3yYj; Wed, 08 Oct 2025 04:25:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=permerror reason="p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com" header.from=cschubert.com (policy=permerror); spf=pass (mx1.freebsd.org: domain of cy.schubert@cschubert.com designates 3.97.99.32 as permitted sender) smtp.mailfrom=cy.schubert@cschubert.com Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id 6CQFvErAg0ym76LjvvuanS; Wed, 08 Oct 2025 04:25:23 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id 6LjtvnAAxmnb86LjuvKQkK; Wed, 08 Oct 2025 04:25:23 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=GI+rEfNK c=1 sm=1 tr=0 ts=68e5e7b3 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=x6icFKpwvdMA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Rk-M77FJAAAA:8 a=pGLkceISAAAA:8 a=YxBL1-UpAAAA:8 a=-NWQWyc4dE42OeJw3vcA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=ef1k35tKgZpiIrJ2aQ5N:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 0FEC1527; Tue, 07 Oct 2025 21:25:21 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id C47BA3AB; Tue, 07 Oct 2025 21:25:20 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Jose Luis Duran , Cy Schubert , jlduran+freebsd@freebsd.org, Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 In-reply-to: References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> <20251007221221.22BCC29E@slippy.cwsent.com> <20251007230048.64C8F39B@slippy.cwsent.com> Comments: In-reply-to Lexi Winter message dated "Wed, 08 Oct 2025 03:35:31 +0100." 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=us-ascii Date: Tue, 07 Oct 2025 21:25:20 -0700 Message-Id: <20251008042520.C47BA3AB@slippy.cwsent.com> X-CMAE-Envelope: MS4xfGO6JV/OuSe9Tkx13fJqBeFq6oGuNL08E/xueoujQJbZFlOusdoEjmnoTe6JPAWYgYsiuyDwcHTzTbgkz4PNIHjNy3i03aJFMh5v0X++KTTWyJjHx+5A sFTaOYFNeFKtjQZjAUaPdXOh/MPXFGxqWs6pYJbp8QZxKl6GQAQBiVdb7yAN/0Ki1Js0yweNQJIJqPwzh3Mwy8DYgs5Bz8uIqeMgEkHcm2dAqz2yHX9CJFc2 t7Pm9rQpxB78JPRy9uToxvh2jru4GhdmSFAQlr583QSH//uSWUzrbLn0tmXJzD27kx+1DVCJ58Zj7ChPGy0R91dWCanvVwCDeHGWaBBohdMem63TiUlpY+Gz p6u/6brAyPxZoWStte7IJle7nyqRD4NptH2Rf2LlRvctVIb0Lr4= X-Spamd-Bar: / X-Spamd-Result: default: False [-1.00 / 15.00]; SUSPICIOUS_RECIPS(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MV_CASE(0.50)[]; RWL_MAILSPIKE_EXCELLENT(-0.40)[3.97.99.32:from]; R_SPF_ALLOW(-0.20)[+ip4:3.97.99.32/31]; NEURAL_HAM_SHORT(-0.20)[-0.196]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.32:from]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_NA(0.00)[]; FREEMAIL_TO(0.00)[gmail.com,cschubert.com,freebsd.org,FreeBSD.org]; DMARC_BAD_POLICY(0.00)[cschubert.com : p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCPT_COUNT_SEVEN(0.00)[7]; R_DKIM_NA(0.00)[]; TAGGED_RCPT(0.00)[freebsd]; REPLYTO_EQ_FROM(0.00)[] X-Rspamd-Queue-Id: 4chKg75NZ1z3yYj In message , Lexi Winter writes: > > > --fsIKWKOqZus1STs3 > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > Jose Luis Duran wrote in =3DZDw@mail.gmail.com>: > > > > > This means so-sndbuf is now 4m. Which triggers a warning, detailed = > in > > > > > upstream commit 713b5db5 ("- Fix to print warning for when so-sndbuf > > > > > setsockopt is not granted."). > > > > > > I wonder if we should revert back to using "so-sndbuf: 0" as the > > > > > default for FreeBSD? Or is there a better solution/workaround? > =20 > > If we configure it with "so-sndbuf: 0" the warning goes away. > > But, nevermind if I'm the only one seeing these warnings. It was just > > a basic local_unbound test. > > it's not just you, a user on IRC also reported this issue on a system > with 256GB memory. i would be inclined to add so-sndbuf: 0 to the > default configuration, but i haven't looked at the actual problem > here in detail (i don't use local_unbound myself). Thinking out loud: Without more context in the upstream commit log message it's difficult we must surmise that the wait for ARP/NDP resolution could be due to a very busy unbound service combined with latency in ARP/NDP resolution. I haven't found any upstream Github issues that document this problem. Maybe there's a pattern waiting to be discovered. Let's open a PR for this to gather more information. I'd also be inclined to open an upstream Github issue for this problem. Questions I have are: 1. What is similar about the systems with this problem? 2. What was upstream *really* trying to solve? Was it a Linux-only problem or more, i.e. affecting FreeBSD also? There is no default configuration file shipped with FreeBSD. Though we should probably include one. That would be the simplest, least intrusive mitigation of upstream's mitigation. As my machine here that does use local_unbound has had no such warnings I'm unable to reproduce the problem locally. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Wed Oct 8 04:42:15 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 4chL2b4Gxlz6BFB3; Wed, 08 Oct 2025 04:42:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chL2b3ZY8z41nM; Wed, 08 Oct 2025 04:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759898535; 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=Pk08CCFZdPMDCz+itfPBpFxFfxj9OKWfqzoaTQ941V4=; b=HPyju4sjwPk3fAm3aSyNU5v2ahhtlp83qiY9j+hjX/oyIFo6wVDx0XnqXH0NiE5g0SdGFS VqOAHl21MXPw546kj1ezjWyOiIi4NkBP6zoJgMZXrfe0wccu4UZWZUluK91skvg5heU+Qq 5GBXXeFR9vC2GtFsZGKaVCjuLKBZOYJQV3fCBRtMBne1MacT6NyVbjy3zE5odcbhHCykkE AqYeOAWihn+hLql3Wsm9LjUqonWXjZpMNbbI0Pg8wxOHD7x9S+FX6JZJ0xTGdgybQQXquT URaWz8DQHFCenL/DKBuWxZXTrs4Z5lOEjnOq4iX4eEmrNq82xHD/+yJYVvHU8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759898535; 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=Pk08CCFZdPMDCz+itfPBpFxFfxj9OKWfqzoaTQ941V4=; b=SHYyIOhZkaoKsCuQHGiVt2BH3apTOxfbp4uPydx/CA809SiqEbFP3uYxje6wtmQ0uPLsQs VhCWzEW0Vd7S0xJKpohZr6acPJqNLty1K95guPXJbHsQ2r9JctxsX4+RAj7RoaFvt+BjHX 2DlGGrGEE0h1nc0sa9wcBLAY5XooGWu1roIuMwGXIuUsYDTZOJgGoqhBjq6r5+zMm3thfO O8ehC0kbmdmcxRIY3HR4orNRo3hkPlWMnp7NP6T8x/08tztFTadoeMeZ8OMS4saX0hkJLa 9KGAKJY1t4t/Y7HI2KM/ct/KZKbdH1JN8ZB9gETNp/kJnLGh4AOSez2TGYnIiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759898535; a=rsa-sha256; cv=none; b=iK/tbXvDzyq97NUs6fQ9ce4KSPF9xdQNu7HcWqBzLxvoMKImzxmLbxmdV/ZkeNOEs8kNpF XzxfRf1+mAHxkb15hT3wklVPSpZMGfYPvlpTPb7cooEcNyMbHh/Kn9nioMsxjSuTXFZD5d UXj3hpy5gLJFu9zA/2GzXrJX4gasr8i3tpLgjByQm4T1zgGQArIW2FhkJDozgUlGZZWgbp qbUgIReL0uTgjTCpq5Ow3c2PV/pYnfGvI4ZiCKfL4n1paVP6Hj8NARfkg1YYJmIGwkOGiW wx3yptGnbyAyAaNtFv8CCVgGe59q/XCxWiw51lSntPy2kSC7e9Wvdy3uSwCgug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chL2b37hZz2Bw; Wed, 08 Oct 2025 04:42:15 +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 5984gFET071987; Wed, 8 Oct 2025 04:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5984gFDu071984; Wed, 8 Oct 2025 04:42:15 GMT (envelope-from git) Date: Wed, 8 Oct 2025 04:42:15 GMT Message-Id: <202510080442.5984gFDu071984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: b6f69c39999b - main - release: Fix dependency ordering 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6f69c39999bfb85af262363b4fe22edc80027d7 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b6f69c39999bfb85af262363b4fe22edc80027d7 commit b6f69c39999bfb85af262363b4fe22edc80027d7 Author: Colin Percival AuthorDate: 2025-10-07 20:48:06 +0000 Commit: Colin Percival CommitDate: 2025-10-08 04:42:10 +0000 release: Fix dependency ordering The 'make release' command triggers some sub-builds, in particular 'real-release' (which builds install images) and 'vm-release' (which builds VM images). These both now depend on pkgbase-repo. Unfortunately for historical reasons 'make real-release' has used a recursive make instead of proper make dependencies; this results in the pkgbase-repo target being invoked twice since the recursive make does not have any awareness of the targets being run by the parent make command. Since the pkgbase-repo target starts by creating the pkgbase-repo directory, the second make command incorrectly assumes that target has already been built; this showed up in 15.0-ALPHA5 builds with pkgbase-repo.tar being empty as it was created after the pkgbase-repo directory was created by before that directory had been populated. Change real-release: make obj make ${RELEASE_TARGETS} to a single line real-release: obj .WAIT ${RELEASE_TARGETS} in order to handle dependency deduplication properly while keeping the intended behaviour that "obj" completes before ${RELEASE_TARGETS}. Diagnosed by: jrtc27, emaste Reviewed by: emaste MFC after: 1 day Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52972 --- release/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 12f5114f8b22..13532097d56c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -448,9 +448,7 @@ release: real-release vm-release cloudware-release oci-release release-done: touch release -real-release: - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj - ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} +real-release: obj .WAIT ${RELEASE_TARGETS} install: release-install vm-install oci-install .WAIT cloud-install From nobody Wed Oct 8 05:23:03 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 4chLxk3zzMz6BJJW; Wed, 08 Oct 2025 05:23:06 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chLxk3VK9z45jl; Wed, 08 Oct 2025 05:23:06 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759900986; 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: in-reply-to:in-reply-to:references:references; bh=56nVHAjLAYFFdD7uwX4EUSMGbp1qZqBnSqL60N2OSwM=; b=LetmALQHYZC1pEd7O0w4dK4Mfc65Mgxqab6pgOQQtiW4dyMqPsqHFEKfrWmnI+KSUrIoBW QRts9RAwy9CiJPri+6szN7z9XSGxFaT4c1d7dk8UE3KcATbXNQEmHk55QquspAVuJk5izV bAyMRMeViYvpKFTqypjQUA59h1BI0F9VWvOSLA+x4Cc9tyQJSs9/uZ4aRoYjRCf9RCamek AIDprYCGii3ax6n3SxU9jkRJz2+uIhvBlUe82GoyYjXMqMj69WluIbRBZoZ23oQ66daejM at5FAZgnzXLUTQSvVe+OTneQ8r0UORUmdCAwxr4gcba4FI6hv0iq3ixC5Wic6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759900986; 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: in-reply-to:in-reply-to:references:references; bh=56nVHAjLAYFFdD7uwX4EUSMGbp1qZqBnSqL60N2OSwM=; b=wpw18lwuyKJH7+0gJDsiyhQGG6w1ACQhmRBXL4bv4RB1Z0gT6WXZzbxxbSpf1zSTPf4rKE UNsTUOTVlKz66yixuCEjwks5LWBoWzOlPXP7EqQgn+tV/JFQkvSDFcgSjlbCaJpNwPYUyB w2Fw9Q3bnzuP39z80/2PddrGSg14Cb1vHVwCi9hNF6kcs7JQC0Gf4JKD9sRas5zckQTR0u lm/npAVU455MYFOGdFlQ048ErmqIY12jj00bsqyTocC7w/4TkZUbJxlP+b+4G6JEOj0UTH snQHENm0Lh9i+ZZRX65i88GrcXWtHcDlxIz1KR2xevpLueI3zeH6605eI9i0YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759900986; a=rsa-sha256; cv=none; b=Mg4Y1EhptWC71BFO7JXaQJJQtB/pqn7f4Mdh2FhECJYWBi3Pto80lVZ8Whzo7Wt5iPrt1s mjB6MqHZzMe+Q/0NhMMyMaDEQfEhRpqxpj+N+bYVd5NvXc+lG+K7XSt7eJb9lZY3QQag3l 8VacYJ36jdnvZryWhsXi7c/ekFinq2Id9TjiuDcuUpn2mlO9CYl+/qie4xqzp9WIZZ125Y OBKmtLAYtq01dURDpoMaRvqiI3PtG7J0Nue24Loufg2Y84zKlKl7cWriYTxh7n9B3KpUgP Tc5/yZKCQKBfS+iMyU9nadb+cqvquwAqqjSfovCluNhH+vKbhE1bW4UDrTCwMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4chLxj6YHWzkgl; Wed, 08 Oct 2025 05:23:05 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Tue, 7 Oct 2025 22:23:03 -0700 From: Gleb Smirnoff To: Lexi Winter Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e7e7bf757ace - main - krb5: create the KDC database directory Message-ID: References: <202510072150.597LoGVE089465@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: On Wed, Oct 08, 2025 at 03:30:19AM +0100, Lexi Winter wrote: L> Gleb Smirnoff wrote in <202510072150.597LoGVE089465@gitrepo.freebsd.org>: L> > krb5: create the KDC database directory L> L> > + krb5kdc mode=0700 L> > + .. L> L> this probably wants "tags=package=kerberos-kdc", otherwise the directory L> won't be created for pkgbase users. I'll appreciate if you fix that correctly. I looked at other entries in this file, I also looked for any tags=.*kerberos.*. Since I didn't find any, I did what I did. Looks like no kerberos packages are defined yet? -- Gleb Smirnoff From nobody Wed Oct 8 05:28:13 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 4chM3h6XL5z6BJm8; Wed, 08 Oct 2025 05:28:16 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chM3h5xSmz46W4; Wed, 08 Oct 2025 05:28:16 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759901296; 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: in-reply-to:in-reply-to:references:references; bh=I1ufE3s91z/9Td0L+C0bWPht/ppEnaNJE4T8TWaG7hc=; b=pj8qY0m1PdrV5xK6a1N1aKMMs4UgLb864H8ON6sfRuLVclmPq1IHq4tvg/TGJYZqKTv9EP Pj56/bURr66kYS7D+C6ok67twnXZXue2YIKAMbALYYoY9Fsyxizqv1oPlm1JxZPPdKMC4V kQmkNMid3NWv2Q6skZjzy7c/MVxjd6DQgL4z2N6lwuZOskwawJtACspyQ1Pz3zy1ytK5/S 88gVfq62Lhb19RzWEIzpX0IdqEdKDB5mlViHezAp4I5rbCFpjYa6Uwwb7CZudn5O7ZjgRD xVaZ2/XJKgZcGCAJE3jtJEupOzu4dz/xdYk5KlRaHTtMNlVKdsIjS+35jXBuyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759901296; 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: in-reply-to:in-reply-to:references:references; bh=I1ufE3s91z/9Td0L+C0bWPht/ppEnaNJE4T8TWaG7hc=; b=E60qIEGW65XCpcI9yzz+WHpmDS4CBFxThtp2KOBGY7meulS5t5IAkdEeBMfqRzIwv1cCLm c7Ya3w7UmaW/A2chpC7734HuDTg09WiqFPJn967ax/UlKmydYoCLorNnNUv8QyFpZKl3X/ 5ycu1eNPlETHjKjpYrsLHGNOVoxTftfXSXPXDvcTfupBXZQI4JNRP/t72yNjCfGmLq82qt 3xr7ahrZ3V//LbgpU8Gf2aODGQygz6597rKa3V/efvqWy2r6JctfoHwFKooWv84/9LoAjz 0bcfOBELmUNcs7OntZ5FYs2tSGp1EkvhbdMnxOOqVYyI8jGfJiy6G/vvF9d8Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759901296; a=rsa-sha256; cv=none; b=gv5gfoLubYPQyhl5kccf0NXcFeIAYL4EFaxUxllATt5ijg89K/jEqN6N3YdLJGJOTKazPw jG5rBSADynqcJOm2Hr+DyVAFxWqNoZdZJD58sIhf3iWOUQ1xVhuesNC0ZUyY6yxdUzuH0F N2dCp5qY2BH1v7jqGo40ljuOV60yppO8h4eLaiT6cuKvmgHWfuv6QkzplPuAokoVqDdGwO 0bQtczhS8Cf+gAjNDSsA/o7AU8V8LUPykdIc8/gmPyCdrpqvh1pVkypm5cnmFNEYZzWsR8 2RDIaWAtNkpcZitUis4+o2dUwZfYFKMnriJg7iZGq6hQXy1t6CM39o4bdoD6Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4chM3h0Bf2zl9S; Wed, 08 Oct 2025 05:28:15 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Tue, 7 Oct 2025 22:28:13 -0700 From: Gleb Smirnoff To: Jose Luis Duran Cc: Cy Schubert , jlduran+freebsd@freebsd.org, Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 Message-ID: References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> <20251007221221.22BCC29E@slippy.cwsent.com> <20251007230048.64C8F39B@slippy.cwsent.com> 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=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Oct 07, 2025 at 09:44:42PM -0300, Jose Luis Duran wrote: J> Here is the warning on a fresh VM with 8GB: J> J> # sysctl hw.physmem J> hw.physmem: 8551202816 J> # service local_unbound onestart J> Starting local_unbound. J> [1759883902] local-unbound[3237:0] warning: setsockopt(..., J> SO_SNDBUF, ...) was not granted: No buffer space available J> [1759883902] local-unbound[3237:0] warning: so-sndbuf 4194304 was J> not granted. Got 9216. To fix: start with root permissions(linux) or J> sysctl bigger net.core.wmem_max(linux) or kern.ipc.maxsockbuf(bsd) J> values. or set so-sndbuf: 0 (use system value). Why would local-unbound want such a big send buffer? Doesn't make sense to me. -- Gleb Smirnoff From nobody Wed Oct 8 05:30:41 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 4chM6W6sWSz6BJrG; Wed, 08 Oct 2025 05:30:43 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chM6W6Fjxz46kY; Wed, 08 Oct 2025 05:30:43 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759901443; 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: in-reply-to:in-reply-to:references:references; bh=qXvDJ9pkrjl3sXv/4J3TFJuo/4AHWEQdsVxC3s9GVA8=; b=XAAhyn/1N3Ph7Nus4pFdtWCq/w0AXUWj06drX0oOKBI2W15JmB0TKwkMZsFgjfuLvHRWw2 mNC9rdssf02dx91EgXui9qmHs5L9PfOEE6ED7jGMKGqyRGZZnsJLISe5PyrTMCFAswVHo+ i8j4iLUoH4PyG0nwVaQsR4P8rXcypeNPusGx8YtK4V8coe9edgdrADGpDsnY/DmLrh90SD YR7Q7fozHzSj7lqLEHbLTyCShwYFO8KZPJY/cpWfiIPHuMT9wfjo+rRyiD6Cjq0jgo7OkV ClcYpo0C5BnEd0kZJ3fW+Ar4ki3HAjaoc/vpnd3957RV1zBT5CyKcPSYCCmVsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759901443; 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: in-reply-to:in-reply-to:references:references; bh=qXvDJ9pkrjl3sXv/4J3TFJuo/4AHWEQdsVxC3s9GVA8=; b=HAYEjjUU8oVcEwkHj2SBhl8f5I1ixSvQX8X6SedOPXt2o8JnfM4tMbjnI8tHJr14MEwWlQ ffTkH6rkU2C5k4atopBPtXsLaUEleNZZorajKVytIu5bFRMipQPAGSimB1i9TLjZ1+bEMc v0IDU5vbs39rHfJ99e+YvsiPBwu4OZHXjD17wvAXYhG9iikYzqg0KVPzJenL6cJBzR4/4W IRoxAuIBvo1i+ASfWDqUmcKuoNfHdm6NvIOQy0gxgvQjVwR3l8E7k6+ZRdMsN4uoMEmwHy QyyNsQ4QKa9qQtqfy3LDwRlDbXTMwIEfk6MJ+Pb9Ba597zVm4Zlyj5yWof0kfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759901443; a=rsa-sha256; cv=none; b=DbaVfVxNGd74+nMIoBsOgnb1jNQ9A7Lw3M4k4RtqcmIQftm7jCLgPGOgNXI0+QlL+ZTClP OMWa6Ygq1MG4dMbiI9kZfbla8y/xtKW/Om8mp8LHIWvlD0hXonao50XibG8c/rn1+LHaHD NXz1tK6LRkP7rbUzXDcUqWOnvcmlSnMzmk1pigP4jaVdFNwIODu74Or4WHheSimfc749NA 1RXaicsGSdwc1OPeazGiaS7KQweQp3M1ThPF4xjA7PqSIbFfTIOIPqjUhRfdQuqNnuJJbm mcKu6syKV3FG1ZpTIzXa7PbVDt6M9FbPG3zNqsyS3Ob673reEPaO5Zx8Hbn9jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4chM6W0V6vzksS; Wed, 08 Oct 2025 05:30:42 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Tue, 7 Oct 2025 22:30:41 -0700 From: Gleb Smirnoff To: Cy Schubert Cc: Jose Luis Duran , jlduran+freebsd@freebsd.org, Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: b2efd602aea8 - main - unbound: Vendor import 1.24.0 Message-ID: References: <202510071524.597FOTr3063628@gitrepo.freebsd.org> <20251007221221.22BCC29E@slippy.cwsent.com> <20251007230048.64C8F39B@slippy.cwsent.com> <20251008042520.C47BA3AB@slippy.cwsent.com> 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=us-ascii Content-Disposition: inline In-Reply-To: <20251008042520.C47BA3AB@slippy.cwsent.com> On Tue, Oct 07, 2025 at 09:25:20PM -0700, Cy Schubert wrote: C> Without more context in the upstream commit log message it's difficult we C> must surmise that the wait for ARP/NDP resolution could be due to a very C> busy unbound service combined with latency in ARP/NDP resolution. I haven't C> found any upstream Github issues that document this problem. When a system can't send UDP packets due to no ARP/NDP entry for the next hop, the packets are not stored in the send buffer. Or does unbound do this for the TCP socket? -- Gleb Smirnoff From nobody Wed Oct 8 05:35:26 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 4chMD55hFdz6BKHy; Wed, 08 Oct 2025 05:35:33 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chMD54nVpz47bl; Wed, 08 Oct 2025 05:35:33 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759901733; 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: in-reply-to:in-reply-to:references:references; bh=4OxGE6xOGVS3rpvVVxZ13p4OKHxklKAi2xlcNC80Gx8=; b=AYxSg2BXhRrPXo7cqAR/oaBiyShZZwZSC7XOfOJkDpYi3nMEsg9XN92aVN9BZ01eF93wN8 5b4FV5Q8opfWiHP6X2T85i8QbmPirzC2fvxoh1rwRhhFT3dw2Ol5UqrnMt8i0V0igO+Pzv CrEEgLhfiWm7AzOwPZDixbuTgOl9fC34BWGmzqakVHh+hYA65R95HPwklxKRr+CqZt13fX CTpM0vC26jXX9SMRd0eZJ7pSLJRQSDUTMSsQ504tsA1zFr12DOkAQ3UmsJFTne0C5x7x9r M9+Md3ZCOsR7gjdsm+IfGp9Ynpmp7DDxsBOuOu9Okk1LQiuWGI8UXxhfXHQZ7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759901733; 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: in-reply-to:in-reply-to:references:references; bh=4OxGE6xOGVS3rpvVVxZ13p4OKHxklKAi2xlcNC80Gx8=; b=tR5FLdgqXBus7jnLuJBwZs+2wSalQyzHhcEg60QfH82YLSKCpsLidTughhXFK7wrFHS5bf s/f60e0pfpCw1a2Hj0ffGYVN8hmW9jw5V4ewDLnJpF+XwPBqhFBeQQ5Mb+dPMpcikiXlsO sMmh4kF8/EFRARND7ziXL7uHICF50fn85DIScAbX3w6hbCJCs5QvhEqNkJ5WnfUPoTTp8X Xr7guK5RVqjqOoxmCKnKOyqpT0OMRz5IrCyDvfLqOzDWdDWnIteMy+oUVfRo/FWjQB8uUu SCkbpu9xctY6hFBtys3RgwhRO3gcFjbMZszckRw8vNzMNgqa/eByan1R9QA9mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759901733; a=rsa-sha256; cv=none; b=Ctkh4HClFZUIJmzp2lnK2cYmM63jPPKf0hvq9AI/zA716FZ1AT7GRFmluFo/bXQLyM9n2X okcdXN/0WHAAg259dRg53ZTvhcNszIT5lEfJONnITbMoS7gzTvQ/SMM/R3PvEamhvT0G5W 5z5S/v54/49LliSv4A5VMpv1RuLBYJlkbNPTxsKsHUJPJy5Luxp/3DqYOYEDr+nkZVkkZg SiY2HcUIc4j8JM18puNb8Z4J/H9kGLoTxIKGwE45P/xii+2rkUeTO6GQu0qoVQpzbOY/6H Ym6WfWZ/ow4WmPZnb9AZqS0dZODrDoNnQ7XT3rSu+El+y/0RWvlooPmqZKKmyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (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) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4chMD50yl8zl9b; Wed, 08 Oct 2025 05:35:33 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 8 Oct 2025 06:35:26 +0100 From: Lexi Winter To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e7e7bf757ace - main - krb5: create the KDC database directory Message-ID: Mail-Followup-To: Gleb Smirnoff , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510072150.597LoGVE089465@gitrepo.freebsd.org> 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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="RYvvGFnE+AwxJB2o" Content-Disposition: inline In-Reply-To: --RYvvGFnE+AwxJB2o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Gleb Smirnoff wrote in : > On Wed, Oct 08, 2025 at 03:30:19AM +0100, Lexi Winter wrote: > L> Gleb Smirnoff wrote in <202510072150.597LoGVE089465@gitrepo.freebsd.or= g>: > L> > krb5: create the KDC database directory > L> =20 > L> > + krb5kdc mode=3D0700 > L> > + .. > L>=20 > L> this probably wants "tags=3Dpackage=3Dkerberos-kdc", otherwise the dir= ectory > L> won't be created for pkgbase users. >=20 > I'll appreciate if you fix that correctly. sure. > I looked at other entries in this file, I also looked for any > tags=3D.*kerberos.*. Since I didn't find any, I did what I did. >=20 > Looks like no kerberos packages are defined yet? we do have packages for Kerberos: FreeBSD-kerberos-16.snap20251008034011 FreeBSD-kerberos-dbg-16.snap20251008034011 FreeBSD-kerberos-dbg-lib32-16.snap20251008034011 FreeBSD-kerberos-dev-16.snap20251008034011 FreeBSD-kerberos-dev-lib32-16.snap20251008034011 FreeBSD-kerberos-kdc-16.snap20251008034011 FreeBSD-kerberos-kdc-dbg-16.snap20251008034011 FreeBSD-kerberos-lib-16.snap20251008034011 FreeBSD-kerberos-lib32-16.snap20251008034011 however it's possible some other Kerberos directories are missing the package tag in mtree. this is an ongoing issue that affects a lot of things (not just Kerberos) and will probably be fixed by me going through every mtree file and manually adding the right package tag. i'm just trying to avoid breaking it any more in the mean time :-) incidentally, there are two phabricator groups that are relevant here: #krb5 (for Kerberos) and #pkgbase. i'd suggest that for any diffs that affect the way things are installed, like mtree or Makefile install targets, people consider adding #pkgbase as a reviewer. i realise not everyone is familiar with pkgbase or wants to deal with it for otherwise unrelated changes, so this is an easy way to get a pkgbase person to look at the change and hopefully catch any issues early. (obviously this is not mandatory, it's just a suggestion.) --RYvvGFnE+AwxJB2o Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaOX4GwAKCRD1nT63mIK/ YJjJAQCgkXkIcUvWpasXpsY0XhdNiPUTsv5PQaZwU3m0fscTuwD/R6fQmqeJNvcv 0DK7vhlYMmoVlWsbLare63cogk1V6AM= =f2j3 -----END PGP SIGNATURE----- --RYvvGFnE+AwxJB2o-- From nobody Wed Oct 8 05:54:43 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 4chMfD1NmGz6BM0P; Wed, 08 Oct 2025 05:54:44 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chMfC72syz49Sw; Wed, 08 Oct 2025 05:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759902884; 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=jIqy9Fmm/z+VDGu0oN+0TeBjg8wH7rUkwdSjBzD+xeM=; b=rW+u+nO7zk0Q2p/8CfkLn2c8rhcrHj4zGe4+wVB6oo+xRJpyO+RCNGmRq7CW76a51H6VCZ 8QrxTIrUAtIqEv+s0kJTVPf+oasUPOYX26M7hT5Ulm7t8qrkNJyQyShA8GnzIYivkfB/9h UiFPAL3uFRtddJ+ybfD9ePG/xQmmiAogWGVshaRU4roy7WSfJm6CzdaaR0zRqu8GybV1lu gdr6jxyIfkZhOgkv8rNrH1aVNn1poYyHka0ceY6KFSbz6NnsiiPN3o2bgj+S1FWXoLffeT OywO0OaZ7o9tOS/rlqEtxB78SXZD+N2/JFNwsHyU2ajd6yHNMOHlzqCxRE+VXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759902884; 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=jIqy9Fmm/z+VDGu0oN+0TeBjg8wH7rUkwdSjBzD+xeM=; b=XurHOg9l4jvQRo5S6aF/hQPDLHlxuFqBaQzxBpLBNoS/yzsYNW4Dm/SPWuZE/I2/Jwjs7X nolNGrOr/PIUDMM4SBj+HVF0OAKp/cIBnl5ymz3KLzRWr5fZVmHtpBgx1gxLHhF0ozclRQ U+Kr7k2VhXP9Wy1eJIwtB9cdy2lSlKjlZTbCEFl0BVYVDtahZa17TCZigHnkWoYlzMjSyk 5ifWmewvG8MolQld3kkctUfvMQ2Bnv8grPwBPPtRk5AcR1iaOZ/sbHgfUfn8rHfD+cOKvN o7Rgh7XIZbqLws/RNvbQcoZdBaA4w9H9a4zaEpsM9XYOr7EddISEFdGKMmlsXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759902884; a=rsa-sha256; cv=none; b=fkT5mCmMvrT+mbO7RbB6hU10TvC1hjduSocfUOwVkE5Z4pegBd41c+v3tnk44U6NhWyCja nydL5/N/m3njFTNNpQioWqC32n1Boe3Vgc0WtecFZ/eptAzgFMiAwKITrJH1Ksn0eeSMrL XrrssvSPGQnN3NifMUAdxP0sZGAvZusccJ7OoaHPVtS90iDNVWZRfN8yJeRdZ9gllpNae3 bv2zp+6MrOrB8LCQZ1/+oR1dp+yR/P7oiQXRaopnStDHc7XqVV1N4DfMw5MGH2TiplqihG IIu7Usu5TqNOFxHaQh0Ej8czCzVG2vwL0yXL3KaO6cDVAmh0Un0x1B4MGGFtXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chMfC6FtMz3Ss; Wed, 08 Oct 2025 05:54:43 +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 5985sh1u003853; Wed, 8 Oct 2025 05:54:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5985shej003850; Wed, 8 Oct 2025 05:54:43 GMT (envelope-from git) Date: Wed, 8 Oct 2025 05:54:43 GMT Message-Id: <202510080554.5985shej003850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: fa6d67cd16b5 - main - BSD.root.dist: Add package tag for all directories 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa6d67cd16b50a7a0be1f003cf1aa1f4064fc2c9 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=fa6d67cd16b50a7a0be1f003cf1aa1f4064fc2c9 commit fa6d67cd16b50a7a0be1f003cf1aa1f4064fc2c9 Author: Lexi Winter AuthorDate: 2025-10-08 05:49:47 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 05:54:36 +0000 BSD.root.dist: Add package tag for all directories This fixes some missing directories, notably /boot/modules. Other directories are not missing because they contain other files, but they should still have their own METALOG entries and be placed in the correct package. MFC after: 3 days Reported by: bdrewery Reviewed by: cperciva, imp Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52958 --- etc/mtree/BSD.root.dist | 90 +++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 6ba632894ca7..95a3361b3c61 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -4,8 +4,9 @@ /set type=dir uname=root gname=wheel mode=0755 . - bin + bin tags=package=runtime .. +/set tags=package=bootloader boot defaults .. @@ -27,7 +28,7 @@ .. kernel .. - loader.conf.d tags=package=bootloader + loader.conf.d .. lua .. @@ -38,88 +39,89 @@ zfs .. .. +/unset tags dev mode=0555 tags=package=runtime .. - etc - X11 + etc tags=package=runtime + X11 tags=package=runtime .. - authpf + authpf tags=package=pf .. - autofs + autofs tags=package=autofs .. - bluetooth + bluetooth tags=package=bluetooth .. - cron.d + cron.d tags=package=cron .. - defaults + defaults tags=package=runtime .. - devd + devd tags=package=devd .. - dma + dma tags=package=dma .. - gss + gss tags=package=runtime .. - jail.conf.d + jail.conf.d tags=package=jail .. kyua tags=package=tests .. - mail + mail tags=package=runtime .. - mtree + mtree tags=package=mtree .. - newsyslog.conf.d + newsyslog.conf.d tags=package=newsyslog .. - ntp mode=0700 + ntp mode=0700 tags=package=ntp .. - pam.d + pam.d tags=package=runtime .. - periodic - daily + periodic tags=package=periodic + daily tags=package=periodic .. - monthly + monthly tags=package=periodic .. - security + security tags=package=periodic .. - weekly + weekly tags=package=periodic .. .. - pkg + pkg tags=package=pkg-bootstrap .. - ppp + ppp tags=package=ppp .. - profile.d + profile.d tags=package=runtime .. - rc.conf.d + rc.conf.d tags=package=rc .. - rc.d + rc.d tags=package=rc .. - security + security tags=package=audit .. - ssh + ssh tags=package=ssh .. - ssl + ssl tags=package=caroot certs tags=package=caroot .. untrusted tags=package=caroot .. .. - sysctl.kld.d + sysctl.kld.d tags=package=runtime .. - syslog.d + syslog.d tags=package=syslogd .. - zfs tags=package=zfs - compatibility.d + zfs tags=package=zfs + compatibility.d tags=package=zfs .. .. .. - lib - geom + lib tags=package=clibs + geom tags=package=geom .. - nvmecontrol + nvmecontrol tags=package=nvme-tools .. .. - libexec - resolvconf + libexec tags=package=clibs + resolvconf tags=package=resolvconf .. .. media tags=package=runtime @@ -132,14 +134,14 @@ .. rescue tags=package=rescue .. - root mode=0750 + root mode=0750 tags=package=runtime .. - sbin + sbin tags=package=runtime .. tmp mode=01777 tags=package=runtime .. - usr + usr tags=package=runtime .. - var + var tags=package=runtime .. .. From nobody Wed Oct 8 06:13:08 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 4chN3S29Dwz6BNLd; Wed, 08 Oct 2025 06:13:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chN3S1fD4z3DRS; Wed, 08 Oct 2025 06:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759903988; 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=C69B5PMFvayU/t+UlQHWMJGnKlt0vHTkLmv0CRdnDhY=; b=oovLFnThBv02hAbnJ8OFqs3/oq1A+KTc6aRKpGYrGZbZEICSP/LN32fqf5RJ41QmVU+YtA suWZBRldJjHb9LR8CWi19tYRJENEqLOHLdL4s+ZaCniLKGyjaOc/2T37NYSoBw0BFwnGMQ /TE2cViT8V5a6SGlK6R2dArKnnxG45Qg+kAWDIuSYp3oLCcf7C0ma/pBHvos0mLBMMMyHy DUTBTCKsX8tfqKlkP2JuD+iFuq0Mm2nKFFoHMn4xHzDfckko5U88n/37SL9Uh+XxqpOQoY uQFAkIEHfHF28P4vsSgLtAGTiXoAUj/vva5NKLmqRNIwJZDORlM+hbZXA4oG9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759903988; 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=C69B5PMFvayU/t+UlQHWMJGnKlt0vHTkLmv0CRdnDhY=; b=Byj+0vKTVNnPK6FXUnPvLH00yoj5bPKgAAtwDBs10pVaiijWKinhw8kiG5xeurXNxja3HZ l2A7fhZmkjfsTz8g9ct++NWyDQJxWtIgLPUo7wWxgbmE4vbffdophm4IsqAIGKvbbzbJc9 K0uSk5C2ds7Wd5izsYttl9WA4o0ajwkHAY2nobXeb6bnnMlpV92g8rNNJnTu2uy0yb10gy StQN+Sl4W/ZxB7OlajHS0qfmFvCEyzWhQUL0g/yEz4/6V/GQqYZe2OuMtR1pZy4DyxtiTq 1H+mhfGbphWZojGmevKshn2srUG1HZn422MCP03UWzsDiBq7dfULMyPNPaR86A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759903988; a=rsa-sha256; cv=none; b=NsdtFXPaFKKvWWUrnImToCu6ZzylhyC8Xl4ZLWp+KpVcudDJVZMZeyuMIzkKaOZQKhKETl a9QUxkST6N58ZKb4gQzU2vjMmc+IoYe7Y8MHFVhASSOttyMuALocRUUs4A+CO7SXN8pQuh jPtj302XRNsvphAyvEanUOyWsVHUQJcV9uLSTZk31a2YqfqzFghnCjnc/RWxeDys6pacPT lPc3lsZRST19+9c0vLKR93IR5eJNnPKOFXpU15SXl5Uo9axzPHB0uTlUcEndTvTIKsvzji tnzQ7p0YbtNVFq+RNXBuNRJKmooqAUovQSxabY5IvE8BHLM0zXcIBvE/DDHN8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chN3S1DMGz3N6; Wed, 08 Oct 2025 06:13:08 +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 5986D8W0042524; Wed, 8 Oct 2025 06:13:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5986D8RG042521; Wed, 8 Oct 2025 06:13:08 GMT (envelope-from git) Date: Wed, 8 Oct 2025 06:13:08 GMT Message-Id: <202510080613.5986D8RG042521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 0f5ed3c427ff - main - bsd.confs.mk: Support CONFGROUPS.yes 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f5ed3c427fff845797c2af2aeceb5855f32a4f4 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0f5ed3c427fff845797c2af2aeceb5855f32a4f4 commit 0f5ed3c427fff845797c2af2aeceb5855f32a4f4 Author: Lexi Winter AuthorDate: 2025-10-08 06:07:10 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 06:07:10 +0000 bsd.confs.mk: Support CONFGROUPS.yes Align CONFGROUPS with other options like SUBDIRS and FILESGROUPS by supporting the CONFGROUPS.yes option. This means logic like this: .if ${MK_FOO} != "no" CONFGROUPS+= FOO .endif can be replaced by: CONFGROUPS.${MK_FOO}+= FOO MFC after: 1 week Reviewed by: imp Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52923 --- share/mk/bsd.confs.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index 77b573c7e42c..e953e6d978dc 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -22,6 +22,14 @@ buildconfig: ${${group}} all: buildconfig . endif +# Take groups from both CONFGROUPS and CONFGROUPS.yes, to allow syntax like +# CONFGROUPS.${MK_FOO}=FOO. Sort and uniq the list of groups in case of +# duplicates. +.if defined(CONFGROUPS) || defined(CONFGROUPS.yes) +CONFGROUPS:=${CONFGROUPS} ${CONFGROUPS.yes} +CONFGROUPS:=${CONFGROUPS:O:u} +.endif + . for group in ${CONFGROUPS} . if defined(${group}) && !empty(${group}) From nobody Wed Oct 8 06:13:09 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 4chN3T3HJ6z6BNnh; Wed, 08 Oct 2025 06:13:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chN3T2KX7z3DRV; Wed, 08 Oct 2025 06:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759903989; 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=oB8GQZrhS6rPLaayniXIhiRwwZYFr/6IzPxnuErBn/w=; b=C+yraLZ/4h1ZzPOglNh6UMBCHPTPzGEwST6PpwLJVREf/D61EDX7Sz88IMZg7IFFBl1/7a n46fISJz2AVh7vlkP3PygUTbOhD4HC9zNl0BfFETo1wWUqrDpQIyU4gOixu4NM+EVxMQ7k yGgIGqZP1ZgSVGaWpOxPo41q/66RcZLCQj8nNvxAkbw/wwM/bReCg3SlRCyFNlfwFteooY reXScH0pAv6o80KKEVt0TyhfjsNB/xqcUarhJrcLd4dailjP4HMkS3j8s+ZjjTdCvZRtBk /ulJWaNmMyLMdkiv1UyeC8kfE3CW9Tu4NY/izL7qsU71/u4SEiBHPq5+skwpQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759903989; 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=oB8GQZrhS6rPLaayniXIhiRwwZYFr/6IzPxnuErBn/w=; b=r6u8TkZKupAUZsf//YSh8NxsmKr6xmzFJOd+AHFKQcKecrWocOhcTcUUgfMPqAv/liR+LL SypL24hanrl6LITl9fOGxvYjpaE3kVg8bgyg+m9NY/QxCqzMDmj+8L9NU7XOYmtZxn2wPM 9C9egRXoPMIurc2PIr5t6k+nTiGnbcDJ89KXIskFvP0VjEukvGvJsnakEqCBDVACTHRwbf JS/lIOXV/RVRSsORsiai/+eNbYdgLHht2yEkBQbNiEzSAoG/7lA1LxkT3K+ehQnxmtaWTn NjIfYcW4m4pnND3I3EpbKLWRbm2qQVici7T3cdAUhEpLJb4TL9IK4ucBm0rwgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759903989; a=rsa-sha256; cv=none; b=iLHDys9ANQgyYBKkhCkfHlHtQD+ALZS3TxursLHOgBXOYLrRp9JyYMbd6zGA4NwJ/4Yn+B lsPWoaDm1nkZ/n0TXL6bdkmq904woqrR3RIIOPImvjBiuH/W53APN3d8oe17DHvPkLMCzl NFR8V6sD4JJE5DoXQtgRdtxMjEcBNDsYPdi4iAUpPJIykjrbD5vHHCsLkY1yYXmJunnVh0 R6lg3Kdoolw29GVKSWvlJt05zqOfog9s//omePR/5sNSn1sSaXC2xheIRjLiYl1jeQAZcC snKHDZze0eeCG66YlRjdf41y8SjTHVTgH3RYWIgj6N96x0p6X4rQLDgCIMQtaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chN3T1sBMz3xy; Wed, 08 Oct 2025 06:13:09 +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 5986D9w7042556; Wed, 8 Oct 2025 06:13:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5986D9nM042553; Wed, 8 Oct 2025 06:13:09 GMT (envelope-from git) Date: Wed, 8 Oct 2025 06:13:09 GMT Message-Id: <202510080613.5986D9nM042553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 56f9879c3dd8 - main - libexec/rc/rc.d/Makefile: Use CONFGROUPS.yes 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56f9879c3dd8fb9cd82fb7bc33e1acf5f8b578ff Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=56f9879c3dd8fb9cd82fb7bc33e1acf5f8b578ff commit 56f9879c3dd8fb9cd82fb7bc33e1acf5f8b578ff Author: Lexi Winter AuthorDate: 2025-10-08 06:08:31 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 06:08:31 +0000 libexec/rc/rc.d/Makefile: Use CONFGROUPS.yes Replace .if statements with CONFGROUPS.${MK_FOO} where possible, and also sort and re-indent the file for readability. A couple of more complicated sections don't work with CONFGROUPS.yes yet, so leave those as they are for now. MFC after: 1 week Reviewed by: imp Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52974 --- libexec/rc/rc.d/Makefile | 465 +++++++++++++++++++++-------------------------- 1 file changed, 204 insertions(+), 261 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 03f0933533ca..f6d1a34ceb9e 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -4,6 +4,7 @@ CONFDIR= /etc/rc.d CONFGROUPS= CONFS CONFSPACKAGE= rc +# Files which are always installed and go in the -rc package. CONFS= DAEMON \ FILESYSTEMS \ LOGIN \ @@ -47,8 +48,6 @@ CONFS= DAEMON \ netoptions \ netwait \ noshutdown \ - ${_nscd} \ - ${_opensm} \ os-release \ pwcheck \ quota \ @@ -77,218 +76,258 @@ CONFS= DAEMON \ var_run \ watchdogd -CONFGROUPS+= DEVD -DEVD= devd -DEVDPACKAGE= devd - -CONFGROUPS+= DEVMATCH -DEVMATCH= devmatch -DEVMATCHPACKAGE= devmatch - -CONFGROUPS+= DHCLIENT -DHCLIENT= dhclient -DHCLIENTPACKAGE= dhclient - -CONFGROUPS+= GEOM -GEOM= geli \ - geli2 \ - gptboot -GEOMPACKAGE= geom - -CONFGROUPS+= GGATED -GGATED= ggated -GGATEDPACKAGE= ggate - -CONFGROUPS+= RESOLVCONF -RESOLVCONF= resolv -RESOLVCONFPACKAGE= resolvconf - -CONFGROUPS+= CRON -CRON+= cron -CRONPACKAGE= cron - -CONFGROUPS+= CTL -CTL= ctld -CTLPACKAGE= ctl - -CONFGROUPS+= NFS -NFS= lockd \ - mountd \ - nfscbd \ - nfsclient \ - nfsd \ - nfsuserd \ - statd -NFSPACKAGE= nfs - -CONFGROUPS+= NEWSYSLOG -NEWSYSLOG= newsyslog -NEWSYSLOGPACKAGE= newsyslog - -CONFGROUPS+= POWERD -POWERD= powerd -POWERDPACKAGE= powerd - -CONFGROUPS+= PPPOED -PPPOED= pppoed -PPPOEDPACKAGE= ppp - -CONFGROUPS+= SYSLOGD -SYSLOGD= syslogd -SYSLOGDPACKAGE= syslogd - -CONFGROUPS+= RCMDS -RCMDS= rwho -RCMDSPACKAGE= rcmds +# Groups for files which don't go in -rc, or which depend on src.conf knobs. .if ${MK_ACCT} != "no" || ${MK_UTMPX} != "no" -CONFGROUPS+= ACCT -ACCTPACKAGE= acct +CONFGROUPS+= ACCT +ACCTPACKAGE= acct .if ${MK_ACCT} != "no" -ACCT+= accounting +ACCT= accounting .endif .if ${MK_UTMPX} != "no" ACCT+= utx .endif .endif -.if ${MK_ACPI} != "no" -CONFGROUPS+= ACPI +CONFGROUPS.${MK_ACPI}+= ACPI +ACPIPACKAGE= acpi ACPI= power_profile -ACPIPACKAGE= acpi -.endif -.if ${MK_APM} != "no" -CONFGROUPS+= APM -APM+= apm +CONFGROUPS.${MK_APM}+= APM +APMPACKAGE= apm +APM= apm .if ${MACHINE} == "i386" APM+= apmd .endif -APMPACKAGE= apm -.endif -.if ${MK_AUDIT} != "no" -CONFGROUPS+= AUDIT -AUDIT+= auditd -AUDIT+= auditdistd -AUDITPACKAGE= audit -.endif +CONFGROUPS.${MK_AUDIT}+= AUDIT +AUDITPACKAGE= audit +AUDIT= auditd \ + auditdistd -.if ${MK_AUTOFS} != "no" -CONFGROUPS+= AUTOFS +CONFGROUPS.${MK_AUTOFS}+= AUTOFS +AUTOFSPACKAGE= autofs AUTOFS= automount \ automountd \ autounmountd -AUTOFSPACKAGE= autofs -.endif -.if ${MK_BLACKLIST} != "no" -CONFGROUPS+= BLOCKLIST +CONFGROUPS.${MK_BLACKLIST}+= BLOCKLIST +BLOCKLISTPACKAGE= blocklist BLOCKLIST= blacklistd -BLOCKLISTPACKAGE=blocklist -.endif -.if ${MK_BLUETOOTH} != "no" -CONFGROUPS+= BLUETOOTH -BLUETOOTH+= bluetooth \ +CONFGROUPS.${MK_BLUETOOTH}+= BLUETOOTH +BLUETOOTHPACKAGE= bluetooth +BLUETOOTH= bluetooth \ bthidd \ hcsecd \ rfcomm_pppd_server \ sdpd \ ubthidhci -BLUETOOTHPACKAGE= bluetooth -.endif -.if ${MK_BOOTPARAMD} != "no" -CONFS+= bootparams -.endif +CONFGROUPS.${MK_BOOTPARAMD}+= BOOTPARAMD +BOOTPARAMD= bootparams -.if ${MK_BSNMP} != "no" -CONFGROUPS+= BSNMP -BSNMP+= bsnmpd -BSNMPPACKAGE= bsnmp -.endif +CONFGROUPS.${MK_BSNMP}+= BSNMP +BSNMPPACKAGE= bsnmp +BSNMP= bsnmpd -.if ${MK_CCD} != "no" -CONFGROUPS+= CCD +CONFGROUPS.${MK_CCD}+= CCD +CCDPACKAGE= ccdconfig CCD= ccd -CCDPACKAGE= ccdconfig -.endif -.if ${MK_CUSE} != "no" -CONFGROUPS+= VOSS -VOSS= virtual_oss -VOSSPACKAGE= sound -.endif +CONFGROUPS+= DEVD +DEVDPACKAGE= devd +DEVD= devd + +CONFGROUPS+= DEVMATCH +DEVMATCHPACKAGE= devmatch +DEVMATCH= devmatch + +CONFGROUPS+= DHCLIENT +DHCLIENTPACKAGE= dhclient +DHCLIENT= dhclient + +CONFGROUPS+= CRON +CRONPACKAGE= cron +CRON= cron -.if ${MK_KERBEROS_SUPPORT} != "no" -CONFGROUPS+= GSSD +CONFGROUPS+= CTL +CTLPACKAGE= ctl +CTL= ctld + +CONFGROUPS+= GEOM +GEOMPACKAGE= geom +GEOM= geli \ + geli2 \ + gptboot + +CONFGROUPS+= GGATED +GGATEDPACKAGE= ggate +GGATED= ggated + +CONFGROUPS.${MK_KERBEROS_SUPPORT}+=GSSD +GSSDPACKAGE= gssd GSSD= gssd -GSSDPACKAGE= gssd -.endif -.if ${MK_HAST} != "no" -CONFGROUPS+= HAST +CONFGROUPS.${MK_HAST}+= HAST +HASTPACKAGE= hast HAST= hastd -HASTPACKAGE= hast -.endif -.if ${MK_INETD} != "no" -CONFGROUPS+= INETD +CONFGROUPS.${MK_INETD}+= INETD +INETDPACKAGE= inetd INETD= inetd -INETDPACKAGE= inetd -.endif -.if ${MK_IPFILTER} != "no" -CONFGROUPS+= IPF +CONFGROUPS.${MK_IPFILTER}+= IPF +IPFPACKAGE= ipf IPF= ipfilter \ ipfs \ ipmon \ ipnat \ ippool -IPFPACKAGE= ipf -.endif -.if ${MK_IPFW} != "no" -CONFGROUPS+= IPFW -IPFW= ipfw dnctl +CONFGROUPS.${MK_IPFW}+= IPFW +IPFWPACKAGE= ipfw +IPFW= ipfw \ + dnctl .if ${MK_NETGRAPH} != "no" IPFW+= ipfw_netflow .endif -IPFWPACKAGE= ipfw -# natd is only built when ipfw is built -CONFGROUPS+= NATD -NATD+= natd -NATDPACKAGE= natd -.endif - -.if ${MK_ISCSI} != "no" -CONFGROUPS+= ISCSI +CONFGROUPS.${MK_ISCSI}+= ISCSI +ISCSIPACKAGE= iscsi ISCSI= iscsictl \ iscsid -ISCSIPACKAGE= iscsi -.endif -.if ${MK_JAIL} != "no" -CONFGROUPS+= JAIL -JAIL+= jail -JAILPACKAGE= jail -.endif +# natd is only built when ipfw is built +CONFGROUPS.${MK_IPFW}+= NATD +NATDPACKAGE= natd +NATD= natd + +CONFGROUPS.${MK_JAIL}+= JAIL +JAILPACKAGE= jail +JAIL= jail + +CONFGROUPS.${MK_LPR}+= LP +LPPACKAGE= lp +LP= lpd + +CONFGROUPS+= NEWSYSLOG +NEWSYSLOGPACKAGE= newsyslog +NEWSYSLOG= newsyslog + +CONFGROUPS+= NFS +NFSPACKAGE= nfs +NFS= lockd \ + mountd \ + nfscbd \ + nfsclient \ + nfsd \ + nfsuserd \ + statd + +CONFGROUPS.${MK_NIS}+= NIS +NISPACKAGE= yp +NIS= ypbind \ + ypldap \ + yppasswdd \ + ypserv \ + ypset \ + ypupdated \ + ypxfrd \ + nisdomain -.if ${MK_LEGACY_CONSOLE} != "no" -CONFGROUPS+= CONSOLE -CONSOLE+= moused -CONSOLE+= msconvd -CONSOLE+= syscons -CONSOLEPACKAGE= console-tools -.endif +CONFGROUPS.${MK_NS_CACHING}+= NSCD +NSCD= nscd -.if ${MK_LPR} != "no" -CONFGROUPS+= LP -LP+= lpd -LPPACKAGE= lp -.endif +CONFGROUPS.${MK_NTP}+= NTP +NTPPACKAGE= ntp +NTP= ntpd \ + ntpdate + +CONFGROUPS.${MK_NUAGEINIT}+= NUAGEINIT +NUAGEINITPACKAGE= nuageinit +NUAGEINIT= nuageinit \ + nuageinit_post_net \ + nuageinit_user_data_script + +CONFGROUPS.${MK_OFED_EXTRA}+= OPENSM +OPENSM= opensm + +CONFGROUPS.${MK_PF}+= PF +PFPACKAGE= pf +PF= pf \ + pflog \ + pfsync \ + ftp-proxy + +CONFGROUPS+= POWERD +POWERDPACKAGE= powerd +POWERD= powerd + +CONFGROUPS.${MK_PPP}+= PPP +PPPPACKAGE= ppp +PPP= ppp + +CONFGROUPS+= PPPOED +PPPOEDPACKAGE= ppp +PPPOED= pppoed + +CONFGROUPS+= SYSLOGD +SYSLOGDPACKAGE= syslogd +SYSLOGD= syslogd + +CONFGROUPS+= RCMDS +RCMDSPACKAGE= rcmds +RCMDS= rwho + +CONFGROUPS+= RESOLVCONF +RESOLVCONFPACKAGE= resolvconf +RESOLVCONF= resolv + +CONFGROUPS.${MK_SENDMAIL}+= SENDMAIL +SENDMAILPACKAGE= sendmail +SENDMAIL= sendmail + +CONFGROUPS.${MK_OPENSSH}+= SSH +SSHPACKAGE= ssh +SSH= sshd + +CONFGROUPS.${MK_UNBOUND}+= UNBOUND +UNBOUNDPACKAGE= unbound +UNBOUND= local_unbound + +CONFGROUPS.${MK_VI}+= VI +VIPACKAGE= vi +VI= virecover + +CONFGROUPS.${MK_CUSE}+= VOSS +VOSSPACKAGE= sound +VOSS= virtual_oss + +CONFGROUPS.${MK_WIRELESS}+= HOSTAPD +HOSTAPDPACKAGE= hostapd +HOSTAPD= hostapd + +CONFGROUPS.${MK_WIRELESS}+= WPA +WPAPACKAGE= wpa +WPA= wpa_supplicant + +CONFGROUPS.${MK_ZFS}+= ZFS +ZFSPACKAGE= zfs +ZFS= zfs \ + zfsbe \ + zfsd \ + zfskeys \ + zpool \ + zpoolreguid \ + zpoolupgrade \ + zvol + +CONFGROUPS.${MK_LEGACY_CONSOLE}+=SYSCONS +SYSCONSPACKAGE= console-tools +SYSCONS= moused \ + msconvd \ + syscons .if ${MK_KERBEROS} != "no" .if ${MK_MITKRB5} == "no" @@ -318,58 +357,10 @@ KRB5PACKAGE= kerberos-kdc .endif # ${MK_MITKRB5} .endif # ${MK_KERBEROS} -.if ${MK_NIS} != "no" -CONFGROUPS+= YP -YP= ypbind \ - ypldap \ - yppasswdd \ - ypserv \ - ypset \ - ypupdated \ - ypxfrd \ - nisdomain -YPPACKAGE= yp -.endif - -.if ${MK_NS_CACHING} != "no" -_nscd= nscd -.endif - -.if ${MK_NTP} != "no" -CONFGROUPS+= NTP -NTP+= ntpd \ - ntpdate -NTPPACKAGE= ntp -.endif - -.if ${MK_OFED_EXTRA} != "no" -_opensm= opensm -.endif - .if ${MK_OPENSSL} != "no" && ${MK_OPENSSL_KTLS} != "no" -CONFS+= tlsclntd \ - tlsservd -.endif - -.if ${MK_OPENSSH} != "no" -CONFGROUPS+= SSH -SSH= sshd -SSHPACKAGE= ssh -.endif - -.if ${MK_PF} != "no" -CONFGROUPS+= PF -PF= pf \ - pflog \ - pfsync \ - ftp-proxy -PFPACKAGE= pf -.endif - -.if ${MK_PPP} != "no" -CONFGROUPS+= PPP -PPP= ppp -PPPPACKAGE= ppp +CONFGROUPS+= KTLS +KTLS= tlsclntd \ + tlsservd .endif .if ${MK_INET6} != "no" || ${MK_ROUTED} != "no" @@ -384,57 +375,9 @@ RIP+= routed .endif .endif -.if ${MK_SENDMAIL} != "no" -CONFGROUPS+= SMRCD -SMRCD= sendmail -SMRCDPACKAGE= sendmail -.endif - -.if ${MK_NUAGEINIT} != "no" -CONFGROUPS+= NIUAGEINIT -NIUAGEINIT= nuageinit \ - nuageinit_post_net \ - nuageinit_user_data_script -NIUAGEINITPACKAGE= nuageinit -.endif - -.if ${MK_UNBOUND} != "no" -CONFGROUPS+= UNBOUND -UNBOUND+= local_unbound -UNBOUNDPACKAGE= unbound -.endif - -.if ${MK_VI} != "no" -CONFGROUPS+= VI -VI+= virecover -VIPACKAGE= vi -.endif - -.if ${MK_WIRELESS} != "no" -CONFGROUPS+= HOSTAPD -HOSTAPD= hostapd -HOSTAPDPACKAGE= hostapd - -CONFGROUPS+= WPA -WPA= wpa_supplicant -WPAPACKAGE= wpa -.endif - -.if ${MK_ZFS} != "no" -CONFGROUPS+= ZFS -ZFS+= zfs -ZFS+= zfsbe -ZFS+= zfsd -ZFS+= zfskeys -ZFS+= zpool -ZFS+= zpoolreguid -ZFS+= zpoolupgrade -ZFS+= zvol -ZFSPACKAGE= zfs -.endif - -.for fg in ${CONFGROUPS} +.for fg in ${CONFGROUPS} ${CONFGROUPS.yes} ${fg}MODE?= ${BINMODE} +${fg}PACKAGE?= rc .endfor .include From nobody Wed Oct 8 06:51:05 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 4chNvF5JDmz6BRBV; Wed, 08 Oct 2025 06:51:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chNvF31Dnz3Gmp; Wed, 08 Oct 2025 06:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759906265; 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=N1b4pTmnsAQKNv0wVJQSPClL896KVjMkcYg494RSmik=; b=X4L8O2tCq7UQXiKLRBCyIhgG0vKuIx9VK3Q0WMSI6AVBjoyEQhjnjlLztpewG/OdTdi/lP TqcpojgP2NyMJGlGuTYQJet+EFOz2dr7gchabJ8bBFx9LWQ/yCRagbLUlOfL5lZg9wNe1t /aqqRNMvx1PYYJEGVkKKrJ2BQGu5QK36tBtICPx9vHElUHLEe35w7dFDycSiDchrjpiVKH qCkJKUKUemBNmFcijDggjPfbssKSqlwrU/HDZf6kXrOBG+iOFrZmoyYPtitH9HjgsK0pp1 zHgra5fewTv+3jY7uKJ2xiYYlAuS5kPhDiVR5lObPG4S4C1sftXAA19zDO2/QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759906265; 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=N1b4pTmnsAQKNv0wVJQSPClL896KVjMkcYg494RSmik=; b=yp0hixhoIEPpnuZa9KnkkyC/UQqSwYzAINH4+xnP903wjwUP40rctzqPjLGXZCUhbJJ8pw rWGjWqpf67FngNXVOBY2DVyKi+Ycp+JITrwTPEFAnt9/d68TyDK8WYW3lOQhlBHZfsfYtF 0tsTDuTSvCPjgtrBQ0r/IxOjA/D9o387aypsK10OPJKfFtr5nHryRYbbT4LFlm0MmW8Fa9 GzQWPqJBblcc8bslG88u5t9C/Lc5Lzy5G326y6JuKafw/X2HkH8rzSSGiU7wxVkxfVimoT jFVC8PHm1ur54BI+IXwUbHkiWiKfY8P3dewOSZ4acGTQeoDukZa8kaEA90lBig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759906265; a=rsa-sha256; cv=none; b=NNtnMrnAURf5lz3WMTVp7CbvsPtzCWAPCMiun6N4eA3VySr2CcL3+ZG3VSwZrt7ztEGORK E1Nt3kj741HgOMa5EDdbjiiEVk/6P9SlBfrXs70+HKS3ppIZSOPBvPpQOFBpn0r01aJcRA 04Ky3Ow7XvYwJYXzopSgMCnIUW6MwavYSWYrT2PsJrUT4GDyLI+yZw2Ki45IrePJ7cqbKb 9MckWGQ7Up4iF2bzVKGQivUdO7AO/vYqVNvk197gMuyZhfFpIdyROSiuS6kUPhdr5XpSIu WOi7hl6aNE0tnwfFSkxd2qQpBrsro2NeHUkbkiI7RAhNhLJxC2KVaV4zDsqu4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chNvF2czWz5VK; Wed, 08 Oct 2025 06:51:05 +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 5986p5CC009902; Wed, 8 Oct 2025 06:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5986p5Kl009899; Wed, 8 Oct 2025 06:51:05 GMT (envelope-from git) Date: Wed, 8 Oct 2025 06:51:05 GMT Message-Id: <202510080651.5986p5Kl009899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: c8f9a9abd800 - main - generate-set-ucl.lua: Add missing copyright header 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8f9a9abd8000a8514e0beee99ffcf48d05ce47b Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=c8f9a9abd8000a8514e0beee99ffcf48d05ce47b commit c8f9a9abd8000a8514e0beee99ffcf48d05ce47b Author: Lexi Winter AuthorDate: 2025-10-08 06:50:03 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 06:50:03 +0000 generate-set-ucl.lua: Add missing copyright header This file was derived from generate-ucl.lua, so copy the existing header. MFC after: 3 days --- release/packages/generate-set-ucl.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua index ab8765c8cf2d..9ba7026b75df 100755 --- a/release/packages/generate-set-ucl.lua +++ b/release/packages/generate-set-ucl.lua @@ -1,4 +1,10 @@ #!/usr/libexec/flua +-- +-- Copyright (c) 2024-2025 Baptiste Daroussin +-- Copyright (c) 2025 Lexi Winter +-- +-- SPDX-License-Identifier: BSD-2-Clause +-- --[[ usage: generate-set-ucl.lua