From patchwork Fri Mar 9 15:11:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 131146 Delivered-To: patch@linaro.org Received: by 10.80.194.209 with SMTP id u17csp1135502edf; Fri, 9 Mar 2018 07:14:05 -0800 (PST) X-Google-Smtp-Source: AG47ELuOwIj1Xibh3RfrXl4RnT33LZt8i3kGAP31JcMxhRJpdOqZ6HiKPT8T4WU+DzK7ZHxzz3+U X-Received: by 10.36.60.216 with SMTP id m207mr3930346ita.68.1520608445252; Fri, 09 Mar 2018 07:14:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520608445; cv=none; d=google.com; s=arc-20160816; b=GwSEFVEDiy15aAc6wLvofxBYEv5OEqvnIu+O/tWolrQe/HuPsBHqBbgA9wGY9UhF60 8V9rBZB6hA3ibcqHBFWC1oJRas48K1Det1zAzD/1UZBBSNFP/SRMocy7uzpufIJZKMIC 3CDunsuKD/lALI/INGwCblNfZCFgDnOWNXZpUoZItj60USyfqjlquBFH620Rtd49y4/P ni295cRrF/aAIgXy6LYZ/3SrWE+YlClKJR9h5yZI8xHfZmo6eT87DD7iEhiodvirEBuq CdMzzOj3YGAfZb30B5+SlzJQ8hr1LGpjdlVnV2obAuEfx99hEK1mpF+KCpuZXj4xnKSZ IU/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=J3mf4oBNj5TwbVK3qsjyQFZcuPGRQr0vKKndQYD3L0U=; b=l1rPmtnuA3XmJ0L9frTTT8YUCzrZgxC4l16bnGpuPwElpJkUYnnnsrfNGxbw1/YB8X K/cl+k+ok/84kXfF4oVEK5G88zAs0s9JJnJnlsxfoS119Nz5nzp4uPIYihAx8iRzoT0j DWUbGqO/GzdmpktgaPIGlv8rjVUjgnV7eFv33SDPrI8/u+FL9Gwrrrnaz2Xl0CS68mmX fARA+i+P8F/d4sNJG6wbt7TqlzVudyU+aouXmeXxJhpKC18h9zuj2c4AgGG1/sckbuyB 4wPSxNPum3VXkXUcyn7yPyKTAVbj7z4at9eQr22IRv9OcaUwkz22gn8BHyE7lTy+NDsK OhSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hDJ/Ze0k; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 72si1300357iti.85.2018.03.09.07.14.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Mar 2018 07:14:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hDJ/Ze0k; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1euJgY-0005sb-NW; Fri, 09 Mar 2018 15:11:54 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1euJgY-0005sB-2t for xen-devel@lists.xenproject.org; Fri, 09 Mar 2018 15:11:54 +0000 X-Inumbo-ID: 0758d743-23ac-11e8-ba59-bc764e045a96 Received: from mail-wm0-x243.google.com (unknown [2a00:1450:400c:c09::243]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 0758d743-23ac-11e8-ba59-bc764e045a96; Fri, 09 Mar 2018 16:10:40 +0100 (CET) Received: by mail-wm0-x243.google.com with SMTP id q83so4513853wme.5 for ; Fri, 09 Mar 2018 07:11:52 -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=cJJxS9+HUf0Z/mEURf0oBqxEanTkAh3dH96zRHATkN0=; b=hDJ/Ze0ku39NdS4lU+mgeMSdURHhcEudI/lOXzjySK2n0NNMjECSLd0xw/KaRpzT3q 1tDPW3i1kAprH/yrL72vblYqX6yfKOPH6x4YQnytsYiVK6Vb1CEn+kgWLCUJAZkPnA4X nnjw2J7Fy7C6FOhZwPSl7rkD5KUOThnw9+r80= 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=cJJxS9+HUf0Z/mEURf0oBqxEanTkAh3dH96zRHATkN0=; b=Li0ZXgNJMn/5XtPUT5vLksm8ASKswtFAXGqFM58WDpkaz0Ayvq4DvCbLH2X0+xoUuR CCD4EvgeMTyodcqEc4Pw/rDdYQuwnfrwpoOqs8akxpvyFHzuaJoKasOwOjBs7Yz/F5PJ +LnqwqtjaVzygtXHE3/psFDS82uq2DBLzOew2kK3wnmcxAJfO6ETb+hryPj1CcsCjpna SrLl0YqQQcrhbghg5ZrRKuntg63obZlUNP6qTSJQCFQAjX0s5rq+Kty7/rI/Fnknud9b 4IXGmY5C1IVvQmEN9x5QmjFznwbwPZsEzQckHcUC97yutZdmeF1L/e8zTocKg9XTPRxj VHIw== X-Gm-Message-State: AElRT7H7uoc2bdzb3jcP+NazH2MnQnYfB5SDXWzD/jE8flInLkJhnk6U OuYPpLN8wnrAYQiUu2sND1IIuRBXUgU= X-Received: by 10.28.51.199 with SMTP id z190mr2486102wmz.68.1520608311417; Fri, 09 Mar 2018 07:11:51 -0800 (PST) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id 1sm1721198wmj.35.2018.03.09.07.11.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 07:11:50 -0800 (PST) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Fri, 9 Mar 2018 15:11:24 +0000 Message-Id: <20180309151133.31371-9-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180309151133.31371-1-andre.przywara@linaro.org> References: <20180309151133.31371-1-andre.przywara@linaro.org> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 08/17] ARM: VGIC: rename gic_event_needs_delivery() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" gic_event_needs_delivery() is not named very intuitively, especially the gic_ prefix is somewhat misleading. Rename it to vgic_pending_irq(), which makes it clear that this relates to the virtual GIC and is about interrupts. Signed-off-by: Andre Przywara --- Changelog: - Add vcpu parameter - Rename to vgic_vcpu_pending_irq() xen/arch/arm/gic-vgic.c | 16 ++++++++++++++-- xen/include/asm-arm/event.h | 2 +- xen/include/asm-arm/gic.h | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic-vgic.c b/xen/arch/arm/gic-vgic.c index c0fe38fd37..f4c98bffd1 100644 --- a/xen/arch/arm/gic-vgic.c +++ b/xen/arch/arm/gic-vgic.c @@ -339,9 +339,18 @@ void gic_clear_pending_irqs(struct vcpu *v) gic_remove_from_lr_pending(v, p); } -int gic_events_need_delivery(void) +/** + * vgic_vcpu_pending_irq() - determine if interrupts need to be injected + * @vcpu: The vCPU on which to check for interrupts. + * + * Checks whether there is an interrupt on the given VCPU which needs + * handling in the guest. This requires at least one IRQ to be pending + * and enabled. + * + * Returns: 1 if the guest should run to handle interrupts, 0 otherwise. + */ +int vgic_vcpu_pending_irq(struct vcpu *v) { - struct vcpu *v = current; struct pending_irq *p; unsigned long flags; const unsigned long apr = gic_hw_ops->read_apr(0); @@ -349,6 +358,9 @@ int gic_events_need_delivery(void) int active_priority; int rc = 0; + /* We rely on reading the VMCR, which is only accessible locally. */ + ASSERT(v == current); + mask_priority = gic_hw_ops->read_vmcr_priority(); active_priority = find_next_bit(&apr, 32, 0); diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h index e8c2a6cb44..c7a415ef57 100644 --- a/xen/include/asm-arm/event.h +++ b/xen/include/asm-arm/event.h @@ -24,7 +24,7 @@ static inline int local_events_need_delivery_nomask(void) * interrupts disabled so this shouldn't be a problem in the general * case. */ - if ( gic_events_need_delivery() ) + if ( vgic_vcpu_pending_irq(current) ) return 1; if ( !vcpu_info(current, evtchn_upcall_pending) ) diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 3b2d0217a6..ff0b22451b 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -238,7 +238,7 @@ int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, extern void vgic_sync_to_lrs(void); extern void gic_clear_pending_irqs(struct vcpu *v); -extern int gic_events_need_delivery(void); +extern int vgic_vcpu_pending_irq(struct vcpu *v); extern void init_maintenance_interrupt(void); extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq,