From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: Cong Wang <xiyou.wangcong@gmail.com>,
syzbot+aaa6fa4949cc5d9b7b25@syzkaller.appspotmail.com,
Dmitry Vyukov <dvyukov@google.com>,
Taehee Yoo <ap420073@gmail.com>
Subject: [Patch net-next v2 2/2] bonding: remove useless stats_lock_key
Date: Sat, 2 May 2020 22:22:20 -0700 [thread overview]
Message-ID: <20200503052220.4536-3-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20200503052220.4536-1-xiyou.wangcong@gmail.com>
After commit b3e80d44f5b1
("bonding: fix lockdep warning in bond_get_stats()") the dynamic
key is no longer necessary, as we compute nest level at run-time.
So, we can just remove it to save some lockdep key entries.
Test commands:
ip link add bond0 type bond
ip link add bond1 type bond
ip link set bond0 master bond1
ip link set bond0 nomaster
ip link set bond1 master bond0
Reported-and-tested-by: syzbot+aaa6fa4949cc5d9b7b25@syzkaller.appspotmail.com
Cc: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
drivers/net/bonding/bond_main.c | 3 ---
include/net/bonding.h | 1 -
2 files changed, 4 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d01871321d22..baa93191dfdd 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4491,7 +4491,6 @@ static void bond_uninit(struct net_device *bond_dev)
list_del(&bond->bond_list);
- lockdep_unregister_key(&bond->stats_lock_key);
bond_debug_unregister(bond);
}
@@ -4896,8 +4895,6 @@ static int bond_init(struct net_device *bond_dev)
return -ENOMEM;
spin_lock_init(&bond->stats_lock);
- lockdep_register_key(&bond->stats_lock_key);
- lockdep_set_class(&bond->stats_lock, &bond->stats_lock_key);
netdev_lockdep_set_classes(bond_dev);
list_add_tail(&bond->bond_list, &bn->dev_list);
diff --git a/include/net/bonding.h b/include/net/bonding.h
index dc2ce31a1f52..0b696da5c115 100644
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
@@ -237,7 +237,6 @@ struct bonding {
struct dentry *debug_dir;
#endif /* CONFIG_DEBUG_FS */
struct rtnl_link_stats64 bond_stats;
- struct lock_class_key stats_lock_key;
};
#define bond_slave_get_rcu(dev) \
--
2.26.2
next prev parent reply other threads:[~2020-05-03 5:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-03 5:22 [Patch net-next v2 0/2] net: reduce dynamic lockdep keys Cong Wang
2020-05-03 5:22 ` [Patch net-next v2 1/2] net: partially revert dynamic lockdep key changes Cong Wang
2020-05-04 17:11 ` Taehee Yoo
2020-05-13 15:56 ` Vladimir Oltean
2020-05-16 15:22 ` Taehee Yoo
2020-05-16 16:53 ` Vladimir Oltean
2020-05-17 12:53 ` Taehee Yoo
2020-05-17 18:42 ` Cong Wang
2020-05-17 19:35 ` Florian Fainelli
2020-05-03 5:22 ` Cong Wang [this message]
2020-05-04 19:06 ` [Patch net-next v2 0/2] net: reduce dynamic lockdep keys David Miller
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=20200503052220.4536-3-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=ap420073@gmail.com \
--cc=dvyukov@google.com \
--cc=netdev@vger.kernel.org \
--cc=syzbot+aaa6fa4949cc5d9b7b25@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.