R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Fix data-races around weight_p and dev_weight_[rt]x_bias.

Browse Source 
[ Upstream commit bf955b5ab8f6f7b0632cdef8e36b14e4f6e77829 ]

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

Also, dev_[rt]x_weight can be read/written at the same time.  So, we
need to use READ_ONCE() and WRITE_ONCE() for its access.  Moreover, to
use the same weight_p while changing dev_[rt]x_weight, we add a mutex
in proc_do_dev_weight().

Fixes: 3d48b53fb2 ("net: dev_weight: TX/RX orthogonality")
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
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>
This commit is contained in:
Kuniyuki Iwashima 2022-08-23 10:46:45 -07:00 committed by Greg Kroah-Hartman
parent a9982b60c4
commit d6be3137d5
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/dev.c
View File

@ -5851,7 +5851,7 @@ static int process_backlog(struct napi_struct *napi, int quota)
net_rps_action_and_irq_enable(sd); net_rps_action_and_irq_enable(sd);
} }
napi->weight = dev_rx_weight; napi->weight = READ_ONCE(dev_rx_weight);
while (again) { while (again) {
struct sk_buff *skb; struct sk_buff *skb;

15
net/core/sysctl_net_core.c
View File

@ -231,14 +231,17 @@ static int set_default_qdisc(struct ctl_table *table, int write,
static int proc_do_dev_weight(struct ctl_table *table, int write, static int proc_do_dev_weight(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
int ret; static DEFINE_MUTEX(dev_weight_mutex);
int ret, weight;
mutex_lock(&dev_weight_mutex);
ret = proc_dointvec(table, write, buffer, lenp, ppos); ret = proc_dointvec(table, write, buffer, lenp, ppos);
if (ret != 0) if (!ret && write) {
return ret; weight = READ_ONCE(weight_p);
WRITE_ONCE(dev_rx_weight, weight * dev_weight_rx_bias);
dev_rx_weight = weight_p * dev_weight_rx_bias; WRITE_ONCE(dev_tx_weight, weight * dev_weight_tx_bias);
dev_tx_weight = weight_p * dev_weight_tx_bias; }
mutex_unlock(&dev_weight_mutex);
return ret; return ret;
} }

2
net/sched/sch_generic.c
View File

@ -397,7 +397,7 @@ static inline bool qdisc_restart(struct Qdisc *q, int *packets)
void __qdisc_run(struct Qdisc *q) void __qdisc_run(struct Qdisc *q)
{ {
int quota = dev_tx_weight; int quota = READ_ONCE(dev_tx_weight);
int packets; int packets;
while (qdisc_restart(q, &packets)) { while (qdisc_restart(q, &packets)) {