summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorKuniyuki Iwashima <kuniyu@amazon.com>2022-08-23 10:46:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-05 10:26:31 +0200
commit2a341830849e1ced57e40455bcaa6fc9b79662d5 (patch)
treeacefdcb151c1c911c9cf97d00596566d2b2e5e9a /net/core
parentc3d0b6b3c808ff7d5439fbe6a41108bbb000ab26 (diff)
downloadlinux-stable-2a341830849e1ced57e40455bcaa6fc9b79662d5.tar.gz
linux-stable-2a341830849e1ced57e40455bcaa6fc9b79662d5.tar.bz2
linux-stable-2a341830849e1ced57e40455bcaa6fc9b79662d5.zip
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: 7acf8a1e8a28 ("Replace 2 jiffies with sysctl netdev_budget_usecs to enable softirq tuning") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index c93068ea2e4f..880b096eef8a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6335,7 +6335,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);