Lockdep enablement for seqcount/seqlocks (v2)
Subsystems (21)
cover Lockdep enablement for seqcount/seqlocks (v2)
Just wanted to send this out again for further feedback.
This patch series enables lockdep for seqcount/seqlock structures, as well as provides the required cleanups to explicitly initialize the seqcount structures on u64_stat_sync users.
In addition the last two patches in this provide fixes to some of the issues the new lockdep infrastructure caught.
I'd greatly appreciate any thoughts or feedback on the series! Particularly on how the u64_stats_sync initialization changes should be merged.
thanks
-john
Changeslog:
v2:
* Took Eric Dumazet's suggestion for a better ipv6 deadlock fix
* Macro formatting improvements suggested by Ingo
* Minor commit message tweaks
John Stultz (4):
[RFC] net: Explicitly initialize u64_stats_sync structures for lockdep [RFC] seqcount: Add lockdep functionality to seqcount/seqlock
structures
[RFC] cpuset: Fix potential deadlock w/ set_mems_allowed [RFC] ipv6: Fix for possible ipv6 seqlock deadlock
arch/x86/vdso/vclock_gettime.c | 8 +-- drivers/net/dummy.c | 6 ++ drivers/net/ethernet/emulex/benet/be_main.c | 4 ++ drivers/net/ethernet/intel/igb/igb_main.c | 5 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++ drivers/net/ethernet/marvell/mvneta.c | 3 + drivers/net/ethernet/marvell/sky2.c | 3 + drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 ++ drivers/net/ethernet/nvidia/forcedeth.c | 2 + drivers/net/ethernet/realtek/8139too.c | 3 + drivers/net/ethernet/tile/tilepro.c | 2 + drivers/net/ethernet/via/via-rhine.c | 3 + drivers/net/ifb.c | 5 ++ drivers/net/loopback.c | 6 ++ drivers/net/macvlan.c | 7 +++ drivers/net/nlmon.c | 8 +++ drivers/net/team/team.c | 6 ++ drivers/net/team/team_mode_loadbalance.c | 9 ++- drivers/net/veth.c | 8 +++ drivers/net/virtio_net.c | 8 +++ drivers/net/vxlan.c | 8 +++ drivers/net/xen-netfront.c | 6 ++ fs/dcache.c | 4 +- fs/fs_struct.c | 2 +- include/linux/cpuset.h | 4 ++ include/linux/init_task.h | 8 +-- include/linux/lockdep.h | 8 ++- include/linux/seqlock.h | 79 +++++++++++++++++++++++--- include/linux/u64_stats_sync.h | 7 +++ mm/filemap_xip.c | 2 +- net/8021q/vlan_dev.c | 9 ++- net/bridge/br_device.c | 7 +++ net/ipv4/af_inet.c | 14 +++++ net/ipv4/ip_tunnel.c | 8 ++- net/ipv6/addrconf.c | 14 +++++ net/ipv6/af_inet6.c | 14 +++++ net/ipv6/ip6_gre.c | 15 +++++ net/ipv6/ip6_output.c | 2 +- net/ipv6/ip6_tunnel.c | 7 +++ net/ipv6/sit.c | 15 +++++ net/netfilter/ipvs/ip_vs_ctl.c | 25 +++++++- net/openvswitch/datapath.c | 6 ++ net/openvswitch/vport.c | 8 +++ 43 files changed, 348 insertions(+), 28 deletions(-)
Signature · 1 line
1.8.1.2
RFC PATCH 1/4 net: Explicitly initialize u64_stats_sync structures for lockdep
In order to enable lockdep on seqcount/seqlock structures, we must explicitly initialize any locks.
The u64_stats_sync structure, uses a seqcount, and thus we need to introduce a u64_stats_init() function and use it to initialize the structure.
This unfortunately adds a lot of fairly trivial initialization code to a number of drivers. But the benefit of ensuring correctness makes this worth while.
Because these changes are required for lockdep to be enabled, and the changes are quite trivial, I've not yet split this patch out into 30-some separate patches, as I figured it would be better to get the various maintainers thoughts on how to best merge this change along with the seqcount lockdep enablement.
Feedback would be appreciated!
--- drivers/net/dummy.c | 6 ++++++ drivers/net/ethernet/emulex/benet/be_main.c | 4 ++++ drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++++ drivers/net/ethernet/marvell/mvneta.c | 3 +++ drivers/net/ethernet/marvell/sky2.c | 3 +++ drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 ++++ drivers/net/ethernet/nvidia/forcedeth.c | 2 ++ drivers/net/ethernet/realtek/8139too.c | 3 +++ drivers/net/ethernet/tile/tilepro.c | 2 ++ drivers/net/ethernet/via/via-rhine.c | 3 +++ drivers/net/ifb.c | 5 +++++ drivers/net/loopback.c | 6 ++++++ drivers/net/macvlan.c | 7 +++++++ drivers/net/nlmon.c | 8 ++++++++ drivers/net/team/team.c | 6 ++++++ drivers/net/team/team_mode_loadbalance.c | 9 ++++++++- drivers/net/veth.c | 8 ++++++++ drivers/net/virtio_net.c | 8 ++++++++ drivers/net/vxlan.c | 8 ++++++++ drivers/net/xen-netfront.c | 6 ++++++ include/linux/u64_stats_sync.h | 7 +++++++ net/8021q/vlan_dev.c | 9 ++++++++- net/bridge/br_device.c | 7 +++++++ net/ipv4/af_inet.c | 14 ++++++++++++++ net/ipv4/ip_tunnel.c | 8 +++++++- net/ipv6/addrconf.c | 14 ++++++++++++++ net/ipv6/af_inet6.c | 14 ++++++++++++++ net/ipv6/ip6_gre.c | 15 +++++++++++++++ net/ipv6/ip6_tunnel.c | 7 +++++++ net/ipv6/sit.c | 15 +++++++++++++++ net/netfilter/ipvs/ip_vs_ctl.c | 25 ++++++++++++++++++++++--- net/openvswitch/datapath.c | 6 ++++++ net/openvswitch/vport.c | 8 ++++++++ 34 files changed, 253 insertions(+), 6 deletions(-)
drivers/net/dummy.c +6 -0
@@ -88,10 +88,16 @@ static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev)static int dummy_dev_init (struct net_device *dev) { +int i; dev->dstats = alloc_percpu(struct pcpu_dstats);if (!dev->dstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_dstats *dstats; + dstats =per_cpu_ptr (dev->dstats, i); +u64_stats_init (&dstats->syncp); + }return 0 ; }
drivers/net/ethernet/emulex/benet/be_main.c +4 -0
@@ -2033,6 +2033,9 @@ static int be_tx_qs_create(struct be_adapter *adapter)if (status)return status; +u64_stats_init (&txo->stats.sync); +u64_stats_init (&txo->stats.sync_compl); +/* If num_evt_qs is less than num_tx_qs, then more than * one txq share an eq */
@@ -2094,6 +2097,7 @@ static int be_rx_cqs_create(struct be_adapter *adapter)if (rc)return rc; +u64_stats_init (&rxo->stats.sync); eq = &adapter->eq_obj[i % adapter->num_evt_qs].q; rc =be_cmd_cq_create (adapter, cq, eq, false,3 );if (rc)
drivers/net/ethernet/intel/igb/igb_main.c +5 -0
@@ -1223,6 +1223,9 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, ring->count = adapter->tx_ring_count; ring->queue_index = txr_idx; +u64_stats_init (&ring->tx_syncp); +u64_stats_init (&ring->tx_syncp2); +/* assign ring to adapter */ adapter->tx_ring[txr_idx] = ring;
@@ -1256,6 +1259,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, ring->count = adapter->rx_ring_count; ring->queue_index = rxr_idx; +u64_stats_init (&ring->rx_syncp); +/* assign ring to adapter */ adapter->rx_ring[rxr_idx] = ring; }
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +4 -0
@@ -4867,6 +4867,8 @@ int ixgbe_setup_tx_resources(struct ixgbe_ring *tx_ring)if (!tx_ring->tx_buffer_info) goto err; +u64_stats_init (&tx_ring->syncp); +/* round up to nearest 4K */ tx_ring->size = tx_ring->count *sizeof (union ixgbe_adv_tx_desc ); tx_ring->size =ALIGN (tx_ring->size,4096 );
@@ -4949,6 +4951,8 @@ int ixgbe_setup_rx_resources(struct ixgbe_ring *rx_ring)if (!rx_ring->rx_buffer_info) goto err; +u64_stats_init (&rx_ring->syncp); +/* Round up to nearest 4K */ rx_ring->size = rx_ring->count *sizeof (union ixgbe_adv_rx_desc ); rx_ring->size =ALIGN (rx_ring->size,4096 );
drivers/net/ethernet/marvell/mvneta.c +3 -0
@@ -2792,6 +2792,9 @@ static int mvneta_probe(struct platform_device *pdev) pp =netdev_priv (dev); +u64_stats_init (&pp->tx_stats.syncp); +u64_stats_init (&pp->rx_stats.syncp); + pp->weight =MVNETA_RX_POLL_WEIGHT ; pp->phy_node = phy_node; pp->phy_interface = phy_mode;
drivers/net/ethernet/marvell/sky2.c +3 -0
@@ -4763,6 +4763,9 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, sky2->hw = hw; sky2->msg_enable =netif_msg_init (debug, default_msg); +u64_stats_init (&sky2->tx_stats.syncp); +u64_stats_init (&sky2->rx_stats.syncp); +/* Auto speed and flow control */ sky2->flags =SKY2_FLAG_AUTO_SPEED |SKY2_FLAG_AUTO_PAUSE ;if (hw->chip_id !=CHIP_ID_YUKON_XL )
drivers/net/ethernet/neterion/vxge/vxge-main.c +4 -0
@@ -2072,6 +2072,10 @@ static int vxge_open_vpaths(struct vxgedev *vdev) vdev->config.tx_steering_type; vpath->fifo.ndev = vdev->ndev; vpath->fifo.pdev = vdev->pdev; + +u64_stats_init (&vpath->fifo.stats.syncp); +u64_stats_init (&vpath->ring.stats.syncp); +if (vdev->config.tx_steering_type) vpath->fifo.txq =netdev_get_tx_queue (vdev->ndev, i);
drivers/net/ethernet/nvidia/forcedeth.c +2 -0
@@ -5619,6 +5619,8 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)spin_lock_init (&np->lock);spin_lock_init (&np->hwstats_lock);SET_NETDEV_DEV (dev, &pci_dev->dev); +u64_stats_init (&np->swstats_rx_syncp); +u64_stats_init (&np->swstats_tx_syncp);init_timer (&np->oom_kick); np->oom_kick.data = (unsigned long ) dev;
drivers/net/ethernet/realtek/8139too.c +3 -0
@@ -791,6 +791,9 @@ static struct net_device *rtl8139_init_board(struct pci_dev *pdev)pci_set_master (pdev); +u64_stats_init (&tp->rx_stats.syncp); +u64_stats_init (&tp->tx_stats.syncp); + retry:/* PIO bar register comes first. */ bar = !use_io;
drivers/net/ethernet/tile/tilepro.c +2 -0
@@ -1008,6 +1008,8 @@ static void tile_net_register(void *dev_ptr) info->egress_timer.data = (long )info; info->egress_timer.function = tile_net_handle_egress_timer; +u64_stats_init (&info->stats.syncp); + priv->cpu[my_cpu] = info;/*
drivers/net/ethernet/via/via-rhine.c +3 -0
@@ -987,6 +987,9 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rp->base = ioaddr; +u64_stats_init (&rp->tx_stats.syncp); +u64_stats_init (&rp->rx_stats.syncp); +/* Get chip registers into a sane state */ rhine_power_init (dev);rhine_hw_init (dev, pioaddr);
drivers/net/ifb.c +5 -0
@@ -265,6 +265,7 @@ MODULE_PARM_DESC(numifbs, "Number of ifb devices");static int __init ifb_init_one (int index) {struct net_device *dev_ifb; +struct ifb_private *dp;int err; dev_ifb = alloc_netdev(sizeof(struct ifb_private),
@@ -273,6 +274,10 @@ static int __init ifb_init_one(int index)if (!dev_ifb)return -ENOMEM ; + dp =netdev_priv (dev_ifb); +u64_stats_init (&dp->rsync); +u64_stats_init (&dp->tsync); + dev_ifb->rtnl_link_ops = &ifb_link_ops; err =register_netdevice (dev_ifb);if (err <0 )
drivers/net/loopback.c +6 -0
@@ -137,10 +137,16 @@ static const struct ethtool_ops loopback_ethtool_ops = {static int loopback_dev_init (struct net_device *dev) { +int i; dev->lstats = alloc_percpu(struct pcpu_lstats);if (!dev->lstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_lstats *lb_stats; + lb_stats =per_cpu_ptr (dev->lstats, i); +u64_stats_init (&lb_stats->syncp); + }return 0 ; }
drivers/net/macvlan.c +7 -0
@@ -501,6 +501,7 @@ static int macvlan_init(struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);const struct net_device *lowerdev = vlan->lowerdev; +int i; dev->state = (dev->state & ~MACVLAN_STATE_MASK ) | (lowerdev->state &MACVLAN_STATE_MASK );
@@ -516,6 +517,12 @@ static int macvlan_init(struct net_device *dev)if (!vlan->pcpu_stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct macvlan_pcpu_stats *mvlstats; + mvlstats =per_cpu_ptr (vlan->pcpu_stats, i); +u64_stats_init (&mvlstats->syncp); + } +return 0 ; }
drivers/net/nlmon.c +8 -0
@@ -47,8 +47,16 @@ static int nlmon_change_mtu(struct net_device *dev, int new_mtu)static int nlmon_dev_init (struct net_device *dev) { +int i; + dev->lstats = alloc_percpu(struct pcpu_lstats); +for_each_possible_cpu (i) { +struct pcpu_lstats *nlmstats; + nlmstats =per_cpu_ptr (dev->lstats, i); +u64_stats_init (&nlmstats->syncp); + } +return dev->lstats ==NULL ? -ENOMEM :0 ; }
drivers/net/team/team.c +6 -0
@@ -1540,6 +1540,12 @@ static int team_init(struct net_device *dev)if (!team->pcpu_stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct team_pcpu_stats *team_stats; + team_stats =per_cpu_ptr (team->pcpu_stats, i); +u64_stats_init (&team_stats->syncp); + } +for (i =0 ; i <TEAM_PORT_HASHENTRIES ; i++)INIT_HLIST_HEAD (&team->en_port_hlist[i]);INIT_LIST_HEAD (&team->port_list);
drivers/net/team/team_mode_loadbalance.c +8 -1
@@ -570,7 +570,7 @@ static int lb_init(struct team *team) {struct lb_priv *lb_priv =get_lb_priv (team);lb_select_tx_port_func_t *func; -int err; +int i, err;/* set default tx port selector */ func =lb_select_tx_port_get_func ("hash" );
@@ -588,6 +588,13 @@ static int lb_init(struct team *team) goto err_alloc_pcpu_stats; } +for_each_possible_cpu (i) { +struct lb_pcpu_stats *team_lb_stats; + team_lb_stats =per_cpu_ptr (lb_priv->pcpu_stats, i); +u64_stats_init (&team_lb_stats->syncp); + } + +INIT_DELAYED_WORK (&lb_priv->ex->stats.refresh_dw, lb_stats_refresh); err =team_options_register (team, lb_options,ARRAY_SIZE (lb_options));
drivers/net/veth.c +8 -0
@@ -230,10 +230,18 @@ static int veth_change_mtu(struct net_device *dev, int new_mtu)static int veth_dev_init (struct net_device *dev) { +int i; + dev->vstats = alloc_percpu(struct pcpu_vstats);if (!dev->vstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_vstats *veth_stats; + veth_stats =per_cpu_ptr (dev->vstats, i); +u64_stats_init (&veth_stats->syncp); + } +return 0 ; }
drivers/net/virtio_net.c +8 -0
@@ -1559,6 +1559,14 @@ static int virtnet_probe(struct virtio_device *vdev)if (vi->stats ==NULL ) goto free; +for_each_possible_cpu (i) { +struct virtnet_stats *virtnet_stats; + virtnet_stats =per_cpu_ptr (vi->stats, i); +u64_stats_init (&virtnet_stats->tx_syncp); +u64_stats_init (&virtnet_stats->rx_syncp); + } + + vi->vq_index =alloc_percpu (int);if (vi->vq_index ==NULL ) goto free_stats;
drivers/net/vxlan.c +8 -0
@@ -1886,11 +1886,19 @@ static int vxlan_init(struct net_device *dev)struct vxlan_dev *vxlan =netdev_priv (dev);struct vxlan_net *vn =net_generic (dev_net (dev), vxlan_net_id);struct vxlan_sock *vs; +int i; dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *vxlan_stats; + vxlan_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&vxlan_stats->syncp); + } + +spin_lock (&vn->sock_lock); vs =vxlan_find_sock (dev_net (dev), vxlan->dst_port);if (vs) {
drivers/net/xen-netfront.c +6 -0
@@ -1338,6 +1338,12 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)if (np->stats ==NULL ) goto exit; +for_each_possible_cpu (i) { +struct netfront_stats *xen_nf_stats; + xen_nf_stats =per_cpu_ptr (np->stats, i); +u64_stats_init (&xen_nf_stats->syncp); + } +/* Initialise tx_skbs as a free chain containing every entry. */ np->tx_skb_freelist =0 ;for (i =0 ; i <NET_TX_RING_SIZE ; i++) {
include/linux/u64_stats_sync.h +7 -0
@@ -67,6 +67,13 @@ struct u64_stats_sync {#endif }; + +#if BITS_PER_LONG ==32 && defined(CONFIG_SMP ) +# define u64_stats_init (syncp) seqcount_init(syncp.seq) +#else +# define u64_stats_init (syncp) do { } while (0) +#endif +static inline void u64_stats_update_begin (struct u64_stats_sync *syncp) {#if BITS_PER_LONG ==32 && defined(CONFIG_SMP )
net/8021q/vlan_dev.c +8 -1
@@ -558,7 +558,7 @@ static const struct net_device_ops vlan_netdev_ops;static int vlan_dev_init (struct net_device *dev) {struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; -int subclass =0 ; +int subclass =0 , i;netif_carrier_off (dev);
@@ -612,6 +612,13 @@ static int vlan_dev_init(struct net_device *dev)if (!vlan_dev_priv (dev)->vlan_pcpu_stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct vlan_pcpu_stats *vlan_stat; + vlan_stat =per_cpu_ptr (vlan_dev_priv (dev)->vlan_pcpu_stats, i); +u64_stats_init (&vlan_stat->syncp); + } + +return 0 ; }
net/bridge/br_device.c +7 -0
@@ -88,11 +88,18 @@ out:static int br_dev_init (struct net_device *dev) {struct net_bridge *br =netdev_priv (dev); +int i; br->stats = alloc_percpu(struct br_cpu_netstats);if (!br->stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct br_cpu_netstats *br_dev_stats; + br_dev_stats =per_cpu_ptr (br->stats, i); +u64_stats_init (&br_dev_stats->syncp); + } +return 0 ; }
net/ipv4/af_inet.c +14 -0
@@ -1520,6 +1520,7 @@ int snmp_mib_init(void __percpu *ptr[2], size_t mibsize, size_t align) ptr[0 ] =__alloc_percpu (mibsize, align);if (!ptr[0 ])return -ENOMEM ; +#if SNMP_ARRAY_SZ ==2 ptr[1 ] =__alloc_percpu (mibsize, align);if (!ptr[1 ]) {
@@ -1563,6 +1564,8 @@ static const struct net_protocol icmp_protocol = {static __net_init int ipv4_mib_init_net (struct net *net) { +int i; +if (snmp_mib_init ((void __percpu **)net->mib.tcp_statistics,sizeof (struct tcp_mib ), __alignof__(struct tcp_mib )) <0 )
@@ -1571,6 +1574,17 @@ static __net_init int ipv4_mib_init_net(struct net *net) sizeof(struct ipstats_mib), __alignof__(struct ipstats_mib)) < 0) goto err_ip_mib; + +for_each_possible_cpu (i) { +struct ipstats_mib *af_inet_stats; + af_inet_stats =per_cpu_ptr (net->mib.ip_statistics[0 ], i); +u64_stats_init (&af_inet_stats->syncp); +#if SNMP_ARRAY_SZ ==2 + af_inet_stats =per_cpu_ptr (net->mib.ip_statistics[1 ], i); +u64_stats_init (&af_inet_stats->syncp); +#endif + } +if (snmp_mib_init ((void __percpu **)net->mib.net_statistics,sizeof (struct linux_mib ), __alignof__(struct linux_mib )) <0 )
net/ipv4/ip_tunnel.c +7 -1
@@ -976,13 +976,19 @@ int ip_tunnel_init(struct net_device *dev) {struct ip_tunnel *tunnel =netdev_priv (dev);struct iphdr *iph = &tunnel->parms.iph; -int err; +int i, err; dev->destructor = ip_tunnel_dev_free; dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ipt_stats; + ipt_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ipt_stats->syncp); + } + err =gro_cells_init (&tunnel->gro_cells, dev);if (err) {free_percpu (dev->tstats);
net/ipv6/addrconf.c +14 -0
@@ -281,10 +281,24 @@ static void addrconf_mod_dad_timer(struct inet6_ifaddr *ifp,static int snmp6_alloc_dev (struct inet6_dev *idev) { +int i; +if (snmp_mib_init ((void __percpu **)idev->stats.ipv6,sizeof (struct ipstats_mib ), __alignof__(struct ipstats_mib )) <0 ) goto err_ip; + +for_each_possible_cpu (i) { +struct ipstats_mib *addrconf_stats; + addrconf_stats =per_cpu_ptr (idev->stats.ipv6[0 ], i); +u64_stats_init (&addrconf_stats->syncp); +#if SNMP_ARRAY_SZ ==2 + addrconf_stats =per_cpu_ptr (idev->stats.ipv6[1 ], i); +u64_stats_init (&addrconf_stats->syncp); +#endif + } + + idev->stats.icmpv6dev =kzalloc (sizeof (struct icmpv6_mib_device ),GFP_KERNEL );if (!idev->stats.icmpv6dev)
net/ipv6/af_inet6.c +14 -0
@@ -719,6 +719,8 @@ static void ipv6_packet_cleanup(void)static int __net_init ipv6_init_mibs (struct net *net) { +int i; +if (snmp_mib_init ((void __percpu **)net->mib.udp_stats_in6,sizeof (struct udp_mib ), __alignof__(struct udp_mib )) <0 )
@@ -731,6 +733,18 @@ static int __net_init ipv6_init_mibs(struct net *net) sizeof(struct ipstats_mib), __alignof__(struct ipstats_mib)) < 0) goto err_ip_mib; + +for_each_possible_cpu (i) { +struct ipstats_mib *af_inet6_stats; + af_inet6_stats =per_cpu_ptr (net->mib.ipv6_statistics[0 ], i); +u64_stats_init (&af_inet6_stats->syncp); +#if SNMP_ARRAY_SZ ==2 + af_inet6_stats =per_cpu_ptr (net->mib.ipv6_statistics[1 ], i); +u64_stats_init (&af_inet6_stats->syncp); +#endif + } + +if (snmp_mib_init ((void __percpu **)net->mib.icmpv6_statistics,sizeof (struct icmpv6_mib ), __alignof__(struct icmpv6_mib )) <0 )
net/ipv6/ip6_gre.c +15 -0
@@ -1254,6 +1254,7 @@ static void ip6gre_tunnel_setup(struct net_device *dev)static int ip6gre_tunnel_init (struct net_device *dev) {struct ip6_tnl *tunnel; +int i; tunnel =netdev_priv (dev);
@@ -1271,6 +1272,13 @@ static int ip6gre_tunnel_init(struct net_device *dev)if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ip6gre_tunnel_stats; + ip6gre_tunnel_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ip6gre_tunnel_stats->syncp); + } + +return 0 ; }
@@ -1451,6 +1459,7 @@ static void ip6gre_netlink_parms(struct nlattr *data[],static int ip6gre_tap_init (struct net_device *dev) {struct ip6_tnl *tunnel; +int i; tunnel =netdev_priv (dev);
@@ -1464,6 +1473,12 @@ static int ip6gre_tap_init(struct net_device *dev)if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ip6gre_tap_stats; + ip6gre_tap_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ip6gre_tap_stats->syncp); + } +return 0 ; }
net/ipv6/ip6_tunnel.c +7 -0
@@ -1486,12 +1486,19 @@ static inline int ip6_tnl_dev_init_gen(struct net_device *dev) {struct ip6_tnl *t =netdev_priv (dev); +int i; t->dev = dev; t->net =dev_net (dev); dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; + +for_each_possible_cpu (i) { +struct pcpu_tstats *ip6_tnl_stats; + ip6_tnl_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ip6_tnl_stats->syncp); + }return 0 ; }
net/ipv6/sit.c +15 -0
@@ -1256,6 +1256,7 @@ static void ipip6_tunnel_setup(struct net_device *dev)static int ipip6_tunnel_init (struct net_device *dev) {struct ip_tunnel *tunnel =netdev_priv (dev); +int i; tunnel->dev = dev; tunnel->net =dev_net (dev);
@@ -1268,6 +1269,12 @@ static int ipip6_tunnel_init(struct net_device *dev)if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ipip6_tunnel_stats; + ipip6_tunnel_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ipip6_tunnel_stats->syncp); + } +return 0 ; }
@@ -1277,6 +1284,7 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)struct iphdr *iph = &tunnel->parms.iph;struct net *net =dev_net (dev);struct sit_net *sitn =net_generic (net, sit_net_id); +int i; tunnel->dev = dev; tunnel->net =dev_net (dev);
@@ -1290,6 +1298,13 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev) dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; + +for_each_possible_cpu (i) { +struct pcpu_tstats *ipip6_fb_stats; + ipip6_fb_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ipip6_fb_stats->syncp); + } +dev_hold (dev);rcu_assign_pointer (sitn->tunnels_wc[0 ], tunnel);return 0 ;
net/netfilter/ipvs/ip_vs_ctl.c +22 -3
@@ -836,7 +836,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, struct ip_vs_dest **dest_p) {struct ip_vs_dest *dest; -unsigned int atype; +unsigned int atype, i;EnterFunction (2 );
@@ -863,6 +863,12 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest,if (!dest->stats.cpustats) goto err_alloc; +for_each_possible_cpu (i) { +struct ip_vs_cpu_stats *ip_vs_dest_stats; + ip_vs_dest_stats =per_cpu_ptr (dest->stats.cpustats, i); +u64_stats_init (&ip_vs_dest_stats->syncp); + } + dest->af = svc->af; dest->protocol = svc->protocol; dest->vaddr = svc->addr;
@@ -1136,7 +1142,7 @@ static int ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, struct ip_vs_service **svc_p) { - int ret = 0; + int ret = 0, i;struct ip_vs_scheduler *sched =NULL ;struct ip_vs_pe *pe =NULL ;struct ip_vs_service *svc =NULL ;
@@ -1186,6 +1192,13 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, goto out_err; } +for_each_possible_cpu (i) { +struct ip_vs_cpu_stats *ip_vs_stats; + ip_vs_stats =per_cpu_ptr (svc->stats.cpustats, i); +u64_stats_init (&ip_vs_stats->syncp); + } + +/* I'm the first user of the service */ atomic_set (&svc->refcnt,0 );
@@ -3796,7 +3809,7 @@ static struct notifier_block ip_vs_dst_notifier = {int __net_init ip_vs_control_net_init (struct net *net) { -int idx; +int i, idx;struct netns_ipvs *ipvs =net_ipvs (net);/* Initialize rs_table */
@@ -3815,6 +3828,12 @@ int __net_init ip_vs_control_net_init(struct net *net)if (!ipvs->tot_stats.cpustats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct ip_vs_cpu_stats *ipvs_tot_stats; + ipvs_tot_stats =per_cpu_ptr (ipvs->tot_stats.cpustats, i); +u64_stats_init (&ipvs_tot_stats->syncp); + } +spin_lock_init (&ipvs->tot_stats.lock);proc_create ("ip_vs" ,0 , net->proc_net, &ip_vs_info_fops);
net/openvswitch/datapath.c +6 -0
@@ -1698,6 +1698,12 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) goto err_destroy_table; } +for_each_possible_cpu (i) { +struct dp_stats_percpu *dpath_stats; + dpath_stats =per_cpu_ptr (dp->stats_percpu, i); +u64_stats_init (&dpath_stats->sync); + } + dp->ports =kmalloc (DP_VPORT_HASH_BUCKETS *sizeof (struct hlist_head ),GFP_KERNEL );if (!dp->ports) {
net/openvswitch/vport.c +8 -0
@@ -118,6 +118,7 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops, {struct vport *vport;size_t alloc_size; +int i; alloc_size =sizeof (struct vport );if (priv_size) {
@@ -141,6 +142,13 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops,return ERR_PTR (-ENOMEM ); } +for_each_possible_cpu (i) { +struct pcpu_tstats *vport_stats; + vport_stats =per_cpu_ptr (vport->percpu_stats, i); +u64_stats_init (&vport_stats->syncp); + } + +spin_lock_init (&vport->stats_lock);return vport;
Signature · 1 line
1.8.1.2
Re: [PATCH 1/4] [RFC] net: Explicitly initialize u64_stats_sync structures for lockdep
Quoted 11 lines · John Stultz
In order to enable lockdep on seqcount/seqlock structures, we must explicitly initialize any locks.
The
u64_stats_syncstructure, uses a seqcount, and thus we need to introduce au64_stats_init()function and use it to initialize the structure.This unfortunately adds a lot of fairly trivial initialization code to a number of drivers. But the benefit of ensuring correctness makes this worth while.
Quoted 5 lines
Because these changes are required for lockdep to be enabled, and the changes are quite trivial, I've not yet split this patch out into 30-some separate patches, as I figured it would be better to get the various maintainers thoughts on how to best merge this change along with the seqcount lockdep enablement.
Just wanted to ping folks on this patch, as I haven't gotten any feedback.
As its a prereq for the seqcount lockdep support, I'd like to get it queued/merged, but I'm not sure what the right maintainer path or approach should be.
1) Do folks prefer to see this patch split up into 30-some separate trivial clenaup patches, or have it go in all as one logical change?
2) Would folks want this patch (in whichever form) to be merged separately via the networking maintainers, or can it be merged via -tip as part of the seqcount lockdep series?
thanks
-john
Re: [PATCH 1/4] [RFC] net: Explicitly initialize u64_stats_sync structures for lockdep
Hello,
Quoted 6 lines · John Stultz
Just wanted to ping folks on this patch, as I haven't gotten any feedback.
As its a prereq for the seqcount lockdep support, I'd like to get it queued/merged, but I'm not sure what the right maintainer path or approach should be.
Quoted 6 lines
1) Do folks prefer to see this patch split up into 30-some separate trivial clenaup patches, or have it go in all as one logical change?
2) Would folks want this patch (in whichever form) to be merged separately via the networking maintainers, or can it be merged via -tip as part of the seqcount lockdep series?
The IPVS part in net/netfilter/ipvs/ looks ok to me.
We do not have any pending changes for this area, so you can skip the ipvs trees for this change. If you need ack for the IPVS part, here it is:
Regards
--
Julian Anastasov <[email protected]>
tip-bot for John Stultz
merge bot[tip:core/locking] net: Explicitly initialize u64_stats_sync structures for lockdep
In reply to John Stultznet: Explicitly initialize u64_stats_sync structures for lockdep
Commit-ID: 827da44c61419f29ae3be198c342e2147f1a10cb Gitweb: http://git.kernel.org/tip/827da44c61419f29ae3be198c342e2147f1a10cb Author: John Stultz <[email protected]> AuthorDate: Mon, 7 Oct 2013 15:51:58 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 6 Nov 2013 12:40:25 +0100
net: Explicitly initialize u64_stats_sync structures for lockdep
In order to enable lockdep on seqcount/seqlock structures, we must explicitly initialize any locks.
The u64_stats_sync structure, uses a seqcount, and thus we need to introduce a u64_stats_init() function and use it to initialize the structure.
This unfortunately adds a lot of fairly trivial initialization code to a number of drivers. But the benefit of ensuring correctness makes this worth while.
Because these changes are required for lockdep to be enabled, and the changes are quite trivial, I've not yet split this patch out into 30-some separate patches, as I figured it would be better to get the various maintainers thoughts on how to best merge this change along with the seqcount lockdep enablement.
Feedback would be appreciated!
--- drivers/net/dummy.c | 6 ++++++ drivers/net/ethernet/emulex/benet/be_main.c | 4 ++++ drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++++ drivers/net/ethernet/marvell/mvneta.c | 3 +++ drivers/net/ethernet/marvell/sky2.c | 3 +++ drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 ++++ drivers/net/ethernet/nvidia/forcedeth.c | 2 ++ drivers/net/ethernet/realtek/8139too.c | 3 +++ drivers/net/ethernet/tile/tilepro.c | 2 ++ drivers/net/ethernet/via/via-rhine.c | 3 +++ drivers/net/ifb.c | 5 +++++ drivers/net/loopback.c | 6 ++++++ drivers/net/macvlan.c | 7 +++++++ drivers/net/nlmon.c | 8 ++++++++ drivers/net/team/team.c | 6 ++++++ drivers/net/team/team_mode_loadbalance.c | 9 ++++++++- drivers/net/veth.c | 8 ++++++++ drivers/net/virtio_net.c | 8 ++++++++ drivers/net/vxlan.c | 8 ++++++++ drivers/net/xen-netfront.c | 6 ++++++ include/linux/u64_stats_sync.h | 7 +++++++ net/8021q/vlan_dev.c | 9 ++++++++- net/bridge/br_device.c | 7 +++++++ net/ipv4/af_inet.c | 14 ++++++++++++++ net/ipv4/ip_tunnel.c | 8 +++++++- net/ipv6/addrconf.c | 14 ++++++++++++++ net/ipv6/af_inet6.c | 14 ++++++++++++++ net/ipv6/ip6_gre.c | 15 +++++++++++++++ net/ipv6/ip6_tunnel.c | 7 +++++++ net/ipv6/sit.c | 15 +++++++++++++++ net/netfilter/ipvs/ip_vs_ctl.c | 25 ++++++++++++++++++++++--- net/openvswitch/datapath.c | 6 ++++++ net/openvswitch/vport.c | 8 ++++++++ 34 files changed, 253 insertions(+), 6 deletions(-)
drivers/net/dummy.c +6 -0
@@ -88,10 +88,16 @@ static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev)static int dummy_dev_init (struct net_device *dev) { +int i; dev->dstats = alloc_percpu(struct pcpu_dstats);if (!dev->dstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_dstats *dstats; + dstats =per_cpu_ptr (dev->dstats, i); +u64_stats_init (&dstats->syncp); + }return 0 ; }
drivers/net/ethernet/emulex/benet/be_main.c +4 -0
@@ -2047,6 +2047,9 @@ static int be_tx_qs_create(struct be_adapter *adapter)if (status)return status; +u64_stats_init (&txo->stats.sync); +u64_stats_init (&txo->stats.sync_compl); +/* If num_evt_qs is less than num_tx_qs, then more than * one txq share an eq */
@@ -2108,6 +2111,7 @@ static int be_rx_cqs_create(struct be_adapter *adapter)if (rc)return rc; +u64_stats_init (&rxo->stats.sync); eq = &adapter->eq_obj[i % adapter->num_evt_qs].q; rc =be_cmd_cq_create (adapter, cq, eq, false,3 );if (rc)
drivers/net/ethernet/intel/igb/igb_main.c +5 -0
@@ -1223,6 +1223,9 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, ring->count = adapter->tx_ring_count; ring->queue_index = txr_idx; +u64_stats_init (&ring->tx_syncp); +u64_stats_init (&ring->tx_syncp2); +/* assign ring to adapter */ adapter->tx_ring[txr_idx] = ring;
@@ -1256,6 +1259,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, ring->count = adapter->rx_ring_count; ring->queue_index = rxr_idx; +u64_stats_init (&ring->rx_syncp); +/* assign ring to adapter */ adapter->rx_ring[rxr_idx] = ring; }
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +4 -0
@@ -4867,6 +4867,8 @@ int ixgbe_setup_tx_resources(struct ixgbe_ring *tx_ring)if (!tx_ring->tx_buffer_info) goto err; +u64_stats_init (&tx_ring->syncp); +/* round up to nearest 4K */ tx_ring->size = tx_ring->count *sizeof (union ixgbe_adv_tx_desc ); tx_ring->size =ALIGN (tx_ring->size,4096 );
@@ -4949,6 +4951,8 @@ int ixgbe_setup_rx_resources(struct ixgbe_ring *rx_ring)if (!rx_ring->rx_buffer_info) goto err; +u64_stats_init (&rx_ring->syncp); +/* Round up to nearest 4K */ rx_ring->size = rx_ring->count *sizeof (union ixgbe_adv_rx_desc ); rx_ring->size =ALIGN (rx_ring->size,4096 );
drivers/net/ethernet/marvell/mvneta.c +3 -0
@@ -2792,6 +2792,9 @@ static int mvneta_probe(struct platform_device *pdev) pp =netdev_priv (dev); +u64_stats_init (&pp->tx_stats.syncp); +u64_stats_init (&pp->rx_stats.syncp); + pp->weight =MVNETA_RX_POLL_WEIGHT ; pp->phy_node = phy_node; pp->phy_interface = phy_mode;
drivers/net/ethernet/marvell/sky2.c +3 -0
@@ -4763,6 +4763,9 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, sky2->hw = hw; sky2->msg_enable =netif_msg_init (debug, default_msg); +u64_stats_init (&sky2->tx_stats.syncp); +u64_stats_init (&sky2->rx_stats.syncp); +/* Auto speed and flow control */ sky2->flags =SKY2_FLAG_AUTO_SPEED |SKY2_FLAG_AUTO_PAUSE ;if (hw->chip_id !=CHIP_ID_YUKON_XL )
drivers/net/ethernet/neterion/vxge/vxge-main.c +4 -0
@@ -2072,6 +2072,10 @@ static int vxge_open_vpaths(struct vxgedev *vdev) vdev->config.tx_steering_type; vpath->fifo.ndev = vdev->ndev; vpath->fifo.pdev = vdev->pdev; + +u64_stats_init (&vpath->fifo.stats.syncp); +u64_stats_init (&vpath->ring.stats.syncp); +if (vdev->config.tx_steering_type) vpath->fifo.txq =netdev_get_tx_queue (vdev->ndev, i);
drivers/net/ethernet/nvidia/forcedeth.c +2 -0
@@ -5619,6 +5619,8 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)spin_lock_init (&np->lock);spin_lock_init (&np->hwstats_lock);SET_NETDEV_DEV (dev, &pci_dev->dev); +u64_stats_init (&np->swstats_rx_syncp); +u64_stats_init (&np->swstats_tx_syncp);init_timer (&np->oom_kick); np->oom_kick.data = (unsigned long ) dev;
drivers/net/ethernet/realtek/8139too.c +3 -0
@@ -791,6 +791,9 @@ static struct net_device *rtl8139_init_board(struct pci_dev *pdev)pci_set_master (pdev); +u64_stats_init (&tp->rx_stats.syncp); +u64_stats_init (&tp->tx_stats.syncp); + retry:/* PIO bar register comes first. */ bar = !use_io;
drivers/net/ethernet/tile/tilepro.c +2 -0
@@ -1008,6 +1008,8 @@ static void tile_net_register(void *dev_ptr) info->egress_timer.data = (long )info; info->egress_timer.function = tile_net_handle_egress_timer; +u64_stats_init (&info->stats.syncp); + priv->cpu[my_cpu] = info;/*
drivers/net/ethernet/via/via-rhine.c +3 -0
@@ -987,6 +987,9 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rp->base = ioaddr; +u64_stats_init (&rp->tx_stats.syncp); +u64_stats_init (&rp->rx_stats.syncp); +/* Get chip registers into a sane state */ rhine_power_init (dev);rhine_hw_init (dev, pioaddr);
drivers/net/ifb.c +5 -0
@@ -265,6 +265,7 @@ MODULE_PARM_DESC(numifbs, "Number of ifb devices");static int __init ifb_init_one (int index) {struct net_device *dev_ifb; +struct ifb_private *dp;int err; dev_ifb = alloc_netdev(sizeof(struct ifb_private),
@@ -273,6 +274,10 @@ static int __init ifb_init_one(int index)if (!dev_ifb)return -ENOMEM ; + dp =netdev_priv (dev_ifb); +u64_stats_init (&dp->rsync); +u64_stats_init (&dp->tsync); + dev_ifb->rtnl_link_ops = &ifb_link_ops; err =register_netdevice (dev_ifb);if (err <0 )
drivers/net/loopback.c +6 -0
@@ -137,10 +137,16 @@ static const struct ethtool_ops loopback_ethtool_ops = {static int loopback_dev_init (struct net_device *dev) { +int i; dev->lstats = alloc_percpu(struct pcpu_lstats);if (!dev->lstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_lstats *lb_stats; + lb_stats =per_cpu_ptr (dev->lstats, i); +u64_stats_init (&lb_stats->syncp); + }return 0 ; }
drivers/net/macvlan.c +7 -0
@@ -501,6 +501,7 @@ static int macvlan_init(struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev);const struct net_device *lowerdev = vlan->lowerdev; +int i; dev->state = (dev->state & ~MACVLAN_STATE_MASK ) | (lowerdev->state &MACVLAN_STATE_MASK );
@@ -516,6 +517,12 @@ static int macvlan_init(struct net_device *dev)if (!vlan->pcpu_stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct macvlan_pcpu_stats *mvlstats; + mvlstats =per_cpu_ptr (vlan->pcpu_stats, i); +u64_stats_init (&mvlstats->syncp); + } +return 0 ; }
drivers/net/nlmon.c +8 -0
@@ -47,8 +47,16 @@ static int nlmon_change_mtu(struct net_device *dev, int new_mtu)static int nlmon_dev_init (struct net_device *dev) { +int i; + dev->lstats = alloc_percpu(struct pcpu_lstats); +for_each_possible_cpu (i) { +struct pcpu_lstats *nlmstats; + nlmstats =per_cpu_ptr (dev->lstats, i); +u64_stats_init (&nlmstats->syncp); + } +return dev->lstats ==NULL ? -ENOMEM :0 ; }
drivers/net/team/team.c +6 -0
@@ -1540,6 +1540,12 @@ static int team_init(struct net_device *dev)if (!team->pcpu_stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct team_pcpu_stats *team_stats; + team_stats =per_cpu_ptr (team->pcpu_stats, i); +u64_stats_init (&team_stats->syncp); + } +for (i =0 ; i <TEAM_PORT_HASHENTRIES ; i++)INIT_HLIST_HEAD (&team->en_port_hlist[i]);INIT_LIST_HEAD (&team->port_list);
drivers/net/team/team_mode_loadbalance.c +8 -1
@@ -570,7 +570,7 @@ static int lb_init(struct team *team) {struct lb_priv *lb_priv =get_lb_priv (team);lb_select_tx_port_func_t *func; -int err; +int i, err;/* set default tx port selector */ func =lb_select_tx_port_get_func ("hash" );
@@ -588,6 +588,13 @@ static int lb_init(struct team *team) goto err_alloc_pcpu_stats; } +for_each_possible_cpu (i) { +struct lb_pcpu_stats *team_lb_stats; + team_lb_stats =per_cpu_ptr (lb_priv->pcpu_stats, i); +u64_stats_init (&team_lb_stats->syncp); + } + +INIT_DELAYED_WORK (&lb_priv->ex->stats.refresh_dw, lb_stats_refresh); err =team_options_register (team, lb_options,ARRAY_SIZE (lb_options));
drivers/net/veth.c +8 -0
@@ -230,10 +230,18 @@ static int veth_change_mtu(struct net_device *dev, int new_mtu)static int veth_dev_init (struct net_device *dev) { +int i; + dev->vstats = alloc_percpu(struct pcpu_vstats);if (!dev->vstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_vstats *veth_stats; + veth_stats =per_cpu_ptr (dev->vstats, i); +u64_stats_init (&veth_stats->syncp); + } +return 0 ; }
drivers/net/virtio_net.c +8 -0
@@ -1569,6 +1569,14 @@ static int virtnet_probe(struct virtio_device *vdev)if (vi->stats ==NULL ) goto free; +for_each_possible_cpu (i) { +struct virtnet_stats *virtnet_stats; + virtnet_stats =per_cpu_ptr (vi->stats, i); +u64_stats_init (&virtnet_stats->tx_syncp); +u64_stats_init (&virtnet_stats->rx_syncp); + } + + vi->vq_index =alloc_percpu (int);if (vi->vq_index ==NULL ) goto free_stats;
drivers/net/vxlan.c +8 -0
@@ -1884,11 +1884,19 @@ static int vxlan_init(struct net_device *dev)struct vxlan_dev *vxlan =netdev_priv (dev);struct vxlan_net *vn =net_generic (dev_net (dev), vxlan_net_id);struct vxlan_sock *vs; +int i; dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *vxlan_stats; + vxlan_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&vxlan_stats->syncp); + } + +spin_lock (&vn->sock_lock); vs =vxlan_find_sock (dev_net (dev), vxlan->dst_port);if (vs) {
drivers/net/xen-netfront.c +6 -0
@@ -1338,6 +1338,12 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)if (np->stats ==NULL ) goto exit; +for_each_possible_cpu (i) { +struct netfront_stats *xen_nf_stats; + xen_nf_stats =per_cpu_ptr (np->stats, i); +u64_stats_init (&xen_nf_stats->syncp); + } +/* Initialise tx_skbs as a free chain containing every entry. */ np->tx_skb_freelist =0 ;for (i =0 ; i <NET_TX_RING_SIZE ; i++) {
include/linux/u64_stats_sync.h +7 -0
@@ -67,6 +67,13 @@ struct u64_stats_sync {#endif }; + +#if BITS_PER_LONG ==32 && defined(CONFIG_SMP ) +# define u64_stats_init (syncp) seqcount_init(syncp.seq) +#else +# define u64_stats_init (syncp) do { } while (0) +#endif +static inline void u64_stats_update_begin (struct u64_stats_sync *syncp) {#if BITS_PER_LONG ==32 && defined(CONFIG_SMP )
net/8021q/vlan_dev.c +8 -1
@@ -558,7 +558,7 @@ static const struct net_device_ops vlan_netdev_ops;static int vlan_dev_init (struct net_device *dev) {struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; -int subclass =0 ; +int subclass =0 , i;netif_carrier_off (dev);
@@ -612,6 +612,13 @@ static int vlan_dev_init(struct net_device *dev)if (!vlan_dev_priv (dev)->vlan_pcpu_stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct vlan_pcpu_stats *vlan_stat; + vlan_stat =per_cpu_ptr (vlan_dev_priv (dev)->vlan_pcpu_stats, i); +u64_stats_init (&vlan_stat->syncp); + } + +return 0 ; }
net/bridge/br_device.c +7 -0
@@ -88,11 +88,18 @@ out:static int br_dev_init (struct net_device *dev) {struct net_bridge *br =netdev_priv (dev); +int i; br->stats = alloc_percpu(struct br_cpu_netstats);if (!br->stats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct br_cpu_netstats *br_dev_stats; + br_dev_stats =per_cpu_ptr (br->stats, i); +u64_stats_init (&br_dev_stats->syncp); + } +return 0 ; }
net/ipv4/af_inet.c +14 -0
@@ -1518,6 +1518,7 @@ int snmp_mib_init(void __percpu *ptr[2], size_t mibsize, size_t align) ptr[0 ] =__alloc_percpu (mibsize, align);if (!ptr[0 ])return -ENOMEM ; +#if SNMP_ARRAY_SZ ==2 ptr[1 ] =__alloc_percpu (mibsize, align);if (!ptr[1 ]) {
@@ -1561,6 +1562,8 @@ static const struct net_protocol icmp_protocol = {static __net_init int ipv4_mib_init_net (struct net *net) { +int i; +if (snmp_mib_init ((void __percpu **)net->mib.tcp_statistics,sizeof (struct tcp_mib ), __alignof__(struct tcp_mib )) <0 )
@@ -1569,6 +1572,17 @@ static __net_init int ipv4_mib_init_net(struct net *net) sizeof(struct ipstats_mib), __alignof__(struct ipstats_mib)) < 0) goto err_ip_mib; + +for_each_possible_cpu (i) { +struct ipstats_mib *af_inet_stats; + af_inet_stats =per_cpu_ptr (net->mib.ip_statistics[0 ], i); +u64_stats_init (&af_inet_stats->syncp); +#if SNMP_ARRAY_SZ ==2 + af_inet_stats =per_cpu_ptr (net->mib.ip_statistics[1 ], i); +u64_stats_init (&af_inet_stats->syncp); +#endif + } +if (snmp_mib_init ((void __percpu **)net->mib.net_statistics,sizeof (struct linux_mib ), __alignof__(struct linux_mib )) <0 )
net/ipv4/ip_tunnel.c +7 -1
@@ -976,13 +976,19 @@ int ip_tunnel_init(struct net_device *dev) {struct ip_tunnel *tunnel =netdev_priv (dev);struct iphdr *iph = &tunnel->parms.iph; -int err; +int i, err; dev->destructor = ip_tunnel_dev_free; dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ipt_stats; + ipt_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ipt_stats->syncp); + } + err =gro_cells_init (&tunnel->gro_cells, dev);if (err) {free_percpu (dev->tstats);
net/ipv6/addrconf.c +14 -0
@@ -281,10 +281,24 @@ static void addrconf_mod_dad_timer(struct inet6_ifaddr *ifp,static int snmp6_alloc_dev (struct inet6_dev *idev) { +int i; +if (snmp_mib_init ((void __percpu **)idev->stats.ipv6,sizeof (struct ipstats_mib ), __alignof__(struct ipstats_mib )) <0 ) goto err_ip; + +for_each_possible_cpu (i) { +struct ipstats_mib *addrconf_stats; + addrconf_stats =per_cpu_ptr (idev->stats.ipv6[0 ], i); +u64_stats_init (&addrconf_stats->syncp); +#if SNMP_ARRAY_SZ ==2 + addrconf_stats =per_cpu_ptr (idev->stats.ipv6[1 ], i); +u64_stats_init (&addrconf_stats->syncp); +#endif + } + + idev->stats.icmpv6dev =kzalloc (sizeof (struct icmpv6_mib_device ),GFP_KERNEL );if (!idev->stats.icmpv6dev)
net/ipv6/af_inet6.c +14 -0
@@ -719,6 +719,8 @@ static void ipv6_packet_cleanup(void)static int __net_init ipv6_init_mibs (struct net *net) { +int i; +if (snmp_mib_init ((void __percpu **)net->mib.udp_stats_in6,sizeof (struct udp_mib ), __alignof__(struct udp_mib )) <0 )
@@ -731,6 +733,18 @@ static int __net_init ipv6_init_mibs(struct net *net) sizeof(struct ipstats_mib), __alignof__(struct ipstats_mib)) < 0) goto err_ip_mib; + +for_each_possible_cpu (i) { +struct ipstats_mib *af_inet6_stats; + af_inet6_stats =per_cpu_ptr (net->mib.ipv6_statistics[0 ], i); +u64_stats_init (&af_inet6_stats->syncp); +#if SNMP_ARRAY_SZ ==2 + af_inet6_stats =per_cpu_ptr (net->mib.ipv6_statistics[1 ], i); +u64_stats_init (&af_inet6_stats->syncp); +#endif + } + +if (snmp_mib_init ((void __percpu **)net->mib.icmpv6_statistics,sizeof (struct icmpv6_mib ), __alignof__(struct icmpv6_mib )) <0 )
net/ipv6/ip6_gre.c +15 -0
@@ -1252,6 +1252,7 @@ static void ip6gre_tunnel_setup(struct net_device *dev)static int ip6gre_tunnel_init (struct net_device *dev) {struct ip6_tnl *tunnel; +int i; tunnel =netdev_priv (dev);
@@ -1269,6 +1270,13 @@ static int ip6gre_tunnel_init(struct net_device *dev)if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ip6gre_tunnel_stats; + ip6gre_tunnel_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ip6gre_tunnel_stats->syncp); + } + +return 0 ; }
@@ -1449,6 +1457,7 @@ static void ip6gre_netlink_parms(struct nlattr *data[],static int ip6gre_tap_init (struct net_device *dev) {struct ip6_tnl *tunnel; +int i; tunnel =netdev_priv (dev);
@@ -1462,6 +1471,12 @@ static int ip6gre_tap_init(struct net_device *dev)if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ip6gre_tap_stats; + ip6gre_tap_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ip6gre_tap_stats->syncp); + } +return 0 ; }
net/ipv6/ip6_tunnel.c +7 -0
@@ -1494,12 +1494,19 @@ static inline int ip6_tnl_dev_init_gen(struct net_device *dev) {struct ip6_tnl *t =netdev_priv (dev); +int i; t->dev = dev; t->net =dev_net (dev); dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; + +for_each_possible_cpu (i) { +struct pcpu_tstats *ip6_tnl_stats; + ip6_tnl_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ip6_tnl_stats->syncp); + }return 0 ; }
net/ipv6/sit.c +15 -0
@@ -1310,6 +1310,7 @@ static void ipip6_tunnel_setup(struct net_device *dev)static int ipip6_tunnel_init (struct net_device *dev) {struct ip_tunnel *tunnel =netdev_priv (dev); +int i; tunnel->dev = dev; tunnel->net =dev_net (dev);
@@ -1322,6 +1323,12 @@ static int ipip6_tunnel_init(struct net_device *dev)if (!dev->tstats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct pcpu_tstats *ipip6_tunnel_stats; + ipip6_tunnel_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ipip6_tunnel_stats->syncp); + } +return 0 ; }
@@ -1331,6 +1338,7 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)struct iphdr *iph = &tunnel->parms.iph;struct net *net =dev_net (dev);struct sit_net *sitn =net_generic (net, sit_net_id); +int i; tunnel->dev = dev; tunnel->net =dev_net (dev);
@@ -1344,6 +1352,13 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev) dev->tstats = alloc_percpu(struct pcpu_tstats);if (!dev->tstats)return -ENOMEM ; + +for_each_possible_cpu (i) { +struct pcpu_tstats *ipip6_fb_stats; + ipip6_fb_stats =per_cpu_ptr (dev->tstats, i); +u64_stats_init (&ipip6_fb_stats->syncp); + } +dev_hold (dev);rcu_assign_pointer (sitn->tunnels_wc[0 ], tunnel);return 0 ;
net/netfilter/ipvs/ip_vs_ctl.c +22 -3
@@ -842,7 +842,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, struct ip_vs_dest **dest_p) {struct ip_vs_dest *dest; -unsigned int atype; +unsigned int atype, i;EnterFunction (2 );
@@ -869,6 +869,12 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest,if (!dest->stats.cpustats) goto err_alloc; +for_each_possible_cpu (i) { +struct ip_vs_cpu_stats *ip_vs_dest_stats; + ip_vs_dest_stats =per_cpu_ptr (dest->stats.cpustats, i); +u64_stats_init (&ip_vs_dest_stats->syncp); + } + dest->af = svc->af; dest->protocol = svc->protocol; dest->vaddr = svc->addr;
@@ -1134,7 +1140,7 @@ static int ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, struct ip_vs_service **svc_p) { - int ret = 0; + int ret = 0, i;struct ip_vs_scheduler *sched =NULL ;struct ip_vs_pe *pe =NULL ;struct ip_vs_service *svc =NULL ;
@@ -1184,6 +1190,13 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, goto out_err; } +for_each_possible_cpu (i) { +struct ip_vs_cpu_stats *ip_vs_stats; + ip_vs_stats =per_cpu_ptr (svc->stats.cpustats, i); +u64_stats_init (&ip_vs_stats->syncp); + } + +/* I'm the first user of the service */ atomic_set (&svc->refcnt,0 );
@@ -3780,7 +3793,7 @@ static struct notifier_block ip_vs_dst_notifier = {int __net_init ip_vs_control_net_init (struct net *net) { -int idx; +int i, idx;struct netns_ipvs *ipvs =net_ipvs (net);/* Initialize rs_table */
@@ -3799,6 +3812,12 @@ int __net_init ip_vs_control_net_init(struct net *net)if (!ipvs->tot_stats.cpustats)return -ENOMEM ; +for_each_possible_cpu (i) { +struct ip_vs_cpu_stats *ipvs_tot_stats; + ipvs_tot_stats =per_cpu_ptr (ipvs->tot_stats.cpustats, i); +u64_stats_init (&ipvs_tot_stats->syncp); + } +spin_lock_init (&ipvs->tot_stats.lock);proc_create ("ip_vs" ,0 , net->proc_net, &ip_vs_info_fops);
net/openvswitch/datapath.c +6 -0
@@ -1698,6 +1698,12 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) goto err_destroy_table; } +for_each_possible_cpu (i) { +struct dp_stats_percpu *dpath_stats; + dpath_stats =per_cpu_ptr (dp->stats_percpu, i); +u64_stats_init (&dpath_stats->sync); + } + dp->ports =kmalloc (DP_VPORT_HASH_BUCKETS *sizeof (struct hlist_head ),GFP_KERNEL );if (!dp->ports) {
net/openvswitch/vport.c +8 -0
@@ -118,6 +118,7 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops, {struct vport *vport;size_t alloc_size; +int i; alloc_size =sizeof (struct vport );if (priv_size) {
@@ -141,6 +142,13 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops,return ERR_PTR (-ENOMEM ); } +for_each_possible_cpu (i) { +struct pcpu_tstats *vport_stats; + vport_stats =per_cpu_ptr (vport->percpu_stats, i); +u64_stats_init (&vport_stats->syncp); + } + +spin_lock_init (&vport->stats_lock);return vport;
RFC PATCH 2/4 seqcount: Add lockdep functionality to seqcount/seqlock structures
In reply to John StultzCurrently seqlocks and seqcounts don't support lockdep.
After running across a seqcount related deadlock in the timekeeping code, I used a less-refined and more focused variant of this patch to narrow down the cause of the issue.
This is a first-pass attempt to properly enable lockdep functionality on seqlocks and seqcounts.
Since seqcounts are used in the vdso gettimeofday code, I've provided non-lockdep accessors for those needs.
I've also handled one case where there were nested seqlock writers and there may be more edge cases.
Comments and feedback would be appreciated!
--- arch/x86/vdso/vclock_gettime.c | 8 ++--- fs/dcache.c | 4 +-- fs/fs_struct.c | 2 +- include/linux/init_task.h | 8 ++--- include/linux/lockdep.h | 8 +++-- include/linux/seqlock.h | 79 ++++++++++++++++++++++++++++++++++++++---- mm/filemap_xip.c | 2 +- 7 files changed, 90 insertions(+), 21 deletions(-)
arch/x86/vdso/vclock_gettime.c +4 -4
@@ -178,7 +178,7 @@ notrace static int __always_inline do_realtime(struct timespec *ts) ts->tv_nsec =0 ; do { - seq = read_seqcount_begin(>od->seq); + seq = read_seqcount_begin_no_lockdep(>od->seq); mode = gtod->clock.vclock_mode; ts->tv_sec = gtod->wall_time_sec; ns = gtod->wall_time_snsec;
@@ -198,7 +198,7 @@ notrace static int do_monotonic(struct timespec *ts) ts->tv_nsec =0 ; do { - seq = read_seqcount_begin(>od->seq); + seq = read_seqcount_begin_no_lockdep(>od->seq); mode = gtod->clock.vclock_mode; ts->tv_sec = gtod->monotonic_time_sec; ns = gtod->monotonic_time_snsec;
@@ -214,7 +214,7 @@ notrace static int do_realtime_coarse(struct timespec *ts) {unsigned long seq;do { - seq =read_seqcount_begin (>od->seq); + seq =read_seqcount_begin_no_lockdep (>od->seq); ts->tv_sec = gtod->wall_time_coarse.tv_sec; ts->tv_nsec = gtod->wall_time_coarse.tv_nsec; }while (unlikely (read_seqcount_retry (>od->seq, seq)));
@@ -225,7 +225,7 @@ notrace static int do_monotonic_coarse(struct timespec *ts) {unsigned long seq;do { - seq =read_seqcount_begin (>od->seq); + seq =read_seqcount_begin_no_lockdep (>od->seq); ts->tv_sec = gtod->monotonic_time_coarse.tv_sec; ts->tv_nsec = gtod->monotonic_time_coarse.tv_nsec; }while (unlikely (read_seqcount_retry (>od->seq, seq)));
fs/dcache.c +2 -2
@@ -2574,7 +2574,7 @@ static void __d_move(struct dentry * dentry, struct dentry * target)dentry_lock_for_move (dentry, target);write_seqcount_begin (&dentry->d_seq); -write_seqcount_begin (&target->d_seq); +write_seqcount_begin_nested (&target->d_seq,DENTRY_D_LOCK_NESTED );/* __d_drop does write_seqcount_barrier, but they're OK to nest. */
@@ -2706,7 +2706,7 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)dentry_lock_for_move (anon, dentry);write_seqcount_begin (&dentry->d_seq); -write_seqcount_begin (&anon->d_seq); +write_seqcount_begin_nested (&anon->d_seq,DENTRY_D_LOCK_NESTED ); dparent = dentry->d_parent;
fs/fs_struct.c +1 -1
@@ -161,6 +161,6 @@ EXPORT_SYMBOL(current_umask);struct fs_struct init_fs = { .users =1 , .lock =__SPIN_LOCK_UNLOCKED (init_fs.lock), - .seq =SEQCNT_ZERO , + .seq =SEQCNT_ZERO (init_fs.seq), .umask =0022 , };
include/linux/init_task.h +4 -4
@@ -32,10 +32,10 @@ extern struct fs_struct init_fs;#endif #ifdef CONFIG_CPUSETS -#define INIT_CPUSET_SEQ \ - .mems_allowed_seq = SEQCNT_ZERO, +#define INIT_CPUSET_SEQ (tsk) \ + .mems_allowed_seq = SEQCNT_ZERO(tsk.mems_allowed_seq),#else -#define INIT_CPUSET_SEQ +#define INIT_CPUSET_SEQ (tsk)#endif #define INIT_SIGNALS (sig) { \
@@ -220,7 +220,7 @@ extern struct task_group root_task_group;INIT_FTRACE_GRAPH \ INIT_TRACE_RECURSION \ INIT_TASK_RCU_PREEMPT(tsk) \ - INIT_CPUSET_SEQ \ + INIT_CPUSET_SEQ(tsk) \ INIT_VTIME(tsk) \ }
include/linux/lockdep.h +6 -2
@@ -497,6 +497,10 @@ static inline void print_irqtrace_events(struct task_struct *curr)#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i)#define rwlock_release (l, n, i) lock_release(l, n, i) +#define seqcount_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) +#define seqcount_acquire_read (l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i) +#define seqcount_release (l, n, i) lock_release(l, n, i) +#define mutex_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define mutex_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)#define mutex_release (l, n, i) lock_release(l, n, i)
@@ -504,11 +508,11 @@ static inline void print_irqtrace_events(struct task_struct *curr)#define rwsem_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define rwsem_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)#define rwsem_acquire_read (l, s, t, i) lock_acquire_shared(l, s, t, NULL, i) -# define rwsem_release (l, n, i) lock_release(l, n, i) +#define rwsem_release (l, n, i) lock_release(l, n, i)#define lock_map_acquire (l) lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_)#define lock_map_acquire_read (l) lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_) -# define lock_map_release (l) lock_release(l, 1, _THIS_IP_) +#define lock_map_release (l) lock_release(l, 1, _THIS_IP_)#ifdef CONFIG_PROVE_LOCKING # define might_lock (lock) \
include/linux/seqlock.h +72 -7
130 lines not on this page · raw message
mm/filemap_xip.c +1 -1
@@ -26,7 +26,7 @@* of ZERO_PAGE(), such as /dev/zero */ static DEFINE_MUTEX (xip_sparse_mutex); -static seqcount_t xip_sparse_seq =SEQCNT_ZERO ; +static seqcount_t xip_sparse_seq =SEQCNT_ZERO (xip_sparse_seq);static struct page *__xip_sparse_page;/* called under xip_sparse_mutex */
Signature · 1 line
1.8.1.2
tip-bot for John Stultz
merge bot[tip:core/locking] seqcount: Add lockdep functionality to seqcount/seqlock structures
seqcount: Add lockdep functionality to seqcount/seqlock structures
Commit-ID: 1ca7d67cf5d5a2aef26a8d9afd789006fa098347 Gitweb: http://git.kernel.org/tip/1ca7d67cf5d5a2aef26a8d9afd789006fa098347 Author: John Stultz <[email protected]> AuthorDate: Mon, 7 Oct 2013 15:51:59 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 6 Nov 2013 12:40:26 +0100
seqcount: Add lockdep functionality to seqcount/seqlock structures
Currently seqlocks and seqcounts don't support lockdep.
After running across a seqcount related deadlock in the timekeeping code, I used a less-refined and more focused variant of this patch to narrow down the cause of the issue.
This is a first-pass attempt to properly enable lockdep functionality on seqlocks and seqcounts.
Since seqcounts are used in the vdso gettimeofday code, I've provided non-lockdep accessors for those needs.
I've also handled one case where there were nested seqlock writers and there may be more edge cases.
Comments and feedback would be appreciated!
--- arch/x86/vdso/vclock_gettime.c | 8 ++--- fs/dcache.c | 4 +-- fs/fs_struct.c | 2 +- include/linux/init_task.h | 8 ++--- include/linux/lockdep.h | 8 +++-- include/linux/seqlock.h | 79 ++++++++++++++++++++++++++++++++++++++---- mm/filemap_xip.c | 2 +- 7 files changed, 90 insertions(+), 21 deletions(-)
arch/x86/vdso/vclock_gettime.c +4 -4
@@ -178,7 +178,7 @@ notrace static int __always_inline do_realtime(struct timespec *ts) ts->tv_nsec =0 ; do { - seq = read_seqcount_begin(>od->seq); + seq = read_seqcount_begin_no_lockdep(>od->seq); mode = gtod->clock.vclock_mode; ts->tv_sec = gtod->wall_time_sec; ns = gtod->wall_time_snsec;
@@ -198,7 +198,7 @@ notrace static int do_monotonic(struct timespec *ts) ts->tv_nsec =0 ; do { - seq = read_seqcount_begin(>od->seq); + seq = read_seqcount_begin_no_lockdep(>od->seq); mode = gtod->clock.vclock_mode; ts->tv_sec = gtod->monotonic_time_sec; ns = gtod->monotonic_time_snsec;
@@ -214,7 +214,7 @@ notrace static int do_realtime_coarse(struct timespec *ts) {unsigned long seq;do { - seq =read_seqcount_begin (>od->seq); + seq =read_seqcount_begin_no_lockdep (>od->seq); ts->tv_sec = gtod->wall_time_coarse.tv_sec; ts->tv_nsec = gtod->wall_time_coarse.tv_nsec; }while (unlikely (read_seqcount_retry (>od->seq, seq)));
@@ -225,7 +225,7 @@ notrace static int do_monotonic_coarse(struct timespec *ts) {unsigned long seq;do { - seq =read_seqcount_begin (>od->seq); + seq =read_seqcount_begin_no_lockdep (>od->seq); ts->tv_sec = gtod->monotonic_time_coarse.tv_sec; ts->tv_nsec = gtod->monotonic_time_coarse.tv_nsec; }while (unlikely (read_seqcount_retry (>od->seq, seq)));
fs/dcache.c +2 -2
@@ -2574,7 +2574,7 @@ static void __d_move(struct dentry * dentry, struct dentry * target)dentry_lock_for_move (dentry, target);write_seqcount_begin (&dentry->d_seq); -write_seqcount_begin (&target->d_seq); +write_seqcount_begin_nested (&target->d_seq,DENTRY_D_LOCK_NESTED );/* __d_drop does write_seqcount_barrier, but they're OK to nest. */
@@ -2706,7 +2706,7 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)dentry_lock_for_move (anon, dentry);write_seqcount_begin (&dentry->d_seq); -write_seqcount_begin (&anon->d_seq); +write_seqcount_begin_nested (&anon->d_seq,DENTRY_D_LOCK_NESTED ); dparent = dentry->d_parent;
fs/fs_struct.c +1 -1
@@ -161,6 +161,6 @@ EXPORT_SYMBOL(current_umask);struct fs_struct init_fs = { .users =1 , .lock =__SPIN_LOCK_UNLOCKED (init_fs.lock), - .seq =SEQCNT_ZERO , + .seq =SEQCNT_ZERO (init_fs.seq), .umask =0022 , };
include/linux/init_task.h +4 -4
@@ -32,10 +32,10 @@ extern struct fs_struct init_fs;#endif #ifdef CONFIG_CPUSETS -#define INIT_CPUSET_SEQ \ - .mems_allowed_seq = SEQCNT_ZERO, +#define INIT_CPUSET_SEQ (tsk) \ + .mems_allowed_seq = SEQCNT_ZERO(tsk.mems_allowed_seq),#else -#define INIT_CPUSET_SEQ +#define INIT_CPUSET_SEQ (tsk)#endif #define INIT_SIGNALS (sig) { \
@@ -220,7 +220,7 @@ extern struct task_group root_task_group;INIT_FTRACE_GRAPH \ INIT_TRACE_RECURSION \ INIT_TASK_RCU_PREEMPT(tsk) \ - INIT_CPUSET_SEQ \ + INIT_CPUSET_SEQ(tsk) \ INIT_VTIME(tsk) \ }
include/linux/lockdep.h +6 -2
@@ -497,6 +497,10 @@ static inline void print_irqtrace_events(struct task_struct *curr)#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i)#define rwlock_release (l, n, i) lock_release(l, n, i) +#define seqcount_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) +#define seqcount_acquire_read (l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i) +#define seqcount_release (l, n, i) lock_release(l, n, i) +#define mutex_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define mutex_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)#define mutex_release (l, n, i) lock_release(l, n, i)
@@ -504,11 +508,11 @@ static inline void print_irqtrace_events(struct task_struct *curr)#define rwsem_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define rwsem_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)#define rwsem_acquire_read (l, s, t, i) lock_acquire_shared(l, s, t, NULL, i) -# define rwsem_release (l, n, i) lock_release(l, n, i) +#define rwsem_release (l, n, i) lock_release(l, n, i)#define lock_map_acquire (l) lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_)#define lock_map_acquire_read (l) lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_) -# define lock_map_release (l) lock_release(l, 1, _THIS_IP_) +#define lock_map_release (l) lock_release(l, 1, _THIS_IP_)#ifdef CONFIG_PROVE_LOCKING # define might_lock (lock) \
include/linux/seqlock.h +72 -7
130 lines not on this page · raw message
mm/filemap_xip.c +1 -1
@@ -26,7 +26,7 @@* of ZERO_PAGE(), such as /dev/zero */ static DEFINE_MUTEX (xip_sparse_mutex); -static seqcount_t xip_sparse_seq =SEQCNT_ZERO ; +static seqcount_t xip_sparse_seq =SEQCNT_ZERO (xip_sparse_seq);static struct page *__xip_sparse_page;/* called under xip_sparse_mutex */
RFC PATCH 3/4 cpuset: Fix potential deadlock w/ set_mems_allowed
In reply to John StultzAfter adding lockdep support to seqlock/seqcount structures, I started seeing the following warning:
[ 1.070907] ======================================================
[ 1.072015] [ INFO: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected ]
[ 1.073181] 3.11.0+ #67 Not tainted
[ 1.073801] ------------------------------------------------------
[ 1.074882] kworker/u4:2/708 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
[ 1.076088] (&p->mems_allowed_seq){+.+...}, at: [<ffffffff81187d7f>] new_slab+0x5f/0x280
[ 1.077572]
[ 1.077572] and this task is already holding:
[ 1.078593] (&(&q->__queue_lock)->rlock){..-...}, at: [<ffffffff81339f03>] blk_execute_rq_nowait+0x53/0xf0
[ 1.080042] which would create a new lock dependency:
[ 1.080042] (&(&q->__queue_lock)->rlock){..-...} -> (&p->mems_allowed_seq){+.+...}
[ 1.080042]
[ 1.080042] but this new dependency connects a SOFTIRQ-irq-safe lock:
[ 1.080042] (&(&q->__queue_lock)->rlock){..-...}
[ 1.080042] ... which became SOFTIRQ-irq-safe at:
[ 1.080042] [<ffffffff810ec179>] __lock_acquire+0x5b9/0x1db0
[ 1.080042] [<ffffffff810edfe5>] lock_acquire+0x95/0x130
[ 1.080042] [<ffffffff818968a1>] _raw_spin_lock+0x41/0x80
[ 1.080042] [<ffffffff81560c9e>] scsi_device_unbusy+0x7e/0xd0
[ 1.080042] [<ffffffff8155a612>] scsi_finish_command+0x32/0xf0
[ 1.080042] [<ffffffff81560e91>] scsi_softirq_done+0xa1/0x130
[ 1.080042] [<ffffffff8133b0f3>] blk_done_softirq+0x73/0x90
[ 1.080042] [<ffffffff81095dc0>] __do_softirq+0x110/0x2f0
[ 1.080042] [<ffffffff81095fcd>] run_ksoftirqd+0x2d/0x60
[ 1.080042] [<ffffffff810bc506>] smpboot_thread_fn+0x156/0x1e0
[ 1.080042] [<ffffffff810b3916>] kthread+0xd6/0xe0
[ 1.080042] [<ffffffff818980ac>] ret_from_fork+0x7c/0xb0
[ 1.080042]
[ 1.080042] to a SOFTIRQ-irq-unsafe lock:
[ 1.080042] (&p->mems_allowed_seq){+.+...}
[ 1.080042] ... which became SOFTIRQ-irq-unsafe at:
[ 1.080042] ... [<ffffffff810ec1d3>] __lock_acquire+0x613/0x1db0
[ 1.080042] [<ffffffff810edfe5>] lock_acquire+0x95/0x130
[ 1.080042] [<ffffffff810b3df2>] kthreadd+0x82/0x180
[ 1.080042] [<ffffffff818980ac>] ret_from_fork+0x7c/0xb0
[ 1.080042]
[ 1.080042] other info that might help us debug this:
[ 1.080042]
[ 1.080042] Possible interrupt unsafe locking scenario:
[ 1.080042]
[ 1.080042] CPU0 CPU1
[ 1.080042] ---- ----
[ 1.080042] lock(&p->mems_allowed_seq);
[ 1.080042] local_irq_disable();
[ 1.080042] lock(&(&q->__queue_lock)->rlock);
[ 1.080042] lock(&p->mems_allowed_seq);
[ 1.080042] <Interrupt>
[ 1.080042] lock(&(&q->__queue_lock)->rlock);
[ 1.080042]
[ 1.080042] *** DEADLOCK ***The issue stems from the kthreadd() function calling set_mems_allowed with irqs enabled. While its possibly unlikely for the actual deadlock to trigger, a fix is fairly simple: disable irqs before taking the mems_allowed_seq lock.
--- include/linux/cpuset.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/cpuset.h +4 -0
@@ -110,10 +110,14 @@ static inline bool put_mems_allowed(unsigned int seq)static inline void set_mems_allowed (nodemask_t nodemask) { +unsigned long flags; +task_lock (current); +local_irq_save (flags);write_seqcount_begin (¤t->mems_allowed_seq); current->mems_allowed = nodemask;write_seqcount_end (¤t->mems_allowed_seq); +local_irq_restore (flags);task_unlock (current); }
Signature · 1 line
1.8.1.2
tip-bot for John Stultz
merge bot[tip:core/locking] cpuset: Fix potential deadlock w/ set_mems_allowed
cpuset: Fix potential deadlock w/ set_mems_allowed
Commit-ID: db751fe3ea6880ff5ac5abe60cb7b80deb5a4140 Gitweb: http://git.kernel.org/tip/db751fe3ea6880ff5ac5abe60cb7b80deb5a4140 Author: John Stultz <[email protected]> AuthorDate: Mon, 7 Oct 2013 15:52:00 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 6 Nov 2013 12:40:27 +0100
cpuset: Fix potential deadlock w/ set_mems_allowed
After adding lockdep support to seqlock/seqcount structures, I started seeing the following warning:
[ 1.070907] ======================================================
[ 1.072015] [ INFO: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected ]
[ 1.073181] 3.11.0+ #67 Not tainted
[ 1.073801] ------------------------------------------------------
[ 1.074882] kworker/u4:2/708 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
[ 1.076088] (&p->mems_allowed_seq){+.+...}, at: [<ffffffff81187d7f>] new_slab+0x5f/0x280
[ 1.077572]
[ 1.077572] and this task is already holding:
[ 1.078593] (&(&q->__queue_lock)->rlock){..-...}, at: [<ffffffff81339f03>] blk_execute_rq_nowait+0x53/0xf0
[ 1.080042] which would create a new lock dependency:
[ 1.080042] (&(&q->__queue_lock)->rlock){..-...} -> (&p->mems_allowed_seq){+.+...}
[ 1.080042]
[ 1.080042] but this new dependency connects a SOFTIRQ-irq-safe lock:
[ 1.080042] (&(&q->__queue_lock)->rlock){..-...}
[ 1.080042] ... which became SOFTIRQ-irq-safe at:
[ 1.080042] [<ffffffff810ec179>] __lock_acquire+0x5b9/0x1db0
[ 1.080042] [<ffffffff810edfe5>] lock_acquire+0x95/0x130
[ 1.080042] [<ffffffff818968a1>] _raw_spin_lock+0x41/0x80
[ 1.080042] [<ffffffff81560c9e>] scsi_device_unbusy+0x7e/0xd0
[ 1.080042] [<ffffffff8155a612>] scsi_finish_command+0x32/0xf0
[ 1.080042] [<ffffffff81560e91>] scsi_softirq_done+0xa1/0x130
[ 1.080042] [<ffffffff8133b0f3>] blk_done_softirq+0x73/0x90
[ 1.080042] [<ffffffff81095dc0>] __do_softirq+0x110/0x2f0
[ 1.080042] [<ffffffff81095fcd>] run_ksoftirqd+0x2d/0x60
[ 1.080042] [<ffffffff810bc506>] smpboot_thread_fn+0x156/0x1e0
[ 1.080042] [<ffffffff810b3916>] kthread+0xd6/0xe0
[ 1.080042] [<ffffffff818980ac>] ret_from_fork+0x7c/0xb0
[ 1.080042]
[ 1.080042] to a SOFTIRQ-irq-unsafe lock:
[ 1.080042] (&p->mems_allowed_seq){+.+...}
[ 1.080042] ... which became SOFTIRQ-irq-unsafe at:
[ 1.080042] ... [<ffffffff810ec1d3>] __lock_acquire+0x613/0x1db0
[ 1.080042] [<ffffffff810edfe5>] lock_acquire+0x95/0x130
[ 1.080042] [<ffffffff810b3df2>] kthreadd+0x82/0x180
[ 1.080042] [<ffffffff818980ac>] ret_from_fork+0x7c/0xb0
[ 1.080042]
[ 1.080042] other info that might help us debug this:
[ 1.080042]
[ 1.080042] Possible interrupt unsafe locking scenario:
[ 1.080042]
[ 1.080042] CPU0 CPU1
[ 1.080042] ---- ----
[ 1.080042] lock(&p->mems_allowed_seq);
[ 1.080042] local_irq_disable();
[ 1.080042] lock(&(&q->__queue_lock)->rlock);
[ 1.080042] lock(&p->mems_allowed_seq);
[ 1.080042] <Interrupt>
[ 1.080042] lock(&(&q->__queue_lock)->rlock);
[ 1.080042]
[ 1.080042] *** DEADLOCK ***The issue stems from the kthreadd() function calling set_mems_allowed with irqs enabled. While its possibly unlikely for the actual deadlock to trigger, a fix is fairly simple: disable irqs before taking the mems_allowed_seq lock.
--- include/linux/cpuset.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/cpuset.h +4 -0
@@ -110,10 +110,14 @@ static inline bool put_mems_allowed(unsigned int seq)static inline void set_mems_allowed (nodemask_t nodemask) { +unsigned long flags; +task_lock (current); +local_irq_save (flags);write_seqcount_begin (¤t->mems_allowed_seq); current->mems_allowed = nodemask;write_seqcount_end (¤t->mems_allowed_seq); +local_irq_restore (flags);task_unlock (current); }
RFC PATCH 4/4 ipv6: Fix for possible ipv6 seqlock deadlock
In reply to John StultzWhile enabling lockdep on seqlocks, I ran across the warning below caused by the ipv6 stats being updated in both irq and non-irq context.
This patch changes from IP6_INC_STATS_BH to IP6_INC_STATS (suggested by Eric Dumazet) to resolve this problem.
[ 11.120383] =================================
[ 11.121024] [ INFO: inconsistent lock state ]
[ 11.121663] 3.12.0-rc1+ #68 Not tainted
[ 11.122229] ---------------------------------
[ 11.122867] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[ 11.123741] init/4483 [HC0[0]:SC1[3]:HE1:SE0] takes:
[ 11.124505] (&stats->syncp.seq#6){+.?...}, at: [<c1ab80c2>] ndisc_send_ns+0xe2/0x130
[ 11.125736] {SOFTIRQ-ON-W} state was registered at:
[ 11.126447] [<c10e0eb7>] __lock_acquire+0x5c7/0x1af0
[ 11.127222] [<c10e2996>] lock_acquire+0x96/0xd0
[ 11.127925] [<c1a9a2c3>] write_seqcount_begin+0x33/0x40
[ 11.128766] [<c1a9aa03>] ip6_dst_lookup_tail+0x3a3/0x460
[ 11.129582] [<c1a9e0ce>] ip6_dst_lookup_flow+0x2e/0x80
[ 11.130014] [<c1ad18e0>] ip6_datagram_connect+0x150/0x4e0
[ 11.130014] [<c1a4d0b5>] inet_dgram_connect+0x25/0x70
[ 11.130014] [<c198dd61>] SYSC_connect+0xa1/0xc0
[ 11.130014] [<c198f571>] SyS_connect+0x11/0x20
[ 11.130014] [<c198fe6b>] SyS_socketcall+0x12b/0x300
[ 11.130014] [<c1bbf880>] syscall_call+0x7/0xb
[ 11.130014] irq event stamp: 1184
[ 11.130014] hardirqs last enabled at (1184): [<c1086901>] local_bh_enable+0x71/0x110
[ 11.130014] hardirqs last disabled at (1183): [<c10868cd>] local_bh_enable+0x3d/0x110
[ 11.130014] softirqs last enabled at (0): [<c108014d>] copy_process.part.42+0x45d/0x11a0
[ 11.130014] softirqs last disabled at (1147): [<c1086e05>] irq_exit+0xa5/0xb0
[ 11.130014]
[ 11.130014] other info that might help us debug this:
[ 11.130014] Possible unsafe locking scenario:
[ 11.130014]
[ 11.130014] CPU0
[ 11.130014] ----
[ 11.130014] lock(&stats->syncp.seq#6);
[ 11.130014] <Interrupt>
[ 11.130014] lock(&stats->syncp.seq#6);
[ 11.130014]
[ 11.130014] *** DEADLOCK ***
[ 11.130014]
[ 11.130014] 3 locks held by init/4483:
[ 11.130014] #0: (rcu_read_lock){.+.+..}, at: [<c109363c>] SyS_setpriority+0x4c/0x620
[ 11.130014] #1: (((&ifa->dad_timer))){+.-...}, at: [<c108c1c0>] call_timer_fn+0x0/0xf0
[ 11.130014] #2: (rcu_read_lock){.+.+..}, at: [<c1ab6494>] ndisc_send_skb+0x54/0x5d0
[ 11.130014]
[ 11.130014] stack backtrace:
[ 11.130014] CPU: 0 PID: 4483 Comm: init Not tainted 3.12.0-rc1+ #68
[ 11.130014] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
[ 11.130014] 00000000 00000000 c55e5c10 c1bb0e71 c57128b0 c55e5c4c c1badf79 c1ec1123
[ 11.130014] c1ec1484 00001183 00000000 00000000 00000001 00000003 00000001 00000000
[ 11.130014] c1ec1484 00000004 c5712dcc 00000000 c55e5c84 c10de492 00000004 c10755f2
[ 11.130014] Call Trace:
[ 11.130014] [<c1bb0e71>] dump_stack+0x4b/0x66
[ 11.130014] [<c1badf79>] print_usage_bug+0x1d3/0x1dd
[ 11.130014] [<c10de492>] mark_lock+0x282/0x2f0
[ 11.130014] [<c10755f2>] ? kvm_clock_read+0x22/0x30
[ 11.130014] [<c10dd8b0>] ? check_usage_backwards+0x150/0x150
[ 11.130014] [<c10e0e74>] __lock_acquire+0x584/0x1af0
[ 11.130014] [<c10b1baf>] ? sched_clock_cpu+0xef/0x190
[ 11.130014] [<c10de58c>] ? mark_held_locks+0x8c/0xf0
[ 11.130014] [<c10e2996>] lock_acquire+0x96/0xd0
[ 11.130014] [<c1ab80c2>] ? ndisc_send_ns+0xe2/0x130
[ 11.130014] [<c1ab66d3>] ndisc_send_skb+0x293/0x5d0
[ 11.130014] [<c1ab80c2>] ? ndisc_send_ns+0xe2/0x130
[ 11.130014] [<c1ab80c2>] ndisc_send_ns+0xe2/0x130
[ 11.130014] [<c108cc32>] ? mod_timer+0xf2/0x160
[ 11.130014] [<c1aa706e>] ? addrconf_dad_timer+0xce/0x150
[ 11.130014] [<c1aa70aa>] addrconf_dad_timer+0x10a/0x150
[ 11.130014] [<c1aa6fa0>] ? addrconf_dad_completed+0x1c0/0x1c0
[ 11.130014] [<c108c233>] call_timer_fn+0x73/0xf0
[ 11.130014] [<c108c1c0>] ? __internal_add_timer+0xb0/0xb0
[ 11.130014] [<c1aa6fa0>] ? addrconf_dad_completed+0x1c0/0x1c0
[ 11.130014] [<c108c5b1>] run_timer_softirq+0x141/0x1e0
[ 11.130014] [<c1086b20>] ? __do_softirq+0x70/0x1b0
[ 11.130014] [<c1086b70>] __do_softirq+0xc0/0x1b0
[ 11.130014] [<c1086e05>] irq_exit+0xa5/0xb0
[ 11.130014] [<c106cfd5>] smp_apic_timer_interrupt+0x35/0x50
[ 11.130014] [<c1bbfbca>] apic_timer_interrupt+0x32/0x38
[ 11.130014] [<c10936ed>] ? SyS_setpriority+0xfd/0x620
[ 11.130014] [<c10e26c9>] ? lock_release+0x9/0x240
[ 11.130014] [<c10936d7>] ? SyS_setpriority+0xe7/0x620
[ 11.130014] [<c1bbee6d>] ? _raw_read_unlock+0x1d/0x30
[ 11.130014] [<c1093701>] SyS_setpriority+0x111/0x620
[ 11.130014] [<c109363c>] ? SyS_setpriority+0x4c/0x620
[ 11.130014] [<c1bbf880>] syscall_call+0x7/0xb--- net/ipv6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_output.c +1 -1
@@ -909,7 +909,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, out_err_release:if (err == -ENETUNREACH ) -IP6_INC_STATS_BH (net,NULL ,IPSTATS_MIB_OUTNOROUTES ); +IP6_INC_STATS (net,NULL ,IPSTATS_MIB_OUTNOROUTES );dst_release (*dst); *dst =NULL ;return err;
Signature · 1 line
1.8.1.2
Re: [PATCH 4/4] [RFC] ipv6: Fix for possible ipv6 seqlock deadlock
Quoted 2 lines · John Stultz
While enabling lockdep on seqlocks, I ran across the warning below caused by the ipv6 stats being updated in both irq and non-irq context.
You mean a lockdep warning on a seqcount in this context, right ?
Quoted 3 lines
This patch changes from
IP6_INC_STATS_BHtoIP6_INC_STATS(suggested by Eric Dumazet) to resolve this problem.
...
Quoted 21 lines
Cc Eric Dumazet <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Steven Rostedt <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Ingo Molnar <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "David S. Miller" <[email protected]>Cc Alexey Kuznetsov <[email protected]>Cc James Morris <[email protected]>Cc Hideaki YOSHIFUJI <[email protected]>Cc Patrick McHardy <[email protected]>Signed-off-by John Stultz <[email protected]>--- net/ipv6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/ipv6/ip6_output.c +0
-0
net/ipv6/ip6_output.c static int ip6_dst_lookup_tail(struct sock *sk, · line 915
Quoted 8 lines
net/ipv6/ip6_output.c +1
-1@@ -909,7 +909,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, out_err_release:if (err == -ENETUNREACH ) -IP6_INC_STATS_BH (net,NULL ,IPSTATS_MIB_OUTNOROUTES ); +IP6_INC_STATS (net,NULL ,IPSTATS_MIB_OUTNOROUTES );dst_release (*dst); *dst =NULL ;return err;
This one is certainly a bug fix, David please consider adding it to your net tree
Bug added in commit ca46f9c834913f ("[IPv6] SNMP: Increment OutNoRoutes when connecting to unreachable network")
tip-bot for John Stultz
merge bot[tip:core/locking] ipv6: Fix possible ipv6 seqlock deadlock
In reply to John Stultzipv6: Fix possible ipv6 seqlock deadlock
Commit-ID: 5ac68e7c34a4797aa4ca9615e5a6603bda1abe9b Gitweb: http://git.kernel.org/tip/5ac68e7c34a4797aa4ca9615e5a6603bda1abe9b Author: John Stultz <[email protected]> AuthorDate: Mon, 7 Oct 2013 15:52:01 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 6 Nov 2013 12:40:28 +0100
ipv6: Fix possible ipv6 seqlock deadlock
While enabling lockdep on seqlocks, I ran across the warning below caused by the ipv6 stats being updated in both irq and non-irq context.
This patch changes from IP6_INC_STATS_BH to IP6_INC_STATS (suggested by Eric Dumazet) to resolve this problem.
[ 11.120383] =================================
[ 11.121024] [ INFO: inconsistent lock state ]
[ 11.121663] 3.12.0-rc1+ #68 Not tainted
[ 11.122229] ---------------------------------
[ 11.122867] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[ 11.123741] init/4483 [HC0[0]:SC1[3]:HE1:SE0] takes:
[ 11.124505] (&stats->syncp.seq#6){+.?...}, at: [<c1ab80c2>] ndisc_send_ns+0xe2/0x130
[ 11.125736] {SOFTIRQ-ON-W} state was registered at:
[ 11.126447] [<c10e0eb7>] __lock_acquire+0x5c7/0x1af0
[ 11.127222] [<c10e2996>] lock_acquire+0x96/0xd0
[ 11.127925] [<c1a9a2c3>] write_seqcount_begin+0x33/0x40
[ 11.128766] [<c1a9aa03>] ip6_dst_lookup_tail+0x3a3/0x460
[ 11.129582] [<c1a9e0ce>] ip6_dst_lookup_flow+0x2e/0x80
[ 11.130014] [<c1ad18e0>] ip6_datagram_connect+0x150/0x4e0
[ 11.130014] [<c1a4d0b5>] inet_dgram_connect+0x25/0x70
[ 11.130014] [<c198dd61>] SYSC_connect+0xa1/0xc0
[ 11.130014] [<c198f571>] SyS_connect+0x11/0x20
[ 11.130014] [<c198fe6b>] SyS_socketcall+0x12b/0x300
[ 11.130014] [<c1bbf880>] syscall_call+0x7/0xb
[ 11.130014] irq event stamp: 1184
[ 11.130014] hardirqs last enabled at (1184): [<c1086901>] local_bh_enable+0x71/0x110
[ 11.130014] hardirqs last disabled at (1183): [<c10868cd>] local_bh_enable+0x3d/0x110
[ 11.130014] softirqs last enabled at (0): [<c108014d>] copy_process.part.42+0x45d/0x11a0
[ 11.130014] softirqs last disabled at (1147): [<c1086e05>] irq_exit+0xa5/0xb0
[ 11.130014]
[ 11.130014] other info that might help us debug this:
[ 11.130014] Possible unsafe locking scenario:
[ 11.130014]
[ 11.130014] CPU0
[ 11.130014] ----
[ 11.130014] lock(&stats->syncp.seq#6);
[ 11.130014] <Interrupt>
[ 11.130014] lock(&stats->syncp.seq#6);
[ 11.130014]
[ 11.130014] *** DEADLOCK ***
[ 11.130014]
[ 11.130014] 3 locks held by init/4483:
[ 11.130014] #0: (rcu_read_lock){.+.+..}, at: [<c109363c>] SyS_setpriority+0x4c/0x620
[ 11.130014] #1: (((&ifa->dad_timer))){+.-...}, at: [<c108c1c0>] call_timer_fn+0x0/0xf0
[ 11.130014] #2: (rcu_read_lock){.+.+..}, at: [<c1ab6494>] ndisc_send_skb+0x54/0x5d0
[ 11.130014]
[ 11.130014] stack backtrace:
[ 11.130014] CPU: 0 PID: 4483 Comm: init Not tainted 3.12.0-rc1+ #68
[ 11.130014] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
[ 11.130014] 00000000 00000000 c55e5c10 c1bb0e71 c57128b0 c55e5c4c c1badf79 c1ec1123
[ 11.130014] c1ec1484 00001183 00000000 00000000 00000001 00000003 00000001 00000000
[ 11.130014] c1ec1484 00000004 c5712dcc 00000000 c55e5c84 c10de492 00000004 c10755f2
[ 11.130014] Call Trace:
[ 11.130014] [<c1bb0e71>] dump_stack+0x4b/0x66
[ 11.130014] [<c1badf79>] print_usage_bug+0x1d3/0x1dd
[ 11.130014] [<c10de492>] mark_lock+0x282/0x2f0
[ 11.130014] [<c10755f2>] ? kvm_clock_read+0x22/0x30
[ 11.130014] [<c10dd8b0>] ? check_usage_backwards+0x150/0x150
[ 11.130014] [<c10e0e74>] __lock_acquire+0x584/0x1af0
[ 11.130014] [<c10b1baf>] ? sched_clock_cpu+0xef/0x190
[ 11.130014] [<c10de58c>] ? mark_held_locks+0x8c/0xf0
[ 11.130014] [<c10e2996>] lock_acquire+0x96/0xd0
[ 11.130014] [<c1ab80c2>] ? ndisc_send_ns+0xe2/0x130
[ 11.130014] [<c1ab66d3>] ndisc_send_skb+0x293/0x5d0
[ 11.130014] [<c1ab80c2>] ? ndisc_send_ns+0xe2/0x130
[ 11.130014] [<c1ab80c2>] ndisc_send_ns+0xe2/0x130
[ 11.130014] [<c108cc32>] ? mod_timer+0xf2/0x160
[ 11.130014] [<c1aa706e>] ? addrconf_dad_timer+0xce/0x150
[ 11.130014] [<c1aa70aa>] addrconf_dad_timer+0x10a/0x150
[ 11.130014] [<c1aa6fa0>] ? addrconf_dad_completed+0x1c0/0x1c0
[ 11.130014] [<c108c233>] call_timer_fn+0x73/0xf0
[ 11.130014] [<c108c1c0>] ? __internal_add_timer+0xb0/0xb0
[ 11.130014] [<c1aa6fa0>] ? addrconf_dad_completed+0x1c0/0x1c0
[ 11.130014] [<c108c5b1>] run_timer_softirq+0x141/0x1e0
[ 11.130014] [<c1086b20>] ? __do_softirq+0x70/0x1b0
[ 11.130014] [<c1086b70>] __do_softirq+0xc0/0x1b0
[ 11.130014] [<c1086e05>] irq_exit+0xa5/0xb0
[ 11.130014] [<c106cfd5>] smp_apic_timer_interrupt+0x35/0x50
[ 11.130014] [<c1bbfbca>] apic_timer_interrupt+0x32/0x38
[ 11.130014] [<c10936ed>] ? SyS_setpriority+0xfd/0x620
[ 11.130014] [<c10e26c9>] ? lock_release+0x9/0x240
[ 11.130014] [<c10936d7>] ? SyS_setpriority+0xe7/0x620
[ 11.130014] [<c1bbee6d>] ? _raw_read_unlock+0x1d/0x30
[ 11.130014] [<c1093701>] SyS_setpriority+0x111/0x620
[ 11.130014] [<c109363c>] ? SyS_setpriority+0x4c/0x620
[ 11.130014] [<c1bbf880>] syscall_call+0x7/0xb--- net/ipv6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_output.c +1 -1
@@ -909,7 +909,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, out_err_release:if (err == -ENETUNREACH ) -IP6_INC_STATS_BH (net,NULL ,IPSTATS_MIB_OUTNOROUTES ); +IP6_INC_STATS (net,NULL ,IPSTATS_MIB_OUTNOROUTES );dst_release (*dst); *dst =NULL ;return err;
Peter Zijlstra
maintainerQuoted 6 lines · John Stultz
Just wanted to send this out again for further feedback.
This patch series enables lockdep for seqcount/seqlock structures, as well as provides the required cleanups to explicitly initialize the seqcount structures on
u64_stat_syncusers.
Quoted 6 lines
In addition the last two patches in this provide fixes to some of the issues the new lockdep infrastructure caught.
I'd greatly appreciate any thoughts or feedback on the series! Particularly on how the
u64_stats_syncinitialization changes should be merged.
I've picked up all 4 patches for the lockdep tree; I've tried against -next of today (20131029) and found no collisions with networking so I'm hoping all will land well.
Please anybody holler if they disagree/want things done differently.