| Message ID | 1587575340-6790-6-git-send-email-xiangxia.m.yue@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | expand meter tables and fix bug | expand |
On Wed, Apr 22, 2020 at 10:10 AM <xiangxia.m.yue@gmail.com> wrote: > > From: Tonghao Zhang <xiangxia.m.yue@gmail.com> > > 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> > --- > net/openvswitch/meter.c | 2 +- > net/openvswitch/meter.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > Acked-by: Pravin B Shelar <pshelar@ovn.org> Thanks.
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 fcde5ee647da..9ca50bfd1142 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; };