[PATCH] x86: fix hvm_migrate_irq assertion

[PATCH] x86: fix hvm_migrate_irq assertion

[Wei Liu]

782cf8ba46 ("pass-through: adjust pIRQ migration") added an assertion
to hvm_migrate_irq.

PVH Dom0 is broken because it doesn't have dpci allocated. Add an
is_hardware_domain check to the assertion.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 xen/arch/x86/hvm/hvm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 519282937b..5d263c4090 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -464,7 +464,8 @@ void hvm_migrate_timers(struct vcpu *v)
 
 void hvm_migrate_pirq(struct hvm_pirq_dpci *pirq_dpci, const struct vcpu *v)
 {
-    ASSERT(iommu_enabled && hvm_domain_irq(v->domain)->dpci);
+    ASSERT(iommu_enabled &&
+           (is_hardware_domain(v->domain) || hvm_domain_irq(v->domain)->dpci));
 
     if ( (pirq_dpci->flags & HVM_IRQ_DPCI_MACH_MSI) &&
          /* Needn't migrate pirq if this pirq is delivered to guest directly.*/
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86: fix hvm_migrate_irq assertion

[Jan Beulich]

>>> On 12.11.18 at 15:04, <wei.liu2@citrix.com> wrote:
> 782cf8ba46 ("pass-through: adjust pIRQ migration") added an assertion
> to hvm_migrate_irq.
> 
> PVH Dom0 is broken because it doesn't have dpci allocated. Add an
> is_hardware_domain check to the assertion.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>

I'm sorry for the breakage.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86: fix hvm_migrate_irq assertion

[Roger Pau Monné]

On Mon, Nov 12, 2018 at 02:04:59PM +0000, Wei Liu wrote:
> 782cf8ba46 ("pass-through: adjust pIRQ migration") added an assertion
> to hvm_migrate_irq.
> 
> PVH Dom0 is broken because it doesn't have dpci allocated. Add an
> is_hardware_domain check to the assertion.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

> ---
>  xen/arch/x86/hvm/hvm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
> index 519282937b..5d263c4090 100644
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -464,7 +464,8 @@ void hvm_migrate_timers(struct vcpu *v)
>  
>  void hvm_migrate_pirq(struct hvm_pirq_dpci *pirq_dpci, const struct vcpu *v)
>  {
> -    ASSERT(iommu_enabled && hvm_domain_irq(v->domain)->dpci);
> +    ASSERT(iommu_enabled &&
> +           (is_hardware_domain(v->domain) || hvm_domain_irq(v->domain)->dpci));

Albeit I would just remove the hvm_domain_irq(v->domain)->dpci part of
the assert, AFAICT the function doesn't use it at all.

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86: fix hvm_migrate_irq assertion

[Wei Liu]

On Mon, Nov 12, 2018 at 07:35:57AM -0700, Jan Beulich wrote:
> >>> On 12.11.18 at 15:04, <wei.liu2@citrix.com> wrote:
> > 782cf8ba46 ("pass-through: adjust pIRQ migration") added an assertion
> > to hvm_migrate_irq.
> > 
> > PVH Dom0 is broken because it doesn't have dpci allocated. Add an
> > is_hardware_domain check to the assertion.
> > 
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> 
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
> 
> I'm sorry for the breakage.
> 

No worries. I should have noticed this while reviewing your patch, so I
don't blame you.

Wei.

> Jan
> 
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel