iommufd/selftest: Fix _test_mock_dirty_bitmaps()

The ASSERT_EQ() macro sneakily expands to two statements, so the loop here
needs braces to ensure it captures both and actually terminates the test
upon failure. Where these tests are currently failing on my arm64 machine,
this reduces the number of logged lines from a rather unreasonable
~197,000 down to 10. While we're at it, we can also clean up the
tautologous "count" calculations whose assertions can never fail unless
mathematics and/or the C language become fundamentally broken.

Fixes: a9af47e382a4 ("iommufd/selftest: Test IOMMU_HWPT_GET_DIRTY_BITMAP")
Link: https://lore.kernel.org/r/90e083045243ef407dd592bb1deec89cd1f4ddf2.1700153535.git.robin.murphy@arm.com
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
Tested-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h
index 050e9751321cff1015474c3023df28c2194d5a52..ad9202335656cc82e8475cf74aba72b6adf7e2b0 100644 (file)
--- a/tools/testing/selftests/iommu/iommufd_utils.h
+++ b/tools/testing/selftests/iommu/iommufd_utils.h
@@ -293,15 +293,13 @@ static int _test_mock_dirty_bitmaps(int fd, __u32 hwpt_id, size_t length,
                                    __u64 bitmap_size, __u32 flags,
                                    struct __test_metadata *_metadata)
 {
-       unsigned long i, count, nbits = bitmap_size * BITS_PER_BYTE;
+       unsigned long i, nbits = bitmap_size * BITS_PER_BYTE;
        unsigned long nr = nbits / 2;
        __u64 out_dirty = 0;
 
        /* Mark all even bits as dirty in the mock domain */
-       for (count = 0, i = 0; i < nbits; count += !(i % 2), i++)
-               if (!(i % 2))
-                       set_bit(i, (unsigned long *)bitmap);
-       ASSERT_EQ(nr, count);
+       for (i = 0; i < nbits; i += 2)
+               set_bit(i, (unsigned long *)bitmap);
 
        test_cmd_mock_domain_set_dirty(fd, hwpt_id, length, iova, page_size,
                                       bitmap, &out_dirty);
@@ -311,9 +309,10 @@ static int _test_mock_dirty_bitmaps(int fd, __u32 hwpt_id, size_t length,
        memset(bitmap, 0, bitmap_size);
        test_cmd_get_dirty_bitmap(fd, hwpt_id, length, iova, page_size, bitmap,
                                  flags);
-       for (count = 0, i = 0; i < nbits; count += !(i % 2), i++)
+       /* Beware ASSERT_EQ() is two statements -- braces are not redundant! */
+       for (i = 0; i < nbits; i++) {
                ASSERT_EQ(!(i % 2), test_bit(i, (unsigned long *)bitmap));
-       ASSERT_EQ(count, out_dirty);
+       }
 
        memset(bitmap, 0, bitmap_size);
        test_cmd_get_dirty_bitmap(fd, hwpt_id, length, iova, page_size, bitmap,