From: Jay Vosburgh <jay.vosburgh@canonical.com>
To: Zhengchao Shao <shaozhengchao@huawei.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, andy@greyhouse.net,
weiyongjun1@huawei.com, yuehaibing@huawei.com
Subject: Re: [PATCH net-next] bonding: use WARN_ON instead of BUG in alb_upper_dev_walk
Date: Mon, 13 Nov 2023 16:31:39 -0800 [thread overview]
Message-ID: <9928.1699921899@famine> (raw)
In-Reply-To: <20231113092754.3285306-1-shaozhengchao@huawei.com>
Zhengchao Shao <shaozhengchao@huawei.com> wrote:
>If failed to allocate "tags" or could not find the final upper device from
>start_dev's upper list in bond_verify_device_path(), only the loopback
>detection of the current upper device should be affected, and the system is
>no need to be panic.
>
>Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
>---
> drivers/net/bonding/bond_alb.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
>index dc2c7b979656..5519cc95b966 100644
>--- a/drivers/net/bonding/bond_alb.c
>+++ b/drivers/net/bonding/bond_alb.c
>@@ -984,8 +984,10 @@ static int alb_upper_dev_walk(struct net_device *upper,
> */
> if (netif_is_macvlan(upper) && !strict_match) {
> tags = bond_verify_device_path(bond->dev, upper, 0);
>- if (IS_ERR_OR_NULL(tags))
>- BUG();
>+ if (IS_ERR_OR_NULL(tags)) {
>+ WARN_ON(1);
>+ return 0;
This seems reasonable enough, although I'd suggest the using
WARN_ON_ONCE instead of WARN_ON. Alternatively, this could stay as
WARN_ON if the above also returns non-zero in order to terminate the
netdev_walk_all_upper_dev_rcu walk. The intent here is to avoid
spamming the log if there's a lot of macvlans above the bond. If the
allocation in bond_verify_device_path failed, trying again immediately
seems likely to fail as well.
We could also arrange for whatever called alb_upper_dev_walk to
reschedule at a slightly later time, but I don't think that's worth the
trouble. The bond will by default resend learning packets once per
second, so issues related to a lost learning packet should resolve
relatively quickly.
-J
>+ }
> alb_send_lp_vid(slave, upper->dev_addr,
> tags[0].vlan_proto, tags[0].vlan_id);
> kfree(tags);
>--
>2.34.1
---
-Jay Vosburgh, jay.vosburgh@canonical.com
next prev parent reply other threads:[~2023-11-14 0:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 9:27 [PATCH net-next] bonding: use WARN_ON instead of BUG in alb_upper_dev_walk Zhengchao Shao
2023-11-14 0:31 ` Jay Vosburgh [this message]
2023-11-14 8:22 ` shaozhengchao
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=9928.1699921899@famine \
--to=jay.vosburgh@canonical.com \
--cc=andy@greyhouse.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shaozhengchao@huawei.com \
--cc=weiyongjun1@huawei.com \
--cc=yuehaibing@huawei.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).