From nobody Fri May 27 13:20:47 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 67DF31B49F1B; Fri, 27 May 2022 13:20:47 +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 4L8lmb2Wjcz3DZx; Fri, 27 May 2022 13:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653657647; 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=zajAUcotNTgg8kkUzDPXLUnf8QnxcoQZVxjODiIZQog=; b=M7SQJZKTwFB+eDM+g2zFntWCjPCsYu/RCY7FGAw3/2FOiKgrybqRcIOvmzCON+05LdHRaj xlriUe+uhLQvrIMh4yNW0Yk1t3p+fD0M17p1E/MuDESvJodmTWrGVcKe54+g9m/nz7aSU4 eU4Ir/kSNMrBe3BtCfomuY/S1WMc5EesaX8iHhjdRViuDPb0ggZJvncOSWJbliwnLMIH3k 9OPdbojVNKlZb4heo/uw6I41xTW6ZWqxNnOHkO1Utcj6eX9Rj1gYTDnO4stz7+koBIm9U+ ZthylzMs2x+osxdKYoCHQNeUivqM/PbBUmS9m2j6MQ8khmkcGG66w2ommRt9jQ== 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 36CE9229E8; Fri, 27 May 2022 13:20:47 +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 24RDKlvh048260; Fri, 27 May 2022 13:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24RDKlxU048259; Fri, 27 May 2022 13:20:47 GMT (envelope-from git) Date: Fri, 27 May 2022 13:20:47 GMT Message-Id: <202205271320.24RDKlxU048259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a3113db1024d - stable/13 - bitstring_test: Add regression tests for bit_ff(c|s)_area_at() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a3113db1024d159157fc2e4f0aa31fd4f96b2db1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653657647; 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=zajAUcotNTgg8kkUzDPXLUnf8QnxcoQZVxjODiIZQog=; b=SVII7mCKWWP2zbMybiLFuU1xDaJAr/SKlknfhC4c+OR8beX0FD+J11pgb6U1BSrT4c4M/K QYB2KhkO9hR7BFMNAKgZePGpB5+TtozIrfqtmTuU0WNZ7VbmHMS0xWU/AcHfezx5B5BLOE rG8DT9zWKGRIy3fCCSX18ozTtFnkhqyMLUvWdt4oV6jZJAWowcU5cjup/SJTJp4ZLXiaUS L9qHjaWVIr0uyTVV48UtdFJpD5UVcQ0w33W42cEPc5UHZ88uPxSSQfm+9BW+l7Ha7ulWVW uupze/S3dfRoNi5jPkysd4Y+M8sXjHcoigq6BnS/b/9DbfJdE4WILUR0ENwBpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653657647; a=rsa-sha256; cv=none; b=f1ljFgY1+I9yu2n+hdVUorpDFG5oWIamHru7qsIiWTGzcrekhvpBFQ8W51Raecp2jcA7Gn +ieu2Ut9lEaS8hXZ9ZALLhRwdsrCgrL5vL9EG7G9JIY46xlVqWxOtnQ0ZxSa2FXIWW6nqH GwvnQL5taAuKxDZnAiLwNfOWjS3wr0BhZlO5TeNkpHVhtHqLfOtjKE9ZWbLDmVJiMAidJr EL6B7XJKl8pgNY33LL2SDyHzQBwThrSfPkrZRlETxAn7bAfiiu2g+5oOogKYv6SMXwtWpp wPajFob25hkPK1nhcMXapAFs4nOLFwbToRdjKiFHaSy+9jOfDCvyWdDWJofciQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a3113db1024d159157fc2e4f0aa31fd4f96b2db1 commit a3113db1024d159157fc2e4f0aa31fd4f96b2db1 Author: Mark Johnston AuthorDate: 2022-05-20 14:18:10 +0000 Commit: Mark Johnston CommitDate: 2022-05-27 13:14:47 +0000 bitstring_test: Add regression tests for bit_ff(c|s)_area_at() Validate the cases where a match can be found immediately and where no match can be found. This extends the existing test cases and is enough to catch the bug fixed in commit 6e7a585348d5 ("bitstring: fix ff_area() when start!=0"). Reviewed by: dougm Sponsored by: The FreeBSD Foundation (cherry picked from commit 670be460e4089038aadb47917bd71fe07d2cac21) --- tests/sys/sys/bitstring_test.c | 73 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 13 deletions(-) diff --git a/tests/sys/sys/bitstring_test.c b/tests/sys/sys/bitstring_test.c index c891a98645f8..f8a6c5e503f7 100644 --- a/tests/sys/sys/bitstring_test.c +++ b/tests/sys/sys/bitstring_test.c @@ -29,6 +29,7 @@ * * $FreeBSD$ */ + #include #include @@ -321,26 +322,72 @@ BITSTRING_TC_DEFINE(bit_ffc_at) nbits, memloc, nbits + 3, found_clear_bit); } -BITSTRING_TC_DEFINE(bit_ffc_area_no_match) +BITSTRING_TC_DEFINE(bit_ffc_area_at_all_or_nothing) /* bitstr_t *bitstr, int nbits, const char *memloc */ { - int found_clear_bits; + int found; - memset(bitstr, 0xFF, bitstr_size(nbits)); - bit_ffc_area(bitstr, nbits, 2, &found_clear_bits); - ATF_REQUIRE_EQ_MSG(-1, found_clear_bits, - "bit_ffc_area_%d_%s: Failed all set bits.", nbits, memloc); + memset(bitstr, 0, bitstr_size(nbits)); + if (nbits % _BITSTR_BITS != 0) + bit_nset(bitstr, nbits, roundup2(nbits, _BITSTR_BITS) - 1); + + for (int start = 0; start < nbits; start++) { + for (int size = 1; size < nbits - start; size++) { + bit_ffc_area_at(bitstr, start, nbits, size, &found); + ATF_REQUIRE_EQ_MSG(start, found, + "bit_ffc_area_at_%d_%s: " + "Did not find %d clear bits at %d", + nbits, memloc, size, start); + } + } + + memset(bitstr, 0xff, bitstr_size(nbits)); + if (nbits % _BITSTR_BITS != 0) + bit_nclear(bitstr, nbits, roundup2(nbits, _BITSTR_BITS) - 1); + + for (int start = 0; start < nbits; start++) { + for (int size = 1; size < nbits - start; size++) { + bit_ffc_area_at(bitstr, start, nbits, size, &found); + ATF_REQUIRE_EQ_MSG(-1, found, + "bit_ffc_area_at_%d_%s: " + "Found %d clear bits at %d", + nbits, memloc, size, start); + } + } } -BITSTRING_TC_DEFINE(bit_ffs_area_no_match) +BITSTRING_TC_DEFINE(bit_ffs_area_at_all_or_nothing) /* bitstr_t *bitstr, int nbits, const char *memloc */ { - int found_clear_bits; + int found; memset(bitstr, 0, bitstr_size(nbits)); - bit_ffs_area(bitstr, nbits, 2, &found_clear_bits); - ATF_REQUIRE_EQ_MSG(-1, found_clear_bits, - "bit_ffs_area_%d_%s: Failed all clear bits.", nbits, memloc); + if (nbits % _BITSTR_BITS != 0) + bit_nset(bitstr, nbits, roundup2(nbits, _BITSTR_BITS) - 1); + + for (int start = 0; start < nbits; start++) { + for (int size = 1; size < nbits - start; size++) { + bit_ffs_area_at(bitstr, start, nbits, size, &found); + ATF_REQUIRE_EQ_MSG(-1, found, + "bit_ffs_area_at_%d_%s: " + "Found %d set bits at %d", + nbits, memloc, size, start); + } + } + + memset(bitstr, 0xff, bitstr_size(nbits)); + if (nbits % _BITSTR_BITS != 0) + bit_nclear(bitstr, nbits, roundup2(nbits, _BITSTR_BITS) - 1); + + for (int start = 0; start < nbits; start++) { + for (int size = 1; size < nbits - start; size++) { + bit_ffs_area_at(bitstr, start, nbits, size, &found); + ATF_REQUIRE_EQ_MSG(start, found, + "bit_ffs_area_at_%d_%s: " + "Did not find %d set bits at %d", + nbits, memloc, size, start); + } + } } ATF_TC_WITHOUT_HEAD(bit_ffs_area); @@ -820,8 +867,8 @@ ATF_TP_ADD_TCS(tp) BITSTRING_TC_ADD(tp, bit_nclear); BITSTRING_TC_ADD(tp, bit_nset); BITSTRING_TC_ADD(tp, bit_count); - BITSTRING_TC_ADD(tp, bit_ffs_area_no_match); - BITSTRING_TC_ADD(tp, bit_ffc_area_no_match); + BITSTRING_TC_ADD(tp, bit_ffs_area_at_all_or_nothing); + BITSTRING_TC_ADD(tp, bit_ffc_area_at_all_or_nothing); BITSTRING_TC_ADD(tp, bit_foreach); BITSTRING_TC_ADD(tp, bit_foreach_at); BITSTRING_TC_ADD(tp, bit_foreach_unset);