From nobody Tue Feb 08 16:16:48 2022 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 7FFD519A5AB2; Tue, 8 Feb 2022 16:16:49 +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 4JtSnY14Z0z3pX6; Tue, 8 Feb 2022 16:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644337009; 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=NdpGvcjE4R8qZhCx/QbSF2LaB2qoWAqXeJXwsrizHa0=; b=OE8J+LU+gt+qI0rZKj5HAO8/K6s+Hy7jqlE/LQAIcslF8auAXZiQHQXUgRD1AAB0LCPuqV x7A0Ft8xA9qU3horiiSCXaBr4h1yT9fFYVe4UlhrcffBdkmln0bXFhL9jE/oQdxYZ2Kdms W1EYO5v85wgjCtSFpnXki/+vpQaJiv8Nj2lQrtVWIJWX3dJlanjgpiwugFfxnU1E3ea8xn rRhCK4f2vuup/C4faDx7oUmX7R7LwMKlsvHm+AbPpHBGiXPjjMCCdhnFtwdHT7KXw8PVH9 IHmUN/DSLKEeMqKoujV4Yf9DN/LBc1H6eSuWpce397hmgJzkwtI1Hk4xtL+Pyw== 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 F41A21C829; Tue, 8 Feb 2022 16:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 218GGmc3002086; Tue, 8 Feb 2022 16:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218GGmVF002085; Tue, 8 Feb 2022 16:16:48 GMT (envelope-from git) Date: Tue, 8 Feb 2022 16:16:48 GMT Message-Id: <202202081616.218GGmVF002085@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: 36dbd166887d - stable/12 - dt_unring_buf: set dtbd_oldest to the start of the first record 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 36dbd166887dd498a2707130a1f6c90583d36fc6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644337009; 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=NdpGvcjE4R8qZhCx/QbSF2LaB2qoWAqXeJXwsrizHa0=; b=acRilR8JLpf7ZdWEnQcCqYz9TKxBQyg9JTPjJMIlmFgKL5NOcpi2z9N7DrLP9UG/N8DY7y RhzoHsK2/a71S+JkhUbaacwUEVxgM3RZfuy5jWctYNCBZ1QzyaMEanA+aBIDLFQP8FNzOM 2zE+dxnwcRQy/JGUWi9vrjegWjwnnbi3xHitaCBng0zqVka08uNnqXgW2dUbksgeByP9d2 m51kJMlubkHLdG53JMM9dy6mwqYvwj7D3FQVw2Q+i1+Av2TS75ICKYdtG6h8DeDXYGlJvm 2YYQIA+emmfTKd2YjekznR4wmtKJLhiq0bPIA4OBa8qpIuRbhHQWLItSR7ZROw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644337009; a=rsa-sha256; cv=none; b=wA/p7QRLfe3CK0LqYwjRCpKDsC0Nn3/CUqNUvHF6ONbYZMEwEtqlcXc+EPVGtUu1+oCvJD 9AqkJsZvL7OJaeukS8/Ru9uzKJozVRWGdAPtIW7o8HPZ8cwDGU6ns/Xzl4LEK7+wEIeNtm g7KvL79p09Akj2bEOfuGdAg1I+NF2786rcNhgTJ1rpXDcdG/Ks2YIjNFjNZedQmbzqo/Oj evkpFohRPclYpLUEX0PgLjta3evgCP7GFhrGeCZgYkzvoJxEr24IHeSJKaBR2PbkyVg1YQ 8XavCJvjKCy3/WatKHjdLbLwaRVS6Kmn+9RimZtYlXbNPHn2hPjhbyUDvAYFCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=36dbd166887dd498a2707130a1f6c90583d36fc6 commit 36dbd166887dd498a2707130a1f6c90583d36fc6 Author: Andriy Gapon AuthorDate: 2022-01-11 13:44:04 +0000 Commit: Andriy Gapon CommitDate: 2022-02-08 16:16:36 +0000 dt_unring_buf: set dtbd_oldest to the start of the first record It was set to the start of the buffer and that can be different from the start of teh first record because of a misalignment. This change follows the example of dt_realloc_buf(). (cherry picked from commit 256c8c5df2a4bdd43afd9ec5a2f8be9374284e1e) --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c index 62c120388b18..79b22b27ff1b 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c @@ -2621,7 +2621,7 @@ dt_unring_buf(dtrace_hdl_t *dtp, dtrace_bufdesc_t *buf) bcopy(buf->dtbd_data, ndp, buf->dtbd_oldest); dt_free(dtp, buf->dtbd_data); - buf->dtbd_oldest = 0; + buf->dtbd_oldest = misalign; buf->dtbd_data = newdata; buf->dtbd_size += misalign;