From: Christoffer Dall <christoffer.dall@linaro.org> To: "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com> Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>, Christoffer Dall <christoffer.dall@linaro.org> Subject: [PULL 27/28] KVM: arm/arm64: Fix userspace_irqchip_in_use counting Date: Wed, 31 Jan 2018 10:35:06 +0100 [thread overview] Message-ID: <20180131093507.22219-28-christoffer.dall@linaro.org> (raw) In-Reply-To: <20180131093507.22219-1-christoffer.dall@linaro.org> We were not decrementing the static key count in the right location. kvm_arch_vcpu_destroy() is only called to clean up after a failed VCPU create attempt, whereas kvm_arch_vcpu_free() is called on teardown of the VM as well. Move the static key decrement call to kvm_arch_vcpu_free(). Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- virt/kvm/arm/arm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 639dca0c0560..04ee7a327870 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -295,6 +295,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) { + if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm))) + static_branch_dec(&userspace_irqchip_in_use); + kvm_mmu_free_memory_caches(vcpu); kvm_timer_vcpu_terminate(vcpu); kvm_pmu_vcpu_destroy(vcpu); @@ -304,8 +307,6 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) { - if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm))) - static_branch_dec(&userspace_irqchip_in_use); kvm_arch_vcpu_free(vcpu); } -- 2.14.2
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PULL 27/28] KVM: arm/arm64: Fix userspace_irqchip_in_use counting Date: Wed, 31 Jan 2018 10:35:06 +0100 [thread overview] Message-ID: <20180131093507.22219-28-christoffer.dall@linaro.org> (raw) In-Reply-To: <20180131093507.22219-1-christoffer.dall@linaro.org> We were not decrementing the static key count in the right location. kvm_arch_vcpu_destroy() is only called to clean up after a failed VCPU create attempt, whereas kvm_arch_vcpu_free() is called on teardown of the VM as well. Move the static key decrement call to kvm_arch_vcpu_free(). Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- virt/kvm/arm/arm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 639dca0c0560..04ee7a327870 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -295,6 +295,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) { + if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm))) + static_branch_dec(&userspace_irqchip_in_use); + kvm_mmu_free_memory_caches(vcpu); kvm_timer_vcpu_terminate(vcpu); kvm_pmu_vcpu_destroy(vcpu); @@ -304,8 +307,6 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) { - if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm))) - static_branch_dec(&userspace_irqchip_in_use); kvm_arch_vcpu_free(vcpu); } -- 2.14.2
next prev parent reply other threads:[~2018-01-31 9:35 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-31 9:34 [PULL 00/28] KVM/ARM Changes for v4.16 Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 01/28] arm64: KVM: Hide PMU from guests when disabled Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 10:54 ` Andrew Jones 2018-01-31 10:54 ` Andrew Jones 2018-01-31 11:00 ` Christoffer Dall 2018-01-31 11:00 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 02/28] KVM: arm: Use PTR_ERR_OR_ZERO() Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 03/28] KVM: arm/arm64: Remove redundant preemptible checks Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 04/28] KVM: arm/arm64: Factor out functionality to get vgic mmio requester_vcpu Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 05/28] KVM: arm/arm64: Don't cache the timer IRQ level Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 06/28] KVM: arm/arm64: vgic: Support level-triggered mapped interrupts Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 07/28] KVM: arm/arm64: Support a vgic interrupt line level sample function Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 08/28] KVM: arm/arm64: Support VGIC dist pend/active changes for mapped IRQs Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 09/28] KVM: arm/arm64: Provide a get_input_level for the arch timer Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 10/28] KVM: arm/arm64: Avoid work when userspace iqchips are not used Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 11/28] KVM: arm/arm64: Delete outdated forwarded irq documentation Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 12/28] Revert "arm64: KVM: Hide PMU from guests when disabled" Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 13/28] KVM: arm/arm64: Detangle kvm_mmu.h from kvm_hyp.h Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 14/28] KVM: arm/arm64: Split dcache/icache flushing Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 15/28] arm64: KVM: Add invalidate_icache_range helper Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 16/28] arm: KVM: Add optimized PIPT icache flushing Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 17/28] arm64: KVM: PTE/PMD S2 XN bit definition Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 18/28] KVM: arm/arm64: Limit icache invalidation to prefetch aborts Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 19/28] KVM: arm/arm64: Only clean the dcache on translation fault Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:34 ` [PULL 20/28] KVM: arm/arm64: Preserve Exec permission across R/W permission faults Christoffer Dall 2018-01-31 9:34 ` Christoffer Dall 2018-01-31 9:35 ` [PULL 21/28] KVM: arm/arm64: Drop vcpu parameter from guest cache maintenance operartions Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall 2018-01-31 9:35 ` [PULL 22/28] arm64: mm: Add additional parameter to uaccess_ttbr0_enable Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall 2018-01-31 9:35 ` [PULL 23/28] arm64: mm: Add additional parameter to uaccess_ttbr0_disable Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall 2018-01-31 9:35 ` [PULL 24/28] KVM: arm/arm64: Handle CPU_PM_ENTER_FAILED Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall 2018-01-31 9:35 ` [PULL 25/28] KVM: arm/arm64: Fix trailing semicolon Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall 2018-01-31 9:35 ` [PULL 26/28] KVM: arm/arm64: Fix incorrect timer_is_pending logic Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall [this message] 2018-01-31 9:35 ` [PULL 27/28] KVM: arm/arm64: Fix userspace_irqchip_in_use counting Christoffer Dall 2018-01-31 9:35 ` [PULL 28/28] KVM: arm/arm64: Fixup userspace irqchip static key optimization Christoffer Dall 2018-01-31 9:35 ` Christoffer Dall 2018-01-31 17:16 ` [PULL 00/28] KVM/ARM Changes for v4.16 Radim Krčmář 2018-01-31 17:16 ` Radim Krčmář
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180131093507.22219-28-christoffer.dall@linaro.org \ --to=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=pbonzini@redhat.com \ --cc=rkrcmar@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.