From patchwork Wed Apr 12 00:44:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9676265 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 C5E0060383 for ; Wed, 12 Apr 2017 00:48:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD0BA28565 for ; Wed, 12 Apr 2017 00:48:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A21AD2857B; Wed, 12 Apr 2017 00:48:45 +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 4FE5E28565 for ; Wed, 12 Apr 2017 00:48:45 +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 1cy6Ql-00010U-Nk; Wed, 12 Apr 2017 00:46:43 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy6Qk-0000y0-Kd for xen-devel@lists.xenproject.org; Wed, 12 Apr 2017 00:46:42 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id 19/A0-04817-2F87DE85; Wed, 12 Apr 2017 00:46:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRWlGSWpSXmKPExsVysyfVTfdjxds Ig0t/hS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxlV9MKDkhV7LvJ1sDYL9rFyMUhJLCJUeLs ronsXYycQM5eRonLn3hAbDYBXYkdN18zg9giAqESc34+YgZpYBZYwyjR/ukpK0hCWMBK4susp WDNLAKqEs8fLwRr4BVwl3i/5iNQDQeHhICcxJV/CSBhTqDw9t0TWSF2uUlsnbaYeQIj9wJGhl WMGsWpRWWpRbpG5npJRZnpGSW5iZk5uoYGZnq5qcXFiempOYlJxXrJ+bmbGIG+ZQCCHYyL1wY eYpTkYFIS5b2s8DZCiC8pP6UyI7E4I76oNCe1+BCjDAeHkgRvFDBUhASLUtNTK9Iyc4BBBpOW 4OBREuG9WA6U5i0uSMwtzkyHSJ1iVJQS53UH6RMASWSU5sG1wQL7EqOslDAvI9AhQjwFqUW5m SWo8q8YxTkYlYR5Z4KM58nMK4Gb/gpoMRPQ4jO7XoIsLklESEk1MB7P+NYk3CvjXfiqMezy+y PeAbvk9dQ9ct3/aXbx75gwV+X1++cnG7o0OxI3VDPx7hSyOHRCmf2p+JWYJXMvfVw1/YxJd/n mZvFKLqM4tqtSPJ3BvSUWP28qp6icebrgoK1h0jYXraDZfrLzfi/3ajz0zd+5o8Lgtu+M403v DjYEf4+79tvrsBJLcUaioRZzUXEiAEdVdp9nAgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1491958000!56681823!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 52887 invoked from network); 12 Apr 2017 00:46:41 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-14.tower-21.messagelabs.com with SMTP; 12 Apr 2017 00:46:41 -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 790A6CFC; Tue, 11 Apr 2017 17:46:40 -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 D7C923F575; Tue, 11 Apr 2017 17:46:38 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Wed, 12 Apr 2017 01:44:27 +0100 Message-Id: <1491957874-31600-21-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 20/27] ARM: GICv3: handle unmapped LPIs 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 When LPIs get unmapped by a guest, they might still be in some LR of some VCPU. Nevertheless we remove the corresponding pending_irq (possibly freeing it), and detect this case (irq_to_pending() returns NULL) when the LR gets cleaned up later. However a *new* LPI may get mapped with the same number while the old LPI is *still* in some LR. To avoid getting the wrong state, we mark every newly mapped LPI as PRISTINE, which means: has never been in an LR before. If we detect the LPI in an LR anyway, it must have been an older one, which we can simply retire. Signed-off-by: Andre Przywara --- xen/arch/arm/gic.c | 17 ++++++++++++++++- xen/arch/arm/vgic-v3-its.c | 5 +++++ xen/include/asm-arm/vgic.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index d752352..e8c3202 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -373,6 +373,8 @@ static inline void gic_set_lr(int lr, struct pending_irq *p, { ASSERT(!local_irq_is_enabled()); + clear_bit(GIC_IRQ_GUEST_PRISTINE_LPI, &p->status); + gic_hw_ops->update_lr(lr, p, state); set_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); @@ -510,7 +512,17 @@ static void gic_update_one_lr(struct vcpu *v, int i) } else if ( lr_val.state & GICH_LR_PENDING ) { - int q __attribute__ ((unused)) = test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); + int q __attribute__ ((unused)); + + if ( test_and_clear_bit(GIC_IRQ_GUEST_PRISTINE_LPI, &p->status) ) + { + gic_hw_ops->clear_lr(i); + clear_bit(i, &this_cpu(lr_mask)); + + return; + } + + q = test_and_clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); #ifdef GIC_DEBUG if ( q ) gdprintk(XENLOG_DEBUG, "trying to inject irq=%d into d%dv%d, when it is already pending in LR%d\n", @@ -522,6 +534,9 @@ static void gic_update_one_lr(struct vcpu *v, int i) gic_hw_ops->clear_lr(i); clear_bit(i, &this_cpu(lr_mask)); + if ( test_and_clear_bit(GIC_IRQ_GUEST_PRISTINE_LPI, &p->status) ) + return; + if ( p->desc != NULL ) clear_bit(_IRQ_INPROGRESS, &p->desc->status); clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index b7e61b2..0765810 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -618,6 +618,11 @@ static int its_handle_mapti(struct virt_its *its, uint64_t *cmdptr) goto out_remove_host_entry; pirq->lpi_vcpu_id = vcpu->vcpu_id; + /* + * Mark this LPI as new, so any older (now unmapped) LPI in any LR + * can be easily recognised as such. + */ + set_bit(GIC_IRQ_GUEST_PRISTINE_LPI, pirq->status); /* * Now insert the pending_irq into the domain's LPI tree, so that diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 02732db..b1a7525 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -66,6 +66,7 @@ struct pending_irq #define GIC_IRQ_GUEST_VISIBLE 2 #define GIC_IRQ_GUEST_ENABLED 3 #define GIC_IRQ_GUEST_MIGRATING 4 +#define GIC_IRQ_GUEST_PRISTINE_LPI 5 unsigned long status; struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ unsigned int irq;