Skip to contentSkip to conversation

Fix virtio-*(-non)-transitional crash on 2.6 machine-types

PATCH In review Eduardo Habkost 3 participants 6 messages Jan 10, 2019 – Jan 11, 2019

lore
Share & tools
lore
#0 lore raw

v3 cover Fix virtio-*(-non)-transitional crash on 2.6 machine-types

Changes v2 -> v3:
* Don't ignore all errors: only ignore optional properties if they don't exist
* Patch 1/3 from v2 was already merged on machine-next

Description of v2:

This is a second attempt to fix the crash reported by Thomas[1].

This keeps the compat property array simple, different from my first attempt[2].

This also avoids extra complexity on the device code: we don't need interface name, inheritance tricks, or devices overriding a compat property after the fact. The simple absence of the QOM properties on some device types is enough to make the compat code skip them.

This series is based on my machine-next branch, because of conflicts with compat property array cleanups that are already queued.

[1] http://mid.mail-archive.com/[email protected]
[2] http://mid.mail-archive.com/[email protected]

Eduardo Habkost (2):
globals: Allow global properties to be optional
virtio: Make disable-legacy/disable-modern compat properties optional

 include/hw/qdev-core.h | 3 +++
 hw/core/machine.c      | 5 +++--
 qom/object.c           | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
#1 lore raw

PATCH v3 1/2 globals: Allow global properties to be optional

Making some global properties optional will let us simplify compat code when a given property works on most (but not all) subclasses of a given type.

Device types will be able to opt out from optional compat properties by simply not registering those properties.

---
Changes v2 -> v3:
* Don't ignore all errors, ignore property only if it doesn't exist

Changes v1 -> v2:
* (new patch)

Note: the "An error is fatal for non-hotplugged devices [...]" comment that appears in the diff scope is inaccurate, but I will fix that in a separate patch because I don't want this to get into the way of fixing the crash.

---
 include/hw/qdev-core.h | 3 +++
 qom/object.c           | 3 +++
 2 files changed, 6 insertions(+)
