diff options
| author | Tonghao Zhang <xiangxia.m.yue@gmail.com> | 2020-04-24 08:08:06 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-23 18:26:11 -0700 |
| commit | e57358873bb5d6caa882b9684f59140912b37dde (patch) | |
| tree | fab2ca5995d63de8d623c0af97072e9ac8141486 | |
| parent | c77350089052cafa8125169e37463ab7028d6a18 (diff) | |
| download | linux-e57358873bb5d6caa882b9684f59140912b37dde.tar.bz2 | |
net: openvswitch: use u64 for meter bucket
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>
| -rw-r--r-- | net/openvswitch/meter.c | 2 | ||||
| -rw-r--r-- | net/openvswitch/meter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c index e36b464b32a5..915f31123f23 100644 --- a/net/openvswitch/meter.c +++ b/net/openvswitch/meter.c @@ -392,7 +392,7 @@ static struct dp_meter *dp_meter_create(struct nlattr **a) * * 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; if (band_max_delta_t > meter->max_delta_t) meter->max_delta_t = band_max_delta_t; diff --git a/net/openvswitch/meter.h b/net/openvswitch/meter.h index 61a3ca43cd77..0c33889a8515 100644 --- a/net/openvswitch/meter.h +++ b/net/openvswitch/meter.h @@ -26,7 +26,7 @@ struct dp_meter_band { u32 type; u32 rate; u32 burst_size; - u32 bucket; /* 1/1000 packets, or in bits */ + u64 bucket; /* 1/1000 packets, or in bits */ struct ovs_flow_stats stats; }; |