Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf/x86/amd/uncore: Avoid a false positive warning about snprintf truncation in amd_uncore_umc_ctx_init

Fix the following warning:
CC [M] arch/x86/events/amd/uncore.o
arch/x86/events/amd/uncore.c: In function ‘amd_uncore_umc_ctx_init’:
arch/x86/events/amd/uncore.c:951:52: warning: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 8 [-Wformat-truncation=]
snprintf(pmu->name, sizeof(pmu->name), "amd_umc_%d", index);
^~
arch/x86/events/amd/uncore.c:951:43: note: directive argument in the range [0, 2147483647]
snprintf(pmu->name, sizeof(pmu->name), "amd_umc_%d", index);
^~~~~~~~~~~~
arch/x86/events/amd/uncore.c:951:4: note: ‘snprintf’ output between 10 and 19 bytes into a destination of size 16
snprintf(pmu->name, sizeof(pmu->name), "amd_umc_%d", index);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

As far as I can see, there can't be more than UNCORE_GROUP_MAX (256)
groups and each group can't have more than 255 PMU, so the number
printed by this %d can't exceed 65279, that's only 5 digits and would
fit into the buffer. So it's a false positive warning. But we can
make the compiler happy by declaring index as a 16-bit number.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sandipan Das <sandipan.das@amd.com>
Link: https://lore.kernel.org/r/20241105095253.18f34b4d@endymion.delvare

authored by

Jean Delvare and committed by
Peter Zijlstra
2e71e8bc 0d5eb14c

+3 -2
+3 -2
arch/x86/events/amd/uncore.c
··· 916 916 u8 group_num_pmcs[UNCORE_GROUP_MAX] = { 0 }; 917 917 union amd_uncore_info info; 918 918 struct amd_uncore_pmu *pmu; 919 - int index = 0, gid, i; 919 + int gid, i; 920 + u16 index = 0; 920 921 921 922 if (pmu_version < 2) 922 923 return 0; ··· 949 948 for_each_set_bit(gid, gmask, UNCORE_GROUP_MAX) { 950 949 for (i = 0; i < group_num_pmus[gid]; i++) { 951 950 pmu = &uncore->pmus[index]; 952 - snprintf(pmu->name, sizeof(pmu->name), "amd_umc_%d", index); 951 + snprintf(pmu->name, sizeof(pmu->name), "amd_umc_%hu", index); 953 952 pmu->num_counters = group_num_pmcs[gid] / group_num_pmus[gid]; 954 953 pmu->msr_base = MSR_F19H_UMC_PERF_CTL + i * pmu->num_counters * 2; 955 954 pmu->rdpmc_base = -1;