From nobody Sun Jan 28 13:15:41 2024 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 4TNBkk1gnjz58Yrj; Sun, 28 Jan 2024 13:15:42 +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 4TNBkk12q1z4ytC; Sun, 28 Jan 2024 13:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447742; 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=oc54fdl++sb1F1l5d/8ZfFj0L+ESTo66thaH1+T5LNs=; b=ltG5lz80vtltnqsUC9O58sdlgkvsESStuPDWV1q1DFYYKbJ/2QK50MomG9xtPv81bY0LWi GL1VthJ00kBqznxKBw0iyEzJFTMgOn7cg+58nhae925+6zGqSoqyx5OK33mROHUj7YA+Ug QZ9soCe7SciXJ4mTvszgwKJm2ncTB/UtPtyncWZw/Au/Ug2Vpci1t2sJPApEbcWEFf0fq+ 654nGWJdoVE/7vM5LwGS0Hqx/8g26zHcdXrLzX/Xr6sANeRCn5cYZRdpDQm/b8BgGOou57 qs3JFWjKg1vYDTilBH3K+GWci3viBFp8iR/pvN2i9gRblwP+FRMHRPFmWefJ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706447742; 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=oc54fdl++sb1F1l5d/8ZfFj0L+ESTo66thaH1+T5LNs=; b=T5ROuBVm+vC7FCvch/NGimt+OeTv93gS82RJ5iiWbM9m+ocJGXPTAM3Sj02Dd9WjBTzd29 fxt/OXY1bGrYmyUvyJ7RqB2U2Qyxn5+GHZUivTd3mMO+QkxsxcquUrcu+KLwO2vWVWGYwj qrNHvONUQaowed84ebnlF+eme9YshI+zD+JgW5Z4wdvxjPmanFqlGliArbPzWU2HkSVh8V 37ZYym/mDJSaCGwRlEUv6GC9/TonEZUSzfixWWPVtZHXGsf44aj1bmZrHx1dZyS2QC1iuR UrPc1J1U5Xz7/suHErjLPvFsKLRy7GGXuro0b24RdtLG44FhdLbUAsLRgj0HZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706447742; a=rsa-sha256; cv=none; b=sqzBlFyG56pRdJnWceqon2Kz3B/GBpED7OYu3sztGhNUm7Y7kSKhM7XXLA2vQB40fotHRR sdz5T5Ua7h/7tawQiVbeBbCz76EWRGOorm9Dtnak9faWWKmjh8yYjAkBEmb9xxMq9oUZ/q 7RnQMQb10Z18Q5cmsXwc5FxAlDt0n5k81o8YOxsCODUS2absW4ZJQLRdkW+TkxNAXdl/zU d87dA9+C38KK22CVlxZd9vI+Pys2ywTaYQjr46F9PJu1L0dNwdZtgQcKW0vTLIAnf9/ifg zDSRcbr2ZxBDv/JO2fSE4QCK16EvetYzhSdv3AYIhcUnN8yAecDoxabzhsZpHg== 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 4TNBkk05lHz18TS; Sun, 28 Jan 2024 13:15:42 +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 40SDFf97040154; Sun, 28 Jan 2024 13:15:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SDFfC8040151; Sun, 28 Jan 2024 13:15:41 GMT (envelope-from git) Date: Sun, 28 Jan 2024 13:15:41 GMT Message-Id: <202401281315.40SDFfC8040151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: e92491d95ff3 - main - dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e92491d95ff3500e140eafa614e88ca84ffb0d26 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=e92491d95ff3500e140eafa614e88ca84ffb0d26 commit e92491d95ff3500e140eafa614e88ca84ffb0d26 Author: Andriy Gapon AuthorDate: 2021-12-24 09:38:38 +0000 Commit: Andriy Gapon CommitDate: 2024-01-28 13:15:17 +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. --- 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 ce02676e0dc1..83c0648b23b1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -12058,7 +12058,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(); @@ -14866,10 +14865,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)