提交 b60ebae6 编写于 作者: K Kuniyuki Iwashima 提交者: Zheng Zengkai

net: Fix a data-race around netdev_budget.

stable inclusion
from stable-v5.10.140
commit 12a34d7f0463ebb6db01977091b5cda46d9060bc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I63FTT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=12a34d7f0463ebb6db01977091b5cda46d9060bc

--------------------------------

[ Upstream commit 2e0c4237 ]

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

Fixes: 51b0bded ("[NET]: Separate two usages of netdev_max_backlog.")
Signed-off-by: NKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 8e6b092e
...@@ -6886,7 +6886,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h) ...@@ -6886,7 +6886,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
struct softnet_data *sd = this_cpu_ptr(&softnet_data); struct softnet_data *sd = this_cpu_ptr(&softnet_data);
unsigned long time_limit = jiffies + unsigned long time_limit = jiffies +
usecs_to_jiffies(netdev_budget_usecs); usecs_to_jiffies(netdev_budget_usecs);
int budget = netdev_budget; int budget = READ_ONCE(netdev_budget);
LIST_HEAD(list); LIST_HEAD(list);
LIST_HEAD(repoll); LIST_HEAD(repoll);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册