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
}
}
+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 tap_create {
+ my ($iface, $bridge) = @_;
+
+ die "unable to get bridge setting\n" if !$bridge;
+
+ my $bridgemtu = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/mtu");
+ die "bridge '$bridge' does not exist\n" if !$bridgemtu;
+
+ eval{ PVE::Tools::run_command("/sbin/ifconfig $iface 0.0.0.0 promisc up mtu $bridgemtu");};
+ die "interface activation failed\n" if $@;
+}
+
+sub tap_plug {
+ my ($iface, $bridge, $tag) = @_;
+
+ my $newbridge = activate_bridge_vlan($bridge, $tag);
+ copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+
+ system ("/usr/sbin/brctl addif $newbridge $iface") == 0 ||
+ die "can't add interface to bridge\n";
+}
+
+sub tap_unplug {
+ my ($iface, $bridge, $tag) = @_;
+
+ $bridge .= "v$tag" if $tag;
+
+ system ("/usr/sbin/brctl delif $bridge $iface") == 0 ||
+ die "can't del interface from bridge\n";
+}
sub copy_bridge_config {
my ($br0, $br1) = @_;