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

Commit 7f90128e authored by Akeem G Abodunrin's avatar Akeem G Abodunrin Committed by Jeff Kirsher
Browse files

igb: Added rcu_lock to avoid race 



This patch adds rcu_lock to avoid possible race condition with igb_update_stats
function accessing the rings in free_ q_vector.

CC: Eric Dumazet <edumazet@google.com>
Signed-off-by: default avatarAkeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e5c3370f

drivers/net/ethernet/intel/igb/igb_main.c

+4 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ static void igb_free_q_vector(struct igb_adapter *adapter, int v_idx) 
	adapter->q_vector[v_idx] = NULL;

	netif_napi_del(&q_vector->napi);



	/* ixgbe_get_stats64() might access the rings on this vector,

	/* igb_get_stats64() might access the rings on this vector,

	 * we must wait a grace period before freeing it.

	 */

	kfree_rcu(q_vector, rcu);
@@ -4859,6 +4859,8 @@ void igb_update_stats(struct igb_adapter *adapter, 


	bytes = 0;

	packets = 0;



	rcu_read_lock();

	for (i = 0; i < adapter->num_rx_queues; i++) {

		u32 rqdpc = rd32(E1000_RQDPC(i));

		struct igb_ring *ring = adapter->rx_ring[i];
@@ -4894,6 +4896,7 @@ void igb_update_stats(struct igb_adapter *adapter, 
	}

	net_stats->tx_bytes = bytes;

	net_stats->tx_packets = packets;

	rcu_read_unlock();



	/* read stats registers */

	adapter->stats.crcerrs += rd32(E1000_CRCERRS);