Browse Source

Merge "[SR-IOV] Do not fail if ip-link vf "min_tx_rate" is not supported" into stable/train

changes/14/781214/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
597cefba9f
4 changed files with 67 additions and 1 deletions
  1. +34
    -0
      neutron/cmd/sanity/checks.py
  2. +15
    -0
      neutron/cmd/sanity_check.py
  3. +8
    -1
      neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py
  4. +10
    -0
      neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_pci_lib.py

+ 34
- 0
neutron/cmd/sanity/checks.py View File

@ -20,6 +20,7 @@ import tempfile
import netaddr
from neutron_lib import constants as n_consts
from neutron_lib import exceptions
from neutron_lib.utils import helpers
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import uuidutils
@ -487,3 +488,36 @@ def gre_conntrack_supported():
return agent_utils.execute(cmd, log_fail_as_error=False)
except exceptions.ProcessExecutionError:
return False
def min_tx_rate_support():
device_mappings = helpers.parse_mappings(
cfg.CONF.SRIOV_NIC.physical_device_mappings, unique_keys=False)
devices_to_test = set()
for devices_in_physnet in device_mappings.values():
for device in devices_in_physnet:
devices_to_test.add(device)
# NOTE(ralonsoh): the VF used by default is 0. Each SR-IOV configured
# NIC should have configured at least 1 VF.
VF_NUM = 0
devices_without_support = set()
for device in devices_to_test:
try:
ip_link = ip_lib.IpLinkCommand(device)
# NOTE(ralonsoh): to set min_tx_rate, first is needed to set
# max_tx_rate and max_tx_rate >= min_tx_rate.
vf_config = {'vf': VF_NUM, 'rate': {'min_tx_rate': int(400),
'max_tx_rate': int(500)}}
ip_link.set_vf_feature(vf_config)
vf_config = {'vf': VF_NUM, 'rate': {'min_tx_rate': 0,
'max_tx_rate': 0}}
ip_link.set_vf_feature(vf_config)
except ip_lib.InvalidArgument:
devices_without_support.add(device)
if devices_without_support:
LOG.debug('The following NICs do not support "min_tx_rate": %s',
devices_without_support)
return False
return True

+ 15
- 0
neutron/cmd/sanity_check.py View File

@ -278,6 +278,15 @@ def check_ip_nonlocal_bind():
return result
def check_min_tx_rate_support():
result = checks.min_tx_rate_support()
if not result:
LOG.warning('There are SR-IOV network interfaces that do not support '
'setting the minimum TX rate (dataplane enforced minimum '
'guaranteed bandwidth) "ip-link vf min_tx_rate".')
return result
# Define CLI opts to test specific features, with a callback for the test
OPTS = [
BoolOptCallback('ovs_vxlan', check_ovs_vxlan, default=False,
@ -335,6 +344,10 @@ OPTS = [
help=_('Check ip_nonlocal_bind kernel option works with '
'network namespaces.'),
default=False),
BoolOptCallback('check_min_tx_rate_support', check_min_tx_rate_support,
help=_('Check if the configured SR-IOV NICs support '
'the "ip-link vf min_tx_rate" parameter.'),
default=False),
]
@ -383,6 +396,8 @@ def enable_tests_from_config():
'OVSHybridIptablesFirewallDriver'),
):
cfg.CONF.set_default('bridge_firewalling', True)
if cfg.CONF.SRIOV_NIC.physical_device_mappings:
cfg.CONF.set_default('check_min_tx_rate_support', True)
def all_tests_passed():


+ 8
- 1
neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py View File

@ -100,4 +100,11 @@ class PciDeviceIPWrapper(ip_lib.IPWrapper):
"""
ip = self.device(self.dev_name)
vf_config = {'vf': vf_index, 'rate': {rate_type: int(rate_value)}}
ip.link.set_vf_feature(vf_config)
try:
ip.link.set_vf_feature(vf_config)
except ip_lib.InvalidArgument:
# NOTE(ralonsoh): some NICs do not support "min_tx_rate" parameter.
# https://bugs.launchpad.net/neutron/+bug/1918464
LOG.error('Device %(device)s does not support ip-link vf '
'"%(rate_type)s" parameter.',
{'device': self.dev_name, 'rate_type': rate_type})

+ 10
- 0
neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_pci_lib.py View File

@ -101,3 +101,13 @@ class TestPciLib(base.BaseTestCase):
self.pci_wrapper.set_vf_rate(self.VF_INDEX, 'min_tx_rate', 10)
vf = {'vf': self.VF_INDEX, 'rate': {'min_tx_rate': 10}}
self.mock_ip_device.link.set_vf_feature.assert_called_once_with(vf)
@mock.patch.object(pci_lib, 'LOG')
def test_set_vf_rate_exception(self, mock_log):
self.mock_ip_device.link.set_vf_feature.side_effect = (
ip_lib.InvalidArgument)
self.pci_wrapper.set_vf_rate(self.VF_INDEX, 'min_tx_rate', 10)
mock_log.error.assert_called_once_with(
'Device %(device)s does not support ip-link vf "%(rate_type)s" '
'parameter.', {'device': self.DEV_NAME, 'rate_type': 'min_tx_rate'}
)

Loading…
Cancel
Save