- Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] [PATCH][Kimchi] Improve Kimchi feature tests output
by Aline Manera 27 May '16

27 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Kimchi] Fixed Clone Guest modal window
by sguimaraes943＠gmail.com 27 May '16

27 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Fixed a minor issue with a <div> tag not closed in Clone Guest modal window. Samuel Guimarães (1): Fixed Clone Guest modal window ui/pages/guest-clone.html.tmpl | 1 + 1 file changed, 1 insertion(+) -- 1.9.3

3 3

Re: [Kimchi-devel] [PATCH V4] [Kimchi] Handle Libvirt host ENOSPC event
by Aline Manera 27 May '16

27 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH v2] [Kimchi] Decrease the sleep time for libvirt event timout
by Aline Manera 27 May '16

27 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH v2] [Kimchi 2/2] Implement multi-function pci hotplug support
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 100 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 91 insertions(+), 9 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 7051324..2130ac4 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -97,6 +97,22 @@ class VMHostDevsModel(object): return self.task.lookup(taskid) + def _get_pci_devices_xml(self, pci_infos, slot, driver): + hostdevs = '' + # all devices included in the xml will be sorted in reverse (the + # function 0 will be the last one) and will include the guest + # address details + for dev_info in sorted(pci_infos, + key=itemgetter('function'), + reverse=True): + + dev_info['detach_driver'] = driver + hostdevs += self._get_pci_device_xml(dev_info, + slot, + True) + + return '<devices>%s</devices>' % hostdevs + def _get_pci_device_xml(self, dev_info, slot, is_multifunction): if 'detach_driver' not in dev_info: dev_info['detach_driver'] = 'kvm' @@ -108,12 +124,6 @@ class VMHostDevsModel(object): driver = E.driver(name=dev_info['detach_driver']) if is_multifunction: - multi = E.address(type='pci', - domain='0', - bus='0', - slot=str(slot), - function=str(dev_info['function'])) - if dev_info['function'] == 0: multi = E.address(type='pci', domain='0', @@ -122,6 +132,13 @@ class VMHostDevsModel(object): function=str(dev_info['function']), multifunction='on') + else: + multi = E.address(type='pci', + domain='0', + bus='0', + slot=str(slot), + function=str(dev_info['function'])) + host_dev = E.hostdev(source, driver, multi, mode='subsystem', type='pci', managed='yes') @@ -168,7 +185,7 @@ class VMHostDevsModel(object): if free < slot: return free - return free+1 + return free + 1 def _attach_pci_device(self, cb, params): cb('Attaching PCI device') @@ -198,8 +215,7 @@ class VMHostDevsModel(object): pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names] pci_infos.append(dev_info) - is_multifunction = len(pci_infos) > 1 and \ - DOM_STATE_MAP[dom.info()[0]] == "shutoff" + is_multifunction = len(pci_infos) > 1 pci_infos = sorted(pci_infos, key=itemgetter('name')) # does not allow hot-plug of 3D graphic cards @@ -234,8 +250,32 @@ class VMHostDevsModel(object): slot = 0 if is_multifunction: + # search for the first available slot in guest xml slot = self._available_slot(dom) + with RollbackContext() as rollback: + # multifunction hotplug is a special case where all functions + # must be attached together within one xml file, the same does + # not happen to multifunction coldplug - where each function is + # attached individually + if DOM_STATE_MAP[dom.info()[0]] != 'shutoff' and is_multifunction: + xmlstr = self._get_pci_devices_xml(pci_infos, slot, driver) + + try: + dom.attachDeviceFlags(xmlstr, device_flags) + + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach mutifunction device VM %s: \n%s', + vmid, xmlstr) + raise + + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() + cb('OK', True) + return + for pci_info in pci_infos: pci_info['detach_driver'] = driver cb('Reading source device XML') @@ -486,6 +526,14 @@ class VMHostDevModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) + if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): + if is_3D_device: + cb('Updating MMIO from VM...') + devsmodel = VMHostDevsModel(conn=self.conn) + devsmodel.update_mmio_guest(vmid, False) + cb('OK', True) + return + for e in hostdev: if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: xmlstr = etree.tostring(e) @@ -506,6 +554,40 @@ class VMHostDevModel(object): cb('OK', True) + def _get_devices_same_addr(self, hostdev, domain, bus, slot): + devices = [] + for device in hostdev: + if device.attrib['type'] != 'pci': + continue + + address = device.source.address + if int(address.attrib['domain'], 16) != domain or \ + int(address.attrib['bus'], 16) != bus or \ + int(address.attrib['slot'], 16) != slot: + continue + + devices.append(etree.tostring(device)) + + return devices + + def _hotunplug_multifunction_pci(self, dom, hostdev, dev_name): + domain, bus, slot, _ = dev_name.split('_')[1:] + # get all devices attached to the guest in the same domain+bus+slot + # that the one we are going to detach because they must be detached + # together + devices = self._get_devices_same_addr(hostdev, + int(domain, 16), + int(bus, 16), + int(slot, 16)) + if len(devices) <= 1: + return False + + devices_xml = '<devices>%s</devices>' % ''.join(devices) + dom.detachDeviceFlags(devices_xml, + get_vm_config_flag(dom, mode='all')) + + return True + def _delete_affected_pci_devices(self, dom, dev_name, pci_devs): dev_model = DeviceModel(conn=self.conn) try: -- 2.7.4

