From patchwork Wed Feb 26 18:39:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 25397 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9D3C520715 for ; Wed, 26 Feb 2014 18:41:29 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id gq1sf4342672obb.7 for ; Wed, 26 Feb 2014 10:41:29 -0800 (PST) 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=pCXsjwLtP7R0ej9e4NsfrIdwz/Xv/KOa41NIrNBgcOY=; b=EykdmHNPlM7tihvXgCzyVYMOL7qpI2n+wUG0u6eGyqWJn5qb1v4AIK9NM7lKCzn3fF 33y0I4UOKb9hP0VeD8uVqcMKe/Jhaim+C9p5JTYckEe3PACuNPQfLWwcl3zQxNNS2mmU LalPxINTmuIDGJ5Ml3marqqZzoQ7gaAjCp6zZng+r/VyZhZC7Ogz44BSPxfiiMco62WF h8BvGHTd7Nl6gvSTtsczZznrsWSGDZLp0sqFjdQWrJ1lkYr7NvBrLc7iTZ87Kc8QZqSA i4WhfnHnfI3UDqIIyIN3xV0JMGbUQxZw5Zd85Ppl++IDijzV+kscenn6knPsVcSV9mfx eE7w== X-Gm-Message-State: ALoCoQk072+X6OjxdyPLvwIX8v4sqNbaZgc8Ly5xMs3Eua5rC2kQYO2B6qB+qzvcOodQLmESg320 X-Received: by 10.182.81.7 with SMTP id v7mr2100305obx.28.1393440089049; Wed, 26 Feb 2014 10:41:29 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.200 with SMTP id p66ls337773qgp.74.gmail; Wed, 26 Feb 2014 10:41:28 -0800 (PST) X-Received: by 10.52.27.9 with SMTP id p9mr5935209vdg.28.1393440088880; Wed, 26 Feb 2014 10:41:28 -0800 (PST) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id os4si461664vcb.22.2014.02.26.10.41.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Feb 2014 10:41:28 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so2544806veb.25 for ; Wed, 26 Feb 2014 10:41:28 -0800 (PST) X-Received: by 10.52.65.207 with SMTP id z15mr185315vds.61.1393440088788; Wed, 26 Feb 2014 10:41:28 -0800 (PST) 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.174.196 with SMTP id u4csp46833vcz; Wed, 26 Feb 2014 10:41:28 -0800 (PST) X-Received: by 10.224.24.67 with SMTP id u3mr10579251qab.10.1393440087835; Wed, 26 Feb 2014 10:41:27 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id y1si468842qce.28.2014.02.26.10.41.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Feb 2014 10:41:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WIjPB-00080e-CY; Wed, 26 Feb 2014 18:40:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WIjOz-0007uH-P6 for xen-devel@lists.xensource.com; Wed, 26 Feb 2014 18:40:18 +0000 Received: from [193.109.254.147:16975] by server-9.bemta-14.messagelabs.com id 46/A1-24895-0153E035; Wed, 26 Feb 2014 18:40:16 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1393440013!3366978!2 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.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15883 invoked from network); 26 Feb 2014 18:40:15 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 26 Feb 2014 18:40:15 -0000 X-IronPort-AV: E=Sophos;i="4.97,549,1389744000"; d="scan'208";a="104388738" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 26 Feb 2014 18:40:12 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Wed, 26 Feb 2014 13:40:10 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WIjOm-0004S3-DN; Wed, 26 Feb 2014 18:40:04 +0000 From: Stefano Stabellini To: Date: Wed, 26 Feb 2014 18:39:55 +0000 Message-ID: <1393439997-26936-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: MIA1 Cc: julien.grall@citrix.com, jtd@galois.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH-4.5 v3 10/12] 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=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 --- xen/arch/arm/gic.c | 22 +++------------------- xen/arch/arm/vgic.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 2dc6386..296d9a7 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -668,17 +668,14 @@ void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq) { struct pending_irq *p = irq_to_pending(v, virtual_irq); - spin_lock(&gic.lock); if ( !list_empty(&p->lr_queue) ) list_del_init(&p->lr_queue); - spin_unlock(&gic.lock); } void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, unsigned int priority) { int i; - unsigned long flags; struct pending_irq *n = irq_to_pending(v, irq); if ( test_bit(GIC_IRQ_GUEST_VISIBLE, &n->status)) @@ -688,23 +685,17 @@ void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, return; } - spin_lock_irqsave(&gic.lock, flags); - if ( v == current && list_empty(&v->arch.vgic.lr_pending) ) { i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); if (i < nr_lrs) { set_bit(i, &this_cpu(lr_mask)); gic_set_lr(v, i, irq, GICH_LR_PENDING, priority); - goto out; + return; } } gic_add_to_lr_pending(v, irq, priority); - -out: - spin_unlock_irqrestore(&gic.lock, flags); - return; } static void _gic_clear_lr(struct vcpu *v, int i) @@ -726,8 +717,6 @@ static void _gic_clear_lr(struct vcpu *v, int i) } else if ( lr & GICH_LR_PENDING ) { clear_bit(GIC_IRQ_GUEST_PENDING, &p->status); } else { - spin_lock(&gic.lock); - GICH[GICH_LR + i] = 0; clear_bit(i, &this_cpu(lr_mask)); @@ -741,8 +730,6 @@ static void _gic_clear_lr(struct vcpu *v, int i) gic_raise_guest_irq(v, irq, p->priority); } else list_del_init(&p->inflight); - - spin_unlock(&gic.lock); } } @@ -772,11 +759,11 @@ static void gic_restore_pending_irqs(struct vcpu *v) i = find_first_zero_bit(&this_cpu(lr_mask), nr_lrs); if ( i >= nr_lrs ) return; - spin_lock_irqsave(&gic.lock, flags); + spin_lock_irqsave(&v->arch.vgic.lock, flags); gic_set_lr(v, i, p->irq, GICH_LR_PENDING, p->priority); 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); } } @@ -784,13 +771,10 @@ static void gic_restore_pending_irqs(struct vcpu *v) void gic_clear_pending_irqs(struct vcpu *v) { struct pending_irq *p, *t; - unsigned long flags; - spin_lock_irqsave(&gic.lock, flags); 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) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 981db6c..e9464b2 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -365,12 +365,15 @@ static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) struct pending_irq *p; unsigned int irq; int i = 0; + unsigned long flags; while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) < 32 ) { irq = i + (32 * n); p = irq_to_pending(v, irq); + spin_lock_irqsave(&v->arch.vgic.lock, flags); clear_bit(GIC_IRQ_GUEST_ENABLED, &p->status); gic_remove_from_queues(v, irq); + spin_unlock_irqrestore(&v->arch.vgic.lock, flags); if ( p->desc != NULL ) p->desc->handler->disable(p->desc); i++; @@ -391,8 +394,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 ) p->desc->handler->enable(p->desc); i++;