From 9d80d33c58a99bc0546ee08ca0a6f969a2c18837 Mon Sep 17 00:00:00 2001 From: Guo Ren Date: Thu, 13 Oct 2022 23:04:58 -0400 Subject: [PATCH] net: Fixup netif_attrmask_next_and warning Don't pass nr_bits as arg1, cpu_max_bits_warn would cause warning now 854701ba4c39 ("net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}"). ------------[ cut here ]------------ WARNING: CPU: 2 PID: 1 at include/linux/cpumask.h:110 __netif_set_xps_queue+0x14e/0x770 Modules linked in: CPU: 2 PID: 1 Comm: swapper/0 Not tainted 6.0.0-rc4-00018-g854701ba4c39 #324 Hardware name: riscv-virtio,qemu (DT) epc : __netif_set_xps_queue+0x14e/0x770 ra : __netif_set_xps_queue+0x552/0x770 epc : ffffffff806fe448 ra : ffffffff806fe84c sp : ff600000023279d0 gp : ffffffff815fff88 tp : ff600000023a0000 t0 : ff6000000308ab40 t1 : 0000000000000003 t2 : 0000000000000000 s0 : ff60000002327a90 s1 : 0000000000000000 a0 : ff6000000308ab00 a1 : ff6000000308ab00 a2 : ff6000000308a8e8 a3 : 0000000000000004 a4 : 0000000000000000 a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000000000000 s2 : 0000000000000000 s3 : 0000000000000000 s4 : ff60000002327aa0 s5 : ffffffff816031c8 s6 : 0000000000000000 s7 : 0000000000000001 s8 : 0000000000000000 s9 : 0000000000000004 s10: ff6000000308a8c0 s11: 0000000000000004 t3 : 0000000000000000 t4 : 0000000000000014 t5 : 0000000000000000 t6 : 0000000000000000 status: 0000000200000120 badaddr: 0000000000000000 cause: 0000000000000003 [] virtnet_set_affinity+0x14a/0x1c0 [] virtnet_probe+0x7fc/0xee2 [] virtio_dev_probe+0x164/0x2de [] really_probe+0x82/0x224 [] __driver_probe_device+0x5a/0xaa [] driver_probe_device+0x2c/0xb8 [] __driver_attach+0x76/0x108 [] bus_for_each_dev+0x4a/0x8e [] driver_attach+0x1a/0x28 [] bus_add_driver+0x13c/0x1a6 [] driver_register+0x4a/0xfc [] register_virtio_driver+0x1c/0x2c [] virtio_net_driver_init+0x7a/0xb0 [] do_one_initcall+0x66/0x2e4 [] kernel_init_freeable+0x28a/0x304 [] kernel_init+0x1e/0x110 [] ret_from_exception+0x0/0x10 ---[ end trace 0000000000000000 ]--- Fixes: 80d19669ecd3 ("net: Refactor XPS for CPUs and Rx queues") Signed-off-by: Guo Ren Signed-off-by: Guo Ren --- net/core/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index fa53830d068394..9ec8b10ae3291d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2589,8 +2589,8 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask, copy = true; /* allocate memory for queue storage */ - for (j = -1; j = netif_attrmask_next_and(j, online_mask, mask, nr_ids), - j < nr_ids;) { + for (j = -1; j < nr_ids; + j = netif_attrmask_next_and(j, online_mask, mask, nr_ids)) { if (!new_dev_maps) { new_dev_maps = kzalloc(maps_sz, GFP_KERNEL); if (!new_dev_maps) {