Commit fc8695eb authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

Revert "net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}"

This reverts commit 854701ba.

We have more violations around, which leads to:

  WARNING: CPU: 2 PID: 1 at include/linux/cpumask.h:110 __netif_set_xps_queue+0x14e/0x770

Let's back this out and retry with a larger clean up in -next.

Fixes: 854701ba ("net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}")
Link: https://lore.kernel.org/all/20221014030459.3272206-2-guoren@kernel.org/Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a6d58a7
...@@ -3663,8 +3663,9 @@ static inline bool netif_attr_test_online(unsigned long j, ...@@ -3663,8 +3663,9 @@ static inline bool netif_attr_test_online(unsigned long j,
static inline unsigned int netif_attrmask_next(int n, const unsigned long *srcp, static inline unsigned int netif_attrmask_next(int n, const unsigned long *srcp,
unsigned int nr_bits) unsigned int nr_bits)
{ {
/* n is a prior cpu */ /* -1 is a legal arg here. */
cpu_max_bits_warn(n + 1, nr_bits); if (n != -1)
cpu_max_bits_warn(n, nr_bits);
if (srcp) if (srcp)
return find_next_bit(srcp, nr_bits, n + 1); return find_next_bit(srcp, nr_bits, n + 1);
...@@ -3685,8 +3686,9 @@ static inline int netif_attrmask_next_and(int n, const unsigned long *src1p, ...@@ -3685,8 +3686,9 @@ static inline int netif_attrmask_next_and(int n, const unsigned long *src1p,
const unsigned long *src2p, const unsigned long *src2p,
unsigned int nr_bits) unsigned int nr_bits)
{ {
/* n is a prior cpu */ /* -1 is a legal arg here. */
cpu_max_bits_warn(n + 1, nr_bits); if (n != -1)
cpu_max_bits_warn(n, nr_bits);
if (src1p && src2p) if (src1p && src2p)
return find_next_and_bit(src1p, src2p, nr_bits, n + 1); return find_next_and_bit(src1p, src2p, nr_bits, n + 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment