From nobody Tue Jun 16 01:00:54 2026 X-Original-To: dev-commits-src-branches@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 4gfTFM0CyHz6gGCZ for ; Tue, 16 Jun 2026 01:00:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfTFL4rD4z440q for ; Tue, 16 Jun 2026 01:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781571654; 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=46UolZdFF9+mgziDoAzMOZ8172EjSL7NilffQmiLEQc=; b=GEY+7s1w+5NBgHMDA8I1GHV1JWsPLfqtytCeyOaLzjIe+oztaD3GQRQlNC6ZJHeQtXm+Fu DrBMpYlu1cyu6x7NBA9/z0PA30qZtUkfjSJcUmjIzzc6xikwyNN/nkZD0oxpdXk8oms0Ry vIjGujyjymIWJbmdBD1L9ytCRF0v6qlB+ehmZzbehRUXojoIL3IbCBjcTPzoVfAsAesPIF sPDIVn4o3m6RaPbDV9vvihr0zSPgWo/oS/fZuipilMq6rA9Lk4XAhH0p5xfQszdXQE8783 d4KdTw6BphaRzPvffTobS7ZkOUsUvgq7Hix1tfrWbGa8b7sNa6nBO3JpPJ/Oag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781571654; a=rsa-sha256; cv=none; b=BqN+MOll4nve2x0Vx7cr8Bj3y9tzmc/bQxsq4NqAyOzUDubMpXG6JReGZ4UCVTuaVsh98n XQ8iPzgBR2mxgFED4YbaG/zArHN9piyNUjaFqQ/7t4pFqBu8cidBwLJNHjAbzIWQma4Uia LunVMIWL1ETW2sg6Vhl5EsPFeibhZD0RdFLfJkgdMzHzjrT44U3Nvu5sKKZrRsdy5bAGEl 1Wt1fw1AYqliNFUL7t61c/Vswrplj2dGPbXw39sR/4ZSMtmsPn0bEQaVMyOWl9a9fXw7Dz T0K7RdKWFRXQ60+t0S/tkhZvQ+PRxoU6SPY2RjSpUv+yBtMZiPB846IEpF+0kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781571654; 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=46UolZdFF9+mgziDoAzMOZ8172EjSL7NilffQmiLEQc=; b=tJAbJ/iW9GAdDcurcHT/H/PxMgSW3BdoEBgwyaSMNNFmToLrZq1623kFdqTKfMXC67C7g2 Jy8SKblxFmxmKMVQ568A0eX2k3DMmjiJ5tdKOgjuXLfVCQEJ+l3gfJjMPLa4QpSkbtXy0v i7BvBJKhc6bu1k+WUsiOjs7l785Y4QzigtIvXO89XExwpHvuYI/BAMaqYzoNKeQfsphSfo ddMG8nW/2ZWVzGEa4cVNIiR7J3aXO2BCvPS8aBGfYm3l8Uv+2n9iXn7vaWTW8BOkd5nNSR s2XCr9YU9dAevp1gkwR6W0H4QPMIkLh6+un0c06fs5HMTF0CyLT2KrrIdrRtBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfTFL3XV4z1HfZ for ; Tue, 16 Jun 2026 01:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2437c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Jun 2026 01:00:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 9b30dccaefea - stable/14 - audit: Replace TAILQ with STAILQ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b30dccaefeac13f149fe942cf9d94d2ff0c86e5 Auto-Submitted: auto-generated Date: Tue, 16 Jun 2026 01:00:54 +0000 Message-Id: <6a30a046.2437c.58ae2817@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9b30dccaefeac13f149fe942cf9d94d2ff0c86e5 commit 9b30dccaefeac13f149fe942cf9d94d2ff0c86e5 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-05 21:50:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-16 01:00:21 +0000 audit: Replace TAILQ with STAILQ This reduces the size of a trigger entry from 24 bytes to 16 (or from 12 bytes to 8 on 32-bit) with no additional complexity. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, emaste Differential Revision: https://reviews.freebsd.org/D57464 (cherry picked from commit 77e894cb09affe828f4bc81b8e4751a7e22860de) --- sys/security/audit/audit_trigger.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/security/audit/audit_trigger.c b/sys/security/audit/audit_trigger.c index d4b75a7f4baf..7275d30d6ea9 100644 --- a/sys/security/audit/audit_trigger.c +++ b/sys/security/audit/audit_trigger.c @@ -51,13 +51,13 @@ */ struct trigger_info { unsigned int trigger; - TAILQ_ENTRY(trigger_info) list; + STAILQ_ENTRY(trigger_info) list; }; static MALLOC_DEFINE(M_AUDITTRIGGER, "audit_trigger", "Audit trigger events"); static struct cdev *audit_dev; static int audit_isopen = 0; -static TAILQ_HEAD(, trigger_info) trigger_list; +static STAILQ_HEAD(, trigger_info) trigger_list; static struct mtx audit_trigger_mtx; static struct selinfo audit_trigger_rsel; @@ -86,9 +86,9 @@ audit_close(struct cdev *dev, int fflag, int devtype, struct thread *td) /* Flush the queue of pending trigger events. */ mtx_lock(&audit_trigger_mtx); audit_isopen = 0; - while (!TAILQ_EMPTY(&trigger_list)) { - ti = TAILQ_FIRST(&trigger_list); - TAILQ_REMOVE(&trigger_list, ti, list); + while (!STAILQ_EMPTY(&trigger_list)) { + ti = STAILQ_FIRST(&trigger_list); + STAILQ_REMOVE_HEAD(&trigger_list, list); free(ti, M_AUDITTRIGGER); } mtx_unlock(&audit_trigger_mtx); @@ -103,15 +103,15 @@ audit_read(struct cdev *dev, struct uio *uio, int ioflag) struct trigger_info *ti = NULL; mtx_lock(&audit_trigger_mtx); - while (TAILQ_EMPTY(&trigger_list)) { + while (STAILQ_EMPTY(&trigger_list)) { error = msleep(&trigger_list, &audit_trigger_mtx, PSOCK | PCATCH, "auditd", 0); if (error) break; } if (!error) { - ti = TAILQ_FIRST(&trigger_list); - TAILQ_REMOVE(&trigger_list, ti, list); + ti = STAILQ_FIRST(&trigger_list); + STAILQ_REMOVE_HEAD(&trigger_list, list); } mtx_unlock(&audit_trigger_mtx); if (!error) { @@ -136,7 +136,7 @@ audit_poll(struct cdev *dev, int events, struct thread *td) if (events & (POLLIN | POLLRDNORM)) { mtx_lock(&audit_trigger_mtx); - if (!TAILQ_EMPTY(&trigger_list)) + if (!STAILQ_EMPTY(&trigger_list)) revents = events & (POLLIN | POLLRDNORM); else selrecord(td, &audit_trigger_rsel); @@ -159,7 +159,7 @@ audit_send_trigger(unsigned int trigger) return (ENODEV); } ti->trigger = trigger; - TAILQ_INSERT_TAIL(&trigger_list, ti, list); + STAILQ_INSERT_TAIL(&trigger_list, ti, list); selwakeup(&audit_trigger_rsel); wakeup(&trigger_list); mtx_unlock(&audit_trigger_mtx); @@ -180,7 +180,7 @@ void audit_trigger_init(void) { - TAILQ_INIT(&trigger_list); + STAILQ_INIT(&trigger_list); mtx_init(&audit_trigger_mtx, "audit_trigger_mtx", NULL, MTX_DEF); }