X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopt_xensource_libexec_InterfaceReconfigureVswitch.py;h=31e9b5177bf530499f71cb04bd972ee559007fa9;hb=d652410464e0a8e1a35389e7f0c0cd2c2430827a;hp=6c9e3fa8c494d8cb628350ff93ea38a5a7109d48;hpb=9ec4d255acc5628f395fde8aff84a7027c2dc1c9;p=sliver-openvswitch.git diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index 6c9e3fa8c..31e9b5177 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -1,4 +1,4 @@ -# Copyright (c) 2008,2009 Citrix Systems, Inc. +# Copyright (c) 2008,2009,2011 Citrix Systems, Inc. # Copyright (c) 2009,2010,2011 Nicira Networks. # # This program is free software; you can redistribute it and/or modify @@ -14,6 +14,7 @@ from InterfaceReconfigure import * import os import re +import subprocess # # Bare Network Devices -- network devices without IP configuration @@ -38,6 +39,49 @@ def netdev_up(netdev, mtu=None): run_command(["/sbin/ifconfig", netdev, 'up'] + mtu) +# This is a list of drivers that do support VLAN tx or rx acceleration, but +# to which the VLAN bug workaround should not be applied. This could be +# because these are known-good drivers (that is, they do not have any of +# the bugs that the workaround avoids) or because the VLAN bug workaround +# will not work for them and may cause other problems. +# +# This is a very short list because few drivers have been tested. +NO_VLAN_WORKAROUND_DRIVERS = ( + "bonding", +) +def netdev_get_driver_name(netdev): + """Returns the name of the driver for network device 'netdev'""" + symlink = '%s/sys/class/net/%s/device/driver' % (root_prefix(), netdev) + try: + target = os.readlink(symlink) + except OSError, e: + log("%s: could not read netdev's driver name (%s)" % (netdev, e)) + return None + + slash = target.rfind('/') + if slash < 0: + log("target %s of symbolic link %s does not contain slash" + % (target, symlink)) + return None + + return target[slash + 1:] + +def netdev_get_features(netdev): + """Returns the features bitmap for the driver for 'netdev'. + The features bitmap is a set of NETIF_F_ flags supported by its driver.""" + try: + features = open("%s/sys/class/net/%s/features" % (root_prefix(), netdev)).read().strip() + return int(features, 0) + except: + return 0 # interface prolly doesn't exist + +def netdev_has_vlan_accel(netdev): + """Returns True if 'netdev' supports VLAN acceleration, False otherwise.""" + NETIF_F_HW_VLAN_TX = 128 + NETIF_F_HW_VLAN_RX = 256 + NETIF_F_VLAN = NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX + return (netdev_get_features(netdev) & NETIF_F_VLAN) != 0 + # # PIF miscellanea # @@ -249,10 +293,13 @@ def configure_datapath(pif): - A list containing the necessary vsctl command line arguments - A list of additional devices which should be brought up after the configuration is applied. + - A list containing flows to apply to the pif bridge, note that + port numbers may need to be substituted once ofport is known """ vsctl_argv = [] extra_up_ports = [] + bridge_flows = [] assert not pif_is_vlan(pif) bridge = pif_bridge_name(pif) @@ -361,6 +408,25 @@ def configure_datapath(pif): if (fail_mode not in valid_fail_modes) and pool: fail_mode = pool['other_config'].get('vswitch-controller-fail-mode') + # Add default flows to allow management traffic if fail-mode + # transitions to secure based on pool fail-mode setting + if fail_mode == 'secure' and db().get_pif_record(pif).get('management', False): + prev_fail_mode = vswitchCfgQuery(['get-fail-mode', bridge]) + if prev_fail_mode != 'secure': + tp = 'idle_timeout=0,priority=0' + host_mgmt_mac = db().get_pif_record(pif)['MAC'] + # account for bond as management interface + if len(physical_devices) > 1: + bridge_flows += ['%s,in_port=local,arp,dl_src=%s,actions=NORMAL' % (tp, host_mgmt_mac)] + bridge_flows += ['%s,in_port=local,dl_src=%s,actions=NORMAL' % (tp, host_mgmt_mac)] + # we don't know slave ofports yet, substitute later + bridge_flows += ['%s,in_port=%%s,arp,nw_proto=1,actions=local' % (tp)] + bridge_flows += ['%s,in_port=%%s,dl_dst=%s,actions=local' % (tp, host_mgmt_mac)] + else: + bridge_flows += ['%s,in_port=%%s,arp,nw_proto=1,actions=local' % (tp)] + bridge_flows += ['%s,in_port=local,arp,dl_src=%s,actions=%%s' % (tp, host_mgmt_mac)] + bridge_flows += ['%s,in_port=%%s,dl_dst=%s,actions=local' % (tp, host_mgmt_mac)] + bridge_flows += ['%s,in_port=local,dl_src=%s,actions=%%s' % (tp, host_mgmt_mac)] if fail_mode not in valid_fail_modes: fail_mode = 'standalone' @@ -379,7 +445,7 @@ def configure_datapath(pif): vsctl_argv += set_br_external_ids(pif) vsctl_argv += ['## done configuring datapath %s' % bridge] - return vsctl_argv,extra_up_ports + return vsctl_argv,extra_up_ports,bridge_flows def deconfigure_bridge(pif): vsctl_argv = [] @@ -432,6 +498,7 @@ class DatapathVswitch(Datapath): Datapath.__init__(self, pif) self._dp = pif_datapath(pif) self._ipdev = pif_ipdev_name(pif) + self._bridge_flows = [] if pif_is_vlan(pif) and not self._dp: raise Error("Unbridged VLAN devices not implemented yet") @@ -462,15 +529,17 @@ class DatapathVswitch(Datapath): def preconfigure(self, parent): vsctl_argv = [] extra_ports = [] + bridge_flows = [] pifrec = db().get_pif_record(self._pif) dprec = db().get_pif_record(self._dp) ipdev = self._ipdev - c,e = configure_datapath(self._dp) + c,e,f = configure_datapath(self._dp) bridge = pif_bridge_name(self._pif) vsctl_argv += c extra_ports += e + bridge_flows += f dpname = pif_bridge_name(self._dp) @@ -499,6 +568,7 @@ class DatapathVswitch(Datapath): self._vsctl_argv = vsctl_argv self._extra_ports = extra_ports + self._bridge_flows = bridge_flows def bring_down_existing(self): # interface-reconfigure is never explicitly called to down a @@ -528,6 +598,12 @@ class DatapathVswitch(Datapath): # when they are added, and a network device that is down # always reports "no carrier". physical_devices = datapath_get_physical_pifs(self._dp) + + if pif_is_bond(self._dp): + brec = db().get_pif_record(self._dp) + bond_mtu = mtu_setting(brec['network'], "PIF", brec['other_config']) + else: + bond_mtu = None for p in physical_devices: prec = db().get_pif_record(p) @@ -535,7 +611,10 @@ class DatapathVswitch(Datapath): dev = pif_netdev_name(p) - mtu = mtu_setting(prec['network'], "PIF", oc) + if bond_mtu: + mtu = bond_mtu + else: + mtu = mtu_setting(prec['network'], "PIF", oc) netdev_up(dev, mtu) @@ -545,7 +624,41 @@ class DatapathVswitch(Datapath): if len(offload): run_command(['/sbin/ethtool', '-K', dev] + offload) + driver = netdev_get_driver_name(dev) + if 'vlan-bug-workaround' in oc: + vlan_bug_workaround = oc['vlan-bug-workaround'] == 'true' + elif driver in NO_VLAN_WORKAROUND_DRIVERS: + vlan_bug_workaround = False + else: + vlan_bug_workaround = netdev_has_vlan_accel(dev) + + if vlan_bug_workaround: + setting = 'on' + else: + setting = 'off' + run_command(['/usr/sbin/ovs-vlan-bug-workaround', dev, setting]) + datapath_modify_config(self._vsctl_argv) + if self._bridge_flows: + ofports = [] + physical_devices = datapath_get_physical_pifs(self._dp) + if len(physical_devices) > 1: + for slave in physical_devices: + name = pif_netdev_name(slave) + ofport = vswitchCfgQuery(['get', 'interface', name, 'ofport']) + ofports.append(ofport) + else: + name = pif_netdev_name(self._dp) + ofport = vswitchCfgQuery(['get', 'interface', name, 'ofport']) + ofports.append(ofport) + dpname = pif_bridge_name(self._dp) + for flow in self._bridge_flows: + if flow.find('in_port=%s') != -1 or flow.find('actions=%s') != -1: + for port in ofports: + f = flow % (port) + run_command(['/usr/bin/ovs-ofctl', 'add-flow', dpname, f]) + else: + run_command(['/usr/bin/ovs-ofctl', 'add-flow', dpname, flow]) def post(self): for p in self._extra_ports: @@ -601,3 +714,17 @@ class DatapathVswitch(Datapath): netdev_down(p) datapath_modify_config(vsctl_argv) + +# +# utility methods +# + +def vswitchCfgQuery(action_args): + cmd = ['%s/usr/bin/ovs-vsctl' % root_prefix(), + '--timeout=5', '-vANY:console:off'] + action_args + output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate() + if len(output) == 0 or output[0] == None: + output = "" + else: + output = output[0].strip() + return output