1. Patchew
  2. linux
  3. View series

[PATCH] printf: add tests for generic FourCCs

Aditya Garg posted 1 patch 9 months, 1 week ago 
lib/tests/printf_kunit.c | 39 ++++++++++++++++++++++++++++++++-------
1 file changed, 32 insertions(+), 7 deletions(-)
[PATCH] printf: add tests for generic FourCCs
Posted by Aditya Garg 9 months, 1 week ago 
From: Aditya Garg <gargaditya08@live.com>

Format specifiers for printing generic 32-bit FourCCs were recently added
to vsprintf. They are going through the DRM tree alongwith the appletbdrm
driver. Since the printf tests are being converted to kunit, this separate
patch for the tests should make it easier to rebase when the merge window
opens.

Link: https://lore.kernel.org/dri-devel/79FA3F41-FD7A-41D9-852B-D32606AF5EB4@live.com/T/#u
Signed-off-by: Aditya Garg <gargaditya08@live.com>
---
 lib/tests/printf_kunit.c | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/lib/tests/printf_kunit.c b/lib/tests/printf_kunit.c
index 2c9f6170b..b1fa0dcea 100644
--- a/lib/tests/printf_kunit.c
+++ b/lib/tests/printf_kunit.c
@@ -701,21 +701,46 @@ static void fwnode_pointer(struct kunit *kunittest)
 	software_node_unregister_node_group(group);
 }
 
