From nobody Tue Dec 2 03:41:52 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 4dL65X3RFCz6JVGd for ; Tue, 02 Dec 2025 03:41:52 +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 4dL65X1P3lz44Ss for ; Tue, 02 Dec 2025 03:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646912; 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=yW7s4Owclyh23ciW5mkOCF02LbmT+qJufYkxNDA5Q6E=; b=ShKeYh+BWQdSjKp7ELUo/klF9CC4rou0euaSbR3V1GSrfDHy+of7wA6j8FGBU2fkF3oOP8 0khewB176eYHUFsDgjOGkef5RulVXWar5QHabtzhwGim1fZHe4eAl8tFGB6ja7+aKUExHM 8ltwrmplkcEu8WdPjDHzas0BVUvmwnpNdJ02f3lEAIHVSJymxQ0MCYele9CQ3yr8eJ8EjU Y/LxC+lcc+CHr5S7Sd/uZA2p8ZA3nyfjLSV7UGrrykEImhPRRw6/1KV8dGRlvCLrC3/0W9 /9Mo1kD3VeIauR+sVYNXqjLlMgSOvWdYMWsuiOC8Ar40oN5Nn4eCgLlkANhnsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646912; 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=yW7s4Owclyh23ciW5mkOCF02LbmT+qJufYkxNDA5Q6E=; b=ZdCO0+XQXvcVkQbeLu5poKZxi3LUpj6QVs4kI25k7Ejc1gTkhTKXNiPydwT5+BaXZf77vB ZAsm90Hcu1YyRf3/DJ5hzWYCbHdksEzi6MFzb7wC5gm9nJVxctdxoKFOVco7Nf4hxC0kn4 xb107griD5ST3V37XjMJ2onThJOnlSUKFOioVAD4H1s3RXG87mdSTLLz9RY2ulGSDvBTjd 5eXqFHzxidV9hd/d1Tfy2OxHEF6+PbqvC/bdwCX7Qoanm4NIxoE9iQBP4jzUi55gQz4v0R COScYvi3ThM3DNeyFFZq9BTBxH7uBmBkpbB65Upx9bfWTJ29RIFWS6GoH5/4HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764646912; a=rsa-sha256; cv=none; b=TOXQLA3V1CDthvD1tWFaZJ6ay10hv3YYBH70H4cAA0oKZCbPeZjIT6MVU1ecPQMdpSWNkB TcxCKL302EONz7aSYTq7fPI31HLRLXm4tQPblJ2B7CxAvtbVwjSnQKNlAl0OEFR4WPKn6B CR82Z1vpS6UoVyh0w5pcESCFoAghmCsaS1yuiXgZjAF5V/tnicuONR208ykDx+hepsXjHv KY8nppYhTcRw+7IDNFOnm4Y9YD2YWKb+5ZHHtLqTkhznySJDX5GXLT48NKHFfoJ8tgJ7C7 e8N6LpsZDfPWy4YNsapu5yp4h6lSwPkkF7rtUGiiZa29cY07MwVW/rPHxwru4g== 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 4dL65X0tKdzr0S for ; Tue, 02 Dec 2025 03:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 03:41:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 202292ef1078 - main - kern/subr_vmem.c: convert explicit vmem_list_lock use to macros 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: 202292ef107834bfdbec357a9d1a88b9fcf9ceaa Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 03:41:52 +0000 Message-Id: <692e6000.33f70.10ca5078@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=202292ef107834bfdbec357a9d1a88b9fcf9ceaa commit 202292ef107834bfdbec357a9d1a88b9fcf9ceaa Author: Konstantin Belousov AuthorDate: 2025-10-14 17:13:46 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-02 03:41:12 +0000 kern/subr_vmem.c: convert explicit vmem_list_lock use to macros Reviewed by: bnovkov, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D27220 --- 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); }