From nobody Mon Jul 11 06:08:42 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 143E71D07CD0; Mon, 11 Jul 2022 06:08:43 +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 4LhD3G478yz43Jw; Mon, 11 Jul 2022 06:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657519722; 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=R3fNi1YcFpyy/l+O3M5+t8pHd6agnkKnk1SYreYeUK4=; b=vRynqVVUzHU39IMJNQQDJTelTvKqd5m2ACSttp2Qf41PyUlVxzZdRlrtSoev39x+CJOxzd 3adxbQfJVprB3wzOCDDmd98yaMA21ISUjg7e8DTT4PskSrZR+YatlvEBAlIlef9f1wgNdG DBRA3Cg/3yK0lQeHzSXSE2FwL0GPtGzd1Wk0OkFH2bBwzYi2Iyp9nJcSjmwWUZEzrfuXk4 QMqXcb9RMohtvl91JrH+o6xo0uQMc8CF0A7v0U0ErV9GPG5CKO0bDp19eowKaFAHxB7dRD veXHb2RrYdL1HRqbxrT4T5O+9K9D1D81j0QvLATmTzIJtWWIb3kWmz9K1VYmhA== 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 4LhD3G39Sgzt4b; Mon, 11 Jul 2022 06:08:42 +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 26B68g01077239; Mon, 11 Jul 2022 06:08:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26B68gZr077238; Mon, 11 Jul 2022 06:08:42 GMT (envelope-from git) Date: Mon, 11 Jul 2022 06:08:42 GMT Message-Id: <202207110608.26B68gZr077238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: bb75580e0370 - stable/13 - bitstring: fix ff_area() when start!=0 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb75580e0370469d32c77355af47b47e5d7e31fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657519722; 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=R3fNi1YcFpyy/l+O3M5+t8pHd6agnkKnk1SYreYeUK4=; b=kkmWAheth/4P4eQ6Zuc4tSYpPPYuf7j2k+8ogEp0PM+hM3hPZODCtDjCFRUzF+X3Au3gCW 9b0olbB1Ffjo6C4deyaeGayhlYy8OmfXkf/jnQT2jbk4mjIDdUQt7pWQcKJLK6e0s3fmqQ O+pKoGJpMnawuNZTwaGoDcVfeN+LqTK8JuWnSrE2OTWHxp0AyyxzdM2Rx9JBhQ9Ijc4goH nneJdteSDHPAcXUVPIR/qm06Mm10GCjePgvU7Q2h7T8nss7EoEoNQwqPYEI2SUXZUHMmjI u4SWvMErvPIHSpBxNHpHT1aOlUobajkVTjrC1C3QWFHoyBxHBp74U8s+s300ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657519722; a=rsa-sha256; cv=none; b=oni+Ta/U7tLnql0DKq+2DLBDVW2elblqE4/lLBHsIn4oWqyxt6TYu7u6KYmTIrdUQYpb+o MrnMenJEk2PGkmDGgy+wImaoo1G/mszLKLI3I1BdbINeRo7Yph0ZGwEAunq5ZuYF95dEVC 49kNi7/62phN+mJWfxNOkxQJUqIdKweOmAo6SrNe/gWswHe/htYN9r1+T7VcSNEsRVNioa eVFkxDuAn5XVV/PkFTuYYB/0/ThTRMu5GIe2fdsh15BIM+B6NWeDA3Ieu+m3RZ2MgpyklQ MFLIUo4lWIvKBrz0lKdRaZTnCYKJbqCffaEmaAy8I6M24linCzUWCPE16yQD5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=bb75580e0370469d32c77355af47b47e5d7e31fd commit bb75580e0370469d32c77355af47b47e5d7e31fd Author: Doug Moore AuthorDate: 2022-05-10 16:53:52 +0000 Commit: Doug Moore CommitDate: 2022-07-11 06:01:30 +0000 bitstring: fix ff_area() when start!=0 commit 84e2ae64c597000a0 introduced an error in the ff*_area_at functions for nonzero start parameters when the bit range sought was found immediately. It mistakenly replaced '_value = _start' with '_value = 0' in initialization. Undo that mistake. Reported by: markj Reviewed by: markj Tested by: markj Fixes: 84e2ae64c597 vm_reserv: use enhanced bitstring for popmaps Differential Revision: https://reviews.freebsd.org/D35157 (cherry picked from commit 6e7a585348d5b9b96d16c1d76a994236560203c1) --- sys/sys/bitstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/bitstring.h b/sys/sys/bitstring.h index e579f0dece13..3d239c531e47 100644 --- a/sys/sys/bitstring.h +++ b/sys/sys/bitstring.h @@ -305,7 +305,7 @@ bit_ff_area_at(bitstr_t *_bitstr, int _start, int _nbits, int _size, _mask = _match ? _BITSTR_MASK : 0; _maxshft = _bit_idx(_size - 1) == 0 ? _size : (int)_BITSTR_BITS; - _value = 0; + _value = _start; _curbitstr = _bitstr + _bit_idx(_start); _test = ~(_BITSTR_MASK << _bit_offset(_start)); for (_last = _size - 1, _test |= _mask ^ *_curbitstr;