Commit 97ec9715 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-kunit-6.9-rc1' of... 

Merge tag 'linux_kselftest-kunit-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull KUnit updates from Shuah Khan:

 - fix to make kunit_bus_type const

 - kunit tool change to Print UML command

 - DRM device creation helpers are now using the new kunit device
   creation helpers. This change resulted in DRM helpers switching from
   using a platform_device, to a dedicated bus and device type used by
   kunit. kunit devices don't set DMA mask and this caused regression on
   some drm tests as they can't allocate DMA buffers. Fix this problem
   by setting DMA masks on the kunit device during initialization.

 - KUnit has several macros which accept a log message, which can
   contain printf format specifiers. Some of these (the explicit log
   macros) already use the __printf() gcc attribute to ensure the format
   specifiers are valid, but those which could fail the test, and hence
   used __kunit_do_failed_assertion() behind the scenes, did not.

   These include: KUNIT_EXPECT_*_MSG(), KUNIT_ASSERT_*_MSG(), and
   KUNIT_FAIL()

   A nine-patch series adds the __printf() attribute, and fixes all of
   the issues uncovered.

* tag 'linux_kselftest-kunit-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kunit: Annotate _MSG assertion variants with gnu printf specifiers
  drm: tests: Fix invalid printf format specifiers in KUnit tests
  drm/xe/tests: Fix printf format specifiers in xe_migrate test
  net: test: Fix printf format specifier in skb_segment kunit test
  rtc: test: Fix invalid format specifier.
  time: test: Fix incorrect format specifier
  lib: memcpy_kunit: Fix an invalid format specifier in an assertion msg
  lib/cmdline: Fix an invalid format specifier in an assertion msg
  kunit: test: Log the correct filter string in executor_test
  kunit: Setup DMA masks on the kunit device
  kunit: make kunit_bus_type const
  kunit: Mark filter* params as rw
  kunit: tool: Print UML command
parents d451b075 806cb227

drivers/gpu/drm/tests/drm_buddy_test.c

+7 −7
Original line number Diff line number Diff line
@@ -260,30 +260,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=%u\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=%u\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=%u\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=%u\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=%u\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
@@ -292,13 +292,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=%u\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=%u\n", 3 * ps);

			       "buddy_alloc hit an error size=%lu\n", 3 * ps);



	total = 0;

	list_for_each_entry(block, &allocated, link)

drivers/gpu/drm/tests/drm_mm_test.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/xe/tests/xe_migrate.c

+4 −4
Original line number Diff line number Diff line
@@ -114,21 +114,21 @@ static void test_copy(struct xe_migrate *m, struct xe_bo *bo, 
						   region |

						   XE_BO_NEEDS_CPU_ACCESS);

	if (IS_ERR(remote)) {

		KUNIT_FAIL(test, "Failed to allocate remote bo for %s: %li\n",

			   str, PTR_ERR(remote));

		KUNIT_FAIL(test, "Failed to allocate remote bo for %s: %pe\n",

			   str, remote);

		return;

	}



	err = xe_bo_validate(remote, NULL, false);

	if (err) {

		KUNIT_FAIL(test, "Failed to validate system bo for %s: %li\n",

		KUNIT_FAIL(test, "Failed to validate system bo for %s: %i\n",

			   str, err);

		goto out_unlock;

	}



	err = xe_bo_vmap(remote);

	if (err) {

		KUNIT_FAIL(test, "Failed to vmap system bo for %s: %li\n",

		KUNIT_FAIL(test, "Failed to vmap system bo for %s: %i\n",

			   str, err);

		goto out_unlock;

	}

drivers/rtc/lib_test.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void rtc_time64_to_tm_test_date_range(struct kunit *test) 


		days = div_s64(secs, 86400);



		#define FAIL_MSG "%d/%02d/%02d (%2d) : %ld", \

		#define FAIL_MSG "%d/%02d/%02d (%2d) : %lld", \

			year, month, mday, yday, days



		KUNIT_ASSERT_EQ_MSG(test, year - 1900, result.tm_year, FAIL_MSG);

include/kunit/test.h

+6 −6
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt, 


void __noreturn __kunit_abort(struct kunit *test);



void __kunit_do_failed_assertion(struct kunit *test,

void __printf(6, 7) __kunit_do_failed_assertion(struct kunit *test,

						const struct kunit_loc *loc,

						enum kunit_assert_type type,

						const struct kunit_assert *assert,