From patchwork Wed Apr 12 00:44:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9676279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7179F60383 for ; Wed, 12 Apr 2017 00:48:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5761728550 for ; Wed, 12 Apr 2017 00:48:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C40D2856B; Wed, 12 Apr 2017 00:48:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ED82628550 for ; Wed, 12 Apr 2017 00:48:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy6QB-0000Kj-Un; Wed, 12 Apr 2017 00:46:07 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy6QA-0000Jf-KK for xen-devel@lists.xenproject.org; Wed, 12 Apr 2017 00:46:06 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 6E/62-03012-EC87DE85; Wed, 12 Apr 2017 00:46:06 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTfdsxds Ig2XzTCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oy1n+ULJvFV/Fi5jLmB8RZ3FyMXh5DAJkaJ XU2NbBDOXkaJQ/9uADmcHGwCuhI7br5mBrFFBEIl5vx8xAxSxCywhlGi/dNTVpCEsECkROu05 ewgNouAqsTLK1NZQGxeATeJS/NnA8U5OCQE5CSu/EsACXMKuEts3z0RrFUIqGTrtMXMExi5Fz AyrGLUKE4tKkst0jWy1EsqykzPKMlNzMzRNTQw08tNLS5OTE/NSUwq1kvOz93ECPQvAxDsYDy wKPAQoyQHk5Io72WFtxFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHhPlAHlBItS01Mr0jJzgIEG k5bg4FES4VUsB0rzFhck5hZnpkOkTjEqSonz3gXpEwBJZJTmwbXBgvsSo6yUMC8j0CFCPAWpR bmZJajyrxjFORiVhHmXgUzhycwrgZv+CmgxE9DiM7tegiwuSURISTUwbn3p86Flt9tu7RXJPl 8ZxPdV5m3vuCyeZyj17Y32w8qNDKybPRm9+4X+uhpzqXqm9747/Gxff2C5RPz35o0XTU+f9VV zeZf8Xfj54RCmHbrPzHJnLtz192Yt/9xFAQfu+9mLZM4UDP/Ztd9BdHute0fwvpWfk1fJOkzc 8vlZvffVjbErvlfFK7EUZyQaajEXFScCAJu79hhpAgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1491957965!87418956!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50764 invoked from network); 12 Apr 2017 00:46:05 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-13.tower-27.messagelabs.com with SMTP; 12 Apr 2017 00:46:05 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 046FEB16; Tue, 11 Apr 2017 17:46:05 -0700 (PDT) Received: from slackpad.lan (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5C6A13F575; Tue, 11 Apr 2017 17:46:03 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Wed, 12 Apr 2017 01:44:09 +0100 Message-Id: <1491957874-31600-3-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1491957874-31600-1-git-send-email-andre.przywara@arm.com> References: <1491957874-31600-1-git-send-email-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Vijaya Kumar K , Vijay Kilari , Shanker Donthineni Subject: [Xen-devel] [PATCH v8 02/27] ARM: VGIC: move irq_to_pending() calls under the VGIC VCPU lock X-BeenThere: xen-devel@lists.xen.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.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP So far irq_to_pending() is just a convenience function to lookup in statically allocated arrays. This will change with LPIs, which are more dynamic. So move the irq_to_pending() call under the VGIC VCPU lock, so we only use this pointer while holding the lock. Signed-off-by: Andre Przywara --- xen/arch/arm/gic.c | 5 ++++- xen/arch/arm/vgic.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index da19130..dcb1783 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -402,10 +402,13 @@ static inline void gic_add_to_lr_pending(struct vcpu *v, struct pending_irq *n) void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq) { - struct pending_irq *p = irq_to_pending(v, virtual_irq); + struct pending_irq *p; unsigned long flags; spin_lock_irqsave(&v->arch.vgic.lock, flags); + + p = irq_to_pending(v, virtual_irq); + if ( !list_empty(&p->lr_queue) ) list_del_init(&p->lr_queue); spin_unlock_irqrestore(&v->arch.vgic.lock, flags); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 83569b0..c953f13 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -466,14 +466,16 @@ void vgic_clear_pending_irqs(struct vcpu *v) void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq) { uint8_t priority; - struct pending_irq *iter, *n = irq_to_pending(v, virq); + struct pending_irq *iter, *n; unsigned long flags; bool running; - priority = vgic_get_virq_priority(v, virq); - spin_lock_irqsave(&v->arch.vgic.lock, flags); + n = irq_to_pending(v, virq); + + priority = vgic_get_virq_priority(v, virq); + /* vcpu offline */ if ( test_bit(_VPF_down, &v->pause_flags) ) {