X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=data%2FPVE%2FNetwork.pm;h=458a2daa8015c08d584e3044b083c6f9d4698953;hp=ae0ebdb42222cc45fd5ec87823f2b128bbfd5695;hb=0758d0928c035e4447e657f8dab499f1a09e2c65;hpb=ca402c95210c2bdac2dcd317a93c62f3424b17b9

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
index ae0ebdb..458a2da 100644
--- a/data/PVE/Network.pm
+++ b/data/PVE/Network.pm
@@ -1,6 +1,7 @@
 package PVE::Network;
 
 use strict;
+use warnings;
 use PVE::Tools qw(run_command);
 use PVE::ProcFSTools;
 use PVE::INotify;
@@ -11,17 +12,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;
+
     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.
+    # 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 u32 match ip src 0.0.0.0/0 " .
-		"police rate ${rate}bps burst ${burst}b " .
-		"mtu 64kb drop flowid :1");
+		"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 +43,63 @@ 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 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) = @_;
+
+    #cleanup old port config from any openvswitch bridge
+    eval {run_command("/usr/bin/ovs-vsctl del-port $iface", outfunc => sub {}, errfunc => sub {}) };
+
+    if (-d "/sys/class/net/$bridge/bridge") {
+	my $newbridge = activate_bridge_vlan($bridge, $tag);
+	copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+
+	system("/sbin/brctl addif $newbridge $iface") == 0 ||
+	    die "can't add interface to bridge\n";
+    } else {
+	my $cmd = "/usr/bin/ovs-vsctl add-port $bridge $iface";
+	$cmd .= " tag=$tag" if $tag;
+	system($cmd) == 0 ||
+	    die "can't add interface to bridge\n";
+    }
+}
+
+sub tap_unplug {
+    my ($iface, $bridge, $tag) = @_;
+
+    if (-d "/sys/class/net/$bridge/bridge") {
+	$bridge .= "v$tag" if $tag;
+
+	system("/sbin/brctl delif $bridge $iface") == 0 ||
+	    die "can't del interface from bridge\n";
+    } else {
+	system ("/usr/bin/ovs-vsctl del-port $iface") == 0 ||
+	    die "can't del interface from bridge\n";
+    }
+}
 
 sub copy_bridge_config {
     my ($br0, $br1) = @_;
@@ -45,15 +107,14 @@ sub copy_bridge_config {
     return if $br0 eq $br1;
 
     my $br_configs = [ 'ageing_time', 'stp_state', 'priority', 'forward_delay', 
-		       'hello_time', 'max_age'];
+		       'hello_time', 'max_age', 'multicast_snooping', 'multicast_querier'];
 
     foreach my $sysname (@$br_configs) {
 	eval {
 	    my $v0 = PVE::Tools::file_read_firstline("/sys/class/net/$br0/bridge/$sysname");
 	    my $v1 = PVE::Tools::file_read_firstline("/sys/class/net/$br1/bridge/$sysname");
 	    if ($v0 ne $v1) {
-		system("echo \"$v0\" > /sys/class/net/$br1/bridge/$sysname") == 0 ||
-		    warn "unable to set bridge config '$sysname'\n";
+		write_proc_entry("/sys/class/net/$br1/bridge/$sysname", $v0);
 	    }
 	};
 	warn $@ if $@;
@@ -114,7 +175,7 @@ sub activate_bridge_vlan {
 
     # add bridgevlan if it doesn't already exist
     if (! -d "/sys/class/net/$bridgevlan") {
-        system("/usr/sbin/brctl addbr $bridgevlan") == 0 ||
+        system("/sbin/brctl addbr $bridgevlan") == 0 ||
             die "can't add bridge $bridgevlan\n";
     }
 
@@ -125,7 +186,7 @@ sub activate_bridge_vlan {
         die "can't up bridge $bridgevlan\n";
 
     # add $ifacevlan to the bridge
-    system("/usr/sbin/brctl addif $bridgevlan $ifacevlan") == 0 ||
+    system("/sbin/brctl addif $bridgevlan $ifacevlan") == 0 ||
 	die "can't add interface $ifacevlan to bridge $bridgevlan\n";
     
     return $bridgevlan;