Skip to contentSkip to conversation

eth: mlx5: avoid iterator use outside of a loop

PATCH In review Jakub Kicinski 3 participants 4 messages Apr 14, 2023 – Apr 17, 2023

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 eth: mlx5: avoid iterator use outside of a loop

Fix the following warning about risky iterator use:

drivers/net/ethernet/mellanox/mlx5/core/eq.c:1010 mlx5_comp_irq_get_affinity_mask() warn: iterator used outside loop: 'eq'

---
CC: [email protected]
CC: [email protected]

---
 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eq.c +3 -2
index eb41f0abf798..03c0165a8fd5 100644
@@ -1070,10 +1070,11 @@ mlx5_comp_irq_get_affinity_mask(struct mlx5_core_dev *dev, int vector)
 
 	list_for_each_entry(eq, &table->comp_eqs_list, list) {
 		if (i++ == vector)
-			break;
+			return mlx5_irq_get_affinity_mask(eq->core.irq);
 	}
 
-	return mlx5_irq_get_affinity_mask(eq->core.irq);
+	WARN_ON_ONCE(1);
+	return 0;
 }
 EXPORT_SYMBOL(mlx5_comp_irq_get_affinity_mask);
 
Signature · 1 line
2.39.2
#1 lore raw
kernel test robot noticed the following build warnings:

Hi Jakub,

kernel test robot noticed the following build warnings:

[auto build test WARNING on net-next/main]

url:    https://github.com/intel-lab-lkp/linux/commits/Jakub-Kicinski/eth-mlx5-avoid-iterator-use-outside-of-a-loop/20230415-021112
patch link:    https://lore.kernel.org/r/20230414180729.198284-1-kuba%40kernel.org
patch subject: [PATCH net-next] eth: mlx5: avoid iterator use outside of a loop
config: arm64-randconfig-s052-20230413 (https://download.01.org/0day-ci/archive/20230415/[email protected]/config)
compiler: aarch64-linux-gcc (GCC) 12.1.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.4-39-gce1a6720-dirty
# https://github.com/intel-lab-lkp/linux/commit/1432c0a2b6d7ea977dad5de303481b1aae454ef4
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jakub-Kicinski/eth-mlx5-avoid-iterator-use-outside-of-a-loop/20230415-021112
git checkout 1432c0a2b6d7ea977dad5de303481b1aae454ef4
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=arm64 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/net/ethernet/mellanox/mlx5/core/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/

sparse warnings: (new ones prefixed by >>)

>> drivers/net/ethernet/mellanox/mlx5/core/eq.c:1077:16: sparse: sparse: Using plain integer as NULL pointer

vim +1077 drivers/net/ethernet/mellanox/mlx5/core/eq.c

1063
1064 struct cpumask *
1065 mlx5_comp_irq_get_affinity_mask(struct mlx5_core_dev *dev, int vector)
1066 {
1067 struct mlx5_eq_table *table = dev->priv.eq_table;
1068 struct mlx5_eq_comp *eq;
1069 int i = 0;
1070
1071 list_for_each_entry(eq, &table->comp_eqs_list, list) {
1072 if (i++ == vector)
1073 return mlx5_irq_get_affinity_mask(eq->core.irq);
1074 }
1075
1076 WARN_ON_ONCE(1);

> 1077		return 0;

1078 }
1079 EXPORT_SYMBOL(mlx5_comp_irq_get_affinity_mask);
1080

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests
#2 lore raw
In reply to Jakub Kicinski
Quoted 17 lines · Jakub Kicinski

Fix the following warning about risky iterator use:

drivers/net/ethernet/mellanox/mlx5/core/eq.c:1010 mlx5_comp_irq_get_affinity_mask() warn: iterator used outside loop: 'eq'

---
CC: [email protected]
CC: [email protected]

---
 drivers/net/ethernet/mellanox/mlx5/core/eq.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eq.c +0 -0
index eb41f0abf798..03c0165a8fd5 100644

drivers/net/ethernet/mellanox/mlx5/core/eq.c mlx5_comp_irq_get_affinity_mask(struct mlx5_core_dev *dev, int vector) · line 1077

Quoted 10 lines
drivers/net/ethernet/mellanox/mlx5/core/eq.c +3 -2
@@ -1070,10 +1070,11 @@ mlx5_comp_irq_get_affinity_mask(struct mlx5_core_dev *dev, int vector)
 
 	list_for_each_entry(eq, &table->comp_eqs_list, list) {
 		if (i++ == vector)
-			break;
+			return mlx5_irq_get_affinity_mask(eq->core.irq);
 	}
 
-	return mlx5_irq_get_affinity_mask(eq->core.irq);
+	WARN_ON_ONCE(1);
+	return 0;

I would do it without changing last return, but "return ERR_PTR(0);" will do the trick too.

Thanks

Quoted 6 lines
drivers/net/ethernet/mellanox/mlx5/core/eq.c +0 -0
 }
 EXPORT_SYMBOL(mlx5_comp_irq_get_affinity_mask);
 
Signature · 1 line
2.39.2
author maintainer
#3 lore raw
Quoted 6 lines · On Sun, 16 Apr 2023 13:17:53 +0300 Leon Romanovsky wrote:

drivers/net/ethernet/mellanox/mlx5/core/eq.c mlx5_comp_irq_get_affinity_mask(struct mlx5_core_dev *dev, int vector) · line 1077

Quoted 3 lines
drivers/net/ethernet/mellanox/mlx5/core/eq.c +2 -1
-	return mlx5_irq_get_affinity_mask(eq->core.irq);
+	WARN_ON_ONCE(1);
+	return 0;  

I would do it without changing last return, but "return ERR_PTR(0);" will do the trick too.

Hm, I've not seen ERR_PTR(0) used before. I'll return NULL. Looks like callers pass the value to cpumask_first() without checking so either way the warning will be followed by a crash 🤷️