mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Liang <wangliang74@huawei.com>
To: Stanislav Fomichev <sdf@fomichev.me>, <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
	<pabeni@redhat.com>, <jv@jvosburgh.net>, <andrew+netdev@lunn.ch>,
	<linux-kernel@vger.kernel.org>,
	Hangbin Liu <liuhangbin@gmail.com>,
	<syzbot+48c14f61594bdfadb086@syzkaller.appspotmail.com>
Subject: Re: [PATCH net v2] bonding: hold ops lock around get_link
Date: Sun, 27 Apr 2025 11:06:32 +0800	[thread overview]
Message-ID: <11fb538b-0007-4fe7-96b2-6ddb255b496e@huawei.com> (raw)
In-Reply-To: <20250410161117.3519250-1-sdf@fomichev.me>


在 2025/4/11 0:11, Stanislav Fomichev 写道:
> syzbot reports a case of ethtool_ops->get_link being called without
> ops lock:
>
>   ethtool_op_get_link+0x15/0x60 net/ethtool/ioctl.c:63
>   bond_check_dev_link+0x1fb/0x4b0 drivers/net/bonding/bond_main.c:864
>   bond_miimon_inspect drivers/net/bonding/bond_main.c:2734 [inline]
>   bond_mii_monitor+0x49d/0x3170 drivers/net/bonding/bond_main.c:2956
>   process_one_work kernel/workqueue.c:3238 [inline]
>   process_scheduled_works+0xac3/0x18e0 kernel/workqueue.c:3319
>   worker_thread+0x870/0xd50 kernel/workqueue.c:3400
>   kthread+0x7b7/0x940 kernel/kthread.c:464
>   ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:153
>   ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245
>
> Commit 04efcee6ef8d ("net: hold instance lock during NETDEV_CHANGE")
> changed to lockless __linkwatch_sync_dev in ethtool_op_get_link.
> All paths except bonding are coming via locked ioctl. Add necessary
> locking to bonding.
>
> Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
> Reported-by: syzbot+48c14f61594bdfadb086@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=48c14f61594bdfadb086
> Fixes: 04efcee6ef8d ("net: hold instance lock during NETDEV_CHANGE")
> Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
> ---
> v2:
> - move 'BMSR_LSTATUS : 0' part out (Jakub)
> ---
>   drivers/net/bonding/bond_main.c | 13 +++++++++----
>   1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 950d8e4d86f8..8ea183da8d53 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -850,8 +850,9 @@ static int bond_check_dev_link(struct bonding *bond,
>   			       struct net_device *slave_dev, int reporting)
>   {
>   	const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
> -	struct ifreq ifr;
>   	struct mii_ioctl_data *mii;
> +	struct ifreq ifr;
> +	int ret;
>   
>   	if (!reporting && !netif_running(slave_dev))
>   		return 0;
> @@ -860,9 +861,13 @@ static int bond_check_dev_link(struct bonding *bond,
>   		return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;
>   
>   	/* Try to get link status using Ethtool first. */
> -	if (slave_dev->ethtool_ops->get_link)
> -		return slave_dev->ethtool_ops->get_link(slave_dev) ?
> -			BMSR_LSTATUS : 0;
> +	if (slave_dev->ethtool_ops->get_link) {
> +		netdev_lock_ops(slave_dev);
> +		ret = slave_dev->ethtool_ops->get_link(slave_dev);
> +		netdev_unlock_ops(slave_dev);
> +
> +		return ret ? BMSR_LSTATUS : 0;
> +	}
>   
>   	/* Ethtool can't be used, fallback to MII ioctls. */
>   	if (slave_ops->ndo_eth_ioctl) {


Hello, I find that a WARNING still exists:

   RTNL: assertion failed at ./include/net/netdev_lock.h (56)
   WARNING: CPU: 1 PID: 3020 at ./include/net/netdev_lock.h:56 
netdev_ops_assert_locked include/net/netdev_lock.h:56 [inline]
   WARNING: CPU: 1 PID: 3020 at ./include/net/netdev_lock.h:56 
__linkwatch_sync_dev+0x30d/0x360 net/core/link_watch.c:279
   Modules linked in:
   CPU: 1 UID: 0 PID: 3020 Comm: kworker/u8:10 Not tainted 
6.15.0-rc2-syzkaller-00257-gb5c6891b2c5b #0 PREEMPT(full)
   Hardware name: Google Compute Engine, BIOS Google 02/12/2025
   Workqueue: bond0 bond_mii_monitor
   RIP: 0010:netdev_ops_assert_locked include/net/netdev_lock.h:56 [inline]

It is report by syzbot (link: 
https://syzkaller.appspot.com/bug?extid=48c14f61594bdfadb086).

Because ASSERT_RTNL() failed in netdev_ops_assert_locked().

I wonder if should add rtnl lock in bond_check_dev_link()?

Like this:

   +++ b/drivers/net/bonding/bond_main.c
   @@ -862,10 +862,12 @@  static int bond_check_dev_link(struct bonding 
*bond,

        /* Try to get link status using Ethtool first. */
        if (slave_dev->ethtool_ops->get_link) {
   -        netdev_lock_ops(slave_dev);
   -        ret = slave_dev->ethtool_ops->get_link(slave_dev);
   -        netdev_unlock_ops(slave_dev);
   -
   +        if (rtnl_trylock()) {
   +            netdev_lock_ops(slave_dev);
   +            ret = slave_dev->ethtool_ops->get_link(slave_dev);
   +            netdev_unlock_ops(slave_dev);
   +            rtnl_unlock();
   +        }
            return ret ? BMSR_LSTATUS : 0;
        }


  parent reply	other threads:[~2025-04-27  3:06 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-10 16:11 Stanislav Fomichev
2025-04-12  2:01 ` patchwork-bot+netdevbpf
2025-04-27  3:06 ` Wang Liang [this message]
2025-04-28  2:02   ` Hangbin Liu
2025-04-28 15:10     ` Jay Vosburgh
2025-04-29  3:52       ` Hangbin Liu

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=11fb538b-0007-4fe7-96b2-6ddb255b496e@huawei.com \
    --to=wangliang74@huawei.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=jv@jvosburgh.net \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=liuhangbin@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=sdf@fomichev.me \
    --cc=syzbot+48c14f61594bdfadb086@syzkaller.appspotmail.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®