+struct fourcc_struct {
+	u32 code;
+	const char *str;
+};
+
+static void fourcc_pointer_test(struct kunit *kunittest, const struct fourcc_struct *fc,
+				size_t n, const char *fmt)
+{
+	size_t i;
+
+	for (i = 0; i < n; i++)
+		test(fc[i].str, fmt, &fc[i].code);
+}
+
 static void fourcc_pointer(struct kunit *kunittest)
 {
-	struct {
-		u32 code;
-		char *str;
-	} const try[] = {
+	static const struct fourcc_struct try_cc[] = {
 		{ 0x3231564e, "NV12 little-endian (0x3231564e)", },
 		{ 0xb231564e, "NV12 big-endian (0xb231564e)", },
 		{ 0x10111213, ".... little-endian (0x10111213)", },
 		{ 0x20303159, "Y10  little-endian (0x20303159)", },
 	};
-	unsigned int i;
+	static const struct fourcc_struct try_ch[] = {
+		{ 0x41424344, "ABCD (0x41424344)", },
+	};
+	static const struct fourcc_struct try_cn[] = {
+		{ 0x41424344, "DCBA (0x44434241)", },
+	};
+	static const struct fourcc_struct try_cl[] = {
+		{ (__force u32)cpu_to_le32(0x41424344), "ABCD (0x41424344)", },
+	};
+	static const struct fourcc_struct try_cb[] = {
+		{ (__force u32)cpu_to_be32(0x41424344), "ABCD (0x41424344)", },
+	};
 
-	for (i = 0; i < ARRAY_SIZE(try); i++)
-		test(try[i].str, "%p4cc", &try[i].code);
+	fourcc_pointer_test(kunittest, try_cc, ARRAY_SIZE(try_cc), "%p4cc");
+	fourcc_pointer_test(kunittest, try_ch, ARRAY_SIZE(try_ch), "%p4ch");
+	fourcc_pointer_test(kunittest, try_cn, ARRAY_SIZE(try_cn), "%p4cn");
+	fourcc_pointer_test(kunittest, try_cl, ARRAY_SIZE(try_cl), "%p4cl");
+	fourcc_pointer_test(kunittest, try_cb, ARRAY_SIZE(try_cb), "%p4cb");
 }
 
 static void
-- 
2.43.0
Re: [PATCH] printf: add tests for generic FourCCs
Posted by Kees Cook 8 months, 3 weeks ago 
On Fri, Mar 14, 2025 at 03:45:01AM +0000, Aditya Garg wrote:
> From: Aditya Garg <gargaditya08@live.com>
> 
> Format specifiers for printing generic 32-bit FourCCs were recently added
> to vsprintf. They are going through the DRM tree alongwith the appletbdrm
> driver. Since the printf tests are being converted to kunit, this separate
> patch for the tests should make it easier to rebase when the merge window
> opens.
> 
> Link: https://lore.kernel.org/dri-devel/79FA3F41-FD7A-41D9-852B-D32606AF5EB4@live.com/T/#u
> Signed-off-by: Aditya Garg <gargaditya08@live.com>
> ---
>  lib/tests/printf_kunit.c | 39 ++++++++++++++++++++++++++++++++-------

Linus has applied the kunit /lib move tree, so this patch can land via
regular trees now. Who should take it?

-- 
Kees Cook
Re: [PATCH] printf: add tests for generic FourCCs
Posted by Tamir Duberstein 9 months ago 
On Thu, Mar 13, 2025 at 11:45 PM Aditya Garg <gargaditya08@live.com> wrote:
>
> From: Aditya Garg <gargaditya08@live.com>
>
> Format specifiers for printing generic 32-bit FourCCs were recently added
> to vsprintf. They are going through the DRM tree alongwith the appletbdrm
> driver. Since the printf tests are being converted to kunit, this separate
> patch for the tests should make it easier to rebase when the merge window
> opens.
>
> Link: https://lore.kernel.org/dri-devel/79FA3F41-FD7A-41D9-852B-D32606AF5EB4@live.com/T/#u
> Signed-off-by: Aditya Garg <gargaditya08@live.com>
> ---
>  lib/tests/printf_kunit.c | 39 ++++++++++++++++++++++++++++++++-------
>  1 file changed, 32 insertions(+), 7 deletions(-)
>
> diff --git a/lib/tests/printf_kunit.c b/lib/tests/printf_kunit.c
> index 2c9f6170b..b1fa0dcea 100644
> --- a/lib/tests/printf_kunit.c
> +++ b/lib/tests/printf_kunit.c
> @@ -701,21 +701,46 @@ static void fwnode_pointer(struct kunit *kunittest)
>         software_node_unregister_node_group(group);
>  }
>
> +struct fourcc_struct {
> +       u32 code;
> +       const char *str;
> +};
> +
> +static void fourcc_pointer_test(struct kunit *kunittest, const struct fourcc_struct *fc,
> +                               size_t n, const char *fmt)
> +{
> +       size_t i;
> +
> +       for (i = 0; i < n; i++)
> +               test(fc[i].str, fmt, &fc[i].code);
> +}
> +
>  static void fourcc_pointer(struct kunit *kunittest)
>  {
> -       struct {
> -               u32 code;
> -               char *str;
> -       } const try[] = {
> +       static const struct fourcc_struct try_cc[] = {
>                 { 0x3231564e, "NV12 little-endian (0x3231564e)", },
>                 { 0xb231564e, "NV12 big-endian (0xb231564e)", },
>                 { 0x10111213, ".... little-endian (0x10111213)", },
>                 { 0x20303159, "Y10  little-endian (0x20303159)", },
>         };
> -       unsigned int i;
> +       static const struct fourcc_struct try_ch[] = {
> +               { 0x41424344, "ABCD (0x41424344)", },
> +       };
> +       static const struct fourcc_struct try_cn[] = {
> +               { 0x41424344, "DCBA (0x44434241)", },
> +       };
> +       static const struct fourcc_struct try_cl[] = {
> +               { (__force u32)cpu_to_le32(0x41424344), "ABCD (0x41424344)", },
> +       };
> +       static const struct fourcc_struct try_cb[] = {
> +               { (__force u32)cpu_to_be32(0x41424344), "ABCD (0x41424344)", },
> +       };
>
> -       for (i = 0; i < ARRAY_SIZE(try); i++)
> -               test(try[i].str, "%p4cc", &try[i].code);
> +       fourcc_pointer_test(kunittest, try_cc, ARRAY_SIZE(try_cc), "%p4cc");
> +       fourcc_pointer_test(kunittest, try_ch, ARRAY_SIZE(try_ch), "%p4ch");
> +       fourcc_pointer_test(kunittest, try_cn, ARRAY_SIZE(try_cn), "%p4cn");
> +       fourcc_pointer_test(kunittest, try_cl, ARRAY_SIZE(try_cl), "%p4cl");
> +       fourcc_pointer_test(kunittest, try_cb, ARRAY_SIZE(try_cb), "%p4cb");
>  }
>
>  static void
> --
> 2.43.0
>

This code looks fine to me. I would appreciate a preview of the output
of these tests when they fail; a lot of effort went into making the
printf tests produce actionable failure messages, and we should
continue to invest in that IMO.
Re: [PATCH] printf: add tests for generic FourCCs
Posted by Andy Shevchenko 9 months ago 
On Fri, Mar 14, 2025 at 03:45:01AM +0000, Aditya Garg wrote:
> From: Aditya Garg <gargaditya08@live.com>
> 
> Format specifiers for printing generic 32-bit FourCCs were recently added
> to vsprintf. They are going through the DRM tree alongwith the appletbdrm
> driver. Since the printf tests are being converted to kunit, this separate
> patch for the tests should make it easier to rebase when the merge window
> opens.

I am always for the additional test cases!
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

-- 
With Best Regards,
Andy Shevchenko

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.