From nobody Sun Apr 06 22:51:13 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 4ZW6yT4jsrz5s8TB; Sun, 06 Apr 2025 22:51:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZW6yT1sScz3KQK; Sun, 06 Apr 2025 22:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743979873; 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=qK+DxFVKJjIlmNqZPF+yzhtN83Oj7S6fY1pvU1KzUKw=; b=vHn35lAbpTp1KIHe1gQ/3IYTUMcyrBs3j8L89iMc3l3bGXcsODym4Abka1BIqDaQxkt9Pq f2cTR68jDOVJrFc/Rl6v5O9SAZOU8a2ZCiOZ8mz4ZSlBLXoaSOWZ/tVRUg09zXSBfN4Ez7 ACOyxkkLAvyD0dH3UocvoRYfW27Ok+3Hpo+4hs0NAfJS48SDv+iFwlrPhB4Zq5XaPpaED2 E+lok68Se6VIncQov396uzObDVbZVVEw/O9o0azsPBwqiYB4M9oZBiHXZHv96dgOJ2QMSG xbDKK1YkzPF2kmOf6nNmt4jiguwGYfirKZ5uEJxCl1XNZ/7USeEvRMfVU8bilw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743979873; a=rsa-sha256; cv=none; b=NXBLFTyLvYdJ+5/viubDfq1RBProhO9+5aZMDX+2815B18LdAkKvAYO7i+Pv1/n5u4oq8A RJMqvF6GC4xsMDQogdc+Tz29YkZ6+egXSEfL/dgej9+XLylreB0S0MnIfbA9dk+XNNF81U mxzXBiYlHvQ9mkc09vdISrHTIDNYjldxyBAacxXEy4pPWxsyK/bNtkewZeLRYaVIBdP/T5 v/11x1BLacS056f3JQvLVJq4R47nTF+SgcrdmnTcBVsTFWtchwMIM3rJNUIxyo4u3NPkFF OkW1CXpjNTWAbdIty9wpSvTva3IpTNF93K18psqJh8D+ZPSqSrElw5OC8O19aA== 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=1743979873; 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=qK+DxFVKJjIlmNqZPF+yzhtN83Oj7S6fY1pvU1KzUKw=; b=bFrOTJDMBrakS2Bm4G0VUcjsGpdem0HBWdAnP3eAH9pwzdF4vZiGHTZeGY5wMu+Xdcvy6t +wT6pzOvfvVYJ1KPePwPF6Y1uJLOEfffBEn45mKLnlS+qFKHwzjH0MQpo/QCH/jmvyGgRa oumqEUtIeZfNb/EtwvZpf2swgKWni67AlXPUstBaWFknsOJ++dfgdPZD/BQU1ZkE1JQH/N urqQw9dQYvIONhi1AaHYqkIOo5AsTjOlp8pRFa4oZNk19GKhiIw2oXdpLoTD+ODIbLksaA qZXF4bK5r12hemsU7pCJBcO8DcrvF2TaEw5ald2iUkYRPYz8TD0kXU5KgKt7lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZW6yT1BJMz57B; Sun, 06 Apr 2025 22:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 536MpDUC077155; Sun, 6 Apr 2025 22:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 536MpDJ4077151; Sun, 6 Apr 2025 22:51:13 GMT (envelope-from git) Date: Sun, 6 Apr 2025 22:51:13 GMT Message-Id: <202504062251.536MpDJ4077151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 51489b9ced27 - stable/14 - ktrace: Use STAILQ_EMPTY_ATOMIC when checking for records in userret() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 51489b9ced27afdf9ea34edc65c8c31274ccc9c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=51489b9ced27afdf9ea34edc65c8c31274ccc9c5 commit 51489b9ced27afdf9ea34edc65c8c31274ccc9c5 Author: Mark Johnston AuthorDate: 2025-03-23 11:54:59 +0000 Commit: Mark Johnston CommitDate: 2025-04-06 13:54:13 +0000 ktrace: Use STAILQ_EMPTY_ATOMIC when checking for records in userret() As in commit 36631977d8c9, this check is unlocked and may trigger spurious assertion failures. Use STAILQ_EMPTY_ATOMIC() here as well. Fix nearby whitespace. Reported by: syzkaller Reviewed by: olce Fixes: 34740937f7a4 ("queue: New debug macros for STAILQ") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49441 (cherry picked from commit e9a846468acfbba35ca40b888670559aaff7228d) --- sys/sys/ktrace.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 2618c7c719b3..b615d82d2198 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -89,10 +89,9 @@ struct ktr_header { * is the public interface. */ #define KTRCHECK(td, type) ((td)->td_proc->p_traceflag & (1 << type)) -#define KTRPOINT(td, type) (__predict_false(KTRCHECK((td), (type)))) -#define KTRCHECKDRAIN(td) (!(STAILQ_EMPTY(&(td)->td_proc->p_ktr))) +#define KTRPOINT(td, type) (__predict_false(KTRCHECK((td), (type)))) #define KTRUSERRET(td) do { \ - if (__predict_false(KTRCHECKDRAIN(td))) \ + if (__predict_false(!STAILQ_EMPTY_ATOMIC(&(td)->td_proc->p_ktr))) \ ktruserret(td); \ } while (0)