iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: openvswitch: use u64 for meter bucket

Browse Source 
When setting the meter rate to 4+Gbps, there is an
overflow, the meters don't work as expected.

Cc: Pravin B Shelar <pshelar@ovn.org>
Cc: Andy Zhou <azhou@ovn.org>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tonghao Zhang 2020-04-24 08:08:06 +08:00 committed by David S. Miller
parent c773500890
commit e57358873b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/openvswitch/meter.c
View File

@ -392,7 +392,7 @@ static struct dp_meter *dp_meter_create(struct nlattr **a)
* *
* Start with a full bucket. * Start with a full bucket.
*/ */
band->bucket = (band->burst_size + band->rate) * 1000; band->bucket = (band->burst_size + band->rate) * 1000ULL;
band_max_delta_t = band->bucket / band->rate; band_max_delta_t = band->bucket / band->rate;
if (band_max_delta_t > meter->max_delta_t) if (band_max_delta_t > meter->max_delta_t)
meter->max_delta_t = band_max_delta_t; meter->max_delta_t = band_max_delta_t;

2
net/openvswitch/meter.h
View File

@ -26,7 +26,7 @@ struct dp_meter_band {
u32 type; u32 type;
u32 rate; u32 rate;
u32 burst_size; u32 burst_size;
u32 bucket; /* 1/1000 packets, or in bits */ u64 bucket; /* 1/1000 packets, or in bits */
struct ovs_flow_stats stats; struct ovs_flow_stats stats;
}; };