From nobody Sat Feb 17 19:22:39 2024 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 4Tcdww0JyKz53y3W; Sat, 17 Feb 2024 19:22:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tcdwv5zr5z4FvP; Sat, 17 Feb 2024 19:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197759; 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=pLxTNj7YOWC03MfZgg+k+ylYE+dkL1qLO6dqh6K+eek=; b=uTAulCXHQh98STru2Aul6adexshneBwPcLzizR0w1hMRbwTqteOFCa1tX7f/gvbvIbSddM D2L5W8UZpCSjjYBbHpZU/kqyMIdSyUXtMijn1wYTkS4atI4VdpmEldnwjWPUwufoPcjbbw u1ZWJQFZnPQ6meV9DDlIkX6XoTy5unfl6du0hkQ17oP3ehdvY3Xz3ne8wJmPBY7NdzAhBL mkewQD+LaylALaNScPWWet3nHl9NuNOGYBEfuAJuQIPx5tLTGGeDJle/7yLKK1I/dnEXKy uDL36KgurNs0uJQbBM7VaxjE4Q84EV2gSjI05jsnkIfNAVaGg7d54sK/x8wB9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197759; 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=pLxTNj7YOWC03MfZgg+k+ylYE+dkL1qLO6dqh6K+eek=; b=noM51fjI3UmUKuVks/ZyOD84qBEt17BxEzFvs+kpjcJuR3jff50/ykoF9uWnOoc5eNAUjc w8sR/vwzlxlI/DjmICSuOO6SyLH4al9XyAGkRHKffthv4X85SIfOA9uRwv6jYBTawUQP0/ uwaPZIFrSZ8Razzn2zm6gW7v27DuN/VY9kA03y25VdMn1m/6nAlmVh/nmVnVq8AdJGOUlA kro/xm0A960XAhmjECeZNvOjdynWhqcST1GNhYR9hS+aCZuN+MK+Z084FRYLEMthhk4/dg PdVZLH+jd6cqG/Gp1aWm/DcN/wsacogG6sJfC1CI+NVuP4l2GQJQ+ZiSCfDqNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197759; a=rsa-sha256; cv=none; b=pgVj4FkkalU3LHS667IHILga3QGKtImgHUQ9XDI/9SUjjAEKtVDjQFZvwUdxZ5MabAcRzv S7OVWEOjHM+AkcVK3rA7dOO9achh7bg/6wxwVzaiVVOahRZjqMVdp3dftHq0OJHtPqYHB0 OGHigsqcnE7bhsduSPpJH0UEYDcc2mLHijOkxxhm1i5V2rasL6jpRB05Gr/0osY8+wEga6 q7wza2xVuZUwNeplSpTzZbJqVVhxP7+FlRSqwpJl/c70svZJfun7NB6eHzj3HPE+c/NmAp 4CWnAqDU/xqXtwkI4LfxC7SJdDEHjBJKEG/Y8oLjNRW0zJcwLyucl7PU6J2xSQ== 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 4Tcdwv54wwzKgX; Sat, 17 Feb 2024 19:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HJMdaP000704; Sat, 17 Feb 2024 19:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMdSJ000701; Sat, 17 Feb 2024 19:22:39 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:39 GMT Message-Id: <202402171922.41HJMdSJ000701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: f0ed49921c28 - stable/13 - dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0ed49921c2891733b7ee65679a8dcba5398e3b6 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ed49921c2891733b7ee65679a8dcba5398e3b6 commit f0ed49921c2891733b7ee65679a8dcba5398e3b6 Author: Andriy Gapon AuthorDate: 2021-12-24 09:38:38 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag This should disable allocation of the second per-CPU principal buffer which is never used. This will also enable additional asserts for buffers that are never switched. (cherry picked from commit e92491d95ff3500e140eafa614e88ca84ffb0d26) --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 6ae0322ebb0f..17d9536b2428 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -12055,7 +12055,6 @@ dtrace_buffer_switch(dtrace_buffer_t *buf) hrtime_t now; ASSERT(!(buf->dtb_flags & DTRACEBUF_NOSWITCH)); - ASSERT(!(buf->dtb_flags & DTRACEBUF_RING)); cookie = dtrace_interrupt_disable(); now = dtrace_gethrtime(); @@ -14863,10 +14862,10 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) if (which == DTRACEOPT_BUFSIZE) { if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_RING) - flags |= DTRACEBUF_RING; + flags |= DTRACEBUF_RING | DTRACEBUF_NOSWITCH; if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_FILL) - flags |= DTRACEBUF_FILL; + flags |= DTRACEBUF_FILL | DTRACEBUF_NOSWITCH; if (state != dtrace_anon.dta_state || state->dts_activity != DTRACE_ACTIVITY_ACTIVE)