From nobody Tue Dec 9 00:28:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dQKTn5DJXz6JcnL for ; Tue, 09 Dec 2025 00:29: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 4dQKTn2Dcwz3Xyn for ; Tue, 09 Dec 2025 00:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765240141; 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=cWZyJLjJT8SGRRCLNYIDxHxBZFBgHSIMVsShJvow8Tk=; b=YxzG00vQtBq/4bW5vm77OsNS4CUxH9fubmFHj5UjDn9/tW2RI/OMfTHmKrIEjtOBMJcLy8 tcwde/np0f81kxIjRbHjJocFBN+EI2a0vxM/O3u0OlyHx/vkfhsUq7yfw/ow2VSOSemUTL YcUHIQm5ZfieIutM71PR0zHrDjEuskf8kEGCGxHps5OZsoawBCTohFXkRSGZLdMvY+wQst C8UXwS6Yp586YKReTTh0sjQ3HbdWM6sTXa47Z5x0xkaaAmoaWSIAT8SAzKgevM8ZqbQV5o Y1P2/wFtLLnltBuBdyUWlOyRGtBlHR9Z6OeI0Byca3r9tn0U3yJ6V78WNV4nPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765240141; 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=cWZyJLjJT8SGRRCLNYIDxHxBZFBgHSIMVsShJvow8Tk=; b=vJUrSmux35EJFOdJ6ERSxg30QRVgqsfxqYoiYBUwInwUwRAoNuL2RyNjNeQiuSrrHrG79x xJY1126rZ/KRHKUqCY1q5GiqGlm7CR8bbzHOb+69u245soYAqpO3+gVmDuzswURa01zgBz l7Kn0agvmqyM3NFLZbMtCnQL0c6VTLN2V8S07aawobbS8slbo1ptZUP6BC9+gEzYFijy1I Y1YCMRRsez51ZBd0U+AHtRNhtnIcIR8I403sAt5vHErzUGCSLv8ZuD8qkXMy0QLlOm2hEj TTB0dJTRCPe0Ek/9oDhZn8KM3ofmNGCelC57n/DaygcgLEiMY1IJvTL3OepDow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765240141; a=rsa-sha256; cv=none; b=agLMYsPUsDmainaFxBPKl4DRai7uLXhLU+ID/XA4jCaKAF+/qU6ZPc3J09Nnfq9UZd8Dao xtNDnuFDGrSAomIqVxisXHx0lp16JGhms9FAT3mUZwZVrlixFkbpYNlUZlXt3lEF9iY6ez 3Cre52bNYb0g51pziXQCf9cjp55hqlGct7OEKLjXPqmfdUBj6PmIdY8Fy50aAfT3o+cRud kFDdqfIvWBC71EbpvT5NZEum6rh6EJlvsf/8cjKlxmEOFoVonYwGu5BprSQEFg3rfHX64q co99I8hdptZwGkeUdP3PdpqDoNSDe/YZzJPn7+bQDU1jBCM8rksX5TUMayP4hg== 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 4dQKTn1LQQzbwv for ; Tue, 09 Dec 2025 00:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b7fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 00:28:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ccb0a245dff8 - stable/15 - kern/subr_vmem.c: convert explicit vmem_list_lock use to macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ccb0a245dff8ecd976908445e3788e5c58a35406 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 00:28:56 +0000 Message-Id: <69376d48.b7fd.6ef485d4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ccb0a245dff8ecd976908445e3788e5c58a35406 commit ccb0a245dff8ecd976908445e3788e5c58a35406 Author: Konstantin Belousov AuthorDate: 2025-10-14 17:13:46 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-09 00:24:55 +0000 kern/subr_vmem.c: convert explicit vmem_list_lock use to macros (cherry picked from commit 202292ef107834bfdbec357a9d1a88b9fcf9ceaa) --- sys/kern/subr_vmem.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index 9288b0935441..06c104b9fce2 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -194,6 +194,9 @@ static LIST_HEAD(, vmem) vmem_list = LIST_HEAD_INITIALIZER(vmem_list); static uma_zone_t vmem_zone; /* ---- misc */ +#define VMEM_LIST_LOCK() mtx_lock(&vmem_list_lock) +#define VMEM_LIST_UNLOCK() mtx_unlock(&vmem_list_lock) + #define VMEM_CONDVAR_INIT(vm, wchan) cv_init(&vm->vm_cv, wchan) #define VMEM_CONDVAR_DESTROY(vm) cv_destroy(&vm->vm_cv) #define VMEM_CONDVAR_WAIT(vm) cv_wait(&vm->vm_cv, &vm->vm_lock) @@ -777,7 +780,7 @@ vmem_periodic(void *unused, int pending) vmem_size_t desired; vmem_size_t current; - mtx_lock(&vmem_list_lock); + VMEM_LIST_LOCK(); LIST_FOREACH(vm, &vmem_list, vm_alllist) { #ifdef DIAGNOSTIC /* Convenient time to verify vmem state. */ @@ -802,7 +805,7 @@ vmem_periodic(void *unused, int pending) */ VMEM_CONDVAR_BROADCAST(vm); } - mtx_unlock(&vmem_list_lock); + VMEM_LIST_UNLOCK(); callout_reset(&vmem_periodic_ch, vmem_periodic_interval, vmem_periodic_kick, NULL); @@ -1271,9 +1274,9 @@ vmem_init(vmem_t *vm, const char *name, vmem_addr_t base, vmem_size_t size, } } - mtx_lock(&vmem_list_lock); + VMEM_LIST_LOCK(); LIST_INSERT_HEAD(&vmem_list, vm, vm_alllist); - mtx_unlock(&vmem_list_lock); + VMEM_LIST_UNLOCK(); return vm; } @@ -1301,9 +1304,9 @@ void vmem_destroy(vmem_t *vm) { - mtx_lock(&vmem_list_lock); + VMEM_LIST_LOCK(); LIST_REMOVE(vm, vm_alllist); - mtx_unlock(&vmem_list_lock); + VMEM_LIST_UNLOCK(); vmem_destroy1(vm); }