1 0

[PATCH v2] [Kimchi 1/2] Enable hot-plug multi-function pci on front-end
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 66edbcb..4cee8fe 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -486,7 +486,7 @@ kimchi.guest_edit_main = function() { $('.body', '#form-guest-edit-pci').append(itemNode); pciEnabled || $('button', itemNode).remove(); $('button i', itemNode).addClass(iconClass); - if (kimchi.thisVMState === "running" && (arrPCIDevices[i].multifunction || arrPCIDevices[i].vga3d)) { + if (kimchi.thisVMState === "running" && arrPCIDevices[i].vga3d) { $('button', itemNode).prop("disabled", true); } $('button', itemNode).on('click', function(event) { -- 2.7.4

1 0

[PATCH] [Kimchi 0/2] Implement multi-function pci hotplug
by Jose Ricardo Ziviani 27 May '16

27 May '16

This patchset implements multi-function pci hotplug for Kimchi. The special point in it is the need to attach all functions at once (one xml containing all devices) sorted (in reverse, the function 0 is the last one). This logic also applies to hot unplug. How to test the backend: - hotplug curl -u username -H "Content-Type: application/json" -H "Accept: application/json" https://host:8001/plugins/kimchi/vms/0fed23/hostdevs -X POST -d '{"name": "pci_0001_05_00_1"}' - hotunplug curl -u username -H "Content-Type: application/json" -H "Accept: application/json" https://host:8001/plugins/kimchi/vms/0fed23/hostdevs/pci_0001_05_00_0 -X DELETE Note: it doesn't matter the function is chosen (pci_0001_05_00_0 or pci_0001_05_00_1 in this case), both functions will be attached/detached accordingly. Note2: attach/detach are async methods but UI is not reflecting it, it's necessary to close/reopen the Edit window to see the PCI list updated. Jose Ricardo Ziviani (2): Enable hot-plug multi-function pci on front-end Implement multi-function pci hotplug support model/vmhostdevs.py | 96 +++++++++++++++++++++++++++++++++++-- ui/js/src/kimchi.guest_edit_main.js | 2 +- 2 files changed, 94 insertions(+), 4 deletions(-) -- 2.7.4

3 2

[PATCH V4] [Kimchi] Handle Libvirt host ENOSPC event
by Lucio Correia 27 May '16

27 May '16

When storage pool is out of space and guest requires more, guest is paused and nothing is told to the user. This patch uses Libvirt Event handling and Asynchronous Notifications mechanism to tell web users about what happened. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 1 + model/libvirtevents.py | 28 ++++++++++++++++++++++++++++ model/model.py | 3 +++ 3 files changed, 32 insertions(+) V4: try/except added for libvirt event callback registration diff --git a/i18n.py b/i18n.py index 3a5a9d1..2d8390f 100644 --- a/i18n.py +++ b/i18n.py @@ -335,6 +335,7 @@ messages = { "KCHEVENT0001E": _("Failed to register the default event implementation."), "KCHEVENT0002E": _("Failed to register timeout event."), "KCHEVENT0003E": _("Failed to Run the default event implementation."), + "KCHEVENT0004W": _("I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)."), # These messages (ending with L) are for user log purposes "KCHNET0001L": _("Created %(connection)s virtual network '%(name)s'"), diff --git a/model/libvirtevents.py b/model/libvirtevents.py index ab5c17d..6425f9b 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -22,6 +22,9 @@ import libvirt import time from wok.exception import OperationFailed +from wok.message import WokMessage +from wok.model.notifications import add_notification +from wok.utils import wok_log class LibvirtEvents(object): @@ -57,3 +60,28 @@ class LibvirtEvents(object): # Event loop handler used to limit length of waiting for any other event. def _kimchi_EventTimeout(self, timer, opaque): time.sleep(1) + + def event_enospc_cb(self, conn, dom, path, dev, action, reason, args): + if reason == "enospc": + info = { + "vm": dom.name(), + "srcPath": path, + "devAlias": dev, + } + add_notification("KCHEVENT0004W", info, '/plugins/kimchi') + msg = WokMessage("KCHEVENT0004W", info, '/plugins/kimchi') + wok_log.warning(msg.get_text()) + + def handleEnospc(self, conn): + """ + Register Libvirt IO_ERROR_REASON event to handle host ENOSPC + """ + try: + conn.get().domainEventRegisterAny( + None, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + self.event_enospc_cb, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON + ) + except libvirt.libvirtError as e: + wok_log.error("Register of ENOSPC event failed: %s" % e.message) diff --git a/model/model.py b/model/model.py index ed474d2..327d5a7 100644 --- a/model/model.py +++ b/model/model.py @@ -50,6 +50,9 @@ class Model(BaseModel): 'eventsloop': self.events} models = [] + # Register for Libvirt's host ENOSPC event and notify UI if it happens + self.events.handleEnospc(self.conn) + # Import task model from Wok instances = get_instances('wok.model.tasks') for instance in instances: -- 1.9.1

2 2

[PATCH] [Kimchi 2/2] Implement multi-function pci hotplug support
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 3 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 7051324..f643b6e 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -97,6 +97,24 @@ class VMHostDevsModel(object): return self.task.lookup(taskid) + def _get_pci_devices_xml(self, pci_infos, slot, driver): + hostdevs = '' + # all devices included in the xml will be sorted in reverse (the + # function 0 will be the last one) and will include the guest + # address details + for dev_info in sorted(pci_infos, + key=itemgetter('function'), + reverse=True): + + has_multif_flag = True if dev_info['function'] == 0 else False + + dev_info['detach_driver'] = driver + hostdevs += self._get_pci_device_xml(dev_info, + slot, + has_multif_flag) + + return '<devices>%s</devices>' % hostdevs + def _get_pci_device_xml(self, dev_info, slot, is_multifunction): if 'detach_driver' not in dev_info: dev_info['detach_driver'] = 'kvm' @@ -122,6 +140,13 @@ class VMHostDevsModel(object): function=str(dev_info['function']), multifunction='on') + else: + multi = E.address(type='pci', + domain='0', + bus='0', + slot=str(slot), + function=str(dev_info['function'])) + host_dev = E.hostdev(source, driver, multi, mode='subsystem', type='pci', managed='yes') @@ -168,7 +193,7 @@ class VMHostDevsModel(object): if free < slot: return free - return free+1 + return free + 1 def _attach_pci_device(self, cb, params): cb('Attaching PCI device') @@ -198,8 +223,7 @@ class VMHostDevsModel(object): pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names] pci_infos.append(dev_info) - is_multifunction = len(pci_infos) > 1 and \ - DOM_STATE_MAP[dom.info()[0]] == "shutoff" + is_multifunction = len(pci_infos) > 1 pci_infos = sorted(pci_infos, key=itemgetter('name')) # does not allow hot-plug of 3D graphic cards @@ -234,8 +258,32 @@ class VMHostDevsModel(object): slot = 0 if is_multifunction: + # search for the first available slot in guest xml slot = self._available_slot(dom) + with RollbackContext() as rollback: + # multifunction hotplug is a special case where all functions + # must be attached together within one xml file, the same does + # not happen to multifunction coldplug - where each function is + # attached individually + if DOM_STATE_MAP[dom.info()[0]] != 'shutoff' and is_multifunction: + xmlstr = self._get_pci_devices_xml(pci_infos, slot, driver) + + try: + dom.attachDeviceFlags(xmlstr, device_flags) + + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach mutifunction device VM %s: \n%s', + vmid, xmlstr) + raise + + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() + cb('OK', True) + return + for pci_info in pci_infos: pci_info['detach_driver'] = driver cb('Reading source device XML') @@ -486,6 +534,14 @@ class VMHostDevModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) + if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): + if is_3D_device: + cb('Updating MMIO from VM...') + devsmodel = VMHostDevsModel(conn=self.conn) + devsmodel.update_mmio_guest(vmid, False) + cb('OK', True) + return + for e in hostdev: if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: xmlstr = etree.tostring(e) @@ -506,6 +562,40 @@ class VMHostDevModel(object): cb('OK', True) + def _get_devices_same_addr(self, hostdev, domain, bus, slot): + devices = [] + for device in hostdev: + if device.attrib['type'] != 'pci': + continue + + address = device.source.address + if int(address.attrib['domain'], 16) != domain or \ + int(address.attrib['bus'], 16) != bus or \ + int(address.attrib['slot'], 16) != slot: + continue + + devices.append(etree.tostring(device)) + + return devices + + def _hotunplug_multifunction_pci(self, dom, hostdev, dev_name): + domain, bus, slot, _ = dev_name.split('_')[1:] + # get all devices attached to the guest in the same domain+bus+slot + # that the one we are going to detach because they must be detached + # together + devices = self._get_devices_same_addr(hostdev, + int(domain, 16), + int(bus, 16), + int(slot, 16)) + if len(devices) <= 1: + return False + + devices_xml = '<devices>%s</devices>' % ''.join(devices) + dom.detachDeviceFlags(devices_xml, + get_vm_config_flag(dom, mode='all')) + + return True + def _delete_affected_pci_devices(self, dom, dev_name, pci_devs): dev_model = DeviceModel(conn=self.conn) try: -- 2.7.4

1 0

[PATCH] [Kimchi 1/2] Enable hot-plug multi-function pci on front-end
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 66edbcb..4cee8fe 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -486,7 +486,7 @@ kimchi.guest_edit_main = function() { $('.body', '#form-guest-edit-pci').append(itemNode); pciEnabled || $('button', itemNode).remove(); $('button i', itemNode).addClass(iconClass); - if (kimchi.thisVMState === "running" && (arrPCIDevices[i].multifunction || arrPCIDevices[i].vga3d)) { + if (kimchi.thisVMState === "running" && arrPCIDevices[i].vga3d) { $('button', itemNode).prop("disabled", true); } $('button', itemNode).on('click', function(event) { -- 2.7.4

1 0