From: Yury Norov <yury.norov@gmail.com>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: Yury Norov <yury.norov@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Borislav Petkov <bp@alien8.de>,
Eric Dumazet <edumazet@google.com>,
Guo Ren <guoren@linux.alibaba.com>,
Jakub Kicinski <kuba@kernel.org>,
Kuniyuki Iwashima <kuniyu@amazon.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Menglong Dong <imagedong@tencent.com>,
Paolo Abeni <pabeni@redhat.com>, Petr Machata <petrm@nvidia.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
andriy.shevchenko@linux.intel.com, caraitto@google.com,
jonolson@google.com, willemb@google.com,
"David S .Miller" <davem@davemloft.net>,
Andrew Jones <ajones@ventanamicro.com>,
amritha.nambiar@intel.com, linux@rasmusvillemoes.dk
Subject: [PATCH] Revert "net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}"
Date: Sun, 16 Oct 2022 20:09:47 -0700 [thread overview]
Message-ID: <20221017030947.1295426-1-yury.norov@gmail.com> (raw)
This reverts commit 854701ba4c39afae2362ba19a580c461cb183e4f.
The reverted commit makes netif_attr_test_online() network subsystems
generating warnings, and it breaks syzkaller testing.
https://syzkaller.appspot.com/bug?extid=9abe5ecc348676215427
Signed-off-by: Yury Norov <yury.norov@gmail.com>
---
include/linux/netdevice.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a36edb0ec199..eddf8ee270e7 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -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);
--
2.34.1
next reply other threads:[~2022-10-17 3:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-17 3:09 Yury Norov [this message]
2022-10-19 11:49 ` Michael S. Tsirkin
2022-10-19 12:16 ` Christian Borntraeger
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=20221017030947.1295426-1-yury.norov@gmail.com \
--to=yury.norov@gmail.com \
--cc=agordeev@linux.ibm.com \
--cc=ajones@ventanamicro.com \
--cc=amritha.nambiar@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bigeasy@linutronix.de \
--cc=bp@alien8.de \
--cc=caraitto@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=guoren@linux.alibaba.com \
--cc=imagedong@tencent.com \
--cc=jonolson@google.com \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=torvalds@linux-foundation.org \
--cc=willemb@google.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
all inboxes | Powered by JetHome®