From nobody Fri Oct 09 22:13:48 2026 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 4j1h302kR6z6w8wm for ; Fri, 09 Oct 2026 22:13:48 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j1h301VTLz4P6K for ; Fri, 09 Oct 2026 22:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791584028; 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=gkDla0A2/ZGdDPaJ9qG9VqHAj44sgVhSKzoFjRaMf34=; b=sKnkOlXieJ0hTha884+Ng4qoc+FWGSrLdmCOWOFdOIfElEfeeflwGMLdW8mQ3zkmnHLauA RO5j3+8rWIIlqjezqfao6+ETWuG1epguelH5qL2zO9ixD0IiMTCGcLD6qEg59giowrLTer cmwJmPGaIluI/q6eyDLxLpVjL4oEa+4GWhhvmkJ8kqqzA2G/Eh/ukW7E/HVtR4xLklyOWK YdN63ANPTaDu4sLy6ZRBcfod0UCj3kKDc9j2OXNT3Un+Pq8bDsB8GVJOsnqqxAWUKbKLzY Gji7GYUznOM0KGVhA8OoSfW+WnVp5BiUbf5e0LkxWjCZsRlvCkAPfw6UcXP47g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791584028; b=s+LIOF+ye39+AMuSJpmgEmxKJfhGmdTrf7TfYwn1lrV0VW3wYK/JvrfpiCWl7rLWwQju+C fplNiDnitKlCDWoY8z0pNItt1CQNlLFNbXm4ba5k5jNlOpZDTZWQqaFSolfZkayJHAb6Sy XDg5lef0BmwXgYk542RT6Zz29+vbY38634HVmCa7p8ZkrQgHBaTKzLAB87n5UWuJ6sKP8e RrcjZ3qRym9lHtZ3JNL7MkBPZc8X5amHmaL6gR9gcJW5Y8i5QZGu6CCRJWh5I0HvZPlwcx iQExxJZm+vlTdqK57wlWBA9ngfGkZH7K4mGlSpdUJcqGNv8QFRaPrTzbLcdfEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791584028; 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=gkDla0A2/ZGdDPaJ9qG9VqHAj44sgVhSKzoFjRaMf34=; b=h7gLClChBfrCjHUMo8edyLol43N9CzfZAEeBpk3o98kJDuJSDtmQ9F6M/w+v4oW2aGXUGu 1fI9g+S+EISysbAeYXbM0Owf9sMset3YGldonyD/YQQ5GVqBGAWRPctxQFhVEI5cIqo1Jx D4feeUWZqKW4mVI53wu+0hZnsL3PdGyMbyLU9DFQVB7I7RklHjzCY901R45nFxrEOUtziP b/hRhO76FhFfmWExGXPMjzNlOiPQ/lu5tG22Uh44nDeUdkOylbFYA0rxy4Vtz2zzeqXeeC XAy0WZe31MlKvro+cw9uEUsDUwg7DdLycYm2lQSfdgy6wSPjXa7znMA7MQWLQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j1h300ByhzST5 for ; Fri, 09 Oct 2026 22:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41221 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 22:13:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 305c3044e024 - main - libthr: Support disable spinloop List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 305c3044e0249ea24a9b4571dfa6ae319a5bcdec Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 22:13:48 +0000 Message-Id: <6ac9671c.41221.12f9094a@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=305c3044e0249ea24a9b4571dfa6ae319a5bcdec commit 305c3044e0249ea24a9b4571dfa6ae319a5bcdec Author: ShengYi Hung AuthorDate: 2026-10-08 18:38:06 +0000 Commit: ShengYi Hung CommitDate: 2026-10-09 22:13:31 +0000 libthr: Support disable spinloop Like yieldloops, we shoulde be able to set _thr_spinloops to zero. Originally, it makes us to enformce default spin time even if we try to disable it. Make MUTEX_ADAPTIVE_SPINS a one time initialization now. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D60486 --- lib/libthr/thread/thr_init.c | 2 +- lib/libthr/thread/thr_mutex.c | 9 +-------- lib/libthr/thread/thr_private.h | 6 ++++++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index 162ef7dfe7a9..c019c8f27b36 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -118,7 +118,7 @@ size_t _thr_guard_default; size_t _thr_stack_default = THR_STACK_DEFAULT; size_t _thr_stack_initial = THR_STACK_INITIAL; int _thr_page_size; -int _thr_spinloops; +int _thr_spinloops = MUTEX_ADAPTIVE_SPINS; int _thr_yieldloops; int _thr_queuefifo = 4; int _gc_count; diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 139dc768b7ba..9c0939aa6080 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -62,12 +62,6 @@ _Static_assert(offsetof(struct pthread_mutex, m_qe) >= CACHE_LINE_SIZE, "m_qe must not share a cache line with m_lock.m_owner"); #endif -/* - * For adaptive mutexes, how many times to spin doing trylock2 - * before entering the kernel to block - */ -#define MUTEX_ADAPTIVE_SPINS 2000 - /* * Prototypes */ @@ -274,8 +268,7 @@ mutex_init_body(struct pthread_mutex *pmutex, pmutex->m_lock.m_flags |= UMUTEX_ROBUST; } if (PMUTEX_TYPE(pmutex->m_flags) == PTHREAD_MUTEX_ADAPTIVE_NP) { - pmutex->m_spinloops = - _thr_spinloops ? _thr_spinloops: MUTEX_ADAPTIVE_SPINS; + pmutex->m_spinloops = _thr_spinloops; pmutex->m_yieldloops = _thr_yieldloops; } } diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index cf90ac5bd4ef..ffc4ff7233db 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -154,6 +154,12 @@ TAILQ_HEAD(mutex_queue, pthread_mutex); #define MAX_DEFER_WAITERS 50 +/* + * For adaptive mutexes, how many times to spin doing trylock2 + * before entering the kernel to block + */ +#define MUTEX_ADAPTIVE_SPINS 2000 + /* * Values for pthread_mutex m_ps indicator. */