From: guoren@kernel.org
To: andriy.shevchenko@linux.intel.com, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
linux@rasmusvillemoes.dk, yury.norov@gmail.com,
caraitto@google.com, willemb@google.com, jonolson@google.com,
amritha.nambiar@intel.com
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
Guo Ren <guoren@linux.alibaba.com>, Guo Ren <guoren@kernel.org>
Subject: [PATCH V2 1/2] net: Fixup netif_attrmask_next_and warning
Date: Thu, 13 Oct 2022 23:04:58 -0400 [thread overview]
Message-ID: <20221014030459.3272206-2-guoren@kernel.org> (raw)
In-Reply-To: <20221014030459.3272206-1-guoren@kernel.org>
From: Guo Ren <guoren@linux.alibaba.com>
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
[<ffffffff805e5824>] virtnet_set_affinity+0x14a/0x1c0
[<ffffffff805e7b04>] virtnet_probe+0x7fc/0xee2
[<ffffffff8050e120>] virtio_dev_probe+0x164/0x2de
[<ffffffff8055b69e>] really_probe+0x82/0x224
[<ffffffff8055b89a>] __driver_probe_device+0x5a/0xaa
[<ffffffff8055b916>] driver_probe_device+0x2c/0xb8
[<ffffffff8055bf34>] __driver_attach+0x76/0x108
[<ffffffff805597c0>] bus_for_each_dev+0x4a/0x8e
[<ffffffff8055b072>] driver_attach+0x1a/0x28
[<ffffffff8055ab8c>] bus_add_driver+0x13c/0x1a6
[<ffffffff8055c722>] driver_register+0x4a/0xfc
[<ffffffff8050dc34>] register_virtio_driver+0x1c/0x2c
[<ffffffff80a2bae4>] virtio_net_driver_init+0x7a/0xb0
[<ffffffff80002840>] do_one_initcall+0x66/0x2e4
[<ffffffff80a01212>] kernel_init_freeable+0x28a/0x304
[<ffffffff808b21e2>] kernel_init+0x1e/0x110
[<ffffffff80003c46>] ret_from_exception+0x0/0x10
---[ end trace 0000000000000000 ]---
Fixes: 80d19669ecd3 ("net: Refactor XPS for CPUs and Rx queues")
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
---
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 fa53830d0683..9ec8b10ae329 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) {
--
2.36.1
next prev parent reply other threads:[~2022-10-14 3:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-14 3:04 [PATCH V2 0/2] net: Fixup cpu_mask usage guoren
2022-10-14 3:04 ` guoren [this message]
2022-10-14 3:35 ` [PATCH V2 1/2] net: Fixup netif_attrmask_next_and warning Jakub Kicinski
2022-10-14 3:39 ` Jakub Kicinski
2022-10-14 4:42 ` Yury Norov
2022-10-14 6:42 ` Guo Ren
2022-10-14 16:03 ` Jakub Kicinski
2022-10-14 16:16 ` Yury Norov
2022-10-14 18:03 ` Jakub Kicinski
2022-10-15 1:41 ` Guo Ren
2022-10-14 6:38 ` Guo Ren
2022-10-14 15:52 ` Jakub Kicinski
2022-10-15 1:38 ` Guo Ren
2022-10-14 10:00 ` Andy Shevchenko
2022-10-14 10:04 ` Guo Ren
2022-10-14 3:04 ` [PATCH V2 2/2] net: Fixup virtnet_set_affinity() cause cpumask warning guoren
2022-10-14 10:00 ` Andy Shevchenko
2022-10-14 10:04 ` Guo Ren
2022-10-17 1:58 ` Xuan Zhuo
2022-10-17 2:46 ` Guo Ren
2022-10-17 2:58 ` Xuan Zhuo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221014030459.3272206-2-guoren@kernel.org \
--to=guoren@kernel.org \
--cc=amritha.nambiar@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=caraitto@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=guoren@linux.alibaba.com \
--cc=jonolson@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=willemb@google.com \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).