From nobody Sun Apr 21 12:28:34 2024 X-Original-To: dev-commits-src-branches@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 4VMnjZ3VH0z5J7TN; Sun, 21 Apr 2024 12:28:34 +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 4VMnjZ2rPnz57Cf; Sun, 21 Apr 2024 12:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713702514; 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=60TQcc5BqTm7PUW/AstyKkidBc5s4mjxETv1OdRIz6Q=; b=O8L3h2u0ImEOVdyk36rGOIM6XCSz9lpMAPXLbfL6v8j+a1NGt6H4SbYKI0e/tpMchOpBst i2QxInAVplrCOiKz6BWhzh5mLJsKD0Q7fE5DWMi1X1nbCIHkMhTEiND4L/bSLgWSOcOPUA sdVyFAOB1bhvIhwJNwoCbWMQdJkFixf6o35X0Leb7cuYbAXwhlpwLPqPITGl82vxblU4st eHuVaD7N9XA0GeEoAxQ90qFKSogsnGso8FPKYjRssRJc6aOfOUUfVAt5TvO5qA+9kLKSRh qmKX6DgOqupes/keBOmtc2ehyR4q3J2EQkneQOUfF4+O263cQWA7ld0G6F4m6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713702514; a=rsa-sha256; cv=none; b=QRSa55W+KLMCCyiW82N1xHMIUEEAoH7qHYiFFlEP2T1Rn/XBipD08JP1ftuQCk+yuzWKXj tdnLOjNY4JaVekWjgEh19M0klScQ0ULlZdDEbNwA/uYKabVllbQ+9xjGbszDU5Ffm+pKKs eYOmSUw7LCWoCRU5XQbSr9eqGWWXmTrs17SsVEjzybA6fJe8qwC4g1ULGzqoJPvAxupEL8 ve/yviUwtx06Oma9tdllc6r5a2xHPsA/xecKLq64e+YIjPVNOZ3Gie0D+eZBeztVfoYoTL gz8a2kH7RzkUbxtYfw/pQ9bJUvBjUNM5xe0D3yft1ST7MDn5YUAm7e0IGYIh8A== 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=1713702514; 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=60TQcc5BqTm7PUW/AstyKkidBc5s4mjxETv1OdRIz6Q=; b=yr9VEjdkuHD9ZQ4XxE0NKLCsrg8tL3CwxgM/gf5/rwAn5Pkqk89V2WLeEjU9A5NuVM4WR4 o8qzXcBDnVpcrE2zqONAn9KeQxfxeK8Ov/b67L/KajzJaOZIp4rASVvnVqTOBYLaoFftMl I6ukvfx78IkwQXw6bISylKLRwUUjPHaDWFRKpRPSj0GRrUB3PGsFARDmvsbnQSQwPTch+Q 8Khy8JmQScTc/OW4kyA9n24N+CfWMm5ZhfHbKtKtqGJaU+vBL7dt546H1OJQwLEJMa/6gF ZCx+5D9XAXHAmq+1zpia8lMgXx7d8iG+xBkbgTRUC4kbLlF9Qf6jt3xPTlpzRA== 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 4VMnjZ2RxXz1KM7; Sun, 21 Apr 2024 12:28:34 +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 43LCSY40050127; Sun, 21 Apr 2024 12:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LCSY9U050124; Sun, 21 Apr 2024 12:28:34 GMT (envelope-from git) Date: Sun, 21 Apr 2024 12:28:34 GMT Message-Id: <202404211228.43LCSY9U050124@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: 73c9d514236e - stable/14 - Revert "dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 73c9d514236e1d6f82f08204a3c9afbddd6929e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=73c9d514236e1d6f82f08204a3c9afbddd6929e2 commit 73c9d514236e1d6f82f08204a3c9afbddd6929e2 Author: Andriy Gapon AuthorDate: 2024-04-21 10:07:36 +0000 Commit: Andriy Gapon CommitDate: 2024-04-21 12:27:11 +0000 Revert "dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag" This reverts commit e92491d95ff3500e140eafa614e88ca84ffb0d26. It was cherry-picked as fb9c50f983ff6bdd6f33a22ae7d5b391435dd02a. The general idea looked good to me. In particular, it allowed to save some memory and avoid memory allocation failures when a large buffer size was requested along with ring and fill policies. But I didn't take into account that the second, supposedly unused buffer, was actually used as the scratch buffer. The scratch buffer is used as a temporary space for DTrace subroutines like copyin, copyinstr, and alloca. I think that the change can be fixed by allocating a separate smaller buffer for the scratch buffer, but that fix would require more work than I am able to do now. Hence the revert. Reported by: Domagoj Stolfa Diagnosed by: Domagoj Stolfa, markj (cherry picked from commit b9827c007a7a39c7aeef73f8efc217b7b0099464) --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 83c0648b23b1..ce02676e0dc1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -12058,6 +12058,7 @@ 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(); @@ -14865,10 +14866,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 | DTRACEBUF_NOSWITCH; + flags |= DTRACEBUF_RING; if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_FILL) - flags |= DTRACEBUF_FILL | DTRACEBUF_NOSWITCH; + flags |= DTRACEBUF_FILL; if (state != dtrace_anon.dta_state || state->dts_activity != DTRACE_ACTIVITY_ACTIVE)