| From 45e0bcbad6a103618957bfa3e7c84393e83682a4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 20 May 2022 10:11:58 +0200 |
| Subject: perf bench numa: Address compiler error on s390 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Thomas Richter <tmricht@linux.ibm.com> |
| |
| [ Upstream commit f8ac1c478424a9a14669b8cef7389b1e14e5229d ] |
| |
| The compilation on s390 results in this error: |
| |
| # make DEBUG=y bench/numa.o |
| ... |
| bench/numa.c: In function ‘__bench_numa’: |
| bench/numa.c:1749:81: error: ‘%d’ directive output may be truncated |
| writing between 1 and 11 bytes into a region of size between |
| 10 and 20 [-Werror=format-truncation=] |
| 1749 | snprintf(tname, sizeof(tname), "process%d:thread%d", p, t); |
| ^~ |
| ... |
| bench/numa.c:1749:64: note: directive argument in the range |
| [-2147483647, 2147483646] |
| ... |
| # |
| |
| The maximum length of the %d replacement is 11 characters because of the |
| negative sign. Therefore extend the array by two more characters. |
| |
| Output after: |
| |
| # make DEBUG=y bench/numa.o > /dev/null 2>&1; ll bench/numa.o |
| -rw-r--r-- 1 root root 418320 May 19 09:11 bench/numa.o |
| # |
| |
| Fixes: 3aff8ba0a4c9c919 ("perf bench numa: Avoid possible truncation when using snprintf()") |
| Suggested-by: Namhyung Kim <namhyung@gmail.com> |
| Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> |
| Cc: Heiko Carstens <hca@linux.ibm.com> |
| Cc: Sumanth Korikkar <sumanthk@linux.ibm.com> |
| Cc: Sven Schnelle <svens@linux.ibm.com> |
| Cc: Vasily Gorbik <gor@linux.ibm.com> |
| Link: https://lore.kernel.org/r/20220520081158.2990006-1-tmricht@linux.ibm.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/bench/numa.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c |
| index 5797253b9700..69d62e57a0c3 100644 |
| --- a/tools/perf/bench/numa.c |
| +++ b/tools/perf/bench/numa.c |
| @@ -1630,7 +1630,7 @@ static int __bench_numa(const char *name) |
| "GB/sec,", "total-speed", "GB/sec total speed"); |
| |
| if (g->p.show_details >= 2) { |
| - char tname[14 + 2 * 10 + 1]; |
| + char tname[14 + 2 * 11 + 1]; |
| struct thread_data *td; |
| for (p = 0; p < g->p.nr_proc; p++) { |
| for (t = 0; t < g->p.nr_threads; t++) { |
| -- |
| 2.35.1 |
| |