From b5782684055409315412d94d1de2e5f78cffac4d Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Fri, 11 May 2018 10:36:41 +0200 Subject: DPDK link bonding: xor mode CSIT-1073 CSIT-1074 CSIT-1077 Change-Id: I248e079021c30988210fd792b32d5afdca71aadb Signed-off-by: Jan Gelety --- resources/libraries/python/InterfaceUtil.py | 23 ++++ resources/libraries/python/VatJsonUtil.py | 36 ++++++- resources/libraries/python/VppConfigGenerator.py | 69 ++++++++++-- resources/libraries/python/topology.py | 2 +- .../performance/performance_configuration.robot | 119 ++++++++++++++++++++- 5 files changed, 235 insertions(+), 14 deletions(-) (limited to 'resources/libraries') diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index aac78c9e44..6c3aa46a40 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -908,6 +908,29 @@ class InterfaceUtil(object): raise RuntimeError('Create loopback failed on node "{}"' .format(node['host'])) + @staticmethod + def add_bond_eth_interface(node, ifc_name): + """Add BondEthernet interface to current topology. + + :param node: Node to add BondEthernet interface for. + :param ifc_name: Name of the BondEthernet interface. + :type node: dict + :type ifc_name: str + """ + if_key = Topology.add_new_port(node, 'eth_bond') + Topology.update_interface_name(node, if_key, ifc_name) + + vat_executor = VatExecutor() + vat_executor.execute_script_json_out("dump_interfaces.vat", node) + interface_dump_json = vat_executor.get_script_stdout() + + sw_if_idx = VatJsonUtil.get_interface_sw_index_from_json( + interface_dump_json, ifc_name) + Topology.update_interface_sw_if_index(node, if_key, sw_if_idx) + ifc_mac = VatJsonUtil.get_interface_mac_from_json( + interface_dump_json, sw_if_idx) + Topology.update_interface_mac_address(node, if_key, ifc_mac) + @staticmethod def vpp_enable_input_acl_interface(node, interface, ip_version, table_index): diff --git a/resources/libraries/python/VatJsonUtil.py b/resources/libraries/python/VatJsonUtil.py index 4db4eb641a..8414838715 100644 --- a/resources/libraries/python/VatJsonUtil.py +++ b/resources/libraries/python/VatJsonUtil.py @@ -148,14 +148,46 @@ class VatJsonUtil(object): try: if interface['sw_if_index'] == sw_if_index: interface_name = interface['interface_name'] - logger.debug('Interface with name {} has sw_if_index {}.' - .format(interface_name, sw_if_index)) + logger.debug('Interface with sw_if_index {idx} has name' + ' {name}.'.format(idx=sw_if_index, + name=interface_name)) return interface_name except KeyError: pass raise ValueError('Interface with sw_if_index {} not found.' .format(sw_if_index)) + @staticmethod + def get_interface_mac_from_json(interface_dump_json, sw_if_index): + """Get interface MAC address from given JSON output by sw_if_index. + + :param interface_dump_json: JSON output from dump_interface_list VAT + command. + :param sw_if_index: SW interface index. + :type interface_dump_json: str + :type sw_if_index: int + :returns: Interface MAC address. + :rtype: str + :raises ValueError: If interface not found in interface_dump_json. + """ + logger.trace(interface_dump_json) + interface_list = JsonParser().parse_data(interface_dump_json) + for interface in interface_list: + try: + if interface['sw_if_index'] == sw_if_index: + mac_from_json = interface['l2_address'][:6] \ + if 'l2_address' in interface.keys() else '' + mac_address = ':'.join('{:02x}'.format(item) + for item in mac_from_json) + logger.debug('Interface with sw_if_index {idx} has MAC' + ' address {addr}.'.format(idx=sw_if_index, + addr=mac_address)) + return mac_address + except KeyError: + pass + raise ValueError('Interface with sw_if_index {idx} not found.' + .format(idx=sw_if_index)) + @staticmethod def verify_vat_retval(vat_out, exp_retval=0, err_msg='VAT cmd failed'): """Verify return value of VAT command. diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index d1fc32ef9d..e9933f2a18 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -25,6 +25,23 @@ from resources.libraries.python.topology import Topology __all__ = ['VppConfigGenerator'] +def pci_dev_check(pci_dev): + """Check if provided PCI address is in correct format. + + :param pci_dev: PCI address (expected format: xxxx:xx:xx.x). + :type pci_dev: str + :returns: True if PCI address is in correct format. + :rtype: bool + :raises ValueError: If PCI address is in incorrect format. + """ + pattern = re.compile("^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:" + "[0-9A-Fa-f]{2}\\.[0-9A-Fa-f]$") + if not pattern.match(pci_dev): + raise ValueError('PCI address {addr} is not in valid format ' + 'xxxx:xx:xx.x'.format(addr=pci_dev)) + return True + + class VppConfigGenerator(object): """VPP Configuration File Generator.""" @@ -100,6 +117,9 @@ class VppConfigGenerator(object): return if path[0] not in config: config[path[0]] = {} + elif isinstance(config[path[0]], str): + config[path[0]] = {} if config[path[0]] == '' \ + else {config[path[0]]: ''} self.add_config_item(config[path[0]], value, path[1:]) def dump_config(self, obj, level=-1): @@ -205,17 +225,25 @@ class VppConfigGenerator(object): :param devices: PCI device(s) (format xxxx:xx:xx.x) :type devices: tuple - :raises ValueError: If PCI address format is not valid. """ - pattern = re.compile("^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:" - "[0-9A-Fa-f]{2}\\.[0-9A-Fa-f]$") for device in devices: - if not pattern.match(device): - raise ValueError('PCI address {} to be added to host {} ' - 'is not in valid format xxxx:xx:xx.x'. - format(device, self._hostname)) - path = ['dpdk', 'dev {0}'.format(device)] - self.add_config_item(self._nodeconfig, '', path) + if pci_dev_check(device): + path = ['dpdk', 'dev {0}'.format(device)] + self.add_config_item(self._nodeconfig, '', path) + + def add_dpdk_dev_parameter(self, device, parameter, value): + """Add parameter for DPDK device. + + :param device: PCI device (format xxxx:xx:xx.x). + :param parameter: Parameter name. + :param value: Parameter value. + :type device: str + :type parameter: str + :type value: str + """ + if pci_dev_check(device): + path = ['dpdk', 'dev {0}'.format(device), parameter] + self.add_config_item(self._nodeconfig, value, path) def add_dpdk_cryptodev(self, count): """Add DPDK Crypto PCI device configuration. @@ -247,6 +275,29 @@ class VppConfigGenerator(object): path = ['dpdk', cryptodev_config] self.add_config_item(self._nodeconfig, '', path) + def add_dpdk_eth_bond_dev(self, ethbond_id, mode, xmit_policy, *slaves): + """Add DPDK Eth_bond device configuration. + + :param ethbond_id: Eth_bond device ID. + :param mode: Link bonding mode. + :param xmit_policy: Transmission policy. + :param slaves: PCI device(s) to be bonded (format xxxx:xx:xx.x). + :type ethbond_id: str or int + :type mode: str or int + :type xmit_policy: str + :type slaves: list + """ + slaves_config = ',slave=' + \ + ',slave='.join(slave if pci_dev_check(slave) else '' + for slave in slaves) + ethbond_config = 'vdev eth_bond{id},mode={mode}{slaves},' \ + 'xmit_policy={xmit_pol}'.format(id=ethbond_id, + mode=mode, + slaves=slaves_config, + xmit_pol=xmit_policy) + path = ['dpdk', ethbond_config] + self.add_config_item(self._nodeconfig, '', path) + def add_dpdk_dev_default_rxq(self, value): """Add DPDK dev default rxq configuration. diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py index 2f4fd023ba..d60bed1b5b 100644 --- a/resources/libraries/python/topology.py +++ b/resources/libraries/python/topology.py @@ -138,7 +138,7 @@ class Topology(object): :returns: Nothing """ port_types = ('subinterface', 'vlan_subif', 'memif', 'tap', 'vhost', - 'loopback', 'gre_tunnel', 'vxlan_tunnel') + 'loopback', 'gre_tunnel', 'vxlan_tunnel', 'eth_bond') for node_data in nodes.values(): if node_data['type'] == NodeType.DUT: diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index a864a023bf..c795fc85d2 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -921,6 +921,45 @@ | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} +| Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology +| | [Documentation] +| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Setup VLAN +| | ... | on EthernetBond interfaces between DUTs. Cross connect one Vhost +| | ... | interface with physical interface towards TG and other Vhost interface +| | ... | with VLAN sub-interface. All interfaces are brought up. +| | ... +| | ... | *Arguments:* +| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string +| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string +| | ... | - subid - ID of the sub-interface to be created. Type: string +| | ... | - tag_rewrite - Method of tag rewrite. Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with DPDK link\ +| | ... | bonding in 3-node circular topology \| /tmp/sock1 \| /tmp/sock2 \ +| | ... | \| 10 \| pop-1 \| +| | ... +| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | ... +| | Set interfaces in path in 3-node circular topology up +| | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up +| | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up +| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology +| | ... | ${dut1} | ${dut1_eth_bond_if1} | ${dut2} | ${dut2_eth_bond_if1} +| | ... | ${subid} +| | Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} +| | ... | ${tag_rewrite} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} +| | ... | ${sock1} | ${sock2} +| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} +| | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} +| | ... | ${sock1} | ${sock2} +| | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} +| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} + | Initialize L2 bridge domain in 3-node circular topology | | [Documentation] | | ... | Setup L2 DB topology by adding two interfaces on each DUT into BD @@ -1471,8 +1510,8 @@ | | ... | *Example:* | | ... | | ... | \| L2 bridge domains with Vhost-User and VLAN initialized in a 3-node\ -| | ... | circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \| 10\ -| | ... | pop-1 \| +| | ... | circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \| 10 \ +| | ... | \| pop-1 \| | | ... | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} @@ -1496,6 +1535,54 @@ | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} +| Initialize L2 bridge domains with Vhost-User and VLAN with DPDK link bonding in a 3-node circular topology +| | [Documentation] +| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Setup VLAN +| | ... | on EthernetBond interfaces between DUTs. Add one Vhost-User interface +| | ... | into L2 bridge domains with learning enabled with physical interface +| | ... | towards TG and other Vhost-User interface into L2 bridge domains with +| | ... | learning enabled with VLAN sub-interface. All interfaces are brought +| | ... | up. +| | ... +| | ... | *Arguments:* +| | ... | - bd_id1 - Bridge domain ID. Type: integer +| | ... | - bd_id2 - Bridge domain ID. Type: integer +| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string +| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string +| | ... | - subid - ID of the sub-interface to be created. Type: string +| | ... | - tag_rewrite - Method of tag rewrite. Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 bridge domains with Vhost-User and VLAN with DPDK\ +| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \ +| | ... | \| /tmp/sock2 \| 10 \| pop-1 \| +| | ... +| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} +| | ... | ${tag_rewrite} +| | ... +| | Set interfaces in path in 3-node circular topology up +| | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up +| | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up +| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology +| | ... | ${dut1} | ${dut1_eth_bond_if1} | ${dut2} | ${dut2_eth_bond_if1} +| | ... | ${subid} +| | Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} +| | ... | ${tag_rewrite} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} +| | ... | ${sock1} | ${sock2} +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} +| | ... | ${sock1} | ${sock2} +| | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} + | Add PCI devices to DUTs in 3-node single link topology | | [Documentation] | | ... | Add PCI devices to VPP configuration file. @@ -1506,6 +1593,10 @@ | | ${dut2_if2_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if2} | | Run keyword | DUT1.Add DPDK Dev | ${dut1_if1_pci} | ${dut1_if2_pci} | | Run keyword | DUT2.Add DPDK Dev | ${dut2_if1_pci} | ${dut2_if2_pci} +| | Set Test Variable | ${dut1_if1_pci} +| | Set Test Variable | ${dut1_if2_pci} +| | Set Test Variable | ${dut2_if1_pci} +| | Set Test Variable | ${dut2_if2_pci} | Add PCI devices to DUTs in 2-node single link topology | | [Documentation] @@ -1514,6 +1605,30 @@ | | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1} | | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2} | | Run keyword | DUT1.Add DPDK Dev | ${dut1_if1_pci} | ${dut1_if2_pci} +| | Set Test Variable | ${dut1_if1_pci} +| | Set Test Variable | ${dut1_if2_pci} + +| Add VLAN Strip Offload switch off between DUTs in 3-node single link topology +| | [Documentation] +| | ... | Add VLAN Strip Offload switch off on PCI devices between DUTs to VPP +| | ... | configuration file. +| | ... +| | Run keyword | DUT1.Add DPDK Dev Parameter | ${dut1_if2_pci} +| | ... | vlan-strip-offload | off +| | Run keyword | DUT2.Add DPDK Dev Parameter | ${dut2_if1_pci} +| | ... | vlan-strip-offload | off + +| Add DPDK bonded ethernet interfaces to DUTs in 3-node single link topology +| | [Documentation] +| | ... | Add DPDK bonded Ethernet interfaces with mode XOR and transmit policy +| | ... | l34 to VPP configuration file. +| | ... +| | Run keyword | DUT1.Add DPDK Eth Bond Dev | 0 | 2 | l34 | ${dut1_if2_pci} +| | Run keyword | DUT2.Add DPDK Eth Bond Dev | 0 | 2 | l34 | ${dut2_if1_pci} + +| Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology +| | Add Bond Eth Interface | ${dut1} | ${dut1_eth_bond_if1_name} +| | Add Bond Eth Interface | ${dut2} | ${dut2_eth_bond_if1_name} | Configure guest VM with dpdk-testpmd connected via vhost-user | | [Documentation] -- cgit 1.2.3-korg