From patchwork Fri Sep 16 05:16:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 9335001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9A3EC601C2 for ; Fri, 16 Sep 2016 05:17:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83C1829EA0 for ; Fri, 16 Sep 2016 05:17:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 771ED29EA4; Fri, 16 Sep 2016 05:17:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1374D29EA0 for ; Fri, 16 Sep 2016 05:17:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753308AbcIPFRL (ORCPT ); Fri, 16 Sep 2016 01:17:11 -0400 Received: from mx2.suse.de ([195.135.220.15]:50215 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbcIPFRJ (ORCPT ); Fri, 16 Sep 2016 01:17:09 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E0B6BAC4B; Fri, 16 Sep 2016 05:17:06 +0000 (UTC) From: Alexander Graf To: kvmarm@lists.cs.columbia.edu Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] KVM: arm/arm64: timer: Fix hw sync for user space irqchip path Date: Fri, 16 Sep 2016 07:16:11 +0200 Message-Id: <1474002971-31434-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 2.6.6 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP While adding the new vgic implementation, apparently nobody tested the non-vgic path where user space controls the vgic, so two functions slipped through the cracks that get called in generic code but don't check whether hardware support is enabled. This patch guards them with proper checks to ensure we only try to use vgic data structures if they are available. Without this, I get a stack trace: [ 74.363037] Unable to handle kernel paging request at virtual address ffffffffffffffe8 [...] [ 74.929654] [] _raw_spin_lock+0x1c/0x58 [ 74.935133] [] kvm_vgic_flush_hwstate+0x88/0x288 [ 74.941406] [] kvm_arch_vcpu_ioctl_run+0xfc/0x630 [ 74.947766] [] kvm_vcpu_ioctl+0x2f4/0x710 [ 74.953420] [] do_vfs_ioctl+0xb0/0x728 [ 74.958807] [] SyS_ioctl+0x94/0xa8 [ 74.963844] [] el0_svc_naked+0x38/0x3c Fixes: 0919e84c0 Cc: stable@vger.kernel.org Signed-off-by: Alexander Graf --- virt/kvm/arm/vgic/vgic.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index e83b7fe..9f312ba 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -645,6 +645,9 @@ next: /* Sync back the hardware VGIC state into our emulation after a guest's run. */ void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu) { + if (!vcpu->kvm->arch.vgic.enabled) + return; + vgic_process_maintenance_interrupt(vcpu); vgic_fold_lr_state(vcpu); vgic_prune_ap_list(vcpu); @@ -653,6 +656,9 @@ void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu) /* Flush our emulation state into the GIC hardware before entering the guest. */ void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu) { + if (!vcpu->kvm->arch.vgic.enabled) + return; + spin_lock(&vcpu->arch.vgic_cpu.ap_list_lock); vgic_flush_lr_state(vcpu); spin_unlock(&vcpu->arch.vgic_cpu.ap_list_lock);