Hi,
On Wed, Feb 21, 2024 at 05:27:20PM +0800, David Gow wrote:
> The drm_buddy_test's alloc_contiguous test used a u64 for the page size,
> which was then updated to be an 'unsigned long' to avoid 64-bit
> multiplication division helpers.
>
> However, the variable is logged by some KUNIT_ASSERT_EQ_MSG() using the
> '%d' or '%llu' format specifiers, the former of which is always wrong,
> and the latter is no longer correct now that ps is no longer a u64. Fix
> these to all use '%lu'.
>
> Also, drm_mm_test calls KUNIT_FAIL() with an empty string as the
> message. gcc warns if a printf format string is empty (apparently), so
clang does too; under -Wformat-zero-length
> give these some more detailed error messages, which should be more
> useful anyway.
>
> Fixes: a64056bb5a32 ("drm/tests/drm_buddy: add alloc_contiguous test")
> Fixes: fca7526b7d89 ("drm/tests/drm_buddy: fix build failure on 32-bit targets")
> Fixes: fc8d29e298cf ("drm: selftest: convert drm_mm selftest to KUnit")
> Signed-off-by: David Gow <davidgow@xxxxxxxxxx>
Reviewed-by: Justin Stitt <justinstitt@xxxxxxxxxx>
> ---
> drivers/gpu/drm/tests/drm_buddy_test.c | 14 +++++++-------
> drivers/gpu/drm/tests/drm_mm_test.c | 6 +++---
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/tests/drm_buddy_test.c b/drivers/gpu/drm/tests/drm_buddy_test.c
> index 8a464f7f4c61..3dbfa3078449 100644
> --- a/drivers/gpu/drm/tests/drm_buddy_test.c
> +++ b/drivers/gpu/drm/tests/drm_buddy_test.c
> @@ -55,30 +55,30 @@ static void drm_test_buddy_alloc_contiguous(struct kunit *test)
> KUNIT_ASSERT_FALSE_MSG(test,
> drm_buddy_alloc_blocks(&mm, 0, mm_size,
> ps, ps, list, 0),
> - "buddy_alloc hit an error size=%d\n",
> + "buddy_alloc hit an error size=%lu\n",
> ps);
> } while (++i < n_pages);
>
> KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, mm_size,
> 3 * ps, ps, &allocated,
> DRM_BUDDY_CONTIGUOUS_ALLOCATION),
> - "buddy_alloc didn't error size=%d\n", 3 * ps);
> + "buddy_alloc didn't error size=%lu\n", 3 * ps);
>
> drm_buddy_free_list(&mm, &middle);
> KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, mm_size,
> 3 * ps, ps, &allocated,
> DRM_BUDDY_CONTIGUOUS_ALLOCATION),
> - "buddy_alloc didn't error size=%llu\n", 3 * ps);
> + "buddy_alloc didn't error size=%lu\n", 3 * ps);
> KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, mm_size,
> 2 * ps, ps, &allocated,
> DRM_BUDDY_CONTIGUOUS_ALLOCATION),
> - "buddy_alloc didn't error size=%llu\n", 2 * ps);
> + "buddy_alloc didn't error size=%lu\n", 2 * ps);
>
> drm_buddy_free_list(&mm, &right);
> KUNIT_ASSERT_TRUE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, mm_size,
> 3 * ps, ps, &allocated,
> DRM_BUDDY_CONTIGUOUS_ALLOCATION),
> - "buddy_alloc didn't error size=%llu\n", 3 * ps);
> + "buddy_alloc didn't error size=%lu\n", 3 * ps);
> /*
> * At this point we should have enough contiguous space for 2 blocks,
> * however they are never buddies (since we freed middle and right) so
> @@ -87,13 +87,13 @@ static void drm_test_buddy_alloc_contiguous(struct kunit *test)
> KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, mm_size,
> 2 * ps, ps, &allocated,
> DRM_BUDDY_CONTIGUOUS_ALLOCATION),
> - "buddy_alloc hit an error size=%d\n", 2 * ps);
> + "buddy_alloc hit an error size=%lu\n", 2 * ps);
>
> drm_buddy_free_list(&mm, &left);
> KUNIT_ASSERT_FALSE_MSG(test, drm_buddy_alloc_blocks(&mm, 0, mm_size,
> 3 * ps, ps, &allocated,
> DRM_BUDDY_CONTIGUOUS_ALLOCATION),
> - "buddy_alloc hit an error size=%d\n", 3 * ps);
> + "buddy_alloc hit an error size=%lu\n", 3 * ps);
>
> total = 0;
> list_for_each_entry(block, &allocated, link)
> diff --git a/drivers/gpu/drm/tests/drm_mm_test.c b/drivers/gpu/drm/tests/drm_mm_test.c
> index 1eb0c304f960..f37c0d765865 100644
> --- a/drivers/gpu/drm/tests/drm_mm_test.c
> +++ b/drivers/gpu/drm/tests/drm_mm_test.c
> @@ -157,7 +157,7 @@ static void drm_test_mm_init(struct kunit *test)
>
> /* After creation, it should all be one massive hole */
> if (!assert_one_hole(test, &mm, 0, size)) {
> - KUNIT_FAIL(test, "");
> + KUNIT_FAIL(test, "mm not one hole on creation");
> goto out;
> }
>
> @@ -171,14 +171,14 @@ static void drm_test_mm_init(struct kunit *test)
>
> /* After filling the range entirely, there should be no holes */
> if (!assert_no_holes(test, &mm)) {
> - KUNIT_FAIL(test, "");
> + KUNIT_FAIL(test, "mm has holes when filled");
> goto out;
> }
>
> /* And then after emptying it again, the massive hole should be back */
> drm_mm_remove_node(&tmp);
> if (!assert_one_hole(test, &mm, 0, size)) {
> - KUNIT_FAIL(test, "");
> + KUNIT_FAIL(test, "mm does not have single hole after emptying");
> goto out;
> }
>
> --
> 2.44.0.rc0.258.g7320e95886-goog
>
Thanks
Justin
