On Thu, 29 Feb 2024 at 23:07, Shuah Khan <sk...@linuxfoundation.org> wrote: > > Hi Stephen, > > On 2/28/24 21:26, Stephen Rothwell wrote: > > Hi all, > > > > After merging the kunit-next tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > In file included from drivers/gpu/drm/tests/drm_buddy_test.c:7: > > drivers/gpu/drm/tests/drm_buddy_test.c: In function > > 'drm_test_buddy_alloc_range_bias': > > drivers/gpu/drm/tests/drm_buddy_test.c:191:40: error: format '%u' expects a > > matching 'unsigned int' argument [-Werror=format=] > > 191 | "buddy_alloc failed with > > bias(%x-%x), size=%u, ps=%u\n", > > | > > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > include/kunit/test.h:597:37: note: in definition of macro '_KUNIT_FAILED' > > 597 | fmt, > > \ > > | ^~~ > > include/kunit/test.h:662:9: note: in expansion of macro > > 'KUNIT_UNARY_ASSERTION' > > 662 | KUNIT_UNARY_ASSERTION(test, > > \ > > | ^~~~~~~~~~~~~~~~~~~~~ > > include/kunit/test.h:1233:9: note: in expansion of macro > > 'KUNIT_FALSE_MSG_ASSERTION' > > 1233 | KUNIT_FALSE_MSG_ASSERTION(test, > > \ > > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > drivers/gpu/drm/tests/drm_buddy_test.c:186:17: note: in expansion of macro > > 'KUNIT_ASSERT_FALSE_MSG' > > 186 | KUNIT_ASSERT_FALSE_MSG(test, > > | ^~~~~~~~~~~~~~~~~~~~~~ > > drivers/gpu/drm/tests/drm_buddy_test.c:191:91: note: format string is > > defined here > > 191 | "buddy_alloc failed with > > bias(%x-%x), size=%u, ps=%u\n", > > | > > ~^ > > | > > | > > | > > unsigned int > > cc1: all warnings being treated as errors > > > > Caused by commit > > > > 806cb2270237 ("kunit: Annotate _MSG assertion variants with gnu printf > > specifiers") > > > > Thank you. I did allmodconfig build on kselftest kunit branch to make > sure all is well, before I pushed the commits. > > > interacting with commit > > > > c70703320e55 ("drm/tests/drm_buddy: add alloc_range_bias test") > > > > from the drm-misc-fixes tree. > > > > I have applied the following patch for today (this should probably > > actually be fixed in the drm-misc-fixes tree). > > > > Danial, David, > > I can carry the fix through kselftest kunit if it works > for all.
I'm happy for this to go in with the KUnit changes if that's the best way to keep all of the printk formatting fixes together. -- David > > > From: Stephen Rothwell <s...@canb.auug.org.au> > > Date: Thu, 29 Feb 2024 15:18:36 +1100 > > Subject: [PATCH] fix up for "drm/tests/drm_buddy: add alloc_range_bias test" > > > > Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au> > > --- > > drivers/gpu/drm/tests/drm_buddy_test.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/tests/drm_buddy_test.c > > b/drivers/gpu/drm/tests/drm_buddy_test.c > > index 1e73e3f0d278..369edf587b44 100644 > > --- a/drivers/gpu/drm/tests/drm_buddy_test.c > > +++ b/drivers/gpu/drm/tests/drm_buddy_test.c > > @@ -188,7 +188,7 @@ static void drm_test_buddy_alloc_range_bias(struct > > kunit *test) > > bias_end, size, > > ps, > > &allocated, > > > > DRM_BUDDY_RANGE_ALLOCATION), > > - "buddy_alloc failed with bias(%x-%x), > > size=%u, ps=%u\n", > > + "buddy_alloc failed with bias(%x-%x), > > size=%u\n", > > bias_start, bias_end, size); > > bias_rem -= size; > > > > thanks, > -- Shuah
smime.p7s
Description: S/MIME Cryptographic Signature