Skip to contentSkip to conversation

bpf: add __printf() to for printf fmt strings

PATCH In review Ben Dooks 4 participants 5 messages Nov 22, 2023 – Dec 8, 2023 BPF

lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

PATCH 1/1 bpf: add __printf() to for printf fmt strings

The btf_seq_show() and btf_snprintf_show() take a printk format string so add a __printf() to these two functions. This fixes the following extended warnings:

kernel/bpf/btf.c:7094:29: error: function ‘btf_seq_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format] kernel/bpf/btf.c:7131:9: error: function ‘btf_snprintf_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format]

---
 kernel/bpf/btf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/btf.c +3 -3
index 15d71d2986d3..46c2e87c383d 100644
@@ -7088,8 +7088,8 @@ static void btf_type_show(const struct btf *btf, u32 type_id, void *obj,
 	btf_type_ops(t)->show(btf, t, type_id, obj, 0, show);
 }
 
-static void btf_seq_show(struct btf_show *show, const char *fmt,
-			 va_list args)
+static __printf(2,0) void btf_seq_show(struct btf_show *show, const char *fmt,
+				       va_list args)
 {
 	seq_vprintf((struct seq_file *)show->target, fmt, args);
 }
@@ -7122,7 +7122,7 @@ struct btf_show_snprintf {
 	int len;		/* length we would have written */
 };
 
-static void btf_snprintf_show(struct btf_show *show, const char *fmt,
+static __printf(2,0) void btf_snprintf_show(struct btf_show *show, const char *fmt,
 			      va_list args)
 {
 	struct btf_show_snprintf *ssnprintf = (struct btf_show_snprintf *)show;
Signature · 1 line
2.37.2.352.g3c44437643
maintainer
#1 lore raw
Quoted 28 lines · Ben Dooks

The btf_seq_show() and btf_snprintf_show() take a printk format string so add a __printf() to these two functions. This fixes the following extended warnings:

kernel/bpf/btf.c:7094:29: error: function ‘btf_seq_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format] kernel/bpf/btf.c:7131:9: error: function ‘btf_snprintf_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format]

---
  kernel/bpf/btf.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/btf.c +2 -2
index 15d71d2986d3..46c2e87c383d 100644
@@ -7088,8 +7088,8 @@ static void btf_type_show(const struct btf *btf, u32 type_id, void *obj,
  	btf_type_ops(t)->show(btf, t, type_id, obj, 0, show);
  }
 
-static void btf_seq_show(struct btf_show *show, const char *fmt,
-			 va_list args)
+static __printf(2,0) void btf_seq_show(struct btf_show *show, const char *fmt,
+				       va_list args)
  {
  	seq_vprintf((struct seq_file *)show->target, fmt, args);
  }

