Patch "net: mvneta: Fix spinlock usage" has been added to the 4.5-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: mvneta: Fix spinlock usage
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mvneta-fix-spinlock-usage.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sat Apr 16 09:15:18 PDT 2016
From: Gregory CLEMENT <[email protected]>
Date: Sat, 12 Mar 2016 18:44:17 +0100
Subject: net: mvneta: Fix spinlock usage
From: Gregory CLEMENT <[email protected]>
[ Upstream commit 1c2722a975fdb8c90bc6ba8570b7fb62db4e2e9c ]
In the previous patch, the spinlock was not initialized. While it didn't cause any trouble yet it could be a problem to use it uninitialized.
The most annoying part was the critical section protected by the spinlock in mvneta_stop(). Some of the functions could sleep as pointed when activated CONFIG_DEBUG_ATOMIC_SLEEP. Actually, in mvneta_stop() we only need to protect the is_stopped flagged, indeed the code of the notifier for CPU online is protected by the same spinlock, so when we get the lock, the notifer work is done.
--- drivers/net/ethernet/marvell/mvneta.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +6 -5
@@ -3070,17 +3070,17 @@ static int mvneta_stop(struct net_devicestruct mvneta_port *pp =netdev_priv (dev);/* Inform that we are stopping so we don't want to setup the -* driver for new CPUs in the notifiers +* driver for new CPUs in the notifiers. The code of the +* notifier for CPU online is protected by the same spinlock, +* so when we get the lock, the notifer work is done. */ spin_lock (&pp->lock); pp->is_stopped = true; +spin_unlock (&pp->lock); +mvneta_stop_dev (pp);mvneta_mdio_remove (pp);unregister_cpu_notifier (&pp->cpu_notifier); -/* Now that the notifier are unregistered, we can release le -* lock -*/ -spin_unlock (&pp->lock);on_each_cpu (mvneta_percpu_disable, pp, true);free_percpu_irq (dev->irq, pp->ports);mvneta_cleanup_rxqs (pp);
@@ -3612,6 +3612,7 @@ static int mvneta_probe(struct platform_ dev->ethtool_ops = &mvneta_eth_tool_ops; pp =netdev_priv (dev); +spin_lock_init (&pp->lock); pp->phy_node = phy_node; pp->phy_interface = phy_mode;
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/net-mvneta-fix-spinlock-usage.patch