From nobody Tue Feb 08 16:16:17 2022 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 050BD19A53DD; Tue, 8 Feb 2022 16:16:18 +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 4JtSmx4zN4z3nxX; Tue, 8 Feb 2022 16:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644336977; 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=nD0e3ChS2RPTKoG9vW+JXBKtHvP8L8xZ65KCsaq6QHY=; b=dVy3d2JkSFZiOWnC9xtlLhfFgja0cPinF2DblD8LdXD3X8wMrQXAKlTtaGgrVx/IAvtpfF O7tiXzsffwviFdq3LEmlWX8rARjqvcOJnvzRiewZaDz89TwrSVn13eHK2kQBAMrAX7BiYC BYf4VkqMFGIdDTcR/7eG9ZF/1DCmtnyu+scn9NLUtW9o9QfqSnE82rosAjO7u8RyusB3+T Tje0kx7J47xmETpjeCOK8w5gdMId+2knLkqZdmIlF1PJ4z6x3eU8S590bFf4HuGtjt4Ax1 zJtvw6d8UV+s/2xLF0I92+C65+O6IZQh9gXtP3tYKacMuqg5Xuawn2pvM9zuYQ== 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 8A1911C4F5; Tue, 8 Feb 2022 16:16:17 +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 218GGHNh001897; Tue, 8 Feb 2022 16:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218GGHnL001896; Tue, 8 Feb 2022 16:16:17 GMT (envelope-from git) Date: Tue, 8 Feb 2022 16:16:17 GMT Message-Id: <202202081616.218GGHnL001896@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: cbc3c3f0d79f - stable/13 - dt_unring_buf: set dtbd_oldest to the start of the first record 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: cbc3c3f0d79fcd067111823996160fb7b6afce60 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644336977; 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=nD0e3ChS2RPTKoG9vW+JXBKtHvP8L8xZ65KCsaq6QHY=; b=eK3atIKDaa9ObWJMECcoLeYAdDQRCV91yBA70NtNEtCYwpyYwjNF6H0+Gm869beOjrVjjh Z73Pn8GkN8plD3UFZL2uu524+ntic42qdxNJ57KftS2JMj9N99M/ij9nmzK0cPR5Y6RrNT nMB02j23uh/9KgKC0o5ZCW9CAqh/XT3zeeRDUzwFiu7rTV7HRvRLsfN8+U5LKn26YGOQCS ZGgHEEHRbmzdKdKrHPj+zPp670ypwPOJE+5lQ7Dy895GUNOEUze6jQUFGUkcWwCQtO1TIx mbN395nAKxZVPM3hcwlQnZ+q9y5Bp+l8eYKoC+U8RP2Nz4Unzdbsr3L53wiHdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644336977; a=rsa-sha256; cv=none; b=v+mRx09EYrPrT9FssSyfkyqdPh08IKf2t327JW2+aJ/Lz1shWjwu5P/QqUw8eYnaQCEsn1 +tM9fDmYaWwIIbZWKvteuOTpCdIR3eHGipCNEMwWuJN1Z65A5J0Eb1Y/VTxoAytgds5flU RXL8J3P0bj2+3FWQoqi6A6CbXoAcxXFOkjTPblZ/IcAtwGL2W5r+7osC+KdcyArZQkiD1i I925ShGUsrB5wkGhEGVGinc+qPQ3+y/IQYTv2FT8GBdCxXNwkzuYopFTUnFC6l3fmgphgy 7tGPTBZrpa+rO/eExOUy7rJTCIrj/hrlKwmz1Hwgx1Zje9Yo4JKYWN/oiniTxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=cbc3c3f0d79fcd067111823996160fb7b6afce60 commit cbc3c3f0d79fcd067111823996160fb7b6afce60 Author: Andriy Gapon AuthorDate: 2022-01-11 13:44:04 +0000 Commit: Andriy Gapon CommitDate: 2022-02-08 16:15:59 +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 811c88bbf0ad..862d4b9222d7 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;