Commit e5735887 authored by Tonghao Zhang's avatar Tonghao Zhang Committed by David S. Miller
Browse files

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: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7735008

net/openvswitch/meter.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/openvswitch/meter.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE