Revert "net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}"
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 Revert "net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}"
This reverts commit 854701ba4c39afae2362ba19a580c461cb183e4f.
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.
--- include/linux/netdevice.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
include/linux/netdevice.h +6 -4
@@ -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,unsigned int nr_bits) { -/* n is a prior cpu */ -cpu_max_bits_warn (n +1 , nr_bits); +/* -1 is a legal arg here. */ +if (n !=-1 ) +cpu_max_bits_warn (n, nr_bits);if (srcp)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, const unsigned long *src2p, unsigned int nr_bits) { -/* n is a prior cpu */ - cpu_max_bits_warn(n + 1, nr_bits); + /* -1 is a legal arg here. */ + if (n != -1) + cpu_max_bits_warn(n, nr_bits);if (src1p && src2p)return find_next_and_bit (src1p, src2p, nr_bits, n +1 );
Signature · 1 line
2.37.3
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Fri, 14 Oct 2022 09:07:46 -0700 you wrote:
This reverts commit
854701ba4c39afae2362ba19a580c461cb183e4f.We have more violations around, which leads to:
WARNING: CPU: 2 PID: 1 at include/linux/cpumask.h:110 __netif_set_xps_queue+0x14e/0x770Let's back this out and retry with a larger clean up in -next.
[...]
Here is the summary with links:
- [net] Revert "net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}"
https://git.kernel.org/netdev/net/c/fc8695eb11f0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 11 lines · Jakub Kicinski
This reverts commit
854701ba4c39afae2362ba19a580c461cb183e4f.We have more violations around, which leads to:
WARNING: CPU: 2 PID: 1 at include/linux/cpumask.h:110 __netif_set_xps_queue+0x14e/0x770Let's back this out and retry with a larger clean up in -next.
Fixes 854701ba4c39 ("net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}")Signed-off-by Jakub Kicinski <[email protected]>
Quoted 35 lines
--- include/linux/netdevice.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)include/linux/netdevice.h +6
-4@@ -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,unsigned int nr_bits) { -/* n is a prior cpu */ -cpu_max_bits_warn (n +1 , nr_bits); +/* -1 is a legal arg here. */ +if (n !=-1 ) +cpu_max_bits_warn (n, nr_bits);if (srcp)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, const unsigned long *src2p, unsigned int nr_bits) { -/* n is a prior cpu */ - cpu_max_bits_warn(n + 1, nr_bits); + /* -1 is a legal arg here. */ + if (n != -1) + cpu_max_bits_warn(n, nr_bits);if (src1p && src2p)return find_next_and_bit (src1p, src2p, nr_bits, n +1 );Signature · 1 line
2.37.3