net: partially revert dynamic lockdep key changes
authorCong Wang <xiyou.wangcong@gmail.com>
Sun, 3 May 2020 05:22:19 +0000 (22:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 May 2020 19:05:56 +0000 (12:05 -0700)
commit1a33e10e4a95cb109ff1145098175df3113313ef
treea903d8645954f9d50e03c3f0b8a25479ec2f6985
parentea84c842900872f5b8d6d4754cf0fa37d6672011
net: partially revert dynamic lockdep key changes

This patch reverts the folowing commits:

commit 064ff66e2bef84f1153087612032b5b9eab005bd
"bonding: add missing netdev_update_lockdep_key()"

commit 53d374979ef147ab51f5d632dfe20b14aebeccd0
"net: avoid updating qdisc_xmit_lock_key in netdev_update_lockdep_key()"

commit 1f26c0d3d24125992ab0026b0dab16c08df947c7
"net: fix kernel-doc warning in <linux/netdevice.h>"

commit ab92d68fc22f9afab480153bd82a20f6e2533769
"net: core: add generic lockdep keys"

but keeps the addr_list_lock_key because we still lock
addr_list_lock nestedly on stack devices, unlikely xmit_lock
this is safe because we don't take addr_list_lock on any fast
path.

Reported-and-tested-by: syzbot+aaa6fa4949cc5d9b7b25@syzkaller.appspotmail.com
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 files changed:
drivers/net/bonding/bond_main.c
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
drivers/net/hamradio/bpqether.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/ipvlan/ipvlan_main.c
drivers/net/macsec.c
drivers/net/macvlan.c
drivers/net/ppp/ppp_generic.c
drivers/net/team/team.c
drivers/net/vrf.c
drivers/net/wireless/intersil/hostap/hostap_hw.c
include/linux/netdevice.h
net/8021q/vlan_dev.c
net/batman-adv/soft-interface.c
net/bluetooth/6lowpan.c
net/core/dev.c
net/dsa/slave.c
net/ieee802154/6lowpan/core.c
net/l2tp/l2tp_eth.c
net/netrom/af_netrom.c
net/rose/af_rose.c
net/sched/sch_generic.c