linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-15 15:14 [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time Peng Hao
@ 2018-11-15  9:42 ` Julien Thierry
  2018-11-15 14:39 ` Andre Przywara
  2018-11-15 15:06 ` Marc Zyngier
  2 siblings, 0 replies; 14+ messages in thread
From: Julien Thierry @ 2018-11-15  9:42 UTC (permalink / raw)
  To: Peng Hao, christoffer.dall, marc.zyngier
  Cc: linux-arm-kernel, kvmarm, linux-kernel

Hi Peng,

On 15/11/18 15:14, Peng Hao wrote:
> When virtual machine starts, hang up. The kernel version of guest
> is 4.16. Host support vgic_v3.

I don't understand the issue here. the vgic_irq->group field does not 
exist in 4.16 (neither in the first nor the last version). Nor does the 
line you are modifying.

Both exist in mainline, but what you are mentioning shouldn't be an 
issue in mainline since vgic_irq->group gets initialized in 
kvm_vgic_vcpu_init for SGIs and PPIs (i.e. intid < 32) which includes 
your interrupt.

Cheers,

> It was mainly due to the incorrect vgic_irq's(intid=27) group value
> during injection interruption. when kvm_vgic_vcpu_init is called,
> dist is not initialized at this time. Unable to get vgic V3 or V2
> correctly, so group is not set.
> group is setted to 1 when vgic_mmio_write_group is invoked at some
> time.
> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
> interrupt injection failed.
> 
> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> ---
>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> index 9c0dd23..d101000 100644
> --- a/virt/kvm/arm/vgic/vgic-v3.c
> +++ b/virt/kvm/arm/vgic/vgic-v3.c
> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)
>   	if (vgic_irq_is_mapped_level(irq) && (val & ICH_LR_PENDING_BIT))
>   		irq->line_level = false;
>   
> -	if (irq->group)
> +	if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>   		val |= ICH_LR_GROUP;
>   
>   	val |= (u64)irq->priority << ICH_LR_PRIORITY_SHIFT;
> 

-- 
Julien Thierry

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH]  kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-15 15:14 [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time Peng Hao
  2018-11-15  9:42 ` Julien Thierry
@ 2018-11-15 14:39 ` Andre Przywara
  2018-11-15 15:06 ` Marc Zyngier
  2 siblings, 0 replies; 14+ messages in thread
From: Andre Przywara @ 2018-11-15 14:39 UTC (permalink / raw)
  To: Peng Hao
  Cc: christoffer.dall, marc.zyngier, kvmarm, linux-arm-kernel, linux-kernel

On Thu, 15 Nov 2018 23:14:08 +0800
Peng Hao <peng.hao2@zte.com.cn> wrote:

Hi,

> When virtual machine starts, hang up.

I take it you mean the *guest* hangs? Because it doesn't get a timer
interrupt?

> The kernel version of guest
> is 4.16. Host support vgic_v3.

Your host kernel is something recent, I guess?

> It was mainly due to the incorrect vgic_irq's(intid=27) group value
> during injection interruption. when kvm_vgic_vcpu_init is called,
> dist is not initialized at this time. Unable to get vgic V3 or V2
> correctly, so group is not set.

Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
version?) or some other userland tool?

> group is setted to 1 when vgic_mmio_write_group is invoked at some
> time.
> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
> interrupt injection failed.
> 
> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> ---
>  virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> index 9c0dd23..d101000 100644
> --- a/virt/kvm/arm/vgic/vgic-v3.c
> +++ b/virt/kvm/arm/vgic/vgic-v3.c
> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
>  
> -	if (irq->group)
> +	if (model == KVM_DEV_TYPE_ARM_VGIC_V3)

This is not the right fix, not only because it basically reverts the
GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
their configured group).

Can you try to work out why kvm_vgic_vcpu_init() is apparently called
before dist->vgic_model is set, also what value it has?
If I understand the code correctly, that shouldn't happen for a GICv3.

Cheers,
Andre.

