From nobody Sat Feb 17 15:12:29 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 4TcXNF6wlLz5BFPG; Sat, 17 Feb 2024 15:12:29 +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 4TcXNF3Vn5z4YRd; Sat, 17 Feb 2024 15:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182749; 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=p/KOY4Qkiok19C2UadZTr7vjePAmjyNleDUKUQuaDZA=; b=ErYSsYzcp1mQhxK8hC+K0Y5VhKR6RHPBDhPAlxVb8gBy8F3u3Aja/pptA1fwv5DaPGHy6J KklptBJijOSwZNeDs8n+Cn4zPMTX092589PtcpzZTkQUFHpZAZ8Lchxf4z0r31lFE9tP+J pD1qxWD8u30yEjGq+uzFAuXYCIE13LkzsPz2BurDerAfEikxm7suJ4RTfL0L4HA50dl/y1 VKWUiZBroSICN+8tQ0abZYO+VTwzNw1Dx5uCI2vvOx8s0oc4hcEsZEL0Bp7l66n3BoAjft qvd2wAdwOd0b3lYRDilPnWYIQFZF1rR04+hqvB+bFpw3NQXNElv4liFki344Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708182749; 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=p/KOY4Qkiok19C2UadZTr7vjePAmjyNleDUKUQuaDZA=; b=yqXx4WSkpYb3I6PqpitBb2ZS5R58hwPs5ixwvmbv8Ds/b2WrnBZx3Sxi/7tRdNRDCynY+7 qfgSSRGyg2yMMVdWxagqBYFOjvt+jutUf2sB2DjtJ981sd+qbcb8B1v1Q+mvW6ntCABAwQ FlvWE1xwZLTWGQTInzY+0l7Fnk9YYLvE4GCkb7+NwrRRWZe/CTEnslOQqAWuwjCwaEEsXj 3TOxA75sJRoAGlM8G9pC4YxOOxB6U34zj4aG4KIfbeB5Dyzs6o9thscfS+wDt+jsPaftu/ KFCjLCiyc9K2S+B1h7KFA2bIBdftfhsunIkAtCS5K1LXu5G7Ge9ctVef6PMsZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708182749; a=rsa-sha256; cv=none; b=em8cr0tzQPcSR4lzguVRJ1a77GG+FlDDLBMsK8KLyX530BHfiGveQhn6Qn2FYUalmYP8uL yoWEYRBgY7m1Yun0Y0wsZWb6JVCaOvdNd6C5Mgo8GlUHvfEdX01QWvnby2qBxlVG78x4UY DvGbPspr9zVIOtPYHnThQHMXdIyzBINiH0FRtFZtq4FOJN8UEBK1HusYyHH3RvBDq0ICkJ lZd4a9SN1fv5dkkoXnG4xq5o+e+BKwqEHaarCQ2TvUaxr3fougdXwuy7S9TVuoWc3cb56/ /l7dNoftPwEsw3CMdzGh4eoQi8wcNbwPOxv+WDQQe3Zq+MmBd7V01rl6/zdcuQ== 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 4TcXNF2c3Gz1BkF; Sat, 17 Feb 2024 15:12:29 +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 41HFCTdq080807; Sat, 17 Feb 2024 15:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFCT15080804; Sat, 17 Feb 2024 15:12:29 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:12:29 GMT Message-Id: <202402171512.41HFCT15080804@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: fb9c50f983ff - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: fb9c50f983ff6bdd6f33a22ae7d5b391435dd02a Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=fb9c50f983ff6bdd6f33a22ae7d5b391435dd02a commit fb9c50f983ff6bdd6f33a22ae7d5b391435dd02a Author: Andriy Gapon AuthorDate: 2021-12-24 09:38:38 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 14:18:04 +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 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)