package PVE::Network;
use strict;
+use warnings;
use PVE::Tools qw(run_command);
use PVE::ProcFSTools;
use PVE::INotify;
setup_tc_rate_limit($iface, $rate, $burst, $debug);
}
+my $read_bridge_mtu = sub {
+ my ($bridge) = @_;
+
+ my $mtu = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/mtu");
+ die "bridge '$bridge' does not exist\n" if !$mtu;
+ # avoid insecure dependency;
+ die "unable to parse mtu value" if $mtu !~ /^(\d+)$/;
+ $mtu = int($1);
+
+ return $mtu;
+};
+
+my $parse_tap_devive_name = sub {
+ my ($iface) = @_;
+
+ my ($vmid, $devid);
+
+ if ($iface =~ m/^tap(\d+)i(\d+)$/) {
+ $vmid = $1;
+ $devid = $2;
+ } elsif ($iface =~ m/^veth(\d+)\.(\d+)$/) {
+ $vmid = $1;
+ $devid = $2;
+ } else {
+ die "wrong interface name $iface";
+ }
+
+ return ($vmid, $devid);
+};
+
+my $compute_fwbr_names_linux = sub {
+ my ($vmid, $devid) = @_;
+
+ my $fwbr = "fwbr${vmid}i${devid}";
+ my $vethfw = "link${vmid}i${devid}";
+ my $vethfwpeer = "link${vmid}p${devid}";
+
+ return ($fwbr, $vethfw, $vethfwpeer);
+};
+
+my $compute_ovs_firewall_port_name = sub {
+ my ($vmid, $devid) = @_;
+
+ return "fwint${vmid}i${devid}";
+};
+
+my $cond_create_bridge = sub {
+ my ($bridge) = @_;
+
+ if (! -d "/sys/class/net/$bridge") {
+ system("/sbin/brctl addbr $bridge") == 0 ||
+ die "can't add bridge '$bridge'\n";
+ }
+};
+
+my $bridge_add_interface = sub {
+ my ($bridge, $iface) = @_;
+
+ system("/sbin/brctl addif $bridge $iface") == 0 ||
+ die "can't add interface 'iface' to bridge '$bridge'\n";
+};
+
+my $activate_interface = sub {
+ my ($iface) = @_;
+
+ system("/sbin/ip link set $iface up") == 0 ||
+ die "can't activate interface '$iface'\n";
+};
+
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;
+ my $bridgemtu = &$read_bridge_mtu($bridge);
- eval{ PVE::Tools::run_command("/sbin/ifconfig $iface 0.0.0.0 promisc up mtu $bridgemtu");};
- die "interface activation failed\n" if $@;
+ eval {
+ PVE::Tools::run_command("/sbin/ifconfig $iface 0.0.0.0 promisc up mtu $bridgemtu");
+ };
+ die "interface activation failed\n" if $@;
}
+
+my $create_firewall_bridge_linux = sub {
+ my ($iface, $bridge) = @_;
+
+ my ($vmid, $devid) = &$parse_tap_devive_name($iface);
+ my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names_linux($vmid, $devid);
+
+ my $bridgemtu = &$read_bridge_mtu($bridge);
+
+ &$cond_create_bridge($fwbr);
+ &$activate_interface($fwbr);
+
+ copy_bridge_config($bridge, $fwbr);
+ # create veth pair
+ if (! -d "/sys/class/net/$vethfw") {
+ system("/sbin/ip link add name $vethfw type veth peer name $vethfwpeer mtu $bridgemtu") == 0 ||
+ die "can't create interface $vethfw\n";
+ }
+
+ # up vethpair
+ &$activate_interface($vethfw);
+ &$activate_interface($vethfwpeer);
+
+ &$bridge_add_interface($bridge, $vethfw);
+ &$bridge_add_interface($fwbr, $vethfwpeer);
+
+ return $fwbr;
+};
+
+my $cleanup_firewall_bridge_linux = sub {
+ my ($iface) = @_;
+
+ my ($vmid, $devid) = &$parse_tap_devive_name($iface);
+ my ($fwbr, $vethfw, $vethfwpeer) = &$compute_fwbr_names_linux($vmid, $devid);
+
+ # delete old vethfw interface
+ if (-d "/sys/class/net/$vethfw") {
+ run_command("/sbin/ip link delete dev $vethfw", outfunc => sub {}, errfunc => sub {});
+ }
+
+ # cleanup fwbr bridge
+ if (-d "/sys/class/net/$fwbr") {
+ run_command("/sbin/ip link set dev $fwbr down", outfunc => sub {}, errfunc => sub {});
+ run_command("/sbin/brctl delbr $fwbr", outfunc => sub {}, errfunc => sub {});
+ }
+};
+
sub tap_plug {
- my ($iface, $bridge, $tag) = @_;
+ my ($iface, $bridge, $tag, $firewall) = @_;
+
+ #cleanup old port config from any openvswitch bridge
+ eval {run_command("/usr/bin/ovs-vsctl del-port $iface", outfunc => sub {}, errfunc => sub {}) };
- my $newbridge = activate_bridge_vlan($bridge, $tag);
- copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+ if (-d "/sys/class/net/$bridge/bridge") {
+ &$cleanup_firewall_bridge_linux($iface); # remove stale devices
- system ("/usr/sbin/brctl addif $newbridge $iface") == 0 ||
- die "can't add interface to bridge\n";
+ my $newbridge = activate_bridge_vlan($bridge, $tag);
+ copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+
+ $newbridge = &$create_firewall_bridge_linux($iface, $newbridge) if $firewall;
+
+ &$bridge_add_interface($newbridge, $iface);
+ } 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) = @_;
+ my ($iface) = @_;
- $bridge .= "v$tag" if $tag;
+ my $path= "/sys/class/net/$iface/brport/bridge";
+ if (-l $path) {
+ my $bridge = basename(readlink($path));
+ #avoid insecure dependency;
+ ($bridge) = $bridge =~ /(\S+)/;
+
+ system("/sbin/brctl delif $bridge $iface") == 0 ||
+ die "can't del interface '$iface' from bridge '$bridge'\n";
- system ("/usr/sbin/brctl delif $bridge $iface") == 0 ||
- die "can't del interface from bridge\n";
+ &$cleanup_firewall_bridge_linux($iface);
+ } else {
+ system ("/usr/bin/ovs-vsctl del-port $iface") == 0 ||
+ die "can't del ovs port '$iface'\n";
+ }
}
sub copy_bridge_config {
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";
+ PVE::ProcFSTools::write_proc_entry("/sys/class/net/$br1/bridge/$sysname", $v0);
}
};
warn $@ if $@;
}
}
+sub activate_bridge_vlan_slave {
+ my ($bridgevlan, $iface, $tag) = @_;
+ my $ifacevlan = "${iface}.$tag";
+
+ # create vlan on $iface is not already exist
+ if (! -d "/sys/class/net/$ifacevlan") {
+ system("/sbin/vconfig add $iface $tag") == 0 ||
+ die "can't add vlan tag $tag to interface $iface\n";
+ }
+
+ # be sure to have the $ifacevlan up
+ &$activate_interface($ifacevlan);
+
+ # test if $vlaniface is already enslaved in another bridge
+ my $path= "/sys/class/net/$ifacevlan/brport/bridge";
+ if (-l $path) {
+ my $tbridge = basename(readlink($path));
+ if ($tbridge ne $bridgevlan) {
+ die "interface $ifacevlan already exist in bridge $tbridge\n";
+ } else {
+ # Port already attached to bridge: do nothing.
+ return;
+ }
+ }
+
+ # add $ifacevlan to the bridge
+ &$bridge_add_interface($bridgevlan, $ifacevlan);
+}
+
sub activate_bridge_vlan {
my ($bridge, $tag_param) = @_;
my $bridgevlan = "${bridge}v$tag";
+ my @ifaces = ();
my $dir = "/sys/class/net/$bridge/brif";
-
- #check if we have an only one ethX or bondX interface in the bridge
-
- my $iface;
PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+)', sub {
- my ($slave) = @_;
-
- die "more then one physical interfaces on bridge '$bridge'\n" if $iface;
- $iface = $slave;
-
+ push @ifaces, $_[0];
});
- die "no physical interface on bridge '$bridge'\n" if !$iface;
-
- my $ifacevlan = "${iface}.$tag";
-
- # create vlan on $iface is not already exist
- if (! -d "/sys/class/net/$ifacevlan") {
- system("/sbin/vconfig add $iface $tag") == 0 ||
- die "can't add vlan tag $tag to interface $iface\n";
- }
-
- # be sure to have the $ifacevlan up
- system("/sbin/ip link set $ifacevlan up") == 0 ||
- die "can't up interface $ifacevlan\n";
-
- # test if $vlaniface is already enslaved in another bridge
- my $path= "/sys/class/net/$ifacevlan/brport/bridge";
- if (-l $path) {
- my $tbridge = basename(readlink($path));
- if ($tbridge eq $bridgevlan) {
- # already member of bridge - assume setup is already done
- return $bridgevlan;
- } else {
- die "interface $ifacevlan already exist in bridge $tbridge\n";
- }
- }
+ die "no physical interface on bridge '$bridge'\n" if scalar(@ifaces) == 0;
# 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";
}
+ # for each physical interface (eth or bridge) bind them to bridge vlan
+ foreach my $iface (@ifaces) {
+ activate_bridge_vlan_slave($bridgevlan, $iface, $tag);
+ }
+
#fixme: set other bridge flags
# be sure to have the bridge up
system("/sbin/ip link set $bridgevlan up") == 0 ||
die "can't up bridge $bridgevlan\n";
-
- # add $ifacevlan to the bridge
- system("/usr/sbin/brctl addif $bridgevlan $ifacevlan") == 0 ||
- die "can't add interface $ifacevlan to bridge $bridgevlan\n";
-
+
return $bridgevlan;
}
projects / pve-common.git / blobdiff