From patchwork Thu Apr 9 15:09:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 46962 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 34EE021416 for ; Thu, 9 Apr 2015 15:15:51 +0000 (UTC) Received: by widjs5 with SMTP id js5sf18080339wid.3 for ; Thu, 09 Apr 2015 08:15:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=k/wyOyTR531APmdH9Xop47TsAlSxO35/PbZVRrPIVAQ=; b=h4A+u1/mihR+E2bitofXpSRFETJCrkwdG2gzsQ/1esZltnR0TqjuVXJm5xEbuhbyRh WOGW/vbQ/xbtop4iZDBU0QvmSHmbqu84lu+MNR5Ag+xgd+l7TANTmsS39ZVo5PO79ksK XEBTvXk+JWWr2RoLxxrsWog19IgZZGPSDI20NE/di9J35h089+OpQqsBYKFdrmcatgFm 3Ln3slEvBcKwskXoDTmGLC6iBD3yQiJIV7ArKC3vg+//Vad/NO0/g/GTH0/y8MM2rUNi F73VZ1Uj2ypvuK64siMmNn7BD+7TpbGZZqCyTBlqGEof2z1gR4oltqhwM82fiOn29nzH pufw== X-Gm-Message-State: ALoCoQlAIosGLhb8Ebr/xG/cxljUxCEfxjojDzSTeM593vxviTlXTy/wjl2aFfToB6U4cHNM6pz7 X-Received: by 10.180.74.197 with SMTP id w5mr703952wiv.5.1428592550567; Thu, 09 Apr 2015 08:15:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.114 with SMTP id q18ls338995laa.8.gmail; Thu, 09 Apr 2015 08:15:50 -0700 (PDT) X-Received: by 10.112.77.234 with SMTP id v10mr28248536lbw.119.1428592550467; Thu, 09 Apr 2015 08:15:50 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id ba7si11685690lab.50.2015.04.09.08.15.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 08:15:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbbuc2 with SMTP id uc2so90168664lbb.2 for ; Thu, 09 Apr 2015 08:15:50 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr21717063lbc.32.1428592550143; Thu, 09 Apr 2015 08:15:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp533693lbt; Thu, 9 Apr 2015 08:15:49 -0700 (PDT) X-Received: by 10.53.7.72 with SMTP id da8mr23794391vdd.58.1428592548477; Thu, 09 Apr 2015 08:15:48 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id gj9si13243812vdc.102.2015.04.09.08.15.47 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 09 Apr 2015 08:15:48 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YgE9h-0000IU-2c; Thu, 09 Apr 2015 15:14:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YgE9g-0000IL-5E for xen-devel@lists.xenproject.org; Thu, 09 Apr 2015 15:14:08 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id CC/F3-23555-F3796255; Thu, 09 Apr 2015 15:14:07 +0000 X-Env-Sender: julien.grall@citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1428592445!15038979!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 6.13.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19037 invoked from network); 9 Apr 2015 15:14:06 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 9 Apr 2015 15:14:06 -0000 X-IronPort-AV: E=Sophos;i="5.11,550,1422921600"; d="scan'208";a="253565283" From: Julien Grall To: Date: Thu, 9 Apr 2015 16:09:29 +0100 Message-ID: <1428592185-18581-4-git-send-email-julien.grall@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428592185-18581-1-git-send-email-julien.grall@citrix.com> References: <1428592185-18581-1-git-send-email-julien.grall@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v5 p2 03/19] xen/arm: Release IRQ routed to a domain when it's destroying X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: From: Julien Grall Xen has to release IRQ routed to a domain in order to reuse later. Currently only SPIs can be routed to the guest so we only need to browse SPIs for a specific domain. Furthermore, a guest can crash and leave the IRQ in an incorrect state (i.e has not been EOIed). Xen will have to reset the IRQ in order to be able to reuse the IRQ later. Introduce 2 new functions for release an IRQ routed to a domain: - release_guest_irq: upper level to retrieve the IRQ, call the GIC code and release the action - gic_remove_guest_irq: Check if we can remove the IRQ, and reset it if necessary Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v5: - Typoes in the commit message - Add Ian's Ack Changes in v4: - Reorder the code flow - Typoes and coding style - Use the newly helper spi_to_pending Changes in v3: - Take the vgic rank lock to protect p->desc - Correctly check if the IRQ is disabled - Extend the check on the virq in release_guest_irq - Use vgic_get_target_vcpu to get the target vCPU - Remove spurious change Changes in v2: - Drop the desc->handler = &no_irq_type in release_irq as it's buggy if the IRQ is routed to Xen - Add release_guest_irq and gic_remove_guest_irq --- xen/arch/arm/gic.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/irq.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic.c | 16 ++++++++++++++++ xen/include/asm-arm/gic.h | 4 ++++ xen/include/asm-arm/irq.h | 2 ++ 5 files changed, 113 insertions(+) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 5f34997..f023e4f 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -163,6 +163,51 @@ out: return res; } +/* This function only works with SPIs for now */ +int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, + struct irq_desc *desc) +{ + struct vcpu *v_target = vgic_get_target_vcpu(d->vcpu[0], virq); + struct vgic_irq_rank *rank = vgic_rank_irq(v_target, virq); + struct pending_irq *p = irq_to_pending(v_target, virq); + unsigned long flags; + + ASSERT(spin_is_locked(&desc->lock)); + ASSERT(test_bit(_IRQ_GUEST, &desc->status)); + ASSERT(p->desc == desc); + + vgic_lock_rank(v_target, rank, flags); + + if ( d->is_dying ) + { + desc->handler->shutdown(desc); + + /* EOI the IRQ it it has not been done by the guest */ + if ( test_bit(_IRQ_INPROGRESS, &desc->status) ) + gic_hw_ops->deactivate_irq(desc); + clear_bit(_IRQ_INPROGRESS, &desc->status); + } + else + { + /* + * TODO: Handle eviction from LRs For now, deny + * remove if the IRQ is inflight or not disabled. + */ + if ( test_bit(_IRQ_INPROGRESS, &desc->status) || + !test_bit(_IRQ_DISABLED, &desc->status) ) + return -EBUSY; + } + + clear_bit(_IRQ_GUEST, &desc->status); + desc->handler = &no_irq_type; + + p->desc = NULL; + + vgic_unlock_rank(v_target, rank, flags); + + return 0; +} + int gic_irq_xlate(const u32 *intspec, unsigned int intsize, unsigned int *out_hwirq, unsigned int *out_type) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index b2ddf6b..376c9f2 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -513,6 +513,52 @@ free_info: return retval; } +int release_guest_irq(struct domain *d, unsigned int virq) +{ + struct irq_desc *desc; + struct irq_guest *info; + unsigned long flags; + struct pending_irq *p; + int ret; + + /* Only SPIs are supported */ + if ( virq < NR_LOCAL_IRQS || virq >= vgic_num_irqs(d) ) + return -EINVAL; + + p = spi_to_pending(d, virq); + if ( !p->desc ) + return -EINVAL; + + desc = p->desc; + + spin_lock_irqsave(&desc->lock, flags); + + ret = -EINVAL; + if ( !test_bit(_IRQ_GUEST, &desc->status) ) + goto unlock; + + info = irq_get_guest_info(desc); + ret = -EINVAL; + if ( d != info->d ) + goto unlock; + + ret = gic_remove_irq_from_guest(d, virq, desc); + if ( ret ) + goto unlock; + + spin_unlock_irqrestore(&desc->lock, flags); + + release_irq(desc->irq, info); + xfree(info); + + return 0; + +unlock: + spin_unlock_irqrestore(&desc->lock, flags); + + return ret; +} + /* * pirq event channels. We don't use these on ARM, instead we use the * features of the GIC to inject virtualised normal interrupts. diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 55c8927..05c5010 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -135,6 +135,22 @@ void register_vgic_ops(struct domain *d, const struct vgic_ops *ops) void domain_vgic_free(struct domain *d) { + int i; + int ret; + + for ( i = 0; i < (d->arch.vgic.nr_spis); i++ ) + { + struct pending_irq *p = spi_to_pending(d, i + 32); + + if ( p->desc ) + { + ret = release_guest_irq(d, p->irq); + if ( ret ) + dprintk(XENLOG_G_WARNING, "d%u: Failed to release virq %u ret = %d\n", + d->domain_id, p->irq, ret); + } + } + xfree(d->arch.vgic.shared_irqs); xfree(d->arch.vgic.pending_irqs); xfree(d->arch.vgic.allocated_irqs); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index ef4bf9a..9e2acb7 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -220,6 +220,10 @@ extern int gic_route_irq_to_guest(struct domain *, unsigned int virq, struct irq_desc *desc, unsigned int priority); +/* Remove an IRQ passthrough to a guest */ +int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, + struct irq_desc *desc); + extern void gic_inject(void); extern void gic_clear_pending_irqs(struct vcpu *v); extern int gic_events_need_delivery(void); diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index 71b39e7..34b492b 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -44,6 +44,8 @@ void init_secondary_IRQ(void); int route_irq_to_guest(struct domain *d, unsigned int virq, unsigned int irq, const char *devname); +int release_guest_irq(struct domain *d, unsigned int irq); + void arch_move_irqs(struct vcpu *v); /* Set IRQ type for an SPI */