From nobody Fri Sep 18 21:31:51 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 4hmm6J3Lwkz6t1kP for ; Fri, 18 Sep 2026 21:31: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmm6J23Bxz4vpl for ; Fri, 18 Sep 2026 21:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789767112; 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=PGIA/f4aptcIId6xYWQw8/XfZHkW6do1+j9wP0HSxSk=; b=vfS5+STWwsfRv+htmxbezP/FNL60mqKKhrxeiQl7wHEWUp+VcYA7UyCfb9JvSObMB+yKeV p5OtLh1kxSUNLIFMTiACWFUui8qB9DzYwkn54GmPevRw9KIm9RSvW2bkgvBXbzB/7RQnaK hayjNhwzzr0pDZuvqG8Oi4MxMnWcV5vSS0G8SG+dUBuWtOvqtaeUfI3wybCCwTOOwWTWTf XHfr/wVCTS2Fyq359LTZSk7NeIAPt6gsii8RRNn4+9GUjcv/wj1uzvuGqoADk4hfgbY7bt FdQ0M7545tg70HkJSZgd5XmjqggrzIPUjSNxZYPESf0j9IC27Z0Jq4mRi9gccg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789767112; b=Rfj4BZO1CFCROVL4eCfZByAG8qLq8KWjlOwYIYeA1oTKNA1tprK0vYMToRcx86R38w1H0F JZH2vWJvJB0PWAa9JMiDBX8ozKzh6rn6EIowBxYyl3Mwb0gZD3zJfrYoeiX2mbKzx2otEl 4RfqYA6t7/wZ+8y9NyGJK1No6HD6uHqLOhQmPP2Bc5BBGzwLgnLSmNM/3sPNZdQODVO4P+ LUKDmnAjkVd6iYJrn2hPF4yNWC3tT+FPy3q2DPxCb0DEcUhYfXMLg702Jhbtxh7C2T9caY AZr+SI9Ilcu6GnV0gBLKBbs6ooaFPpxAg+RNyMuAX0r+aCmWGKkUYH/P4zfYyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789767112; 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=PGIA/f4aptcIId6xYWQw8/XfZHkW6do1+j9wP0HSxSk=; b=lPTHKmK+rRVlVmP6RtCpS+aOnWGBwNUOz3XAfV4HZxl23dnMBnOJO2lr4+IyXZWZKf5SUc V7dt4j+CeB7ZoP+x8Y0izgLviN+GLBau1BTCxUYoWPfejOFSjSY1n4OO5Z55et4gtiBo88 rtB9umgMqHSjizxSqghj73p+tD1YnfJgWjzkIWcZFbMXkl2shlrMV0byDf0POgNS+AUxnV 0zLgfmC9XOGZzGq39rWPkKAnbjpRgXHzELdEX8HdniaX1xljzN6+mdlhABgUjxaPsbMLm+ hU0Yy3A12NvS+/dxjlCEglaiIjAQXC9px4+su4p+Vx6gsEP9ACm3cccYTAoubg== 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 4hmm6J0hYMzcqq for ; Fri, 18 Sep 2026 21:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 197bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 21:31:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0e7c7cfd1127 - main - locks: provide a macro to extract lock_object from various lock types 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 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e7c7cfd11275ac70e1f9ba10ced67a286c89bef Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 21:31:51 +0000 Message-Id: <6aadadc7.197bb.5901f13d@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0e7c7cfd11275ac70e1f9ba10ced67a286c89bef commit 0e7c7cfd11275ac70e1f9ba10ced67a286c89bef Author: Gleb Smirnoff AuthorDate: 2026-09-18 21:13:27 +0000 Commit: Gleb Smirnoff CommitDate: 2026-09-18 21:14:28 +0000 locks: provide a macro to extract lock_object from various lock types To be used in _Generic() KPIs that accept different lock types. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D59455 --- sys/sys/lock.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 74e222176b4a..18e88bc0c343 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -161,6 +161,16 @@ struct lock_class { #define lock_initialized(lo) ((lo)->lo_flags & LO_INITIALIZED) +/* + * The lk2lo() macro is used to extract lock_object from various lock types + * that embed lock_object for purpose of writing a _Generic() macro that would + * allow to create a single KPI for different kinds of locks. + * The NOLOCK is lock-typed NULL pointer, to be used as no-lock argument in + * such _Generic() macros. + */ +#define lk2lo(lk) (&(lk)->lock_object) +#define NOLOCK ((struct mtx *)0) + extern struct lock_class lock_class_mtx_sleep; extern struct lock_class lock_class_mtx_spin; extern struct lock_class lock_class_sx;