From patchwork Tue Jun 24 18:30:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 32445 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ECA08201EF for ; Tue, 24 Jun 2014 18:32:24 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf3634018oag.5 for ; Tue, 24 Jun 2014 11:32:24 -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:date:from:to:message-id:user-agent :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=GIGmr9QBQwgh+CQ2osBhs56sNnASOu2xASzKcelOPNM=; b=l+BG8LH+tWWGITNWWrKsnUuLvgOAlz4+Dcy+7eYPARLoizRIEKu9F1cDI0NPWo/tL/ a+pdouVTep2JlcTCG1eoN8or85GsXacR3dFuzn3xzy//MNDRpPmVOOftnv97ZUrKGzdK z0hvY1BU+T8SVqHU3Lu9eV20kqbSLGbarBQP3pSScJXiZ6ac4Jw73Sn9ovnNlNtY7Rl9 deLXehnutwvk/s/GkmiN0Fz5enyEWn8dTImUearNU3j4WC1HzjLiyVb5KTIzX+ageIia vwrtpoFppk5J62p+T2lv+4oBE0yfsMlfOF1dH/eoKW4CVnwpBr73kOsLvp4/dTcVfF4l tZ/w== X-Gm-Message-State: ALoCoQmwYDJEQYSWzEFyB0YsyHHNKDAUEVhjAevSb4XFPVEdAVlXr16SlMBT4inJtBQXgVgZu3SF X-Received: by 10.182.66.198 with SMTP id h6mr1397059obt.12.1403634744596; Tue, 24 Jun 2014 11:32:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.241 with SMTP id 104ls1429953qgn.4.gmail; Tue, 24 Jun 2014 11:32:24 -0700 (PDT) X-Received: by 10.221.36.73 with SMTP id sz9mr1909122vcb.62.1403634744475; Tue, 24 Jun 2014 11:32:24 -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 qe9si726127vcb.79.2014.06.24.11.32.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Jun 2014 11:32:24 -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 hy4so753468vcb.6 for ; Tue, 24 Jun 2014 11:32:24 -0700 (PDT) X-Received: by 10.220.99.66 with SMTP id t2mr2228569vcn.40.1403634744373; Tue, 24 Jun 2014 11:32:24 -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.221.37.5 with SMTP id tc5csp231956vcb; Tue, 24 Jun 2014 11:32:24 -0700 (PDT) X-Received: by 10.50.7.39 with SMTP id g7mr3021692iga.15.1403634743866; Tue, 24 Jun 2014 11:32:23 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id 5si27065842igr.9.2014.06.24.11.32.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 24 Jun 2014 11:32:23 -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 1WzVUK-0001uw-8K; Tue, 24 Jun 2014 18:30:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WzVUI-0001ui-P8 for xen-devel@lists.xensource.com; Tue, 24 Jun 2014 18:30:34 +0000 Received: from [85.158.139.211:60684] by server-17.bemta-5.messagelabs.com id F7/87-08711-9C3C9A35; Tue, 24 Jun 2014 18:30:33 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1403634631!11797486!1 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 9885 invoked from network); 24 Jun 2014 18:30:33 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 24 Jun 2014 18:30:33 -0000 X-IronPort-AV: E=Sophos;i="5.01,539,1400025600"; d="scan'208";a="146664204" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 24 Jun 2014 18:30:31 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Tue, 24 Jun 2014 14:30:30 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1WzVUE-00067W-KT; Tue, 24 Jun 2014 19:30:30 +0100 Date: Tue, 24 Jun 2014 19:30:00 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [Xen 4.4.x] call vgic_en/disable_irqs holding the rank_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: Modifying ienable and calling vgic_enable_irqs or vgic_disable_irqs need to be atomic. Move the calls to vgic_enable_irqs and vgic_disable_irqs before releasing the rank lock. Signed-off-by: Stefano Stabellini diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 850006c..fa5acd6 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -509,8 +509,8 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable |= *r; - vgic_unlock_rank(v, rank); vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER); + vgic_unlock_rank(v, rank); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -520,8 +520,8 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable &= ~*r; - vgic_unlock_rank(v, rank); vgic_disable_irqs(v, (*r) & tr, gicd_reg - GICD_ICENABLER); + vgic_unlock_rank(v, rank); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: