mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

dpif-netdev: Refactor and fix the buckets calculation.

Browse Source 
The way that "burst_size" was used as total buckets is
very strange. If user set the "burst_size" too smaller while
"rate" larger, that may affect the meter normal work.
This patch refactor the buckets calculation, and start
with a full buckets. It also makes the calculation equal
to what kernel datapath does.

Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Tonghao Zhang
2021-03-03 22:46:56 +08:00
committed by Ilya Maximets
parent 759aaa8513
commit c3690ccbce
3 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/dpif-netdev.c
View File

@@ -280,8 +280,8 @@ static bool dpcls_lookup(struct dpcls *cls,
struct dp_meter_band {
uint32_t rate;
uint32_t burst_size;
uint64_t bucket; /* In 1/1000 packets (for PKTPS), or in bits (for KBPS) */
uint64_t burst_size;
uint64_t packet_count;
uint64_t byte_count;
};
@@ -6226,12 +6226,14 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,
/* Update all bands and find the one hit with the highest rate for each
* packet (if any). */
for (int m = 0; m < meter->n_bands; ++m) {
band = &meter->bands[m];
uint64_t max_bucket_size;
band = &meter->bands[m];
max_bucket_size = (band->rate + band->burst_size) * 1000ULL;
/* Update band's bucket. */
band->bucket += (uint64_t) delta_t * band->rate;
if (band->bucket > band->burst_size) {
band->bucket = band->burst_size;
if (band->bucket > max_bucket_size) {
band->bucket = max_bucket_size;
}
/* Drain the bucket for all the packets, if possible. */
@@ -6352,13 +6354,15 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id,
config->bands[i].burst_size = config->bands[i].rate;
}
meter->bands[i].bucket = 0;
meter->bands[i].rate = config->bands[i].rate;
meter->bands[i].burst_size = config->bands[i].burst_size * 1000ULL;
meter->bands[i].burst_size = config->bands[i].burst_size;
/* Start with a full bucket. */
meter->bands[i].bucket =
(meter->bands[i].burst_size + meter->bands[i].rate) * 1000ULL;
/* Figure out max delta_t that is enough to fill any bucket. */
band_max_delta_t
= meter->bands[i].burst_size / meter->bands[i].rate;
= meter->bands[i].bucket / meter->bands[i].rate;
if (band_max_delta_t > meter->max_delta_t) {
meter->max_delta_t = band_max_delta_t;
}