Patch "selftests/bpf: Fix test_progs compilation failure in 32-bit arch" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/bpf: Fix test_progs compilation failure in 32-bit arch

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-bpf-fix-test_progs-compilation-failure-in-.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5537f867cf1fca75eaa2b2ca1418ad4a36b232a2
Author: Yang Jihong <yangjihong1@xxxxxxxxxx>
Date:   Tue Nov 8 09:58:57 2022 +0800

    selftests/bpf: Fix test_progs compilation failure in 32-bit arch
    
    [ Upstream commit 5704bc7e8991164b14efb748b5afa0715c25fac3 ]
    
    test_progs fails to be compiled in the 32-bit arch, log is as follows:
    
      test_progs.c:1013:52: error: format '%ld' expects argument of type 'long int', but argument 3 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
       1013 |                 sprintf(buf, "MSG_TEST_LOG (cnt: %ld, last: %d)",
            |                                                  ~~^
            |                                                    |
            |                                                    long int
            |                                                  %d
       1014 |                         strlen(msg->test_log.log_buf),
            |                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            |                         |
            |                         size_t {aka unsigned int}
    
    Fix it.
    
    Fixes: 91b2c0afd00c ("selftests/bpf: Add parallelism to test_progs")
    Signed-off-by: Yang Jihong <yangjihong1@xxxxxxxxxx>
    Acked-by: Yonghong Song <yhs@xxxxxx>
    Link: https://lore.kernel.org/r/20221108015857.132457-1-yangjihong1@xxxxxxxxxx
    Signed-off-by: Martin KaFai Lau <martin.lau@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 3561c97701f2..a07b8ae64bf8 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -993,7 +993,7 @@ static inline const char *str_msg(const struct msg *msg, char *buf)
 			msg->subtest_done.have_log);
 		break;
 	case MSG_TEST_LOG:
-		sprintf(buf, "MSG_TEST_LOG (cnt: %ld, last: %d)",
+		sprintf(buf, "MSG_TEST_LOG (cnt: %zu, last: %d)",
 			strlen(msg->test_log.log_buf),
 			msg->test_log.is_last);
 		break;