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

Commit 923fa41a authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Greg Kroah-Hartman
Browse files

net: Fix a data-race around netdev_budget_usecs. 



[ Upstream commit fa45d484c52c73f79db2c23b0cdfc6c6455093ad ]

While reading netdev_budget_usecs, it can be changed concurrently.
Thus, we need to add READ_ONCE() to its reader.

Fixes: 7acf8a1e ("Replace 2 jiffies with sysctl netdev_budget_usecs to enable softirq tuning")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent adeb24af

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -6393,7 +6393,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h) 
{

	struct softnet_data *sd = this_cpu_ptr(&softnet_data);

	unsigned long time_limit = jiffies +

		usecs_to_jiffies(netdev_budget_usecs);

		usecs_to_jiffies(READ_ONCE(netdev_budget_usecs));

	int budget = READ_ONCE(netdev_budget);

	LIST_HEAD(list);

	LIST_HEAD(repoll);