Skip to content
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

NAS-130967 / 24.10-RC.1 / Provide cpu topology extensions to VM if requested #14392

Merged
merged 1 commit into from
Sep 3, 2024
Merged

NAS-130967 / 24.10-RC.1 / Provide cpu topology extensions to VM if requested #14392

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
26 changes: 26 additions & 0 deletions ...middlewared/middlewared/alembic/versions/24.10/2024-08-30_22-13_cpu_topology_extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
"""
Providing cpu topology extension to VMs

Revision ID: d24d6760fda4
Revises: 7b13df980355
Create Date: 2024-08-30 22:13:09.525439+00:00
"""
from alembic import op
import sqlalchemy as sa


revision = 'd24d6760fda4'
down_revision = '7b13df980355'
branch_labels = None
depends_on = None


def upgrade():
with op.batch_alter_table('vm_vm', schema=None) as batch_op:
batch_op.add_column(
sa.Column('enable_cpu_topology_extension', sa.Boolean(), nullable=False, server_default='0')
)


def downgrade():
pass
2 changes: 2 additions & 0 deletions src/middlewared/middlewared/plugins/vm/supervisor/domain_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ def cpu_xml(vm_data, context):
features = []
if vm_data['cpu_mode'] == 'HOST-PASSTHROUGH':
features.append(create_element('cache', mode='passthrough'))
if vm_data['enable_cpu_topology_extension']:
features.append(create_element('feature', policy='require', name='topoext'))

cpu_nodes = [
create_element(
Expand Down
2 changes: 2 additions & 0 deletions src/middlewared/middlewared/plugins/vm/vms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class VMModel(sa.Model):
command_line_args = sa.Column(sa.Text(), default='', nullable=False)
bootloader_ovmf = sa.Column(sa.String(1024), default='OVMF_CODE.fd')
trusted_platform_module = sa.Column(sa.Boolean(), default=False)
enable_cpu_topology_extension = sa.Column(sa.Boolean(), default=False)


@functools.cache
Expand Down Expand Up @@ -145,6 +146,7 @@ async def extend_vm(self, vm, context):
Int('threads', default=1),
Str('cpuset', default=None, null=True, validators=[NumericSet()]),
Str('nodeset', default=None, null=True, validators=[NumericSet()]),
Bool('enable_cpu_topology_extension', default=False),
Bool('pin_vcpus', default=False),
Bool('suspend_on_snapshot', default=False),
Bool('trusted_platform_module', default=False),
Expand Down
20 changes: 20 additions & 0 deletions src/middlewared/middlewared/pytest/unit/plugins/vm/test_vm_libvirt_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def test_command_line_xml(vm_data, expected_xml):
'cpuset': None,
'pin_vcpus': False,
'nodeset': None,
'enable_cpu_topology_extension': False
}, {'cpu_model_choices': {}}, [
'<cpu mode="custom"><topology sockets="1" cores="2" threads="3" /></cpu>',
'<vcpu>6</vcpu>',
Expand All @@ -49,10 +50,26 @@ def test_command_line_xml(vm_data, expected_xml):
'cpuset': None,
'pin_vcpus': False,
'nodeset': None,
'enable_cpu_topology_extension': False
}, {'cpu_model_choices': {}}, [
'<cpu mode="host-passthrough"><topology sockets="1" cores="2" threads="3" /><cache mode="passthrough" /></cpu>',
'<vcpu>6</vcpu>',
]),
({
'cpu_mode': 'HOST-PASSTHROUGH',
'vcpus': 1,
'cores': 2,
'threads': 3,
'cpu_model': None,
'cpuset': None,
'pin_vcpus': False,
'nodeset': None,
'enable_cpu_topology_extension': True
}, {'cpu_model_choices': {}}, [
'<cpu mode="host-passthrough"><topology sockets="1" cores="2" threads="3" />'
'<cache mode="passthrough" /><feature policy="require" name="topoext" /></cpu>',
'<vcpu>6</vcpu>',
]),
({
'cpu_mode': 'CUSTOM',
'vcpus': 1,
Expand All @@ -62,6 +79,7 @@ def test_command_line_xml(vm_data, expected_xml):
'cpuset': None,
'pin_vcpus': False,
'nodeset': None,
'enable_cpu_topology_extension': False
}, {'cpu_model_choices': {'pentium': 'pentium', 'pentium2': 'pentium2'}}, [
'<cpu mode="custom"><topology sockets="1" cores="2" threads="3" />'
'<model fallback="forbid">pentium</model></cpu>',
Expand All @@ -76,6 +94,7 @@ def test_command_line_xml(vm_data, expected_xml):
'cpuset': '1-2,4-6',
'pin_vcpus': True,
'nodeset': None,
'enable_cpu_topology_extension': False,
}, {'cpu_model_choices': {}}, [
'<cpu mode="custom"><topology sockets="1" cores="2" threads="3" /></cpu>',
'<vcpu cpuset="1-2,4-6">6</vcpu>',
Expand All @@ -91,6 +110,7 @@ def test_command_line_xml(vm_data, expected_xml):
'cpuset': None,
'pin_vcpus': False,
'nodeset': '1-2,4-6',
'enable_cpu_topology_extension': False
}, {'cpu_model_choices': {}}, [
'<cpu mode="custom"><topology sockets="1" cores="2" threads="3" /></cpu>',
'<vcpu>6</vcpu>',
Expand Down
Loading