* [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines
@ 2017-11-29 12:33 Mohammed Gamal
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize() Mohammed Gamal
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Mohammed Gamal @ 2017-11-29 12:33 UTC (permalink / raw)
To: qemu-devel, mst, mjt, lvivier
Cc: peterx, thuth, ehabkost, pbonzini, Mohammed Gamal
[Resending for the second time]
Starting qemu with
qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
leads to a segfault. The code assume PCI bus is present and
tries to access the bus structure without checking.
The patch series moves the error checks from vtd_realize()
and amdvi_realize() to the generic x86_iommu_realize() and
adds a check for PCI bus presence.
Mohammed Gamal (2):
x86_iommu: Move machine check to x86_iommu_realize()
x86_iommu: check if machine has PCI bus
hw/i386/amd_iommu.c | 13 ++-----------
hw/i386/intel_iommu.c | 13 ++-----------
hw/i386/x86-iommu.c | 13 +++++++++++++
3 files changed, 17 insertions(+), 22 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize()
2017-11-29 12:33 [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Mohammed Gamal
@ 2017-11-29 12:33 ` Mohammed Gamal
2017-11-29 15:23 ` Thomas Huth
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 2/2] x86_iommu: check if machine has PCI bus Mohammed Gamal
2017-11-29 12:42 ` [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Peter Xu
2 siblings, 1 reply; 10+ messages in thread
From: Mohammed Gamal @ 2017-11-29 12:33 UTC (permalink / raw)
To: qemu-devel, mst, mjt, lvivier
Cc: peterx, thuth, ehabkost, pbonzini, Mohammed Gamal
Instead of having the same error checks in vtd_realize()
and amdvi_realize(), move that over to the generic
x86_iommu_realize().
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
---
hw/i386/amd_iommu.c | 13 ++-----------
hw/i386/intel_iommu.c | 13 ++-----------
hw/i386/x86-iommu.c | 13 +++++++++++++
3 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index ad8155c..1618282 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1141,18 +1141,9 @@ static void amdvi_realize(DeviceState *dev, Error **err)
AMDVIState *s = AMD_IOMMU_DEVICE(dev);
X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
MachineState *ms = MACHINE(qdev_get_machine());
- MachineClass *mc = MACHINE_GET_CLASS(ms);
- PCMachineState *pcms =
- PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
- PCIBus *bus;
-
- if (!pcms) {
- error_setg(err, "Machine-type '%s' not supported by amd-iommu",
- mc->name);
- return;
- }
+ PCMachineState *pcms = PC_MACHINE(ms);
+ PCIBus *bus = pcms->bus;
- bus = pcms->bus;
s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,
amdvi_uint64_equal, g_free, g_free);
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 3a5bb0b..0138b3b 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -3027,20 +3027,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
static void vtd_realize(DeviceState *dev, Error **errp)
{
MachineState *ms = MACHINE(qdev_get_machine());
- MachineClass *mc = MACHINE_GET_CLASS(ms);
- PCMachineState *pcms =
- PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
- PCIBus *bus;
+ PCMachineState *pcms = PC_MACHINE(ms);
+ PCIBus *bus = pcms->bus;
IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
- if (!pcms) {
- error_setg(errp, "Machine-type '%s' not supported by intel-iommu",
- mc->name);
- return;
- }
-
- bus = pcms->bus;
x86_iommu->type = TYPE_INTEL;
if (!vtd_decide_config(s, errp)) {
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index 293caf8..51de519 100644
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -21,6 +21,8 @@
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/i386/x86-iommu.h"
+#include "hw/i386/pc.h"
+#include "qapi/error.h"
#include "qemu/error-report.h"
#include "trace.h"
@@ -80,7 +82,18 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
{
X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
X86IOMMUClass *x86_class = X86_IOMMU_GET_CLASS(dev);
+ MachineState *ms = MACHINE(qdev_get_machine());
+ MachineClass *mc = MACHINE_GET_CLASS(ms);
+ PCMachineState *pcms =
+ PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
QLIST_INIT(&x86_iommu->iec_notifiers);
+
+ if (!pcms) {
+ error_setg(errp, "Machine-type '%s' not supported by IOMMU",
+ mc->name);
+ return;
+ }
+
if (x86_class->realize) {
x86_class->realize(dev, errp);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH RESEND 2/2] x86_iommu: check if machine has PCI bus
2017-11-29 12:33 [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Mohammed Gamal
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize() Mohammed Gamal
@ 2017-11-29 12:33 ` Mohammed Gamal
2017-11-29 15:26 ` Thomas Huth
2017-11-29 12:42 ` [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Peter Xu
2 siblings, 1 reply; 10+ messages in thread
From: Mohammed Gamal @ 2017-11-29 12:33 UTC (permalink / raw)
To: qemu-devel, mst, mjt, lvivier
Cc: peterx, thuth, ehabkost, pbonzini, Mohammed Gamal
Starting qemu with
qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
leads to a segfault. The code assume PCI bus is present and
tries to access the bus structure without checking.
Since Intel VT-d and AMDVI should only work with PCI, add a
check for PCI bus and return error if not present.
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
---
hw/i386/x86-iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index 51de519..8a01a2d 100644
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -88,7 +88,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
QLIST_INIT(&x86_iommu->iec_notifiers);
- if (!pcms) {
+ if (!pcms || !pcms->bus) {
error_setg(errp, "Machine-type '%s' not supported by IOMMU",
mc->name);
return;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines
2017-11-29 12:33 [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Mohammed Gamal
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize() Mohammed Gamal
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 2/2] x86_iommu: check if machine has PCI bus Mohammed Gamal
@ 2017-11-29 12:42 ` Peter Xu
2017-11-29 15:33 ` Michael S. Tsirkin
2 siblings, 1 reply; 10+ messages in thread
From: Peter Xu @ 2017-11-29 12:42 UTC (permalink / raw)
To: Mohammed Gamal; +Cc: qemu-devel, mst, mjt, lvivier, thuth, ehabkost, pbonzini
On Wed, Nov 29, 2017 at 01:33:11PM +0100, Mohammed Gamal wrote:
> [Resending for the second time]
>
> Starting qemu with
> qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
> leads to a segfault. The code assume PCI bus is present and
> tries to access the bus structure without checking.
>
> The patch series moves the error checks from vtd_realize()
> and amdvi_realize() to the generic x86_iommu_realize() and
> adds a check for PCI bus presence.
Yes, IMHO this is ok even for 2.11. Michael, what do you think?
>
>
> Mohammed Gamal (2):
> x86_iommu: Move machine check to x86_iommu_realize()
> x86_iommu: check if machine has PCI bus
>
> hw/i386/amd_iommu.c | 13 ++-----------
> hw/i386/intel_iommu.c | 13 ++-----------
> hw/i386/x86-iommu.c | 13 +++++++++++++
> 3 files changed, 17 insertions(+), 22 deletions(-)
>
> --
> 1.8.3.1
>
--
Peter Xu
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize()
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize() Mohammed Gamal
@ 2017-11-29 15:23 ` Thomas Huth
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Huth @ 2017-11-29 15:23 UTC (permalink / raw)
To: Mohammed Gamal, qemu-devel, mst, mjt, lvivier; +Cc: peterx, ehabkost, pbonzini
On 29.11.2017 13:33, Mohammed Gamal wrote:
> Instead of having the same error checks in vtd_realize()
> and amdvi_realize(), move that over to the generic
> x86_iommu_realize().
>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
> ---
> hw/i386/amd_iommu.c | 13 ++-----------
> hw/i386/intel_iommu.c | 13 ++-----------
> hw/i386/x86-iommu.c | 13 +++++++++++++
> 3 files changed, 17 insertions(+), 22 deletions(-)
>
> diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
> index ad8155c..1618282 100644
> --- a/hw/i386/amd_iommu.c
> +++ b/hw/i386/amd_iommu.c
> @@ -1141,18 +1141,9 @@ static void amdvi_realize(DeviceState *dev, Error **err)
> AMDVIState *s = AMD_IOMMU_DEVICE(dev);
> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
> MachineState *ms = MACHINE(qdev_get_machine());
> - MachineClass *mc = MACHINE_GET_CLASS(ms);
> - PCMachineState *pcms =
> - PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
> - PCIBus *bus;
> -
> - if (!pcms) {
> - error_setg(err, "Machine-type '%s' not supported by amd-iommu",
> - mc->name);
> - return;
> - }
> + PCMachineState *pcms = PC_MACHINE(ms);
> + PCIBus *bus = pcms->bus;
>
> - bus = pcms->bus;
> s->iotlb = g_hash_table_new_full(amdvi_uint64_hash,
> amdvi_uint64_equal, g_free, g_free);
>
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index 3a5bb0b..0138b3b 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -3027,20 +3027,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
> static void vtd_realize(DeviceState *dev, Error **errp)
> {
> MachineState *ms = MACHINE(qdev_get_machine());
> - MachineClass *mc = MACHINE_GET_CLASS(ms);
> - PCMachineState *pcms =
> - PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
> - PCIBus *bus;
> + PCMachineState *pcms = PC_MACHINE(ms);
> + PCIBus *bus = pcms->bus;
> IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev);
> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
>
> - if (!pcms) {
> - error_setg(errp, "Machine-type '%s' not supported by intel-iommu",
> - mc->name);
> - return;
> - }
> -
> - bus = pcms->bus;
> x86_iommu->type = TYPE_INTEL;
>
> if (!vtd_decide_config(s, errp)) {
> diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
> index 293caf8..51de519 100644
> --- a/hw/i386/x86-iommu.c
> +++ b/hw/i386/x86-iommu.c
> @@ -21,6 +21,8 @@
> #include "hw/sysbus.h"
> #include "hw/boards.h"
> #include "hw/i386/x86-iommu.h"
> +#include "hw/i386/pc.h"
> +#include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "trace.h"
>
> @@ -80,7 +82,18 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
> {
> X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev);
> X86IOMMUClass *x86_class = X86_IOMMU_GET_CLASS(dev);
> + MachineState *ms = MACHINE(qdev_get_machine());
> + MachineClass *mc = MACHINE_GET_CLASS(ms);
> + PCMachineState *pcms =
> + PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
> QLIST_INIT(&x86_iommu->iec_notifiers);
> +
> + if (!pcms) {
> + error_setg(errp, "Machine-type '%s' not supported by IOMMU",
> + mc->name);
> + return;
> + }
> +
> if (x86_class->realize) {
> x86_class->realize(dev, errp);
> }
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH RESEND 2/2] x86_iommu: check if machine has PCI bus
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 2/2] x86_iommu: check if machine has PCI bus Mohammed Gamal
@ 2017-11-29 15:26 ` Thomas Huth
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Huth @ 2017-11-29 15:26 UTC (permalink / raw)
To: Mohammed Gamal, qemu-devel, mst, mjt, lvivier; +Cc: peterx, ehabkost, pbonzini
On 29.11.2017 13:33, Mohammed Gamal wrote:
> Starting qemu with
> qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
> leads to a segfault. The code assume PCI bus is present and
> tries to access the bus structure without checking.
>
> Since Intel VT-d and AMDVI should only work with PCI, add a
> check for PCI bus and return error if not present.
>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
> ---
> hw/i386/x86-iommu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
> index 51de519..8a01a2d 100644
> --- a/hw/i386/x86-iommu.c
> +++ b/hw/i386/x86-iommu.c
> @@ -88,7 +88,7 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp)
> PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE));
> QLIST_INIT(&x86_iommu->iec_notifiers);
>
> - if (!pcms) {
> + if (!pcms || !pcms->bus) {
> error_setg(errp, "Machine-type '%s' not supported by IOMMU",
> mc->name);
> return;
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines
2017-11-29 12:42 ` [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Peter Xu
@ 2017-11-29 15:33 ` Michael S. Tsirkin
0 siblings, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2017-11-29 15:33 UTC (permalink / raw)
To: Peter Xu
Cc: Mohammed Gamal, qemu-devel, mjt, lvivier, thuth, ehabkost, pbonzini
On Wed, Nov 29, 2017 at 08:42:17PM +0800, Peter Xu wrote:
> On Wed, Nov 29, 2017 at 01:33:11PM +0100, Mohammed Gamal wrote:
> > [Resending for the second time]
> >
> > Starting qemu with
> > qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
> > leads to a segfault. The code assume PCI bus is present and
> > tries to access the bus structure without checking.
> >
> > The patch series moves the error checks from vtd_realize()
> > and amdvi_realize() to the generic x86_iommu_realize() and
> > adds a check for PCI bus presence.
>
> Yes, IMHO this is ok even for 2.11. Michael, what do you think?
I think so too.
> >
> >
> > Mohammed Gamal (2):
> > x86_iommu: Move machine check to x86_iommu_realize()
> > x86_iommu: check if machine has PCI bus
> >
> > hw/i386/amd_iommu.c | 13 ++-----------
> > hw/i386/intel_iommu.c | 13 ++-----------
> > hw/i386/x86-iommu.c | 13 +++++++++++++
> > 3 files changed, 17 insertions(+), 22 deletions(-)
> >
> > --
> > 1.8.3.1
> >
>
> --
> Peter Xu
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines
2017-10-16 9:31 ` Peter Xu
@ 2017-10-18 17:34 ` Michael S. Tsirkin
0 siblings, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2017-10-18 17:34 UTC (permalink / raw)
To: Peter Xu; +Cc: Mohammed Gamal, qemu-devel, thuth, ehabkost, pbonzini, mjt
On Mon, Oct 16, 2017 at 05:31:25PM +0800, Peter Xu wrote:
> On Mon, Oct 16, 2017 at 11:06:21AM +0200, Mohammed Gamal wrote:
> > Starting qemu with
> > qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
> > leads to a segfault. The code assume PCI bus is present and
> > tries to access the bus structure without checking.
> >
> > The patch series moves the error checks from vtd_realize()
> > and amdvi_realize() to the generic x86_iommu_realize() and
> > adds a check for PCI bus presence.
>
> Hi, Michael,
>
> Would you like to pick Mohammed's two patches in your next pull
> request?
>
> Each of the patches has got 2 acks, and it does fix a problem.
>
> Thanks,
Yes, thank you.
> >
> >
> > Mohammed Gamal (2):
> > x86_iommu: Move machine check to x86_iommu_realize()
> > x86_iommu: check if machine has PCI bus
> >
> > hw/i386/amd_iommu.c | 13 ++-----------
> > hw/i386/intel_iommu.c | 13 ++-----------
> > hw/i386/x86-iommu.c | 13 +++++++++++++
> > 3 files changed, 17 insertions(+), 22 deletions(-)
> >
> > --
> > 1.8.3.1
> >
>
> --
> Peter Xu
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines
2017-10-16 9:06 Mohammed Gamal
@ 2017-10-16 9:31 ` Peter Xu
2017-10-18 17:34 ` Michael S. Tsirkin
0 siblings, 1 reply; 10+ messages in thread
From: Peter Xu @ 2017-10-16 9:31 UTC (permalink / raw)
To: Mohammed Gamal, Michael S. Tsirkin
Cc: qemu-devel, thuth, ehabkost, pbonzini, mjt
On Mon, Oct 16, 2017 at 11:06:21AM +0200, Mohammed Gamal wrote:
> Starting qemu with
> qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
> leads to a segfault. The code assume PCI bus is present and
> tries to access the bus structure without checking.
>
> The patch series moves the error checks from vtd_realize()
> and amdvi_realize() to the generic x86_iommu_realize() and
> adds a check for PCI bus presence.
Hi, Michael,
Would you like to pick Mohammed's two patches in your next pull
request?
Each of the patches has got 2 acks, and it does fix a problem.
Thanks,
>
>
> Mohammed Gamal (2):
> x86_iommu: Move machine check to x86_iommu_realize()
> x86_iommu: check if machine has PCI bus
>
> hw/i386/amd_iommu.c | 13 ++-----------
> hw/i386/intel_iommu.c | 13 ++-----------
> hw/i386/x86-iommu.c | 13 +++++++++++++
> 3 files changed, 17 insertions(+), 22 deletions(-)
>
> --
> 1.8.3.1
>
--
Peter Xu
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines
@ 2017-10-16 9:06 Mohammed Gamal
2017-10-16 9:31 ` Peter Xu
0 siblings, 1 reply; 10+ messages in thread
From: Mohammed Gamal @ 2017-10-16 9:06 UTC (permalink / raw)
To: qemu-devel; +Cc: thuth, ehabkost, peterx, pbonzini, mst, mjt, Mohammed Gamal
Starting qemu with
qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
leads to a segfault. The code assume PCI bus is present and
tries to access the bus structure without checking.
The patch series moves the error checks from vtd_realize()
and amdvi_realize() to the generic x86_iommu_realize() and
adds a check for PCI bus presence.
Mohammed Gamal (2):
x86_iommu: Move machine check to x86_iommu_realize()
x86_iommu: check if machine has PCI bus
hw/i386/amd_iommu.c | 13 ++-----------
hw/i386/intel_iommu.c | 13 ++-----------
hw/i386/x86-iommu.c | 13 +++++++++++++
3 files changed, 17 insertions(+), 22 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-11-29 15:34 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-29 12:33 [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Mohammed Gamal
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 1/2] x86_iommu: Move machine check to x86_iommu_realize() Mohammed Gamal
2017-11-29 15:23 ` Thomas Huth
2017-11-29 12:33 ` [Qemu-devel] [PATCH RESEND 2/2] x86_iommu: check if machine has PCI bus Mohammed Gamal
2017-11-29 15:26 ` Thomas Huth
2017-11-29 12:42 ` [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines Peter Xu
2017-11-29 15:33 ` Michael S. Tsirkin
-- strict thread matches above, loose matches on Subject: below --
2017-10-16 9:06 Mohammed Gamal
2017-10-16 9:31 ` Peter Xu
2017-10-18 17:34 ` Michael S. Tsirkin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.