>  		val |= ICH_LR_GROUP;
>  
>  	val |= (u64)irq->priority << ICH_LR_PRIORITY_SHIFT;


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH]  kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-15 15:14 [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time Peng Hao
  2018-11-15  9:42 ` Julien Thierry
  2018-11-15 14:39 ` Andre Przywara
@ 2018-11-15 15:06 ` Marc Zyngier
  2 siblings, 0 replies; 14+ messages in thread
From: Marc Zyngier @ 2018-11-15 15:06 UTC (permalink / raw)
  To: Peng Hao; +Cc: christoffer.dall, linux-arm-kernel, kvmarm, linux-kernel

On Thu, 15 Nov 2018 15:14:08 +0000,
Peng Hao <peng.hao2@zte.com.cn> wrote:
> 
> When virtual machine starts, hang up. The kernel version of guest
> is 4.16. Host support vgic_v3.
> It was mainly due to the incorrect vgic_irq's(intid=27) group value
> during injection interruption. when kvm_vgic_vcpu_init is called,
> dist is not initialized at this time. Unable to get vgic V3 or V2
> correctly, so group is not set.
> group is setted to 1 when vgic_mmio_write_group is invoked at some
> time.
> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
> interrupt injection failed.
> 
> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> ---
>  virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> index 9c0dd23..d101000 100644
> --- a/virt/kvm/arm/vgic/vgic-v3.c
> +++ b/virt/kvm/arm/vgic/vgic-v3.c
> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)
>  	if (vgic_irq_is_mapped_level(irq) && (val & ICH_LR_PENDING_BIT))
>  		irq->line_level = false;
>  
> -	if (irq->group)
> +	if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>  		val |= ICH_LR_GROUP;
>  
>  	val |= (u64)irq->priority << ICH_LR_PRIORITY_SHIFT;

This patch makes exactly zero sense. The group is a property of the
interrupt, and has nothing to do with the model used for the emulation

Which version of the kernel is this against? What userspace are you
using? How can I reproduce this issue?

Thanks,

	M.

-- 
Jazz is not dead, it just smell funny.

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH]  kvm: arm/arm64 : fix vm's hanging at startup time
@ 2018-11-15 15:14 Peng Hao
  2018-11-15  9:42 ` Julien Thierry
                   ` (2 more replies)
  0 siblings, 3 replies; 14+ messages in thread
From: Peng Hao @ 2018-11-15 15:14 UTC (permalink / raw)
  To: christoffer.dall, marc.zyngier
  Cc: linux-arm-kernel, kvmarm, linux-kernel, Peng Hao

When virtual machine starts, hang up. The kernel version of guest
is 4.16. Host support vgic_v3.
It was mainly due to the incorrect vgic_irq's(intid=27) group value
during injection interruption. when kvm_vgic_vcpu_init is called,
dist is not initialized at this time. Unable to get vgic V3 or V2
correctly, so group is not set.
group is setted to 1 when vgic_mmio_write_group is invoked at some
time.
when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
interrupt injection failed.

Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
---
 virt/kvm/arm/vgic/vgic-v3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
index 9c0dd23..d101000 100644
--- a/virt/kvm/arm/vgic/vgic-v3.c
+++ b/virt/kvm/arm/vgic/vgic-v3.c
@@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)
 	if (vgic_irq_is_mapped_level(irq) && (val & ICH_LR_PENDING_BIT))
 		irq->line_level = false;
 
-	if (irq->group)
+	if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
 		val |= ICH_LR_GROUP;
 
 	val |= (u64)irq->priority << ICH_LR_PRIORITY_SHIFT;
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
       [not found]             ` <201811231401560886603@zte.com.cn>
@ 2018-11-23 10:03               ` Christoffer Dall
  0 siblings, 0 replies; 14+ messages in thread
From: Christoffer Dall @ 2018-11-23 10:03 UTC (permalink / raw)
  To: peng.hao2
  Cc: marc.zyngier, andre.przywara, linux-kernel, leif.lindholm,
	ard.bieshseuvel, kvmarm, linux-arm-kernel

On Fri, Nov 23, 2018 at 02:01:56PM +0800, peng.hao2@zte.com.cn wrote:
> >Hi,
> >
> >On Wed, Nov 21, 2018 at 04:56:54PM +0800, peng.hao2@zte.com.cn wrote:
> >> >On 19/11/2018 09:10, Mark Rutland wrote:
> >> >> On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
> >> >>>> On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
> >> >>>>>> Hi,
> >> >>>>>>> When virtual machine starts, hang up.
> >> >>>>>>
> >> >>>>>> I take it you mean the *guest* hangs? Because it doesn't get a timer
> >> >>>>>> interrupt?
> >> >>>>>>
> >> >>>>>>> The kernel version of guest
> >> >>>>>>> is 4.16. Host support vgic_v3.
> >> >>>>>>
> >> >>>>>> Your host kernel is something recent, I guess?
> >> >>>>>>
> >> >>>>>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
> >> >>>>>>> during injection interruption. when kvm_vgic_vcpu_init is called,
> >> >>>>>>> dist is not initialized at this time. Unable to get vgic V3 or V2
> >> >>>>>>> correctly, so group is not set.
> >> >>>>>>
> >> >>>>>> Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
> >> >>>>>> version?) or some other userland tool?
> >> >>>>>>
> >> >>>>>
> >> >>>>> QEMU emulator version 3.0.50 .
> >> >>>>>
> >> >>>>>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
> >> >>>>>>> time.
> >> >>>>>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
> >> >>>>>>> interrupt injection failed.
> >> >>>>>>>
> >> >>>>>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> >> >>>>>>> ---
> >> >>>>>>>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
> >> >>>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >> >>>>>>>
> >> >>>>>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> >> >>>>>>> index 9c0dd23..d101000 100644
> >> >>>>>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
> >> >>>>>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
> >> >>>>>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
> >> >>>>>>> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
> >> >>>>>>> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
> >> >>>>>>>
> >> >>>>>>> -    if (irq->group)
> >> >>>>>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
> >> >>>>>>
> >> >>>>>> This is not the right fix, not only because it basically reverts the
> >> >>>>>> GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
> >> >>>>>> their configured group).
> >> >>>>>>
> >> >>>>>> Can you try to work out why kvm_vgic_vcpu_init() is apparently called
> >> >>>>>> before dist->vgic_model is set, also what value it has?
> >> >>>>>> If I understand the code correctly, that shouldn't happen for a GICv3.
> >> >>>>>>
> >> >>>>> Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through >vgic_mmio_write_group.
> >> >>>>>   If the interrupt comes at this time, the interrupt injection fails.
> >> >>>>
> >> >>>> Does that mean that the guest is configuring its interrupts as Group0?
> >> >>>> That sounds wrong, Linux should configure all it's interrupts as
> >> >>>> non-secure group1.
> >> >>>
> >> >>> no, I think that uefi dose this, not linux.
> >> >>> 1. kvm_vgic_vcpu_init
> >> >>> 2. vgic_create
> >> >>> 3. kvm_vgic_dist_init
> >> >>> 4.vgic_mmio_write_group: uefi as guest, write group=0
> >> >>> 5.vgic_mmio_write_group: linux as guest, write group=1
> >> >>
> >> >> Is this the same issue fixed by EDK2 commit:
> >> >>
> >> >> 66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
> >> >>
> >> >> ... where EDK2 would try to use IAR0 rather than IAR1?
> >> >>
> >> >> The commit messages notes this lead to a boot-time hang.
> >> >
> >> >I managed to trigger an issue with a really old EFI implementation that
> >> >doesn't configure its interrupts as Group1, and yet tries to ACK its
> >> >interrupts using the Group1 accessor. Guess what? It is not going to work.
> >> >
> >> >Commit c7fefb690661f2e38afcb8200bd318ecf38ab961 in the edk2 tree seems
> >> >to be the fix (I only assume it does, I haven't actually checked). A
> >> >recent build, as found in Debian Buster, works perfectly (tested with
> >> >both QEMU v2.12 and tip of tree).
> >> >
> >> >Now, I really don't get what you're saying about Linux not getting
> >> >interrupts. How do you get to booting Linux if EFI is not making any
> >> >forward progress? Are you trying them independently?
> >> >
> >> I start linux with bypassing uefi, the print info is the same.
> >> [507107.748908]  vgic_mmio_write_group:## intid/27 group=0
> >> [507107.752185]  vgic_mmio_write_group:## intid/27 group=0
> >> [507107.899566]  vgic_mmio_write_group:## intid/27 group=1
> >> [507107.907370]  vgic_mmio_write_group:## intid/27 group=1
> >> the command line is like this:
> >> /home/qemu-patch/linshi/qemu/aarch64-softmmu/qemu-system-aarch64  -machine virt-3.1,accel=kvm,usb=off,dump-guest-core=off,gic-version=3  -kernel /home/kernelboot/vmlinuz-4.16.0+ -initrd /home/kernelboot/initramfs-4.16.0+.img -append root=/dev/mapper/cla-root ro crashkernel=auto rd.lvm.lv=cla/root rd.lvm.lv=cla/swap.UTF-8  -drive file=/home/centos74-ph/boot.qcow2,format=qcow2,if=none,id=drive-scsi0-0-0-0 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1  -vnc 0.0.0.0:0 -k en-us -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.3,addr=0x0 -device pvpanic-mmio -msg >timestamp=on
> >>
> >> This is strange. That's probably the Linux 4.16  kernel setting group to 0, and I'll continue to track in guest.
> >
> >Could you try the following patch:
> >
> >diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
> >index c0c0b88af1d5..6fa858c7a5a6 100644
> >--- a/virt/kvm/arm/vgic/vgic-init.c
> >+++ b/virt/kvm/arm/vgic/vgic-init.c
> >@@ -231,13 +231,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
> >irq->config = VGIC_CONFIG_LEVEL;
> >}
> >-        /*
> >-         * GICv3 can only be created via the KVM_DEVICE_CREATE API and
> >-         * so we always know the emulation type at this point as it's
> >-         * either explicitly configured as GICv3, or explicitly
> >-         * configured as GICv2, or not configured yet which also
> >-         * implies GICv2.
> >-         */
> >if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
> >irq->group = 1;
> >else
> >@@ -298,6 +291,16 @@ int vgic_init(struct kvm *kvm)
> >if (ret)
> >goto out;
> >+    /* Initialize groups on CPUs created before the VGIC type was known */
> >+    kvm_for_each_vcpu(i, vcpu, kvm) {
> >+        struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> >+
> >+        for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) {
> >+            struct vgic_irq *irq = &vgic_cpu->private_irqs[i];
> >+            irq->group = 1;
> >+        }
> >+    }
> >+
> >if (vgic_has_its(kvm)) {
> >ret = vgic_v4_init(kvm);
> >if (ret)
> >
> Sorry for the late reply. 
> I test the patch and it works. But I think there is randomness here.
> 1.vgic_init:  set intid/27 group=1
> 2.vgic_mmio_write_group:## intid/27 group=0
> 3.!!! receive a  vtimer irq   ----- it may exist.
> 4.vgic_mmio_write_group:## intid/27 group=1

Are these writes from userspace or from the guest?
(I assume they're from the guest.)

> 
> I made an attempt before:

Was this previous experiment using my patch or without my patch?

> 1. kvm_vgic_vcpu_init
>      according to if  kvm_vgic_global_state.type == VGIC_V3, set group=1
> 2.vgic_mmio_write_group:## intid/27 group=0
> 3.!!! receive a  vtimer irq   -----I really receive a vtimer irq, then the guest hangs.
> 

If the guest you're using is flipping the group of the interrupt and yet
enabling the device and interrupt while flipping the group, then it's
not expected to work and it's a guest bug.

My hunch here tells me that my patch is what we need for KVM, and either

  (1) You no longer have a problem but are tracing some guest
      initialization behavior which is fine, or

  (2) You still have a problem because you also have some broken guest
      code (guest UEFI or guest Linux) that also needs fixing.

If you can demonstrate that you still have a problem, with my path
applied to KVM, and with a recent guest Linux and guest UEFI, then I'll
be happy to have another look.  In that case, could you please provide
the exact versions of your guest Linux and UEFI, as well as the QEMU
version and command line.


Thanks,

    Christoffer

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-21 15:53                 ` Julien Thierry
@ 2018-11-22 10:45                   ` Christoffer Dall
  0 siblings, 0 replies; 14+ messages in thread
From: Christoffer Dall @ 2018-11-22 10:45 UTC (permalink / raw)
  To: Julien Thierry
  Cc: peng.hao2, marc.zyngier, andre.przywara, linux-kernel,
	leif.lindholm, ard.bieshseuvel, kvmarm, linux-arm-kernel

On Wed, Nov 21, 2018 at 03:53:03PM +0000, Julien Thierry wrote:
> 
> 
> On 21/11/18 15:24, Christoffer Dall wrote:
> >On Wed, Nov 21, 2018 at 12:17:45PM +0000, Julien Thierry wrote:
> >>
> >>
> >>On 21/11/18 11:06, Christoffer Dall wrote:
> >>>Hi,
> >>>
> >>>On Wed, Nov 21, 2018 at 04:56:54PM +0800, peng.hao2@zte.com.cn wrote:
> >>>>>On 19/11/2018 09:10, Mark Rutland wrote:
> >>>>>>On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
> >>>>>>>>On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
> >>>>>>>>>>Hi,
> >>>>>>>>>>>When virtual machine starts, hang up.
> >>>>>>>>>>
> >>>>>>>>>>I take it you mean the *guest* hangs? Because it doesn't get a timer
> >>>>>>>>>>interrupt?
> >>>>>>>>>>
> >>>>>>>>>>>The kernel version of guest
> >>>>>>>>>>>is 4.16. Host support vgic_v3.
> >>>>>>>>>>
> >>>>>>>>>>Your host kernel is something recent, I guess?
> >>>>>>>>>>
> >>>>>>>>>>>It was mainly due to the incorrect vgic_irq's(intid=27) group value
> >>>>>>>>>>>during injection interruption. when kvm_vgic_vcpu_init is called,
> >>>>>>>>>>>dist is not initialized at this time. Unable to get vgic V3 or V2
> >>>>>>>>>>>correctly, so group is not set.
> >>>>>>>>>>
> >>>>>>>>>>Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
> >>>>>>>>>>version?) or some other userland tool?
> >>>>>>>>>>
> >>>>>>>>>
> >>>>>>>>>QEMU emulator version 3.0.50 .
> >>>>>>>>>
> >>>>>>>>>>>group is setted to 1 when vgic_mmio_write_group is invoked at some
> >>>>>>>>>>>time.
> >>>>>>>>>>>when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
> >>>>>>>>>>>interrupt injection failed.
> >>>>>>>>>>>
> >>>>>>>>>>>Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> >>>>>>>>>>>---
> >>>>>>>>>>>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
> >>>>>>>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>>>>>>>>
> >>>>>>>>>>>diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>>>>>>index 9c0dd23..d101000 100644
> >>>>>>>>>>>--- a/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>>>>>>+++ b/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>>>>>>@@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
> >>>>>>>>>>>struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
> >>>>>>>>>>>(val & ICH_LR_PENDING_BIT)) irq->line_level = false;
> >>>>>>>>>>>
> >>>>>>>>>>>-    if (irq->group)
> >>>>>>>>>>>+    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
> >>>>>>>>>>
> >>>>>>>>>>This is not the right fix, not only because it basically reverts the
> >>>>>>>>>>GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
> >>>>>>>>>>their configured group).
> >>>>>>>>>>
> >>>>>>>>>>Can you try to work out why kvm_vgic_vcpu_init() is apparently called
> >>>>>>>>>>before dist->vgic_model is set, also what value it has?
> >>>>>>>>>>If I understand the code correctly, that shouldn't happen for a GICv3.
> >>>>>>>>>>
> >>>>>>>>>Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
> >>>>>>>>>   If the interrupt comes at this time, the interrupt injection fails.
> >>>>>>>>
> >>>>>>>>Does that mean that the guest is configuring its interrupts as Group0?
> >>>>>>>>That sounds wrong, Linux should configure all it's interrupts as
> >>>>>>>>non-secure group1.
> >>>>>>>
> >>>>>>>no, I think that uefi dose this, not linux.
> >>>>>>>1. kvm_vgic_vcpu_init
> >>>>>>>2. vgic_create
> >>>>>>>3. kvm_vgic_dist_init
> >>>>>>>4.vgic_mmio_write_group: uefi as guest, write group=0
> >>>>>>>5.vgic_mmio_write_group: linux as guest, write group=1
> >>>>>>
> >>>>>>Is this the same issue fixed by EDK2 commit:
> >>>>>>
> >>>>>>66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
> >>>>>>
> >>>>>>... where EDK2 would try to use IAR0 rather than IAR1?
> >>>>>>
> >>>>>>The commit messages notes this lead to a boot-time hang.
> >>>>>
> >>>>>I managed to trigger an issue with a really old EFI implementation that
> >>>>>doesn't configure its interrupts as Group1, and yet tries to ACK its
> >>>>>interrupts using the Group1 accessor. Guess what? It is not going to work.
> >>>>>
> >>>>>Commit c7fefb690661f2e38afcb8200bd318ecf38ab961 in the edk2 tree seems
> >>>>>to be the fix (I only assume it does, I haven't actually checked). A
> >>>>>recent build, as found in Debian Buster, works perfectly (tested with
> >>>>>both QEMU v2.12 and tip of tree).
> >>>>>
> >>>>>Now, I really don't get what you're saying about Linux not getting
> >>>>>interrupts. How do you get to booting Linux if EFI is not making any
> >>>>>forward progress? Are you trying them independently?
> >>>>>
> >>>>I start linux with bypassing uefi, the print info is the same.
> >>>>[507107.748908]  vgic_mmio_write_group:## intid/27 group=0
> >>>>[507107.752185]  vgic_mmio_write_group:## intid/27 group=0
> >>>>[507107.899566]  vgic_mmio_write_group:## intid/27 group=1
> >>>>[507107.907370]  vgic_mmio_write_group:## intid/27 group=1
> >>>>the command line is like this:
> >>>>/home/qemu-patch/linshi/qemu/aarch64-softmmu/qemu-system-aarch64  -machine virt-3.1,accel=kvm,usb=off,dump-guest-core=off,gic-version=3  -kernel /home/kernelboot/vmlinuz-4.16.0+ -initrd /home/kernelboot/initramfs-4.16.0+.img -append root=/dev/mapper/cla-root ro crashkernel=auto rd.lvm.lv=cla/root rd.lvm.lv=cla/swap.UTF-8  -drive file=/home/centos74-ph/boot.qcow2,format=qcow2,if=none,id=drive-scsi0-0-0-0 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1  -vnc 0.0.0.0:0 -k en-us -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.3,addr=0x0 -device pvpanic-mmio -msg timestamp=on
> >>>>
> >>>>This is strange. That's probably the Linux 4.16  kernel setting group to 0, and I'll continue to track in guest.
> >>>
> >>>Could you try the following patch:
> >>>
> >>>diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
> >>>index c0c0b88af1d5..6fa858c7a5a6 100644
> >>>--- a/virt/kvm/arm/vgic/vgic-init.c
> >>>+++ b/virt/kvm/arm/vgic/vgic-init.c
> >>>@@ -231,13 +231,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
> >>>  			irq->config = VGIC_CONFIG_LEVEL;
> >>>  		}
> >>>-		/*
> >>>-		 * GICv3 can only be created via the KVM_DEVICE_CREATE API and
> >>>-		 * so we always know the emulation type at this point as it's
> >>>-		 * either explicitly configured as GICv3, or explicitly
> >>>-		 * configured as GICv2, or not configured yet which also
> >>>-		 * implies GICv2.
> >>>-		 */
> >>>  		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
> >>>  			irq->group = 1;
> >>>  		else
> >>>@@ -298,6 +291,16 @@ int vgic_init(struct kvm *kvm)
> >>>  	if (ret)
> >>>  		goto out;
> >>>+	/* Initialize groups on CPUs created before the VGIC type was known */
> >>>+	kvm_for_each_vcpu(i, vcpu, kvm) {
> >>>+		struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> >>>+
> >>>+		for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) {
> >>>+			struct vgic_irq *irq = &vgic_cpu->private_irqs[i];
> >>>+			irq->group = 1;
> >>>+		}
> >>>+	}
> >>>+
> >>>  	if (vgic_has_its(kvm)) {
> >>>  		ret = vgic_v4_init(kvm);
> >>>  		if (ret)
> >>>
> >>>
> >>
> >>If the value of dist->vgic_model is not properly initialized at the time we
> >>call kvm_vgic_vcpu_init is call, won't we still overwrite the irq->group
> >>when we get there?
> >
> >I don't understand this question.  When we get where?
> 
> Sorry, I meant when we get to the irq->group initialization in
> kvm_vgic_vcpu_init.
> 
> >
> >>(I still haven't seen why we could consider
> >>dist->vgic_model is initialized at that point).
> >
> >Because there is no enforced ordering between creating VCPUs and
> >creating the VGIC.
> 
> Hmmm, I think that's what I am saying, so we shouldn't look at the value of
> vgic_dist->vgic_model since it could be uninitialized (or 0).
> 
> >
> >>
> >>Shouldn't we do the irq->group initialization somewhere in
> >>kvm_arch_vcpu_ioctl_vcpu_init? (with some vgic_* function to encapsulate it
> >>of course). At that point I believe we know that dist->vgic_model is
> >>initialized.
> >>
> >
> >See above.  AFAICT we don't have a single point at which we can do
> >everything because creation of the two components can be interleaved.
> >
> >We could hook into kvm_vcpu_first_run_init(), but then userspace can
> >observe uninitialized values if it looks at the GIC state prior to
> >running the VCPUs, which is also not great.
> >
> >In other words, I think the problem is that you can do:
> >
> >   create_vcpu(0);
> >   create_vgic(v3);
> >   create_vcpu(2);
> >
> >Now you'll have vcpu0 have its private IRQs set to group 0, and you'll
> >have vcpu1 have its private IRQs set to group 1 (prior to my patch).
> >
> >
> >Am I missing something?
> >
> 
> No, I just got confused between create_vgic and vgic_init. So the place
> looks fine. Sorry for the confusion.
> 
> The fact that we still check dist->vgic_model in kvm_vgic_vcpu_init (twice
> actually), however seems dodgy to me since it might not have been
> initialized.
> 
It might not, but it might also be.  In which case you want to
initialize the CPU to the right values.  So you have:

1. VCPUs created before the VGIC are initialized according to the model
   version when the VGIC is created.

2. VCPUs created after the VGIC is initialized are initialized according
   to the model as they are created.

The alternative is to have a sync-point after the two above, but I
haven't been able to find a good API-backwards way of doing that.


Thanks,

    Christoffer

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-21 15:24               ` Christoffer Dall
@ 2018-11-21 15:53                 ` Julien Thierry
  2018-11-22 10:45                   ` Christoffer Dall
  0 siblings, 1 reply; 14+ messages in thread
From: Julien Thierry @ 2018-11-21 15:53 UTC (permalink / raw)
  To: Christoffer Dall
  Cc: peng.hao2, marc.zyngier, andre.przywara, linux-kernel,
	leif.lindholm, ard.bieshseuvel, kvmarm, linux-arm-kernel



On 21/11/18 15:24, Christoffer Dall wrote:
> On Wed, Nov 21, 2018 at 12:17:45PM +0000, Julien Thierry wrote:
>>
>>
>> On 21/11/18 11:06, Christoffer Dall wrote:
>>> Hi,
>>>
>>> On Wed, Nov 21, 2018 at 04:56:54PM +0800, peng.hao2@zte.com.cn wrote:
>>>>> On 19/11/2018 09:10, Mark Rutland wrote:
>>>>>> On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
>>>>>>>> On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
>>>>>>>>>> Hi,
>>>>>>>>>>> When virtual machine starts, hang up.
>>>>>>>>>>
>>>>>>>>>> I take it you mean the *guest* hangs? Because it doesn't get a timer
>>>>>>>>>> interrupt?
>>>>>>>>>>
>>>>>>>>>>> The kernel version of guest
>>>>>>>>>>> is 4.16. Host support vgic_v3.
>>>>>>>>>>
>>>>>>>>>> Your host kernel is something recent, I guess?
>>>>>>>>>>
>>>>>>>>>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
>>>>>>>>>>> during injection interruption. when kvm_vgic_vcpu_init is called,
>>>>>>>>>>> dist is not initialized at this time. Unable to get vgic V3 or V2
>>>>>>>>>>> correctly, so group is not set.
>>>>>>>>>>
>>>>>>>>>> Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
>>>>>>>>>> version?) or some other userland tool?
>>>>>>>>>>
>>>>>>>>>
>>>>>>>>> QEMU emulator version 3.0.50 .
>>>>>>>>>
>>>>>>>>>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
>>>>>>>>>>> time.
>>>>>>>>>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
>>>>>>>>>>> interrupt injection failed.
>>>>>>>>>>>
>>>>>>>>>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
>>>>>>>>>>> ---
>>>>>>>>>>>    virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>>>>>>>>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>>>>>>
>>>>>>>>>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>>>>>>> index 9c0dd23..d101000 100644
>>>>>>>>>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
>>>>>>>>>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>>>>>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
>>>>>>>>>>> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
>>>>>>>>>>> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
>>>>>>>>>>>
>>>>>>>>>>> -    if (irq->group)
>>>>>>>>>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>>>>>>>>>>
>>>>>>>>>> This is not the right fix, not only because it basically reverts the
>>>>>>>>>> GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
>>>>>>>>>> their configured group).
>>>>>>>>>>
>>>>>>>>>> Can you try to work out why kvm_vgic_vcpu_init() is apparently called
>>>>>>>>>> before dist->vgic_model is set, also what value it has?
>>>>>>>>>> If I understand the code correctly, that shouldn't happen for a GICv3.
>>>>>>>>>>
>>>>>>>>> Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
>>>>>>>>>    If the interrupt comes at this time, the interrupt injection fails.
>>>>>>>>
>>>>>>>> Does that mean that the guest is configuring its interrupts as Group0?
>>>>>>>> That sounds wrong, Linux should configure all it's interrupts as
>>>>>>>> non-secure group1.
>>>>>>>
>>>>>>> no, I think that uefi dose this, not linux.
>>>>>>> 1. kvm_vgic_vcpu_init
>>>>>>> 2. vgic_create
>>>>>>> 3. kvm_vgic_dist_init
>>>>>>> 4.vgic_mmio_write_group: uefi as guest, write group=0
>>>>>>> 5.vgic_mmio_write_group: linux as guest, write group=1
>>>>>>
>>>>>> Is this the same issue fixed by EDK2 commit:
>>>>>>
>>>>>> 66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
>>>>>>
>>>>>> ... where EDK2 would try to use IAR0 rather than IAR1?
>>>>>>
>>>>>> The commit messages notes this lead to a boot-time hang.
>>>>>
>>>>> I managed to trigger an issue with a really old EFI implementation that
>>>>> doesn't configure its interrupts as Group1, and yet tries to ACK its
>>>>> interrupts using the Group1 accessor. Guess what? It is not going to work.
>>>>>
>>>>> Commit c7fefb690661f2e38afcb8200bd318ecf38ab961 in the edk2 tree seems
>>>>> to be the fix (I only assume it does, I haven't actually checked). A
>>>>> recent build, as found in Debian Buster, works perfectly (tested with
>>>>> both QEMU v2.12 and tip of tree).
>>>>>
>>>>> Now, I really don't get what you're saying about Linux not getting
>>>>> interrupts. How do you get to booting Linux if EFI is not making any
>>>>> forward progress? Are you trying them independently?
>>>>>
>>>> I start linux with bypassing uefi, the print info is the same.
>>>> [507107.748908]  vgic_mmio_write_group:## intid/27 group=0
>>>> [507107.752185]  vgic_mmio_write_group:## intid/27 group=0
>>>> [507107.899566]  vgic_mmio_write_group:## intid/27 group=1
>>>> [507107.907370]  vgic_mmio_write_group:## intid/27 group=1
>>>> the command line is like this:
>>>> /home/qemu-patch/linshi/qemu/aarch64-softmmu/qemu-system-aarch64  -machine virt-3.1,accel=kvm,usb=off,dump-guest-core=off,gic-version=3  -kernel /home/kernelboot/vmlinuz-4.16.0+ -initrd /home/kernelboot/initramfs-4.16.0+.img -append root=/dev/mapper/cla-root ro crashkernel=auto rd.lvm.lv=cla/root rd.lvm.lv=cla/swap.UTF-8  -drive file=/home/centos74-ph/boot.qcow2,format=qcow2,if=none,id=drive-scsi0-0-0-0 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1  -vnc 0.0.0.0:0 -k en-us -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.3,addr=0x0 -device pvpanic-mmio -msg timestamp=on
>>>>
>>>> This is strange. That's probably the Linux 4.16  kernel setting group to 0, and I'll continue to track in guest.
>>>
>>> Could you try the following patch:
>>>
>>> diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
>>> index c0c0b88af1d5..6fa858c7a5a6 100644
>>> --- a/virt/kvm/arm/vgic/vgic-init.c
>>> +++ b/virt/kvm/arm/vgic/vgic-init.c
>>> @@ -231,13 +231,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
>>>   			irq->config = VGIC_CONFIG_LEVEL;
>>>   		}
>>> -		/*
>>> -		 * GICv3 can only be created via the KVM_DEVICE_CREATE API and
>>> -		 * so we always know the emulation type at this point as it's
>>> -		 * either explicitly configured as GICv3, or explicitly
>>> -		 * configured as GICv2, or not configured yet which also
>>> -		 * implies GICv2.
>>> -		 */
>>>   		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
>>>   			irq->group = 1;
>>>   		else
>>> @@ -298,6 +291,16 @@ int vgic_init(struct kvm *kvm)
>>>   	if (ret)
>>>   		goto out;
>>> +	/* Initialize groups on CPUs created before the VGIC type was known */
>>> +	kvm_for_each_vcpu(i, vcpu, kvm) {
>>> +		struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
>>> +
>>> +		for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) {
>>> +			struct vgic_irq *irq = &vgic_cpu->private_irqs[i];
>>> +			irq->group = 1;
>>> +		}
>>> +	}
>>> +
>>>   	if (vgic_has_its(kvm)) {
>>>   		ret = vgic_v4_init(kvm);
>>>   		if (ret)
>>>
>>>
>>
>> If the value of dist->vgic_model is not properly initialized at the time we
>> call kvm_vgic_vcpu_init is call, won't we still overwrite the irq->group
>> when we get there?
> 
> I don't understand this question.  When we get where?

Sorry, I meant when we get to the irq->group initialization in 
kvm_vgic_vcpu_init.

> 
>> (I still haven't seen why we could consider
>> dist->vgic_model is initialized at that point).
> 
> Because there is no enforced ordering between creating VCPUs and
> creating the VGIC.

Hmmm, I think that's what I am saying, so we shouldn't look at the value 
of vgic_dist->vgic_model since it could be uninitialized (or 0).

> 
>>
>> Shouldn't we do the irq->group initialization somewhere in
>> kvm_arch_vcpu_ioctl_vcpu_init? (with some vgic_* function to encapsulate it
>> of course). At that point I believe we know that dist->vgic_model is
>> initialized.
>>
> 
> See above.  AFAICT we don't have a single point at which we can do
> everything because creation of the two components can be interleaved.
> 
> We could hook into kvm_vcpu_first_run_init(), but then userspace can
> observe uninitialized values if it looks at the GIC state prior to
> running the VCPUs, which is also not great.
> 
> In other words, I think the problem is that you can do:
> 
>    create_vcpu(0);
>    create_vgic(v3);
>    create_vcpu(2);
> 
> Now you'll have vcpu0 have its private IRQs set to group 0, and you'll
> have vcpu1 have its private IRQs set to group 1 (prior to my patch).
> 
> 
> Am I missing something?
> 

No, I just got confused between create_vgic and vgic_init. So the place 
looks fine. Sorry for the confusion.

The fact that we still check dist->vgic_model in kvm_vgic_vcpu_init 
(twice actually), however seems dodgy to me since it might not have been 
initialized.

Thanks,

-- 
Julien Thierry

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-21 12:17             ` Julien Thierry
@ 2018-11-21 15:24               ` Christoffer Dall
  2018-11-21 15:53                 ` Julien Thierry
  0 siblings, 1 reply; 14+ messages in thread
From: Christoffer Dall @ 2018-11-21 15:24 UTC (permalink / raw)
  To: Julien Thierry
  Cc: peng.hao2, marc.zyngier, andre.przywara, linux-kernel,
	leif.lindholm, ard.bieshseuvel, kvmarm, linux-arm-kernel

On Wed, Nov 21, 2018 at 12:17:45PM +0000, Julien Thierry wrote:
> 
> 
> On 21/11/18 11:06, Christoffer Dall wrote:
> >Hi,
> >
> >On Wed, Nov 21, 2018 at 04:56:54PM +0800, peng.hao2@zte.com.cn wrote:
> >>>On 19/11/2018 09:10, Mark Rutland wrote:
> >>>>On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
> >>>>>>On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
> >>>>>>>>Hi,
> >>>>>>>>>When virtual machine starts, hang up.
> >>>>>>>>
> >>>>>>>>I take it you mean the *guest* hangs? Because it doesn't get a timer
> >>>>>>>>interrupt?
> >>>>>>>>
> >>>>>>>>>The kernel version of guest
> >>>>>>>>>is 4.16. Host support vgic_v3.
> >>>>>>>>
> >>>>>>>>Your host kernel is something recent, I guess?
> >>>>>>>>
> >>>>>>>>>It was mainly due to the incorrect vgic_irq's(intid=27) group value
> >>>>>>>>>during injection interruption. when kvm_vgic_vcpu_init is called,
> >>>>>>>>>dist is not initialized at this time. Unable to get vgic V3 or V2
> >>>>>>>>>correctly, so group is not set.
> >>>>>>>>
> >>>>>>>>Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
> >>>>>>>>version?) or some other userland tool?
> >>>>>>>>
> >>>>>>>
> >>>>>>>QEMU emulator version 3.0.50 .
> >>>>>>>
> >>>>>>>>>group is setted to 1 when vgic_mmio_write_group is invoked at some
> >>>>>>>>>time.
> >>>>>>>>>when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
> >>>>>>>>>interrupt injection failed.
> >>>>>>>>>
> >>>>>>>>>Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> >>>>>>>>>---
> >>>>>>>>>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
> >>>>>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>>>>>>
> >>>>>>>>>diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>>>>index 9c0dd23..d101000 100644
> >>>>>>>>>--- a/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>>>>+++ b/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>>>>@@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
> >>>>>>>>>struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
> >>>>>>>>>(val & ICH_LR_PENDING_BIT)) irq->line_level = false;
> >>>>>>>>>
> >>>>>>>>>-    if (irq->group)
> >>>>>>>>>+    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
> >>>>>>>>
> >>>>>>>>This is not the right fix, not only because it basically reverts the
> >>>>>>>>GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
> >>>>>>>>their configured group).
> >>>>>>>>
> >>>>>>>>Can you try to work out why kvm_vgic_vcpu_init() is apparently called
> >>>>>>>>before dist->vgic_model is set, also what value it has?
> >>>>>>>>If I understand the code correctly, that shouldn't happen for a GICv3.
> >>>>>>>>
> >>>>>>>Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
> >>>>>>>   If the interrupt comes at this time, the interrupt injection fails.
> >>>>>>
> >>>>>>Does that mean that the guest is configuring its interrupts as Group0?
> >>>>>>That sounds wrong, Linux should configure all it's interrupts as
> >>>>>>non-secure group1.
> >>>>>
> >>>>>no, I think that uefi dose this, not linux.
> >>>>>1. kvm_vgic_vcpu_init
> >>>>>2. vgic_create
> >>>>>3. kvm_vgic_dist_init
> >>>>>4.vgic_mmio_write_group: uefi as guest, write group=0
> >>>>>5.vgic_mmio_write_group: linux as guest, write group=1
> >>>>
> >>>>Is this the same issue fixed by EDK2 commit:
> >>>>
> >>>>66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
> >>>>
> >>>>... where EDK2 would try to use IAR0 rather than IAR1?
> >>>>
> >>>>The commit messages notes this lead to a boot-time hang.
> >>>
> >>>I managed to trigger an issue with a really old EFI implementation that
> >>>doesn't configure its interrupts as Group1, and yet tries to ACK its
> >>>interrupts using the Group1 accessor. Guess what? It is not going to work.
> >>>
> >>>Commit c7fefb690661f2e38afcb8200bd318ecf38ab961 in the edk2 tree seems
> >>>to be the fix (I only assume it does, I haven't actually checked). A
> >>>recent build, as found in Debian Buster, works perfectly (tested with
> >>>both QEMU v2.12 and tip of tree).
> >>>
> >>>Now, I really don't get what you're saying about Linux not getting
> >>>interrupts. How do you get to booting Linux if EFI is not making any
> >>>forward progress? Are you trying them independently?
> >>>
> >>I start linux with bypassing uefi, the print info is the same.
> >>[507107.748908]  vgic_mmio_write_group:## intid/27 group=0
> >>[507107.752185]  vgic_mmio_write_group:## intid/27 group=0
> >>[507107.899566]  vgic_mmio_write_group:## intid/27 group=1
> >>[507107.907370]  vgic_mmio_write_group:## intid/27 group=1
> >>the command line is like this:
> >>/home/qemu-patch/linshi/qemu/aarch64-softmmu/qemu-system-aarch64  -machine virt-3.1,accel=kvm,usb=off,dump-guest-core=off,gic-version=3  -kernel /home/kernelboot/vmlinuz-4.16.0+ -initrd /home/kernelboot/initramfs-4.16.0+.img -append root=/dev/mapper/cla-root ro crashkernel=auto rd.lvm.lv=cla/root rd.lvm.lv=cla/swap.UTF-8  -drive file=/home/centos74-ph/boot.qcow2,format=qcow2,if=none,id=drive-scsi0-0-0-0 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1  -vnc 0.0.0.0:0 -k en-us -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.3,addr=0x0 -device pvpanic-mmio -msg timestamp=on
> >>
> >>This is strange. That's probably the Linux 4.16  kernel setting group to 0, and I'll continue to track in guest.
> >
> >Could you try the following patch:
> >
> >diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
> >index c0c0b88af1d5..6fa858c7a5a6 100644
> >--- a/virt/kvm/arm/vgic/vgic-init.c
> >+++ b/virt/kvm/arm/vgic/vgic-init.c
> >@@ -231,13 +231,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
> >  			irq->config = VGIC_CONFIG_LEVEL;
> >  		}
> >-		/*
> >-		 * GICv3 can only be created via the KVM_DEVICE_CREATE API and
> >-		 * so we always know the emulation type at this point as it's
> >-		 * either explicitly configured as GICv3, or explicitly
> >-		 * configured as GICv2, or not configured yet which also
> >-		 * implies GICv2.
> >-		 */
> >  		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
> >  			irq->group = 1;
> >  		else
> >@@ -298,6 +291,16 @@ int vgic_init(struct kvm *kvm)
> >  	if (ret)
> >  		goto out;
> >+	/* Initialize groups on CPUs created before the VGIC type was known */
> >+	kvm_for_each_vcpu(i, vcpu, kvm) {
> >+		struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> >+
> >+		for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) {
> >+			struct vgic_irq *irq = &vgic_cpu->private_irqs[i];
> >+			irq->group = 1;
> >+		}
> >+	}
> >+
> >  	if (vgic_has_its(kvm)) {
> >  		ret = vgic_v4_init(kvm);
> >  		if (ret)
> >
> >
> 
> If the value of dist->vgic_model is not properly initialized at the time we
> call kvm_vgic_vcpu_init is call, won't we still overwrite the irq->group
> when we get there?

I don't understand this question.  When we get where?

> (I still haven't seen why we could consider
> dist->vgic_model is initialized at that point).

Because there is no enforced ordering between creating VCPUs and
creating the VGIC.

> 
> Shouldn't we do the irq->group initialization somewhere in
> kvm_arch_vcpu_ioctl_vcpu_init? (with some vgic_* function to encapsulate it
> of course). At that point I believe we know that dist->vgic_model is
> initialized.
> 

See above.  AFAICT we don't have a single point at which we can do
everything because creation of the two components can be interleaved.

We could hook into kvm_vcpu_first_run_init(), but then userspace can
observe uninitialized values if it looks at the GIC state prior to
running the VCPUs, which is also not great.

In other words, I think the problem is that you can do:

  create_vcpu(0);
  create_vgic(v3);
  create_vcpu(2);

Now you'll have vcpu0 have its private IRQs set to group 0, and you'll
have vcpu1 have its private IRQs set to group 1 (prior to my patch).


Am I missing something?


Thanks,

    Christoffer

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-21 11:06           ` Christoffer Dall
@ 2018-11-21 12:17             ` Julien Thierry
  2018-11-21 15:24               ` Christoffer Dall
       [not found]             ` <201811231401560886603@zte.com.cn>
  1 sibling, 1 reply; 14+ messages in thread
From: Julien Thierry @ 2018-11-21 12:17 UTC (permalink / raw)
  To: Christoffer Dall, peng.hao2
  Cc: marc.zyngier, andre.przywara, linux-kernel, leif.lindholm,
	ard.bieshseuvel, kvmarm, linux-arm-kernel



On 21/11/18 11:06, Christoffer Dall wrote:
> Hi,
> 
> On Wed, Nov 21, 2018 at 04:56:54PM +0800, peng.hao2@zte.com.cn wrote:
>>> On 19/11/2018 09:10, Mark Rutland wrote:
>>>> On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
>>>>>> On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
>>>>>>>> Hi,
>>>>>>>>> When virtual machine starts, hang up.
>>>>>>>>
>>>>>>>> I take it you mean the *guest* hangs? Because it doesn't get a timer
>>>>>>>> interrupt?
>>>>>>>>
>>>>>>>>> The kernel version of guest
>>>>>>>>> is 4.16. Host support vgic_v3.
>>>>>>>>
>>>>>>>> Your host kernel is something recent, I guess?
>>>>>>>>
>>>>>>>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
>>>>>>>>> during injection interruption. when kvm_vgic_vcpu_init is called,
>>>>>>>>> dist is not initialized at this time. Unable to get vgic V3 or V2
>>>>>>>>> correctly, so group is not set.
>>>>>>>>
>>>>>>>> Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
>>>>>>>> version?) or some other userland tool?
>>>>>>>>
>>>>>>>
>>>>>>> QEMU emulator version 3.0.50 .
>>>>>>>
>>>>>>>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
>>>>>>>>> time.
>>>>>>>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
>>>>>>>>> interrupt injection failed.
>>>>>>>>>
>>>>>>>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
>>>>>>>>> ---
>>>>>>>>>    virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>>>>>>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>>>>
>>>>>>>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>>>>> index 9c0dd23..d101000 100644
>>>>>>>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
>>>>>>>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>>>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
>>>>>>>>> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
>>>>>>>>> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
>>>>>>>>>
>>>>>>>>> -    if (irq->group)
>>>>>>>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>>>>>>>>
>>>>>>>> This is not the right fix, not only because it basically reverts the
>>>>>>>> GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
>>>>>>>> their configured group).
>>>>>>>>
>>>>>>>> Can you try to work out why kvm_vgic_vcpu_init() is apparently called
>>>>>>>> before dist->vgic_model is set, also what value it has?
>>>>>>>> If I understand the code correctly, that shouldn't happen for a GICv3.
>>>>>>>>
>>>>>>> Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
>>>>>>>    If the interrupt comes at this time, the interrupt injection fails.
>>>>>>
>>>>>> Does that mean that the guest is configuring its interrupts as Group0?
>>>>>> That sounds wrong, Linux should configure all it's interrupts as
>>>>>> non-secure group1.
>>>>>
>>>>> no, I think that uefi dose this, not linux.
>>>>> 1. kvm_vgic_vcpu_init
>>>>> 2. vgic_create
>>>>> 3. kvm_vgic_dist_init
>>>>> 4.vgic_mmio_write_group: uefi as guest, write group=0
>>>>> 5.vgic_mmio_write_group: linux as guest, write group=1
>>>>
>>>> Is this the same issue fixed by EDK2 commit:
>>>>
>>>> 66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
>>>>
>>>> ... where EDK2 would try to use IAR0 rather than IAR1?
>>>>
>>>> The commit messages notes this lead to a boot-time hang.
>>>
>>> I managed to trigger an issue with a really old EFI implementation that
>>> doesn't configure its interrupts as Group1, and yet tries to ACK its
>>> interrupts using the Group1 accessor. Guess what? It is not going to work.
>>>
>>> Commit c7fefb690661f2e38afcb8200bd318ecf38ab961 in the edk2 tree seems
>>> to be the fix (I only assume it does, I haven't actually checked). A
>>> recent build, as found in Debian Buster, works perfectly (tested with
>>> both QEMU v2.12 and tip of tree).
>>>
>>> Now, I really don't get what you're saying about Linux not getting
>>> interrupts. How do you get to booting Linux if EFI is not making any
>>> forward progress? Are you trying them independently?
>>>
>> I start linux with bypassing uefi, the print info is the same.
>> [507107.748908]  vgic_mmio_write_group:## intid/27 group=0
>> [507107.752185]  vgic_mmio_write_group:## intid/27 group=0
>> [507107.899566]  vgic_mmio_write_group:## intid/27 group=1
>> [507107.907370]  vgic_mmio_write_group:## intid/27 group=1
>> the command line is like this:
>> /home/qemu-patch/linshi/qemu/aarch64-softmmu/qemu-system-aarch64  -machine virt-3.1,accel=kvm,usb=off,dump-guest-core=off,gic-version=3  -kernel /home/kernelboot/vmlinuz-4.16.0+ -initrd /home/kernelboot/initramfs-4.16.0+.img -append root=/dev/mapper/cla-root ro crashkernel=auto rd.lvm.lv=cla/root rd.lvm.lv=cla/swap.UTF-8  -drive file=/home/centos74-ph/boot.qcow2,format=qcow2,if=none,id=drive-scsi0-0-0-0 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1  -vnc 0.0.0.0:0 -k en-us -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.3,addr=0x0 -device pvpanic-mmio -msg timestamp=on
>>
>> This is strange. That's probably the Linux 4.16  kernel setting group to 0, and I'll continue to track in guest.
> 
> Could you try the following patch:
> 
> diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
> index c0c0b88af1d5..6fa858c7a5a6 100644
> --- a/virt/kvm/arm/vgic/vgic-init.c
> +++ b/virt/kvm/arm/vgic/vgic-init.c
> @@ -231,13 +231,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
>   			irq->config = VGIC_CONFIG_LEVEL;
>   		}
>   
> -		/*
> -		 * GICv3 can only be created via the KVM_DEVICE_CREATE API and
> -		 * so we always know the emulation type at this point as it's
> -		 * either explicitly configured as GICv3, or explicitly
> -		 * configured as GICv2, or not configured yet which also
> -		 * implies GICv2.
> -		 */
>   		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
>   			irq->group = 1;
>   		else
> @@ -298,6 +291,16 @@ int vgic_init(struct kvm *kvm)
>   	if (ret)
>   		goto out;
>   
> +	/* Initialize groups on CPUs created before the VGIC type was known */
> +	kvm_for_each_vcpu(i, vcpu, kvm) {
> +		struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> +
> +		for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) {
> +			struct vgic_irq *irq = &vgic_cpu->private_irqs[i];
> +			irq->group = 1;
> +		}
> +	}
> +
>   	if (vgic_has_its(kvm)) {
>   		ret = vgic_v4_init(kvm);
>   		if (ret)
> 
> 

If the value of dist->vgic_model is not properly initialized at the time 
we call kvm_vgic_vcpu_init is call, won't we still overwrite the 
irq->group when we get there? (I still haven't seen why we could 
consider dist->vgic_model is initialized at that point).

Shouldn't we do the irq->group initialization somewhere in 
kvm_arch_vcpu_ioctl_vcpu_init? (with some vgic_* function to encapsulate 
it of course). At that point I believe we know that dist->vgic_model is 
initialized.

Cheers,

-- 
Julien Thierry

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
       [not found]         ` <201811211656540883310@zte.com.cn>
@ 2018-11-21 11:06           ` Christoffer Dall
  2018-11-21 12:17             ` Julien Thierry
       [not found]             ` <201811231401560886603@zte.com.cn>
  0 siblings, 2 replies; 14+ messages in thread
From: Christoffer Dall @ 2018-11-21 11:06 UTC (permalink / raw)
  To: peng.hao2
  Cc: marc.zyngier, andre.przywara, linux-kernel, leif.lindholm,
	ard.bieshseuvel, kvmarm, linux-arm-kernel

Hi,

On Wed, Nov 21, 2018 at 04:56:54PM +0800, peng.hao2@zte.com.cn wrote:
> >On 19/11/2018 09:10, Mark Rutland wrote:
> >> On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
> >>>> On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
> >>>>>> Hi,
> >>>>>>> When virtual machine starts, hang up.
> >>>>>>
> >>>>>> I take it you mean the *guest* hangs? Because it doesn't get a timer
> >>>>>> interrupt?
> >>>>>>
> >>>>>>> The kernel version of guest
> >>>>>>> is 4.16. Host support vgic_v3.
> >>>>>>
> >>>>>> Your host kernel is something recent, I guess?
> >>>>>>
> >>>>>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
> >>>>>>> during injection interruption. when kvm_vgic_vcpu_init is called,
> >>>>>>> dist is not initialized at this time. Unable to get vgic V3 or V2
> >>>>>>> correctly, so group is not set.
> >>>>>>
> >>>>>> Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
> >>>>>> version?) or some other userland tool?
> >>>>>>
> >>>>>
> >>>>> QEMU emulator version 3.0.50 .
> >>>>>
> >>>>>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
> >>>>>>> time.
> >>>>>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
> >>>>>>> interrupt injection failed.
> >>>>>>>
> >>>>>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
> >>>>>>> ---
> >>>>>>>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
> >>>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>>>>
> >>>>>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>> index 9c0dd23..d101000 100644
> >>>>>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
> >>>>>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
> >>>>>>> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
> >>>>>>> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
> >>>>>>>
> >>>>>>> -    if (irq->group)
> >>>>>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
> >>>>>>
> >>>>>> This is not the right fix, not only because it basically reverts the
> >>>>>> GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
> >>>>>> their configured group).
> >>>>>>
> >>>>>> Can you try to work out why kvm_vgic_vcpu_init() is apparently called
> >>>>>> before dist->vgic_model is set, also what value it has?
> >>>>>> If I understand the code correctly, that shouldn't happen for a GICv3.
> >>>>>>
> >>>>> Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
> >>>>>   If the interrupt comes at this time, the interrupt injection fails.
> >>>>
> >>>> Does that mean that the guest is configuring its interrupts as Group0?
> >>>> That sounds wrong, Linux should configure all it's interrupts as
> >>>> non-secure group1.
> >>>
> >>> no, I think that uefi dose this, not linux.
> >>> 1. kvm_vgic_vcpu_init
> >>> 2. vgic_create
> >>> 3. kvm_vgic_dist_init
> >>> 4.vgic_mmio_write_group: uefi as guest, write group=0
> >>> 5.vgic_mmio_write_group: linux as guest, write group=1
> >>
> >> Is this the same issue fixed by EDK2 commit:
> >>
> >> 66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
> >>
> >> ... where EDK2 would try to use IAR0 rather than IAR1?
> >>
> >> The commit messages notes this lead to a boot-time hang.
> >
> >I managed to trigger an issue with a really old EFI implementation that
> >doesn't configure its interrupts as Group1, and yet tries to ACK its
> >interrupts using the Group1 accessor. Guess what? It is not going to work.
> >
> >Commit c7fefb690661f2e38afcb8200bd318ecf38ab961 in the edk2 tree seems
> >to be the fix (I only assume it does, I haven't actually checked). A
> >recent build, as found in Debian Buster, works perfectly (tested with
> >both QEMU v2.12 and tip of tree).
> >
> >Now, I really don't get what you're saying about Linux not getting
> >interrupts. How do you get to booting Linux if EFI is not making any
> >forward progress? Are you trying them independently?
> >
> I start linux with bypassing uefi, the print info is the same.
> [507107.748908]  vgic_mmio_write_group:## intid/27 group=0
> [507107.752185]  vgic_mmio_write_group:## intid/27 group=0
> [507107.899566]  vgic_mmio_write_group:## intid/27 group=1
> [507107.907370]  vgic_mmio_write_group:## intid/27 group=1
> the command line is like this:
> /home/qemu-patch/linshi/qemu/aarch64-softmmu/qemu-system-aarch64  -machine virt-3.1,accel=kvm,usb=off,dump-guest-core=off,gic-version=3  -kernel /home/kernelboot/vmlinuz-4.16.0+ -initrd /home/kernelboot/initramfs-4.16.0+.img -append root=/dev/mapper/cla-root ro crashkernel=auto rd.lvm.lv=cla/root rd.lvm.lv=cla/swap.UTF-8  -drive file=/home/centos74-ph/boot.qcow2,format=qcow2,if=none,id=drive-scsi0-0-0-0 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1  -vnc 0.0.0.0:0 -k en-us -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.3,addr=0x0 -device pvpanic-mmio -msg timestamp=on
> 
> This is strange. That's probably the Linux 4.16  kernel setting group to 0, and I'll continue to track in guest.

Could you try the following patch:

diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
index c0c0b88af1d5..6fa858c7a5a6 100644
--- a/virt/kvm/arm/vgic/vgic-init.c
+++ b/virt/kvm/arm/vgic/vgic-init.c
@@ -231,13 +231,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
 			irq->config = VGIC_CONFIG_LEVEL;
 		}
 
-		/*
-		 * GICv3 can only be created via the KVM_DEVICE_CREATE API and
-		 * so we always know the emulation type at this point as it's
-		 * either explicitly configured as GICv3, or explicitly
-		 * configured as GICv2, or not configured yet which also
-		 * implies GICv2.
-		 */
 		if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
 			irq->group = 1;
 		else
@@ -298,6 +291,16 @@ int vgic_init(struct kvm *kvm)
 	if (ret)
 		goto out;
 
+	/* Initialize groups on CPUs created before the VGIC type was known */
+	kvm_for_each_vcpu(i, vcpu, kvm) {
+		struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
+
+		for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) {
+			struct vgic_irq *irq = &vgic_cpu->private_irqs[i];
+			irq->group = 1;
+		}
+	}
+
 	if (vgic_has_its(kvm)) {
 		ret = vgic_v4_init(kvm);
 		if (ret)


Thanks,

    Christoffer

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-19  9:10     ` Mark Rutland
  2018-11-19  9:26       ` Marc Zyngier
@ 2018-11-19 12:49       ` Marc Zyngier
       [not found]         ` <201811211656540883310@zte.com.cn>
  1 sibling, 1 reply; 14+ messages in thread
From: Marc Zyngier @ 2018-11-19 12:49 UTC (permalink / raw)
  To: peng.hao2
  Cc: Mark Rutland, julien.thierry, andre.przywara, linux-kernel,
	kvmarm, linux-arm-kernel, ard.bieshseuvel, leif.lindholm

On 19/11/2018 09:10, Mark Rutland wrote:
> On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
>>> On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
>>>>> Hi,
>>>>>> When virtual machine starts, hang up.
>>>>>
>>>>> I take it you mean the *guest* hangs? Because it doesn't get a timer
>>>>> interrupt?
>>>>>
>>>>>> The kernel version of guest
>>>>>> is 4.16. Host support vgic_v3.
>>>>>
>>>>> Your host kernel is something recent, I guess?
>>>>>
>>>>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
>>>>>> during injection interruption. when kvm_vgic_vcpu_init is called,
>>>>>> dist is not initialized at this time. Unable to get vgic V3 or V2
>>>>>> correctly, so group is not set.
>>>>>
>>>>> Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
>>>>> version?) or some other userland tool?
>>>>>
>>>>
>>>> QEMU emulator version 3.0.50 .
>>>>
>>>>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
>>>>>> time.
>>>>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
>>>>>> interrupt injection failed.
>>>>>>
>>>>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
>>>>>> ---
>>>>>>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>> index 9c0dd23..d101000 100644
>>>>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
>>>>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
>>>>>> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
>>>>>> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
>>>>>>
>>>>>> -    if (irq->group)
>>>>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>>>>>
>>>>> This is not the right fix, not only because it basically reverts the
>>>>> GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
>>>>> their configured group).
>>>>>
>>>>> Can you try to work out why kvm_vgic_vcpu_init() is apparently called
>>>>> before dist->vgic_model is set, also what value it has?
>>>>> If I understand the code correctly, that shouldn't happen for a GICv3.
>>>>>
>>>> Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
>>>>   If the interrupt comes at this time, the interrupt injection fails.
>>>
>>> Does that mean that the guest is configuring its interrupts as Group0?
>>> That sounds wrong, Linux should configure all it's interrupts as
>>> non-secure group1.
>>
>> no, I think that uefi dose this, not linux.
>> 1. kvm_vgic_vcpu_init 
>> 2. vgic_create 
>> 3. kvm_vgic_dist_init 
>> 4.vgic_mmio_write_group: uefi as guest, write group=0
>> 5.vgic_mmio_write_group: linux as guest, write group=1
> 
> Is this the same issue fixed by EDK2 commit:
> 
> 66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
> 
> ... where EDK2 would try to use IAR0 rather than IAR1?
> 
> The commit messages notes this lead to a boot-time hang.

I managed to trigger an issue with a really old EFI implementation that
doesn't configure its interrupts as Group1, and yet tries to ACK its
interrupts using the Group1 accessor. Guess what? It is not going to work.

Commit c7fefb690661f2e38afcb8200bd318ecf38ab961 in the edk2 tree seems
to be the fix (I only assume it does, I haven't actually checked). A
recent build, as found in Debian Buster, works perfectly (tested with
both QEMU v2.12 and tip of tree).

Now, I really don't get what you're saying about Linux not getting
interrupts. How do you get to booting Linux if EFI is not making any
forward progress? Are you trying them independently?

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
  2018-11-19  9:10     ` Mark Rutland
@ 2018-11-19  9:26       ` Marc Zyngier
  2018-11-19 12:49       ` Marc Zyngier
  1 sibling, 0 replies; 14+ messages in thread
From: Marc Zyngier @ 2018-11-19  9:26 UTC (permalink / raw)
  To: Mark Rutland, peng.hao2
  Cc: julien.thierry, andre.przywara, linux-kernel, kvmarm,
	linux-arm-kernel, ard.bieshseuvel, leif.lindholm

On 19/11/2018 09:10, Mark Rutland wrote:
> On Sat, Nov 17, 2018 at 10:58:37AM +0800, peng.hao2@zte.com.cn wrote:
>>> On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
>>>>> Hi,
>>>>>> When virtual machine starts, hang up.
>>>>>
>>>>> I take it you mean the *guest* hangs? Because it doesn't get a timer
>>>>> interrupt?
>>>>>
>>>>>> The kernel version of guest
>>>>>> is 4.16. Host support vgic_v3.
>>>>>
>>>>> Your host kernel is something recent, I guess?
>>>>>
>>>>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
>>>>>> during injection interruption. when kvm_vgic_vcpu_init is called,
>>>>>> dist is not initialized at this time. Unable to get vgic V3 or V2
>>>>>> correctly, so group is not set.
>>>>>
>>>>> Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
>>>>> version?) or some other userland tool?
>>>>>
>>>>
>>>> QEMU emulator version 3.0.50 .
>>>>
>>>>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
>>>>>> time.
>>>>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
>>>>>> interrupt injection failed.
>>>>>>
>>>>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
>>>>>> ---
>>>>>>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>> index 9c0dd23..d101000 100644
>>>>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
>>>>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
>>>>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
>>>>>> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
>>>>>> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
>>>>>>
>>>>>> -    if (irq->group)
>>>>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>>>>>
>>>>> This is not the right fix, not only because it basically reverts the
>>>>> GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
>>>>> their configured group).
>>>>>
>>>>> Can you try to work out why kvm_vgic_vcpu_init() is apparently called
>>>>> before dist->vgic_model is set, also what value it has?
>>>>> If I understand the code correctly, that shouldn't happen for a GICv3.
>>>>>
>>>> Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
>>>>   If the interrupt comes at this time, the interrupt injection fails.
>>>
>>> Does that mean that the guest is configuring its interrupts as Group0?
>>> That sounds wrong, Linux should configure all it's interrupts as
>>> non-secure group1.
>>
>> no, I think that uefi dose this, not linux.
>> 1. kvm_vgic_vcpu_init 
>> 2. vgic_create 
>> 3. kvm_vgic_dist_init 
>> 4.vgic_mmio_write_group: uefi as guest, write group=0
>> 5.vgic_mmio_write_group: linux as guest, write group=1
> 
> Is this the same issue fixed by EDK2 commit:
> 
> 66127011a544b90e ("ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge")
> 
> ... where EDK2 would try to use IAR0 rather than IAR1?
> 
> The commit messages notes this lead to a boot-time hang.

I doubt it. The EDK2 bug resulted in no interrupt being delivered due to
the group being set to 1, and the interrupt being acknowledged through
the Group0 accessor. Also, this was a 32bit special, and 64bit EDK2 was
just fine.

What Peng describes here is the guest writing the group as 0, which
doesn't make much sense (I certainly don't see EDK2 doing that).

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
       [not found] <201811160823399069106@zte.com.cn>
@ 2018-11-16 10:03 ` Julien Thierry
       [not found]   ` <201811171058376326562@zte.com.cn>
  0 siblings, 1 reply; 14+ messages in thread
From: Julien Thierry @ 2018-11-16 10:03 UTC (permalink / raw)
  To: peng.hao2, andre.przywara
  Cc: christoffer.dall, marc.zyngier, kvmarm, linux-arm-kernel, linux-kernel



On 16/11/18 00:23, peng.hao2@zte.com.cn wrote:
>> Hi,
>>> When virtual machine starts, hang up.
>>
>> I take it you mean the *guest* hangs? Because it doesn't get a timer
>> interrupt?
>>
>>> The kernel version of guest
>>> is 4.16. Host support vgic_v3.
>>
>> Your host kernel is something recent, I guess?
>>
>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
>>> during injection interruption. when kvm_vgic_vcpu_init is called,
>>> dist is not initialized at this time. Unable to get vgic V3 or V2
>>> correctly, so group is not set.
>>
>> Mmh, that shouldn't happen with (v)GICv3. Do you use QEMU (which
>> version?) or some other userland tool?
>>
> 
> QEMU emulator version 3.0.50 .
> 
>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
>>> time.
>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
>>> interrupt injection failed.
>>>
>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
>>> ---
>>>   virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
>>> index 9c0dd23..d101000 100644
>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu,
>>> struct vgic_irq *irq, int lr) if (vgic_irq_is_mapped_level(irq) &&
>>> (val & ICH_LR_PENDING_BIT)) irq->line_level = false;
>>>
>>> -    if (irq->group)
>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>>
>> This is not the right fix, not only because it basically reverts the
>> GICv3 part of 87322099052 (KVM: arm/arm64: vgic: Signal IRQs using
>> their configured group).
>>
>> Can you try to work out why kvm_vgic_vcpu_init() is apparently called
>> before dist->vgic_model is set, also what value it has?
>> If I understand the code correctly, that shouldn't happen for a GICv3.
>>
> Even if the value of  group is correctly assigned in kvm_vgic_vcpu_init, the group is then written 0 through vgic_mmio_write_group.
>   If the interrupt comes at this time, the interrupt injection fails.
> 

