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

Commit 2084b114 authored by Flavio Leitner's avatar Flavio Leitner Committed by Jeff Kirsher
Browse files

e1000e: fix stats locking in e1000_watchdog_task 



Just move the unlock down a bit because it unlocks too
early leaving a chance for get_stats64() run in parallel
while it is still accessing the stats.

Signed-off-by: default avatarFlavio Leitner <fleitner@redhat.com>
Acked-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 86d70e53

drivers/net/e1000e/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -4339,7 +4339,6 @@ static void e1000_watchdog_task(struct work_struct *work) 
link_up:

	spin_lock(&adapter->stats64_lock);

	e1000e_update_stats(adapter);

	spin_unlock(&adapter->stats64_lock);



	mac->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;

	adapter->tpt_old = adapter->stats.tpt;
@@ -4350,6 +4349,7 @@ static void e1000_watchdog_task(struct work_struct *work) 
	adapter->gorc_old = adapter->stats.gorc;

	adapter->gotc = adapter->stats.gotc - adapter->gotc_old;

	adapter->gotc_old = adapter->stats.gotc;

	spin_unlock(&adapter->stats64_lock);



	e1000e_update_adaptive(&adapter->hw);