kernel/bpf/btf.c struct btf_show_snprintf { · line 7127

Quoted 7 lines
kernel/bpf/btf.c +1 -1
@@ -7122,7 +7122,7 @@ struct btf_show_snprintf {
  	int len;		/* length we would have written */
  };
 
-static void btf_snprintf_show(struct btf_show *show, const char *fmt,
+static __printf(2,0) void btf_snprintf_show(struct btf_show *show, const char *fmt,
  			      va_list args)
  {

Looks good, only small nit is to fix up kernel-style formatting wrt spacing.

Quoted 2 lines
kernel/bpf/btf.c +0 -0
  	struct btf_show_snprintf *ssnprintf = (struct btf_show_snprintf *)show;
Reviewed-by on v1 1/1
#2 lore raw
In reply to Ben Dooks
Quoted 8 lines · Ben Dooks

The btf_seq_show() and btf_snprintf_show() take a printk format string so add a __printf() to these two functions. This fixes the following extended warnings:

kernel/bpf/btf.c:7094:29: error: function ‘btf_seq_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format] kernel/bpf/btf.c:7131:9: error: function ‘btf_snprintf_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format]

Looks good to me, thanks for fixing! Could also add a

Fixes eb411377aed9 ("bpf: Add bpf_seq_printf_btf helper")
Quoted 28 lines
---
 kernel/bpf/btf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/btf.c +3 -3
index 15d71d2986d3..46c2e87c383d 100644
@@ -7088,8 +7088,8 @@ static void btf_type_show(const struct btf *btf, u32 type_id, void *obj,
 	btf_type_ops(t)->show(btf, t, type_id, obj, 0, show);
 }
 
-static void btf_seq_show(struct btf_show *show, const char *fmt,
-			 va_list args)
+static __printf(2,0) void btf_seq_show(struct btf_show *show, const char *fmt,
+				       va_list args)
 {
 	seq_vprintf((struct seq_file *)show->target, fmt, args);
 }
@@ -7122,7 +7122,7 @@ struct btf_show_snprintf {
 	int len;		/* length we would have written */
 };
 
-static void btf_snprintf_show(struct btf_show *show, const char *fmt,
+static __printf(2,0) void btf_snprintf_show(struct btf_show *show, const char *fmt,
 			      va_list args)
 {
 	struct btf_show_snprintf *ssnprintf = (struct btf_show_snprintf *)show;
author
#3 lore raw
Quoted 8 lines · Alan Maguire
Quoted 7 lines · Ben Dooks

The btf_seq_show() and btf_snprintf_show() take a printk format string so add a __printf() to these two functions. This fixes the following extended warnings:

kernel/bpf/btf.c:7094:29: error: function ‘btf_seq_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format] kernel/bpf/btf.c:7131:9: error: function ‘btf_snprintf_show’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format]

Quoted 7 lines
Quoted 1 line

Looks good to me, thanks for fixing! Could also add a

Fixes eb411377aed9 ("bpf: Add bpf_seq_printf_btf helper")

Thanks, looks like the test robot found some issues so will go back and look at those as soon as I can.

Quoted 29 lines
Quoted 28 lines
---
  kernel/bpf/btf.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/btf.c +3 -3
index 15d71d2986d3..46c2e87c383d 100644
@@ -7088,8 +7088,8 @@ static void btf_type_show(const struct btf *btf, u32 type_id, void *obj,
  	btf_type_ops(t)->show(btf, t, type_id, obj, 0, show);
  }
 
-static void btf_seq_show(struct btf_show *show, const char *fmt,
-			 va_list args)
+static __printf(2,0) void btf_seq_show(struct btf_show *show, const char *fmt,
+				       va_list args)
  {
  	seq_vprintf((struct seq_file *)show->target, fmt, args);
  }
@@ -7122,7 +7122,7 @@ struct btf_show_snprintf {
  	int len;		/* length we would have written */
  };
 
-static void btf_snprintf_show(struct btf_show *show, const char *fmt,
+static __printf(2,0) void btf_snprintf_show(struct btf_show *show, const char *fmt,
  			      va_list args)
  {
  	struct btf_show_snprintf *ssnprintf = (struct btf_show_snprintf *)show;
Signature · 4 lines
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

https://www.codethink.co.uk/privacy.html
#4 lore raw
In reply to Ben Dooks
kernel test robot noticed the following build warnings:

Hi Ben,

kernel test robot noticed the following build warnings:

[auto build test WARNING on bpf-next/master]
[also build test WARNING on bpf/master linus/master v6.7-rc2 next-20231122] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Ben-Dooks/bpf-add-__printf-to-for-printf-fmt-strings/20231122-231149
base:   https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
patch link:    https://lore.kernel.org/r/20231122133656.290475-1-ben.dooks%40codethink.co.uk
patch subject: [PATCH] bpf: add __printf() to for printf fmt strings
config: x86_64-randconfig-161-20231123 (https://download.01.org/0day-ci/archive/20231123/[email protected]/config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231123/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

kernel/bpf/btf.c: In function 'btf_type_seq_show_flags':

>> kernel/bpf/btf.c:7100:14: warning: assignment left-hand side might be a candidate for a format attribute [-Wsuggest-attribute=format]
    7100 |  sseq.showfn = btf_seq_show;
         |              ^
   kernel/bpf/btf.c: In function 'btf_type_snprintf_show':
   kernel/bpf/btf.c:7151:24: warning: assignment left-hand side might be a candidate for a format attribute [-Wsuggest-attribute=format]
    7151 |  ssnprintf.show.showfn = btf_snprintf_show;
         |                        ^

vim +7100 kernel/bpf/btf.c

31d0bc81637d8d Alan Maguire 2020-09-28  7093  
eb411377aed9e2 Alan Maguire 2020-09-28  7094  int btf_type_seq_show_flags(const struct btf *btf, u32 type_id,
31d0bc81637d8d Alan Maguire 2020-09-28  7095  			    void *obj, struct seq_file *m, u64 flags)
31d0bc81637d8d Alan Maguire 2020-09-28  7096  {
31d0bc81637d8d Alan Maguire 2020-09-28  7097  	struct btf_show sseq;
31d0bc81637d8d Alan Maguire 2020-09-28  7098  
31d0bc81637d8d Alan Maguire 2020-09-28  7099  	sseq.target = m;
31d0bc81637d8d Alan Maguire 2020-09-28 @7100  	sseq.showfn = btf_seq_show;
31d0bc81637d8d Alan Maguire 2020-09-28  7101  	sseq.flags = flags;
31d0bc81637d8d Alan Maguire 2020-09-28  7102  
31d0bc81637d8d Alan Maguire 2020-09-28  7103  	btf_type_show(btf, type_id, obj, &sseq);
31d0bc81637d8d Alan Maguire 2020-09-28  7104  
31d0bc81637d8d Alan Maguire 2020-09-28  7105  	return sseq.state.status;
31d0bc81637d8d Alan Maguire 2020-09-28  7106  }
31d0bc81637d8d Alan Maguire 2020-09-28  7107  
Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki