From nobody Sun Mar 23 11:59:54 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 4ZLF9R2Ch0z5rCF6; Sun, 23 Mar 2025 11:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLF9R1bzKz3R4g; Sun, 23 Mar 2025 11:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742731195; 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=dIq8wkCawVs4lUiSy4gQsVQbSuFTe7xELLr99B9sGOg=; b=q7kn1tWYttYevP6EbqVgPyUkW7yZFbmj/GBvse48OVe8aMFDR12LL/PL9O8vuFI547Dad5 nHrDnf8AsAgnZ9kN6SVh6LFH0JfnylTfjJZxHHsqoh6+AyfjH5jYu9mltZiy//aW84thui 0Szvxfg4fmIkZNaVtGvnOE8dy8ow4rRwuRuI+z63DT6Sa5NnMWreZ1lUoSEv+L2xj84ala r/pZ+7486QjUczZB2WZWHqMHNC3lR6rIUpwLSFeMBJVr7RrPuAz0Ez9556Uq4O6hYlgmaR VCWlKCRBIRxvrYFX4UJ4Vi51d0vYHXq3bYFwd5O6+BQGmywdEaqcNq4ZD9q6Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742731195; a=rsa-sha256; cv=none; b=ujH2RLlvY8Q+kEDq0a+okaoTGuERBsFCZWNHiMRY6g2ucl1ELw5A+83/VBwgineaV9rNua PBj6UMMQv3/O5Getle0qcDWgBXGyHa8Aud8p43z1wG1iLGALrfF5om9+j2HjKpK6fJO5JY 4sDnO+qrO7GSk04TRinPq10zh7zFQOfGVydOy2jCTEQQsZDu/+R78CEmLVe3HMfUeEJhWT tlNVwdrsU2L0MzXcCg1QjprDzDMfO+/Mn/xd3uz1bpDBft7bm/vljQLHARfmnfHC42Cp4a yqlR0owl3RWHJ0YabpyqjZbNrMSRCJGq/sIkTTsiCYn0JoOHoF4GgMuNU/Ttng== 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=1742731195; 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=dIq8wkCawVs4lUiSy4gQsVQbSuFTe7xELLr99B9sGOg=; b=tC8sQzhtlOXlf0pWBJ674q79oRKH55cvEZAWm6EXWzNmEZZpe/5kKUvsgVBjT1nPNEjsYn ERZl59UW+1t3qRyIjYUf73BLIe1m5fc2BGaXo3N3qxiVCu0df7aiUkPfLo8sQk3YVxST3p lhC6lhaIGM6OAReucihrFCqjQhNVy8ZjjvOChPPhizZrFV7l6s1m6P87w93PJ9nt8MxaUE maqxoDlHT3eKjWR5ot5IpGx2M2kc+ePBRQ8h3KWmHnRhMfaJDNKYTMrODuW4N2/H8vZLFo 4zJRTfYblURZfNgfBZpmqHg170y+RApj5u5FHfF4s67FFiM9rW6ln4r7fnNtSw== 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 4ZLF9R0nZkz1661; Sun, 23 Mar 2025 11:59:55 +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 52NBxsQp044875; Sun, 23 Mar 2025 11:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NBxsMX044872; Sun, 23 Mar 2025 11:59:54 GMT (envelope-from git) Date: Sun, 23 Mar 2025 11:59:54 GMT Message-Id: <202503231159.52NBxsMX044872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e9a846468acf - main - ktrace: Use STAILQ_EMPTY_ATOMIC when checking for records in userret() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9a846468acfbba35ca40b888670559aaff7228d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a846468acfbba35ca40b888670559aaff7228d commit e9a846468acfbba35ca40b888670559aaff7228d Author: Mark Johnston AuthorDate: 2025-03-23 11:54:59 +0000 Commit: Mark Johnston CommitDate: 2025-03-23 11:54:59 +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 --- 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 9d06cd33d5d2..6608b9250da4 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -87,10 +87,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)