Does that mean that the guest is configuring its interrupts as Group0? 
That sounds wrong, Linux should configure all it's interrupts as 
non-secure group1.

-- 
Julien Thierry

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time
       [not found] <201811151822532422079@zte.com.cn>
@ 2018-11-15 11:10 ` Julien Thierry
  0 siblings, 0 replies; 14+ messages in thread
From: Julien Thierry @ 2018-11-15 11:10 UTC (permalink / raw)
  To: peng.hao2
  Cc: christoffer.dall, marc.zyngier, linux-arm-kernel, kvmarm, linux-kernel



On 15/11/18 10:22, peng.hao2@zte.com.cn wrote:
>> Hi Peng,
>>
>> On 15/11/18 15:14, Peng Hao wrote:
>>> When virtual machine starts, hang up. The kernel version of guest
>>> is 4.16. Host support vgic_v3.
>>
>> I don't understand the issue here. the vgic_irq->group field does not
>> exist in 4.16 (neither in the first nor the last version). Nor does the
>> line you are modifying.
> Guest's kernel version is 4.16 and Host's kernel version is mainline.
> vgic_irq is a structure of Host's kvm.
>>
>> Both exist in mainline, but what you are mentioning shouldn't be an
>> issue in mainline since vgic_irq->group gets initialized in
>> kvm_vgic_vcpu_init for SGIs and PPIs (i.e. intid < 32) which includes
>> your interrupt.
> Initialization sequence of several components is like this;
> 1.       kvm_vgic_vcpu_init ---- here, dist is not initialized at this time.
>                                               and the value of irq->group depends on
>                                                dist->vgic_model. but now dist->vgic_model = 0
>                                                 and irq->group=0.
>   2.      vgic_create         -----  assign to dist->vgic_model.
>   3.     kvm_vgic_dist_init
> 

I see, thanks for explaining.

This means the initialization in kvm_vgic_vcpu_init depends on whether 
userland creates the GIC device first or the vcpus first...

I don't think the issue lies in vgic_v3_populate_lr, but in 
kvm_vgic_vcpu_init which clearly expects dist->vgic_model to be 
initialized in two places. However, the comment at the top of 
vgic-init.c states:

  * CPU Interface: 
 
 

  * 
 
 

  * - kvm_vgic_vcpu_init(): initialization of static data that 
 
 

  *   doesn't depend on any sizing information or emulation type. No 
 
 

  *   allocation is allowed there.

So I don't think we're supposed to check for dist->vgic_model here. 
Those two checks should probably be moved elsewhere (maybe in 
kvm_vgic_vcpu_enable?) once the gic type has been set.

Thanks,

> thanks.
>>
>> Cheers,
>>
>>> It was mainly due to the incorrect vgic_irq's(intid=27) group value
>>> during injection interruption. when kvm_vgic_vcpu_init is called,
>>> dist is not initialized at this time. Unable to get vgic V3 or V2
>>> correctly, so group is not set.
>>> group is setted to 1 when vgic_mmio_write_group is invoked at some
>>> time.
>>> when irq->group=0 (intid=27), No ICH_LR_GROUP flag was set and
>>> interrupt injection failed.
>>>
>>> Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
>>> ---
>>>    virt/kvm/arm/vgic/vgic-v3.c | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
>>> index 9c0dd23..d101000 100644
>>> --- a/virt/kvm/arm/vgic/vgic-v3.c
>>> +++ b/virt/kvm/arm/vgic/vgic-v3.c
>>> @@ -198,7 +198,7 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)
>>>        if (vgic_irq_is_mapped_level(irq) && (val & ICH_LR_PENDING_BIT))
>>>            irq->line_level = false;
>>>
>>> -    if (irq->group)
>>> +    if (model == KVM_DEV_TYPE_ARM_VGIC_V3)
>>>            val |= ICH_LR_GROUP;
>>>
>>>        val |= (u64)irq->priority << ICH_LR_PRIORITY_SHIFT;
>>>
>>
>> --
>> Julien Thierry

-- 
Julien Thierry

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2018-11-23 10:03 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-15 15:14 [PATCH] kvm: arm/arm64 : fix vm's hanging at startup time Peng Hao
2018-11-15  9:42 ` Julien Thierry
2018-11-15 14:39 ` Andre Przywara
2018-11-15 15:06 ` Marc Zyngier
     [not found] <201811160823399069106@zte.com.cn>
2018-11-16 10:03 ` Julien Thierry
     [not found]   ` <201811171058376326562@zte.com.cn>
2018-11-19  9:10     ` Mark Rutland
2018-11-19  9:26       ` Marc Zyngier
2018-11-19 12:49       ` Marc Zyngier
     [not found]         ` <201811211656540883310@zte.com.cn>
2018-11-21 11:06           ` Christoffer Dall
2018-11-21 12:17             ` Julien Thierry
2018-11-21 15:24               ` Christoffer Dall
2018-11-21 15:53                 ` Julien Thierry
2018-11-22 10:45                   ` Christoffer Dall
     [not found]             ` <201811231401560886603@zte.com.cn>
2018-11-23 10:03               ` Christoffer Dall
     [not found] <201811151822532422079@zte.com.cn>
2018-11-15 11:10 ` Julien Thierry

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).