Skip to content

Allow for creation of multiqueue taps #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
majkijin wants to merge 1 commit into
base: contrail/liberty_12_0_1
Choose a base branch
from
Open

Allow for creation of multiqueue taps #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions nova/network/linux_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,12 +1400,16 @@ def delete_ivs_vif_port(dev):
run_as_root=True)


def create_tap_dev(dev, mac_address=None):
def create_tap_dev(dev, mac_address=None, multiqueue=False):
if not device_exists(dev):
try:
# First, try with 'ip'
utils.execute('ip', 'tuntap', 'add', dev, 'mode', 'tap',
run_as_root=True, check_exit_code=[0, 2, 254])
if multiqueue:
cmd = ('ip', 'tuntap', 'add', dev, 'mode', 'tap',
'multi_queue')
else:
cmd = ('ip', 'tuntap', 'add', dev, 'mode', 'tap')
utils.execute(*cmd, run_as_root=True, check_exit_code=[0, 2, 254])
except processutils.ProcessExecutionError:
# Second option: tunctl
utils.execute('tunctl', '-b', '-t', dev, run_as_root=True)
Expand Down
13 changes: 12 additions & 1 deletion nova/virt/libvirt/vif.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,9 +727,20 @@ def plug_vrouter(self, instance, vif):

Bind the vif to a Contrail virtual port.
"""
def multiqueue_enabled(instance):
metadata = instance['system_metadata']
mq = metadata.get('image_hw_vif_multiqueue_enabled')
vcpus = 0 if 'vcpus' not in instance else instance['vcpus']

if mq and mq.lower() == 'true' and vcpus > 1:
return True
else:
return False

dev = self.get_vif_devname(vif)
try:
linux_net.create_tap_dev(dev)
linux_net.create_tap_dev(dev,
multiqueue=multiqueue_enabled(instance))
self._vrouter_port_add(instance, vif)
except processutils.ProcessExecutionError:
LOG.exception(_LE("Failed while plugging vif"), instance=instance)
Expand Down