Remove the lock_cpu_hotplug()/unlock_cpu_hotplug() calls from net_dma_rebalance
The lock_cpu_hotplug()/unlock_cpu_hotplug() sequence in net_dma_rebalance
is both incorrect (as pointed out by David Miller) because lock_cpu_hotplug()
may sleep while the net_dma_event_lock spinlock is held, and unnecessary (as
pointed out by Andrew Morton) as spin_lock() disables preemption which
protects from CPU hotplug events.
Signed-off-by: Chris Leech <[email protected]>
---
net/core/dev.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 4d2b516..780d770 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3429,12 +3429,9 @@ static void net_dma_rebalance(void)
unsigned int cpu, i, n;
struct dma_chan *chan;
- lock_cpu_hotplug();
-
if (net_dma_count == 0) {
for_each_online_cpu(cpu)
rcu_assign_pointer(per_cpu(softnet_data.net_dma, cpu), NULL);
- unlock_cpu_hotplug();
return;
}
@@ -3454,8 +3451,6 @@ static void net_dma_rebalance(void)
i++;
}
rcu_read_unlock();
-
- unlock_cpu_hotplug();
}
/**
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
