diff options
| author |   Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-08-23 10:46:45 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-08-24 13:46:57 +0100 |
| commit | bf955b5ab8f6f7b0632cdef8e36b14e4f6e77829 (patch) | |
| tree | 45d85660cd5cbaa68bdd7e11b9290fdf6d98fc9e /net/sched/sch_generic.c | |
| parent | net: Fix data-races around sysctl_[rw]mem_(max|default). (diff) | |
| download | linux-dev-bf955b5ab8f6f7b0632cdef8e36b14e4f6e77829.tar.xz linux-dev-bf955b5ab8f6f7b0632cdef8e36b14e4f6e77829.zip | |
net: Fix data-races around weight_p and dev_weight_[rt]x_bias.
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: 3d48b53fb2ae ("net: dev_weight: TX/RX orthogonality")
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_generic.c')
| -rw-r--r-- | net/sched/sch_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index d47b9689eba6..99b697ad2b98 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -409,7 +409,7 @@ static inline bool qdisc_restart(struct Qdisc *q, int *packets) void __qdisc_run(struct Qdisc *q) { - int quota = dev_tx_weight; + int quota = READ_ONCE(dev_tx_weight); int packets; while (qdisc_restart(q, &packets)) { |