From patchwork Wed Dec 13 10:45:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10109691 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 EC189603ED for ; Wed, 13 Dec 2017 10:47:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDFF728E70 for ; Wed, 13 Dec 2017 10:47:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2CD128E74; Wed, 13 Dec 2017 10:47:05 +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=unavailable 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 7855628F09 for ; Wed, 13 Dec 2017 10:47:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbdLMKrE (ORCPT ); Wed, 13 Dec 2017 05:47:04 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:42023 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002AbdLMKqk (ORCPT ); Wed, 13 Dec 2017 05:46:40 -0500 Received: by mail-wm0-f65.google.com with SMTP id b199so4110876wme.1 for ; Wed, 13 Dec 2017 02:46:40 -0800 (PST) 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=f4/+CGNKF2zJ9jFBrM9M5rkwuvsY9KHB4qpHEQ2CX10=; b=ei1yHDCL+AYxnj1JDfUYHzOQSei68G6FQ9MSGKGKgo7k6rTcvqK6jzg/vdmxr2iErx 2rf+6VP36n9Gl7mQDHYfnJF5iXCOVre5sDobw0HcWmuaZVxYU/r3gjUgoVqcT+RAlcUO F0q6LvjogLq0Q6n1bnKWG0IhVMh/tWkNcmn7E= 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=f4/+CGNKF2zJ9jFBrM9M5rkwuvsY9KHB4qpHEQ2CX10=; b=a9yuADkHU2yyXh8ceelYg6qJQAQ5YvnUVi/ZvzLgDYqiy+r1PgZwU4I4qaCRKgN1m6 tbXQmdddp2J+CzKJ3qndSegfOKXvUJfHT2Z5//92bfWTFbkHLI+38mgIg3AVRHuYwS+K BGzmtMZJtUVqtMCAj5D8EtHyBdyuT30dU2sxLMKKok/mOYnMWazYaC3iBa48DMF/iOXl h/AH8PjQp3R70e1L05/jO2KG0U8JFFeGEAbvXvn0nV4CrEN11kPeRC7J4UJ4ALZzfZfR HRNnVB80wpO6mxBuh2mnCgw/peusC6KvLmhDkUVD0DIw3bVj3uCZpTuVYt3XlG1w9/l5 f9Rg== X-Gm-Message-State: AKGB3mJjQDQmEXSHktNhG9KOeBp+8x7Opm2IUBzGj4QpURWssPmXC+h7 ERsHnLmhBZbsR84iw1qHD6FEFA== X-Google-Smtp-Source: ACJfBoubELPdMMswxrXVZWR2ruthSOO8tVDTRRXGYtNa8P9kHMBbHPfuL3CfTBMFoxwAlheXZWu8Ug== X-Received: by 10.80.225.204 with SMTP id m12mr7087085edl.216.1513161999234; Wed, 13 Dec 2017 02:46:39 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id d92sm1079682edd.21.2017.12.13.02.46.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Dec 2017 02:46:38 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier , Andre Przywara , Eric Auger , Christoffer Dall Subject: [PATCH v8 3/9] KVM: arm/arm64: Don't cache the timer IRQ level Date: Wed, 13 Dec 2017 11:45:56 +0100 Message-Id: <20171213104602.16383-4-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171213104602.16383-1-christoffer.dall@linaro.org> References: <20171213104602.16383-1-christoffer.dall@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 timer was modeled after a strict idea of modelling an interrupt line level in software, meaning that only transitions in the level needed to be reported to the VGIC. This works well for the timer, because the arch timer code is in complete control of the device and can track the transitions of the line. However, as we are about to support using the HW bit in the VGIC not just for the timer, but also for VFIO which cannot track transitions of the interrupt line, we have to decide on an interface for level triggered mapped interrupts to the GIC, which both the timer and VFIO can use. VFIO only sees an asserting transition of the physical interrupt line, and tells the VGIC when that happens. That means that part of the interrupt flow is offloaded to the hardware. To use the same interface for VFIO devices and the timer, we therefore have to change the timer (we cannot change VFIO because it doesn't know the details of the device it is assigning to a VM). Luckily, changing the timer is simple, we just need to stop 'caching' the line level, but instead let the VGIC know the state of the timer every time there is a potential change in the line level, and when the line level should be asserted from the timer ISR. The VGIC can ignore extra notifications using its validate mechanism. Reviewed-by: Andre Przywara Signed-off-by: Christoffer Dall Reviewed-by: Marc Zyngier Reviewed-by: Julien Thierry --- virt/kvm/arm/arch_timer.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 4151250ce8da..dd5aca05c500 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -99,11 +99,9 @@ static irqreturn_t kvm_arch_timer_handler(int irq, void *dev_id) } vtimer = vcpu_vtimer(vcpu); - if (!vtimer->irq.level) { - vtimer->cnt_ctl = read_sysreg_el0(cntv_ctl); - if (kvm_timer_irq_can_fire(vtimer)) - kvm_timer_update_irq(vcpu, true, vtimer); - } + vtimer->cnt_ctl = read_sysreg_el0(cntv_ctl); + if (kvm_timer_irq_can_fire(vtimer)) + kvm_timer_update_irq(vcpu, true, vtimer); if (unlikely(!irqchip_in_kernel(vcpu->kvm))) kvm_vtimer_update_mask_user(vcpu); @@ -324,12 +322,20 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu) struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); struct arch_timer_context *ptimer = vcpu_ptimer(vcpu); + bool level; if (unlikely(!timer->enabled)) return; - if (kvm_timer_should_fire(vtimer) != vtimer->irq.level) - kvm_timer_update_irq(vcpu, !vtimer->irq.level, vtimer); + /* + * The vtimer virtual interrupt is a 'mapped' interrupt, meaning part + * of its lifecycle is offloaded to the hardware, and we therefore may + * not have lowered the irq.level value before having to signal a new + * interrupt, but have to signal an interrupt every time the level is + * asserted. + */ + level = kvm_timer_should_fire(vtimer); + kvm_timer_update_irq(vcpu, level, vtimer); if (kvm_timer_should_fire(ptimer) != ptimer->irq.level) kvm_timer_update_irq(vcpu, !ptimer->irq.level, ptimer);