Remove array_size() calls and replace vmalloc() with vmalloc_array() in
nfp_flower_metadata_init().
vmalloc_array() is also optimized better, resulting in less instructions
being used.
Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
---
drivers/net/ethernet/netronome/nfp/flower/metadata.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/metadata.c b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
index 80e4675582bf..137e526e2584 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/metadata.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/metadata.c
@@ -564,8 +564,8 @@ int nfp_flower_metadata_init(struct nfp_app *app, u64 host_ctx_count,
/* Init ring buffer and unallocated stats_ids. */
priv->stats_ids.free_list.buf =
- vmalloc(array_size(NFP_FL_STATS_ELEM_RS,
- priv->stats_ring_size));
+ vmalloc_array(NFP_FL_STATS_ELEM_RS,
+ priv->stats_ring_size);
if (!priv->stats_ids.free_list.buf)
goto err_free_last_used;
--
2.34.1
Hi Qianfeng, kernel test robot noticed the following build warnings: [auto build test WARNING on tnguy-next-queue/dev-queue] [also build test WARNING on tnguy-net-queue/dev-queue net-next/main net/main linus/master v6.17-rc1 next-20250815] [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/Qianfeng-Rong/eth-intel-use-vmalloc_array-to-simplify-code/20250814-183400 base: https://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git dev-queue patch link: https://lore.kernel.org/r/20250814102100.151942-3-rongqianfeng%40vivo.com patch subject: [PATCH v2 2/3] nfp: flower: use vmalloc_array() to simplify code config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20250816/202508161307.IWBBnNXY-lkp@intel.com/config) compiler: s390-linux-gcc (GCC) 15.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250816/202508161307.IWBBnNXY-lkp@intel.com/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 <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202508161307.IWBBnNXY-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from include/linux/vmalloc.h:5, from drivers/net/ethernet/netronome/nfp/flower/metadata.c:8: drivers/net/ethernet/netronome/nfp/flower/metadata.c: In function 'nfp_flower_metadata_init': >> include/linux/stddef.h:24:42: warning: 'vmalloc_array_noprof' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 24 | #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) | ^ include/linux/alloc_tag.h:239:16: note: in definition of macro 'alloc_hooks_tag' 239 | typeof(_do_alloc) _res; \ | ^~~~~~~~~ include/linux/vmalloc.h:192:33: note: in expansion of macro 'alloc_hooks' 192 | #define vmalloc_array(...) alloc_hooks(vmalloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:17: note: in expansion of macro 'vmalloc_array' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/main.h:29:41: note: in expansion of macro 'sizeof_field' 29 | #define NFP_FL_STATS_ELEM_RS sizeof_field(struct nfp_fl_stats_id, \ | ^~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:31: note: in expansion of macro 'NFP_FL_STATS_ELEM_RS' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~~~~~~~~ include/linux/stddef.h:24:42: note: earlier argument should specify number of elements, later size of each element 24 | #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) | ^ include/linux/alloc_tag.h:239:16: note: in definition of macro 'alloc_hooks_tag' 239 | typeof(_do_alloc) _res; \ | ^~~~~~~~~ include/linux/vmalloc.h:192:33: note: in expansion of macro 'alloc_hooks' 192 | #define vmalloc_array(...) alloc_hooks(vmalloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:17: note: in expansion of macro 'vmalloc_array' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/main.h:29:41: note: in expansion of macro 'sizeof_field' 29 | #define NFP_FL_STATS_ELEM_RS sizeof_field(struct nfp_fl_stats_id, \ | ^~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:31: note: in expansion of macro 'NFP_FL_STATS_ELEM_RS' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~~~~~~~~ >> include/linux/stddef.h:24:42: warning: 'vmalloc_array_noprof' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 24 | #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) | ^ include/linux/alloc_tag.h:243:24: note: in definition of macro 'alloc_hooks_tag' 243 | _res = _do_alloc; \ | ^~~~~~~~~ include/linux/vmalloc.h:192:33: note: in expansion of macro 'alloc_hooks' 192 | #define vmalloc_array(...) alloc_hooks(vmalloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:17: note: in expansion of macro 'vmalloc_array' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/main.h:29:41: note: in expansion of macro 'sizeof_field' 29 | #define NFP_FL_STATS_ELEM_RS sizeof_field(struct nfp_fl_stats_id, \ | ^~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:31: note: in expansion of macro 'NFP_FL_STATS_ELEM_RS' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~~~~~~~~ include/linux/stddef.h:24:42: note: earlier argument should specify number of elements, later size of each element 24 | #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) | ^ include/linux/alloc_tag.h:243:24: note: in definition of macro 'alloc_hooks_tag' 243 | _res = _do_alloc; \ | ^~~~~~~~~ include/linux/vmalloc.h:192:33: note: in expansion of macro 'alloc_hooks' 192 | #define vmalloc_array(...) alloc_hooks(vmalloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:17: note: in expansion of macro 'vmalloc_array' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/main.h:29:41: note: in expansion of macro 'sizeof_field' 29 | #define NFP_FL_STATS_ELEM_RS sizeof_field(struct nfp_fl_stats_id, \ | ^~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:31: note: in expansion of macro 'NFP_FL_STATS_ELEM_RS' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~~~~~~~~ >> include/linux/stddef.h:24:42: warning: 'vmalloc_array_noprof' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 24 | #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) | ^ include/linux/alloc_tag.h:246:24: note: in definition of macro 'alloc_hooks_tag' 246 | _res = _do_alloc; \ | ^~~~~~~~~ include/linux/vmalloc.h:192:33: note: in expansion of macro 'alloc_hooks' 192 | #define vmalloc_array(...) alloc_hooks(vmalloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:17: note: in expansion of macro 'vmalloc_array' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/main.h:29:41: note: in expansion of macro 'sizeof_field' 29 | #define NFP_FL_STATS_ELEM_RS sizeof_field(struct nfp_fl_stats_id, \ | ^~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:31: note: in expansion of macro 'NFP_FL_STATS_ELEM_RS' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~~~~~~~~ include/linux/stddef.h:24:42: note: earlier argument should specify number of elements, later size of each element 24 | #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) | ^ include/linux/alloc_tag.h:246:24: note: in definition of macro 'alloc_hooks_tag' 246 | _res = _do_alloc; \ | ^~~~~~~~~ include/linux/vmalloc.h:192:33: note: in expansion of macro 'alloc_hooks' 192 | #define vmalloc_array(...) alloc_hooks(vmalloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:17: note: in expansion of macro 'vmalloc_array' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/main.h:29:41: note: in expansion of macro 'sizeof_field' 29 | #define NFP_FL_STATS_ELEM_RS sizeof_field(struct nfp_fl_stats_id, \ | ^~~~~~~~~~~~ drivers/net/ethernet/netronome/nfp/flower/metadata.c:567:31: note: in expansion of macro 'NFP_FL_STATS_ELEM_RS' 567 | vmalloc_array(NFP_FL_STATS_ELEM_RS, | ^~~~~~~~~~~~~~~~~~~~ vim +24 include/linux/stddef.h 3876488444e712 Denys Vlasenko 2015-03-09 17 4229a470175be1 Kees Cook 2018-01-10 18 /** e7f18c22e6bea2 Kees Cook 2021-08-19 19 * sizeof_field() - Report the size of a struct field in bytes 4229a470175be1 Kees Cook 2018-01-10 20 * 4229a470175be1 Kees Cook 2018-01-10 21 * @TYPE: The structure containing the field of interest 4229a470175be1 Kees Cook 2018-01-10 22 * @MEMBER: The field to return the size of 4229a470175be1 Kees Cook 2018-01-10 23 */ 4229a470175be1 Kees Cook 2018-01-10 @24 #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) 4229a470175be1 Kees Cook 2018-01-10 25 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
On Thu, 14 Aug 2025 18:20:54 +0800 Qianfeng Rong wrote: > - vmalloc(array_size(NFP_FL_STATS_ELEM_RS, > - priv->stats_ring_size)); > + vmalloc_array(NFP_FL_STATS_ELEM_RS, > + priv->stats_ring_size); This generates a bunch of warnings on gcc when building with W=1 -- pw-bot: cr
在 2025/8/16 1:50, Jakub Kicinski 写道: > On Thu, 14 Aug 2025 18:20:54 +0800 Qianfeng Rong wrote: >> - vmalloc(array_size(NFP_FL_STATS_ELEM_RS, >> - priv->stats_ring_size)); >> + vmalloc_array(NFP_FL_STATS_ELEM_RS, >> + priv->stats_ring_size); > This generates a bunch of warnings on gcc when building with W=1 Thank you for pointing this out. I will research the issue and fix the warning immediately. Best regards, Qianfeng
© 2016 - 2025 Red Hat, Inc.