From patchwork Sat Sep 23 00:41:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9967299 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 4F684602CB for ; Sat, 23 Sep 2017 00:42:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4287F29590 for ; Sat, 23 Sep 2017 00:42:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37333299C6; Sat, 23 Sep 2017 00:42:21 +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 BEBB129590 for ; Sat, 23 Sep 2017 00:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752553AbdIWAmT (ORCPT ); Fri, 22 Sep 2017 20:42:19 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:46515 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539AbdIWAmQ (ORCPT ); Fri, 22 Sep 2017 20:42:16 -0400 Received: by mail-wm0-f44.google.com with SMTP id m72so7631458wmc.1 for ; Fri, 22 Sep 2017 17:42:15 -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=bPL/Djk7Y8WBeTddW38LhnZR+TpAdofjIJiCWEKKxLY=; b=C1C/j+dXhndOr4sdkEBqnmDahuVzsrKaxkghOTQZHIYS9Kf+X/04vbo6sySJRiiJYU eyD15CiiB1fpQ4GcKT//11TQvOgfH3Bwl07u9Cn8/jEAe2zvKp4P7Ctn8Aob4qrqpa3J Hao4lAgDxUPrvjs6JCuzyczqbpcwn+kGX1tWI= 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=bPL/Djk7Y8WBeTddW38LhnZR+TpAdofjIJiCWEKKxLY=; b=D0RBplCvnIHz6apbIbDFDx1hHHmKmlNBFdSJRnI3NYGr3k4ncvH4zF+9VYLurHmFm9 GdZagmv/IGuLekrJ0JhAc9saxb30k7VxEIa+za4GwQEo1a1lsRQvB5GlAEv0fCh7XXxr 2Qc18M6KC2hn/1/HBMDxVO/ImbMce4GemDTbqF0P3nmQZTP1qFf7a2JSPLch/JY1wlys 6sIxC4GPzX4N7vIjZ8LXSrOGDWaVIA0vlPehcNqPsVHzMnHQ5of2WWtniL5z2HmWMeVl MNq9I+ZuQan4Sz/AdI2rtb9zryJG3i0fwFgovtB6Cp/nRpiRE5meKLL78Fmmw5XU/hBw 51ZA== X-Gm-Message-State: AHPjjUgJuebn7yZpyUuNLTmWWIHNgtd5p4P4XuyCCTaSLaBmd2mUs1j1 fJoIEFpu4dmi9PE/D5TvqUmfNQ== X-Google-Smtp-Source: AOwi7QB+1aoIkLl+fgwuN8jmz3jB++FjX71e1Mu6qqfDQKwoBmrgIfbNBaNZJzkYnY3oqMEORe57AQ== X-Received: by 10.80.143.226 with SMTP id y89mr6565088edy.21.1506127334582; Fri, 22 Sep 2017 17:42:14 -0700 (PDT) Received: from localhost.localdomain (xd93dd96b.cust.hiper.dk. [217.61.217.107]) by smtp.gmail.com with ESMTPSA id c25sm646085edb.57.2017.09.22.17.42.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 17:42:13 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier , Will Deacon , Catalin Marinas , Christoffer Dall Subject: [PATCH v3 07/20] KVM: arm/arm64: Make timer_arm and timer_disarm helpers more generic Date: Sat, 23 Sep 2017 02:41:54 +0200 Message-Id: <20170923004207.22356-8-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170923004207.22356-1-cdall@linaro.org> References: <20170923004207.22356-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 We are about to add an additional soft timer to the arch timer state for a VCPU and would like to be able to reuse the functions to program and cancel a timer, so we make them slightly more generic and rename to make it more clear that these functions work on soft timers and not the hardware resource that this code is managing. Signed-off-by: Christoffer Dall --- virt/kvm/arm/arch_timer.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 8e89d63..871d8ae 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -56,26 +56,22 @@ u64 kvm_phys_timer_read(void) return timecounter->cc->read(timecounter->cc); } -static bool timer_is_armed(struct arch_timer_cpu *timer) +static bool soft_timer_is_armed(struct arch_timer_cpu *timer) { return timer->armed; } -/* timer_arm: as in "arm the timer", not as in ARM the company */ -static void timer_arm(struct arch_timer_cpu *timer, u64 ns) +static void soft_timer_start(struct hrtimer *hrt, u64 ns) { - timer->armed = true; - hrtimer_start(&timer->timer, ktime_add_ns(ktime_get(), ns), + hrtimer_start(hrt, ktime_add_ns(ktime_get(), ns), HRTIMER_MODE_ABS); } -static void timer_disarm(struct arch_timer_cpu *timer) +static void soft_timer_cancel(struct hrtimer *hrt, struct work_struct *work) { - if (timer_is_armed(timer)) { - hrtimer_cancel(&timer->timer); - cancel_work_sync(&timer->expired); - timer->armed = false; - } + hrtimer_cancel(hrt); + if (work) + cancel_work_sync(work); } static irqreturn_t kvm_arch_timer_handler(int irq, void *dev_id) @@ -271,7 +267,7 @@ static void kvm_timer_emulate(struct kvm_vcpu *vcpu, return; /* The timer has not yet expired, schedule a background timer */ - timer_arm(timer, kvm_timer_compute_delta(timer_ctx)); + soft_timer_start(&timer->timer, kvm_timer_compute_delta(timer_ctx)); } /* @@ -285,7 +281,7 @@ void kvm_timer_schedule(struct kvm_vcpu *vcpu) struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); struct arch_timer_context *ptimer = vcpu_ptimer(vcpu); - BUG_ON(timer_is_armed(timer)); + BUG_ON(soft_timer_is_armed(timer)); /* * No need to schedule a background timer if any guest timer has @@ -306,13 +302,16 @@ void kvm_timer_schedule(struct kvm_vcpu *vcpu) * The guest timers have not yet expired, schedule a background timer. * Set the earliest expiration time among the guest timers. */ - timer_arm(timer, kvm_timer_earliest_exp(vcpu)); + timer->armed = true; + soft_timer_start(&timer->timer, kvm_timer_earliest_exp(vcpu)); } void kvm_timer_unschedule(struct kvm_vcpu *vcpu) { struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; - timer_disarm(timer); + + soft_timer_cancel(&timer->timer, &timer->expired); + timer->armed = false; } static void kvm_timer_flush_hwstate_vgic(struct kvm_vcpu *vcpu) @@ -448,7 +447,7 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) * This is to cancel the background timer for the physical timer * emulation if it is set. */ - timer_disarm(timer); + soft_timer_cancel(&timer->timer, &timer->expired); /* * The guest could have modified the timer registers or the timer @@ -615,7 +614,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); - timer_disarm(timer); + soft_timer_cancel(&timer->timer, &timer->expired); kvm_vgic_unmap_phys_irq(vcpu, vtimer->irq.irq); }