From patchwork Thu May 22 12:32:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 30617 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4A29A20369 for ; Thu, 22 May 2014 12:34:28 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id i17sf10505229qcy.2 for ; Thu, 22 May 2014 05:34:28 -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:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=iPsKVKlsSaQ8THwfKvqCyhwpZlJK2z2VJRjXKH3Mfk8=; b=eD+lPvaFJe6RV7bNLSMFWuknn0hezdbS9XLpzPwBksFGWh7ZENsugAQvdCCLLWWkQd 2g7nc7h8OMapJ4vbwjFV0/RXvsK+2JNm9X1Yln/4yjwXt9+nEUpPmqJHFcG1VnlP8jjI 2sW0PJ2ogDoqRKdJjWd5akU8uM+Q/47aDAqN+y5KRTwi4jH9PpRzvlK+Vw3v7KB8gwH4 SzVmOZZqoMDhOEmubD361V6DAJjzZnZJhg1bnECkvqclvEQy+zkGHh5tfk2fSUxg6htg viE9le892aD/t15e8yqB5vDqwYIcgM2fg9p4WpJ/VXswAorDf9mixVbXKY2hpo7XbJmY znpA== X-Gm-Message-State: ALoCoQmDClPjwpJk0ThKEpsIC1+miz34SWcE6QsgEHI435U1UYqQlOitOoRNS8LwHDmSdMZ0CxeT X-Received: by 10.236.199.108 with SMTP id w72mr22028015yhn.10.1400762068128; Thu, 22 May 2014 05:34:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.97 with SMTP id g88ls1304263qgf.40.gmail; Thu, 22 May 2014 05:34:28 -0700 (PDT) X-Received: by 10.58.112.8 with SMTP id im8mr1652781veb.35.1400762067937; Thu, 22 May 2014 05:34:27 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id v2si4746274vcn.15.2014.05.22.05.34.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 05:34:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id id10so951037vcb.34 for ; Thu, 22 May 2014 05:34:27 -0700 (PDT) X-Received: by 10.58.98.232 with SMTP id el8mr820802veb.42.1400762067849; Thu, 22 May 2014 05:34:27 -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.220.221.72 with SMTP id ib8csp194943vcb; Thu, 22 May 2014 05:34:27 -0700 (PDT) X-Received: by 10.58.116.1 with SMTP id js1mr35430491veb.29.1400762067449; Thu, 22 May 2014 05:34:27 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ek11si3036328vdd.25.2014.05.22.05.34.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 22 May 2014 05:34:27 -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 1WnSBX-0004Px-EX; Thu, 22 May 2014 12:33:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WnSBT-0004It-Bg for xen-devel@lists.xensource.com; Thu, 22 May 2014 12:33:19 +0000 Received: from [193.109.254.147:46630] by server-3.bemta-14.messagelabs.com id 6D/21-22179-E8EED735; Thu, 22 May 2014 12:33:18 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1400761994!6480922!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26874 invoked from network); 22 May 2014 12:33:17 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 22 May 2014 12:33:17 -0000 X-IronPort-AV: E=Sophos;i="4.98,887,1392163200"; d="scan'208";a="133886193" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 22 May 2014 12:33:15 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Thu, 22 May 2014 08:33:13 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WnSBI-0003tn-Aw; Thu, 22 May 2014 13:33:08 +0100 From: Stefano Stabellini To: Date: Thu, 22 May 2014 13:32:27 +0100 Message-ID: <1400761950-25035-10-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v8 10/13] xen/arm: don't protect GICH and lr_queue accesses with gic.lock 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: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.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: GICH is banked, protect accesses by disabling interrupts. Protect lr_queue accesses with the vgic.lock only. gic.lock only protects accesses to GICD now. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Julien Grall --- Changes in v5: - gic_remove_from_queues need to be protected with a vgic lock; - introduce ASSERTs to check the vgic is locked and interrupts are disabled. Changes in v4: - improved in code comments. --- xen/arch/arm/gic.c | 32 +++++++++++++++++--------------- xen/arch/arm/vgic.c | 9 +++++++-- xen/include/asm-arm/domain.h | 5 ++++- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index a6fe566..eb59f5a 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -113,6 +113,7 @@ void gic_save_state(struct vcpu *v) void gic_restore_state(struct vcpu *v) { int i; + ASSERT(!local_irq_is_enabled()); if ( is_idle_vcpu(v) ) return; @@ -549,6 +550,7 @@ static inline void gic_set_lr(int lr, struct pending_irq *p, { uint32_t lr_val; + ASSERT(!local_irq_is_enabled()); BUG_ON(lr >= nr_lrs); BUG_ON(lr < 0); BUG_ON(state & ~(GICH_LR_STATE_MASK<arch.vgic.lock)); + if ( !list_empty(&n->lr_queue) ) return; @@ -588,16 +592,18 @@ void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq) struct pending_irq *p = irq_to_pending(v, virtual_irq); unsigned long flags; - spin_lock_irqsave(&gic.lock, flags); + spin_lock_irqsave(&v->arch.vgic.lock, flags); if ( !list_empty(&p->lr_queue) ) list_del_init(&p->lr_queue); - spin_unlock_irqrestore(&gic.lock, flags); + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } void gic_raise_inflight_irq(struct vcpu *v, unsigned int virtual_irq) { struct pending_irq *n = irq_to_pending(v, virtual_irq); + ASSERT(spin_is_locked(&v->arch.vgic.lock)); + if ( list_empty(&n->lr_queue) ) { if ( v == current ) @@ -614,9 +620,8 @@ void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, unsigned int priority) { int i; - unsigned long flags; - spin_lock_irqsave(&gic.lock, flags); + ASSERT(spin_is_locked(&v->arch.vgic.lock)); if ( v == current && list_empty(&v->arch.vgic.lr_pending) ) { @@ -624,15 +629,11 @@ void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, if (i < nr_lrs) { set_bit(i, &this_cpu(lr_mask)); gic_set_lr(i, irq_to_pending(v, virtual_irq), GICH_LR_PENDING); - goto out; + return; } } gic_add_to_lr_pending(v, irq_to_pending(v, virtual_irq)); - -out: - spin_unlock_irqrestore(&gic.lock, flags); - return; } static void gic_update_one_lr(struct vcpu *v, int i) @@ -642,6 +643,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) int irq; ASSERT(spin_is_locked(&v->arch.vgic.lock)); + ASSERT(!local_irq_is_enabled()); lr = GICH[GICH_LR + i]; irq = (lr >> GICH_LR_VIRTUAL_SHIFT) & GICH_LR_VIRTUAL_MASK; @@ -705,30 +707,28 @@ static void gic_restore_pending_irqs(struct vcpu *v) struct pending_irq *p, *t; unsigned long flags; + spin_lock_irqsave(&v->arch.vgic.lock, flags); list_for_each_entry_safe ( p, t, &v->arch.vgic.lr_pending, lr_queue ) { i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); if ( i >= nr_lrs ) return; - spin_lock_irqsave(&gic.lock, flags); gic_set_lr(i, p, GICH_LR_PENDING); list_del_init(&p->lr_queue); set_bit(i, &this_cpu(lr_mask)); - spin_unlock_irqrestore(&gic.lock, flags); } - + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); } void gic_clear_pending_irqs(struct vcpu *v) { struct pending_irq *p, *t; - unsigned long flags; - spin_lock_irqsave(&gic.lock, flags); + ASSERT(spin_is_locked(&v->arch.vgic.lock)); + v->arch.lr_mask = 0; list_for_each_entry_safe ( p, t, &v->arch.vgic.lr_pending, lr_queue ) list_del_init(&p->lr_queue); - spin_unlock_irqrestore(&gic.lock, flags); } int gic_events_need_delivery(void) @@ -739,6 +739,8 @@ int gic_events_need_delivery(void) void gic_inject(void) { + ASSERT(!local_irq_is_enabled()); + gic_restore_pending_irqs(current); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 13c5c87..4869b87 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -408,8 +408,13 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) vcpu_info(current, evtchn_upcall_pending) && list_empty(&p->inflight) ) vgic_vcpu_inject_irq(v, irq); - else if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) - gic_raise_guest_irq(v, irq, p->priority); + else { + unsigned long flags; + spin_lock_irqsave(&v->arch.vgic.lock, flags); + if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) + gic_raise_guest_irq(v, irq, p->priority); + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); + } if ( p->desc != NULL ) { spin_lock_irqsave(&p->desc->lock, flags); diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index c39756f..59ce196 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -68,7 +68,10 @@ struct pending_irq * vgic.inflight_irqs */ struct list_head inflight; /* lr_queue is used to append instances of pending_irq to - * gic.lr_pending */ + * lr_pending. lr_pending is a per vcpu queue, therefore lr_queue + * accesses are protected with the vgic lock. + * TODO: when implementing irq migration, taking only the current + * vgic lock is not going to be enough. */ struct list_head lr_queue; };