mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
openvswitch: meter: fix race when getting now_ms.
We have observed meters working unexpected if traffic is 3+Gbit/s
with multiple connections.
now_ms is not pretected by meter->lock, we may get a negative
long_delta_ms when another cpu updated meter->used, then:
delta_ms = (u32)long_delta_ms;
which will be a large value.
band->bucket += delta_ms * band->rate;
then we get a wrong band->bucket.
OpenVswitch userspace datapath has fixed the same issue[1] some
time ago, and we port the implementation to kernel datapath.
[1] https://patchwork.ozlabs.org/project/openvswitch/patch/[email protected]/
Fixes: 96fbc13d7e ("openvswitch: Add meter infrastructure")
Signed-off-by: Tao Liu <[email protected]>
Suggested-by: Ilya Maximets <[email protected]>
Reviewed-by: Ilya Maximets <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
1 parent
c7d8302478
commit
e4df1b0c24
1 file changed
+8
@@ -611,6 +611,14 @@ bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
|
||||
spin_lock(&meter->lock);
|
||||
|
||||
long_delta_ms = (now_ms - meter->used); /* ms */
|
||||
if (long_delta_ms < 0) {
|
||||
/* This condition means that we have several threads fighting
|
||||
* for a meter lock, and the one who received the packets a
|
||||
* bit later wins. Assuming that all racing threads received
|
||||
* packets at the same time to avoid overflow.
|
||||
*/
|
||||
long_delta_ms = 0;
|
||||
}
|
||||
|
||||
/* Make sure delta_ms will not be too large, so that bucket will not
|
||||
* wrap around below.
|
||||
|
||||
Reference in new issue
Block a user