Patch "openvswitch: meter: fix the incorrect calculation of max delta_t" has been added to the 4.15-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
openvswitch: meter: fix the incorrect calculation of max delta_t
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
openvswitch-meter-fix-the-incorrect-calculation-of-max-delta_t.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Mar 28 18:37:51 CEST 2018
From: zhangliping <[email protected]>
Date: Fri, 9 Mar 2018 10:08:50 +0800
Subject: openvswitch: meter: fix the incorrect calculation of max delta_t
From: zhangliping <[email protected]>
[ Usptream commit ddc502dfed600bff0b61d899f70d95b76223fdfc ]
Max delat_t should be the full_bucket/rate instead of the full_bucket. Also report EINVAL if the rate is zero.
--- net/openvswitch/meter.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/openvswitch/meter.c +9 -3
@@ -242,14 +242,20 @@ static struct dp_meter *dp_meter_create( band->type =nla_get_u32 (attr[OVS_BAND_ATTR_TYPE ]); band->rate =nla_get_u32 (attr[OVS_BAND_ATTR_RATE ]); +if (band->rate ==0 ) { + err = -EINVAL ; + goto exit_free_meter; + } + band->burst_size =nla_get_u32 (attr[OVS_BAND_ATTR_BURST ]);/* Figure out max delta_t that is enough to fill any bucket. * Keep max_delta_t size to the bucket units: * pkts => 1/1000 packets, kilobits => bits. +* +* Start with a full bucket. */ - band_max_delta_t = (band->burst_size + band->rate) *1000 ; -/* Start with a full bucket. */ - band->bucket = band_max_delta_t; + band->bucket = (band->burst_size + band->rate) *1000 ; + 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; band++;
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/openvswitch-meter-fix-the-incorrect-calculation-of-max-delta_t.patch