setup_tc_rate_limit : delete class and filter before update

[pve-common.git] / data / PVE / Network.pm

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
index a3551deea49b24d6737947d62f7c7cc7ccaa87c8..4cc5fb8c11beafad3fb40a00261ec222895441bd 100644 (file)
--- a/data/PVE/Network.pm
+++ b/data/PVE/Network.pm
@@ -11,17 +11,21 @@ use File::Basename;
 sub setup_tc_rate_limit {
     my ($iface, $rate, $burst, $debug) = @_;
 
-    system("/sbin/tc qdisc del dev $iface ingres >/dev/null 2>&1");
+    system("/sbin/tc class del dev $iface parent 1: classid 1:1 >/dev/null 2>&1");
+    system("/sbin/tc filter del dev $iface parent ffff: protocol ip prio 50 estimator 1sec 8sec >/dev/null 2>&1");
+    system("/sbin/tc qdisc del dev $iface ingress >/dev/null 2>&1");
     system("/sbin/tc qdisc del dev $iface root >/dev/null 2>&1");
 
+    return if (!$rate || ($rate && $rate == 0));
+
     run_command("/sbin/tc qdisc add dev $iface handle ffff: ingress");
 
-    # virtio uses large packets 64K, so we need to set mtu to that
-    # value - else filter drops those packets and rate limit does not work.
-    run_command("/sbin/tc filter add dev $iface parent ffff: "
-               "protocol ip prio 50 u32 match ip src 0.0.0.0/0 "
-               "police rate ${rate}bps burst ${burst}b "
-               "mtu 64kb drop flowid :1");
+    # this does not work wit virtio - don't know why (setting "mtu 64kb" does not help)
+    #run_command("/sbin/tc filter add dev $iface parent ffff: protocol ip prio 50 u32 match ip src 0.0.0.0/0 police rate ${rate}bps burst ${burst}b drop flowid :1");
+    # so we use avrate instead
+    run_command("/sbin/tc filter add dev $iface parent ffff: " .
+               "protocol ip prio 50 estimator 1sec 8sec " .
+               "u32 match ip src 0.0.0.0/0 police avrate ${rate}bps drop flowid :1");
 
     # tbf does not work for unknown reason
     #$TC qdisc add dev $DEV root tbf rate $RATE latency 100ms burst $BURST
@@ -38,6 +42,15 @@ sub setup_tc_rate_limit {
     }
 }
 
+sub tap_rate_limit {
+    my ($iface, $rate) = @_;
+
+    my $debug = 0;
+    $rate = int($rate*1024*1024);
+    my $burst = 1024*1024;
+
+    setup_tc_rate_limit($iface, $rate, $burst, $debug);
+}
 
 sub copy_bridge_config {
     my ($br0, $br1) = @_;