include/hw/qdev-core.h +3 -0
index bc014c1c9f..29874c8611 100644
@@ -250,6 +250,8 @@ struct PropertyInfo {
 /**
  * GlobalProperty:
  * @used: Set to true if property was used when initializing a device.
+ * @optional: If set to true, GlobalProperty will be skipped without errors
+ *            if the property doesn't exist.
  *
  * An error is fatal for non-hotplugged devices, when the global is applied.
  */
@@ -258,6 +260,7 @@ typedef struct GlobalProperty {
     const char *property;
     const char *value;
     bool used;
+    bool optional;
 } GlobalProperty;
 
 static inline void
qom/object.c +3 -0
index 4e5226ca12..b8c732063b 100644
@@ -385,6 +385,9 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp
         if (object_dynamic_cast(obj, p->driver) == NULL) {
             continue;
         }
+        if (p->optional && !object_property_find(obj, p->property, NULL)) {
+            continue;
+        }
         p->used = true;
         object_property_parse(obj, p->value, p->property, &err);
         if (err != NULL) {
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
Reviewed-by on v3 1/2
#2 lore raw

Re: [Qemu-devel] [PATCH v3 1/2] globals: Allow global properties to be optional

Hi

Quoted 40 lines · Eduardo Habkost

Making some global properties optional will let us simplify compat code when a given property works on most (but not all) subclasses of a given type.

Device types will be able to opt out from optional compat properties by simply not registering those properties.

---
Changes v2 -> v3:
* Don't ignore all errors, ignore property only if it doesn't exist

Changes v1 -> v2:
* (new patch)

Note: the "An error is fatal for non-hotplugged devices [...]" comment that appears in the diff scope is inaccurate, but I will fix that in a separate patch because I don't want this to get into the way of fixing the crash.

---
 include/hw/qdev-core.h | 3 +++
 qom/object.c           | 3 +++
 2 files changed, 6 insertions(+)
include/hw/qdev-core.h +2 -0
index bc014c1c9f..29874c8611 100644
@@ -250,6 +250,8 @@ struct PropertyInfo {
 /**
  * GlobalProperty:
  * @used: Set to true if property was used when initializing a device.
+ * @optional: If set to true, GlobalProperty will be skipped without errors
+ *            if the property doesn't exist.
  *
  * An error is fatal for non-hotplugged devices, when the global is applied.
  */

include/hw/qdev-core.h typedef struct GlobalProperty { · line 263

Quoted 4 lines
include/hw/qdev-core.h +1 -0
@@ -258,6 +260,7 @@ typedef struct GlobalProperty {
     const char *property;
     const char *value;
     bool used;
+    bool optional;

with optional/skip_if_missing

Quoted 20 lines
include/hw/qdev-core.h +0 -0
 } GlobalProperty;
 
 static inline void
qom/object.c +3 -1
index 4e5226ca12..b8c732063b 100644
@@ -385,6 +385,9 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp
         if (object_dynamic_cast(obj, p->driver) == NULL) {
             continue;
         }
+        if (p->optional && !object_property_find(obj, p->property, NULL)) {
+            continue;
+        }
         p->used = true;
         object_property_parse(obj, p->value, p->property, &err);
         if (err != NULL) {
--

2.18.0.rc1.1.g3f1ff2140

Reviewed-by on v3 1/2
#3 lore raw

Re: [Qemu-devel] [PATCH v3 1/2] globals: Allow global properties to be optional

In reply to Eduardo Habkost
Quoted 16 lines · On Thu, 10 Jan 2019 16:04:57 -0200 Eduardo Habkost <[email protected]> wrote:

Making some global properties optional will let us simplify compat code when a given property works on most (but not all) subclasses of a given type.

Device types will be able to opt out from optional compat properties by simply not registering those properties.

---
Changes v2 -> v3:
* Don't ignore all errors, ignore property only if it doesn't exist

Changes v1 -> v2:
* (new patch)

Quoted 8 lines

Note: the "An error is fatal for non-hotplugged devices [...]" comment that appears in the diff scope is inaccurate, but I will fix that in a separate patch because I don't want this to get into the way of fixing the crash.

---
 include/hw/qdev-core.h | 3 +++
 qom/object.c           | 3 +++
 2 files changed, 6 insertions(+)
#4 lore raw

PATCH v3 2/2 virtio: Make disable-legacy/disable-modern compat properties optional

In reply to Eduardo Habkost

The disable-legacy and disable-modern properties apply only to some virtio-pci devices. Make those properties optional.

This fixes the crash introduced by commit f6e501a28ef9 ("virtio: Provide version-specific variants of virtio PCI devices"):

  $ qemu-system-x86_64 -machine pc-i440fx-2.6 \
    -device virtio-net-pci-non-transitional
  Unexpected error in object_property_find() at qom/object.c:1092:
  qemu-system-x86_64: -device virtio-net-pci-non-transitional: can't apply \
  global virtio-pci.disable-modern=on: Property '.disable-modern' not found
  Aborted (core dumped)
Fixes f6e501a28ef9 ("virtio: Provide version-specific variants of virtio PCI devices")
---
 hw/core/machine.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
hw/core/machine.c +3 -2
index 5530b71981..a19143aa44 100644
@@ -91,8 +91,9 @@ const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7);
 
 GlobalProperty hw_compat_2_6[] = {
     { "virtio-mmio", "format_transport_address", "off" },
-    { "virtio-pci", "disable-modern", "on" },
-    { "virtio-pci", "disable-legacy", "off" },
+    /* Optional because not all virtio-pci devices support legacy mode */
+    { "virtio-pci", "disable-modern", "on",  .optional = true },
+    { "virtio-pci", "disable-legacy", "off", .optional = true },
 };
 const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6);
 
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
Reviewed-by on v3 2/2
#5 lore raw

Re: [Qemu-devel] [PATCH v3 2/2] virtio: Make disable-legacy/disable-modern compat properties optional

Quoted 13 lines · On Thu, 10 Jan 2019 16:04:58 -0200 Eduardo Habkost <[email protected]> wrote:

The disable-legacy and disable-modern properties apply only to some virtio-pci devices. Make those properties optional.

This fixes the crash introduced by commit f6e501a28ef9 ("virtio: Provide version-specific variants of virtio PCI devices"):

  $ qemu-system-x86_64 -machine pc-i440fx-2.6 \
    -device virtio-net-pci-non-transitional
  Unexpected error in object_property_find() at qom/object.c:1092:
  qemu-system-x86_64: -device virtio-net-pci-non-transitional: can't apply \
  global virtio-pci.disable-modern=on: Property '.disable-modern' not found
  Aborted (core dumped)
Quoted 6 lines
Fixes f6e501a28ef9 ("virtio: Provide version-specific variants of virtio PCI devices")
---
 hw/core/machine.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)