From patchwork Tue Aug 29 09:39:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9927009 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 6FBD56022E for ; Tue, 29 Aug 2017 09:40:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63BCA288D0 for ; Tue, 29 Aug 2017 09:40:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 585F8288C5; Tue, 29 Aug 2017 09:40:12 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 DA1CF288B5 for ; Tue, 29 Aug 2017 09:40:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751558AbdH2JjP (ORCPT ); Tue, 29 Aug 2017 05:39:15 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35986 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443AbdH2JjN (ORCPT ); Tue, 29 Aug 2017 05:39:13 -0400 Received: by mail-wm0-f51.google.com with SMTP id b82so17045134wmd.1 for ; Tue, 29 Aug 2017 02:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XMFEatBNW8N0HyhMiVho7fl6INPu12VqLJdIvV6orcM=; b=dAYvAi93yRStxtmzBUnyUoIQMMcNnmtX8yOJsncowWsTqT5NK4COI4ii+kdkd/pzaF 497Tj+afald4NKzNiEQNwt/ZuAktE/yOv1TUf6Qj8fiRT67h65zOcf5vymdPM9Bp0u7q O2gHSB3cc80vca96p0Z1RaUdfL/7WNTEqoyDM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XMFEatBNW8N0HyhMiVho7fl6INPu12VqLJdIvV6orcM=; b=EvEslqfWO8f29ndZsJYJ7nXE9Mabw+Iw59v+LSwkg1LBdKqXzBxkrBkHmpWiIzRbFe vcCn02XVlGaoX5Yb6h4rxtUu26EvFlamc4ylUShMNSHp69pgdX75/rLFBUxV/yJJkNE8 B6oxstusH7QHCKvKQzqXdV+BIw0Uc3y8MUPxRHc1gxk/E/r7k/DivKgkcAlEcYUHZ7D4 5gHdIqcP5mskIvbthczfIo5Kcq2T+Xz/0MU/dbOr46Pf22SD9SKBag+RSMc/wBlehBpV MlQMc30t0IDNZYPiyCyMg13r0Ju4AGutSi2dy0h4tqC460OoIxx0SL/5boeDXzLRBJsL olsg== X-Gm-Message-State: AHYfb5hdx3szEBa5UmzAqoVnu2fsXRU/lGi0pkn33tgSvWWZs/pexM2J t9HShXXqhYlY89Ab X-Received: by 10.80.218.137 with SMTP id q9mr3114769edj.210.1503999551717; Tue, 29 Aug 2017 02:39:11 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id k34sm1149879edc.2.2017.08.29.02.39.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 02:39:11 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, Eric Auger , Marc Zyngier Cc: Andre Przywara , linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Christoffer Dall Subject: [RFC PATCH 4/4] KVM: arm/arm64: Provide a vgic interrupt line level sample function Date: Tue, 29 Aug 2017 11:39:02 +0200 Message-Id: <20170829093902.15379-5-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170829093902.15379-1-cdall@linaro.org> References: <20170829093902.15379-1-cdall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The GIC sometimes need to sample the physical line of a mapped interrupt. As we know this to be notoriously slow, provide a callback function for devices (such as the timer) which can do this much faster than talking to the distributor, for example by comparing a few in-memory values. Fall back to the good old method of poking the physical GIC if no callback is provided. Signed-off-by: Christoffer Dall Reviewed-by: Marc Zyngier --- include/kvm/arm_vgic.h | 13 ++++++++++++- virt/kvm/arm/arch_timer.c | 16 +++++++++++++++- virt/kvm/arm/vgic/vgic.c | 7 ++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 53f631b..a52990b 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -125,6 +125,17 @@ struct vgic_irq { u8 priority; enum vgic_irq_config config; /* Level or edge */ + /* + * Callback function pointer to in-kernel devices that can tell us the + * state of the input level of mapped level-triggered IRQ faster than + * peaking into the physical GIC. + * + * Always called in non-preemptible section and the functions can use + * kvm_arm_get_running_vcpu() to get the vcpu pointer for private + * IRQs. + */ + bool (*get_input_level)(int vintid); + void *owner; /* Opaque pointer to reserve an interrupt for in-kernel devices. */ }; @@ -309,7 +320,7 @@ void kvm_vgic_init_cpu_hardware(void); int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid, bool level, void *owner); int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq, - u32 vintid); + u32 vintid, bool (*callback)(int vindid)); int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int vintid); bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int vintid); diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index b24e2f7..82169ef 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -643,6 +643,19 @@ static bool timer_irqs_are_valid(struct kvm_vcpu *vcpu) return true; } +static bool timer_get_input_level(int vintid) +{ + struct kvm_vcpu *vcpu = kvm_arm_get_running_vcpu(); + struct arch_timer_context *timer; + + if (vintid == vcpu_vtimer(vcpu)->irq.irq) + timer = vcpu_vtimer(vcpu); + else + BUG(); /* We only map the vtimer so far */ + + return kvm_timer_should_fire(timer); +} + int kvm_timer_enable(struct kvm_vcpu *vcpu) { struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; @@ -664,7 +677,8 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu) return -EINVAL; } - ret = kvm_vgic_map_phys_irq(vcpu, host_vtimer_irq, vtimer->irq.irq); + ret = kvm_vgic_map_phys_irq(vcpu, host_vtimer_irq, vtimer->irq.irq, + &timer_get_input_level); if (ret) return ret; diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index e3ce2fa..0466c10 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -147,6 +147,9 @@ bool vgic_irq_line_level(struct vgic_irq *irq) BUG_ON(!irq->hw); + if (irq->get_input_level) + return irq->get_input_level(irq->intid); + WARN_ON(irq_get_irqchip_state(irq->host_irq, IRQCHIP_STATE_PENDING, &line_level)); @@ -429,7 +432,7 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid, } int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq, - u32 vintid) + u32 vintid, bool (*callback)(int vindid)) { struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, vintid); struct irq_desc *desc; @@ -456,6 +459,7 @@ int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq, irq->hw = true; irq->host_irq = host_irq; irq->hwintid = data->hwirq; + irq->get_input_level = callback; out: spin_unlock(&irq->irq_lock); @@ -476,6 +480,7 @@ int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int vintid) spin_lock(&irq->irq_lock); irq->hw = false; irq->hwintid = 0; + irq->get_input_level = NULL; spin_unlock(&irq->irq_lock); vgic_put_irq(vcpu->kvm, irq);