wl18xx: Bad format for rx_frames_per_rates in debugfs?
Subsystems (3)
Hello,
While adding __printf attributes to several functions in the kernel, I got a surprising gcc warning in drivers/net/wireless/ti/wl18xx/debugfs.c about "format '%u' expects argument of type 'unsigned int', but argument 5 has type 'u32 *'".
Indeed it seems that commit c5d94169e818 ("wl18xx: use new fw stats structures") [1] introduced an array field "u32 rx_frames_per_rates[50]" in struct wl18xx_acx_rx_rate_stat but is using WL18XX_DEBUGFS_FWSTATS_FILE(rx_rate, rx_frames_per_rates, "%u"); instead of something like WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(rx_rate, rx_frames_per_rates, 50); for displaying this value. So I believe that currently the rx_rate entry in debugfs contains a kernel pointer instead of the actual data. As I don't have the hardware to test I can't be sure of it.
Is this a real bug which needs to be fixed or something weird I haven't understood yet?
Thanks
--
Nicolas
PS: I got this gcc warning by adding __printf(4, 5) to wl1271_format_buffer() prototype in drivers/net/wireless/ti/wlcore/debugfs.h:
In file included from /usr/src/linux/drivers/net/wireless/ti/wl18xx/debugfs.c:23:0:
/usr/src/linux/drivers/net/wireless/ti/wl18xx/debugfs.c: In function
'rx_rate_rx_frames_per_rates_read':
/usr/src/linux/drivers/net/wireless/ti/wl18xx/debugfs.c:34:32:
error: format '%u' expects argument of type 'unsigned int', but argument 5 has type 'u32 *' [-Werror=format=]
DEBUGFS_FWSTATS_FILE(a, b, c, wl18xx_acx_statistics)
^
/usr/src/linux/drivers/net/wireless/ti/wl18xx/../wlcore/debugfs.h:77:9:
note: in definition of macro 'DEBUGFS_FWSTATS_FILE'
struct struct_type *stats = wl->stats.fw_stats; \
^
/usr/src/linux/drivers/net/wireless/ti/wl18xx/debugfs.c:142:1: note:
in expansion of macro 'WL18XX_DEBUGFS_FWSTATS_FILE'
WL18XX_DEBUGFS_FWSTATS_FILE(rx_rate, rx_frames_per_rates, "%u");
^--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 17 lines · Nicolas Iooss
Hello,
While adding
__printfattributes to several functions in the kernel, I got a surprising gcc warning indrivers/net/wireless/ti/wl18xx/debugfs.cabout "format '%u' expects argument of type 'unsigned int', but argument 5 has type 'u32 *'".Indeed it seems that commit
c5d94169e818("wl18xx: use new fw stats structures") [1] introduced an array field "u32 rx_frames_per_rates[50]" in structwl18xx_acx_rx_rate_statbut is usingWL18XX_DEBUGFS_FWSTATS_FILE(rx_rate, rx_frames_per_rates, "%u"); instead of something likeWL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(rx_rate, rx_frames_per_rates, 50); for displaying this value. So I believe that currently therx_rateentry in debugfs contains a kernel pointer instead of the actual data. As I don't have the hardware to test I can't be sure of it.
Quoted 3 lines
Is this a real bug which needs to be fixed or something weird I haven't understood yet?
yes, seems like a bug.
Eliad.
PATCH 1/1 wl18xx: show rx_frames_per_rates as an array as it really is
In reply to Nicolas IoossIn struct wl18xx_acx_rx_rate_stat, rx_frames_per_rates field is an array, not a number. This means WL18XX_DEBUGFS_FWSTATS_FILE can't be used to display this field in debugfs (it would display a pointer, not the actual data). Use WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY instead.
This bug has been found by adding a __printf attribute to wl1271_format_buffer. gcc complained about "format '%u' expects argument of type 'unsigned int', but argument 5 has type 'u32 *'".
---
This patch is only compile-tested as I haven't got the hardware to test it live.
drivers/net/wireless/ti/wl18xx/debugfs.c | 2 +- drivers/net/wireless/ti/wlcore/debugfs.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ti/wl18xx/debugfs.c +1 -1
@@ -139,7 +139,7 @@ WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, protection_filter, "%u");WL18XX_DEBUGFS_FWSTATS_FILE (rx_filter, accum_arp_pend_requests,"%u" );WL18XX_DEBUGFS_FWSTATS_FILE (rx_filter, max_arp_queue_dep,"%u" ); -WL18XX_DEBUGFS_FWSTATS_FILE (rx_rate, rx_frames_per_rates,"%u" ); +WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY (rx_rate, rx_frames_per_rates,50 );WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY (aggr_size, tx_agg_vs_rate,AGGR_STATS_TX_AGG *AGGR_STATS_TX_RATE );
drivers/net/wireless/ti/wlcore/debugfs.h +2 -2
@@ -26,8 +26,8 @@#include "wlcore.h" -int wl1271_format_buffer (char __user *userbuf,size_t count, -loff_t *ppos,char *fmt, ...); +__printf(4, 5) int wl1271_format_buffer(char __user *userbuf, size_t count, +loff_t *ppos,char *fmt, ...);int wl1271_debugfs_init (struct wl1271 *wl);void wl1271_debugfs_exit (struct wl1271 *wl);
Signature · 1 line
2.3.2
Kalle Valo
AppliedRe: wl18xx: show rx_frames_per_rates as an array as it really is
Quoted 6 lines
In struct
wl18xx_acx_rx_rate_stat,rx_frames_per_ratesfield is an array, not a number. This meansWL18XX_DEBUGFS_FWSTATS_FILEcan't be used to display this field in debugfs (it would display a pointer, not the actual data). UseWL18XX_DEBUGFS_FWSTATS_FILE_ARRAYinstead.
Quoted 6 lines
This bug has been found by adding a
__printfattribute towl1271_format_buffer. gcc complained about "format '%u' expects argument of type 'unsigned int', but argument 5 has type 'u32 *'".Fixes c5d94169e818 ("wl18xx: use new fw stats structures")Signed-off-by Nicolas Iooss <[email protected]>
Thanks, applied to wireless-drivers-next.git.
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html