Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 827da44c authored by John Stultz's avatar John Stultz Committed by Ingo Molnar
Browse files

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!

Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: James Morris <jmorris@namei.org>
Cc: Jesse Gross <jesse@nicira.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Mirko Lindner <mlindner@marvell.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Roger Luethi <rl@hellgate.ch>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Simon Horman <horms@verge.net.au>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Wensong Zhang <wensong@linux-vs.org>
Cc: netdev@vger.kernel.org
Link: http://lkml.kernel.org/r/1381186321-4906-2-git-send-email-john.stultz@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 32cf7c3c

drivers/net/dummy.c

+6 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;