From patchwork Fri Dec 2 16:38:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tyshchenko X-Patchwork-Id: 9458891 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 5063660236 for ; Fri, 2 Dec 2016 16:40:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E3F228585 for ; Fri, 2 Dec 2016 16:40:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3278028587; Fri, 2 Dec 2016 16:40:52 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 B385728585 for ; Fri, 2 Dec 2016 16:40:51 +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 1cCqqq-0006ge-8K; Fri, 02 Dec 2016 16:38:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCqqp-0006gS-IO for xen-devel@lists.xenproject.org; Fri, 02 Dec 2016 16:38:19 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id BD/63-22495-A73A1485; Fri, 02 Dec 2016 16:38:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnkeJIrShJLcpLzFFi42Lxqg1y1K1a7Bh hcOqroMX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmrGv/QFzwSuBitsHIhoYP3N1MXJxCAlMZ5S4 Mes9WxcjJweLwCUWiQUbakESEgLvWCR+z/sNlpAQiJH4/GUjC4RdKfF+eQcjiC0koCTxeudmJ ohJc5gk3j2eA1bEJmAgsf/dE3YQWwSo6N6qyUwgNrOAocS2yyfBaoQFgiTaH81ghtisKnFjxR JWEJtXwFli+a65UIvlJG6e62SewMi3gJFhFaNGcWpRWWqRrqGBXlJRZnpGSW5iZg6QZ6yXm1p cnJiempOYVKyXnJ+7iREYKPUMDIw7GLd1OR9ilORgUhLlNc1xjBDiS8pPqcxILM6ILyrNSS0+ xCjDwaEkweu4CCgnWJSanlqRlpkDDFmYtAQHj5IIbxNImre4IDG3ODMdInWKUZdjR+eap0xCL Hn5ealS4ryGIEUCIEUZpXlwI2Dxc4lRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMK8eyBSezL wSuE2vgI5gAjqi47o9yBEliQgpqQZG5kKDQPVZv8W8pJ4uvrhj36tCiRb1MvlNnv2nS6Uf5Gz 4uK6N89danZ9X+O/micw2v8srm+TwxEPw/5LJuQ0+HOeWKldxTZn9Jf/1QhHJ7ZmhU9XrT279 Eir9Yf6ZtudqBp1cf1fpC97gc17I6/QpnT9G9PcNMa6Hl3lPHxPbLxeecm5WoHuUEktxRqKhF nNRcSIA8S5nt5oCAAA= X-Env-Sender: olekstysh@gmail.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1480696698!66576686!1 X-Originating-IP: [74.125.82.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17166 invoked from network); 2 Dec 2016 16:38:18 -0000 Received: from mail-wm0-f65.google.com (HELO mail-wm0-f65.google.com) (74.125.82.65) by server-16.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 2 Dec 2016 16:38:18 -0000 Received: by mail-wm0-f65.google.com with SMTP id g23so3558407wme.1 for ; Fri, 02 Dec 2016 08:38:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=oS4UnHXhxoCVw3AEg75LQHUi0PNiTD2xZsIgnVlYLyE=; b=Hh0JnP0Y5ZT8fD24OEFsCpB0QDp7dP2LrMmeMk7dh+aBLFmxRT52rOquy6zfaQj+Mv TlCbl68kTnMxgoARvKdxb0h07/eNjbjFUlfGZ0LFw3OeWIEHNhrBfbyvFKYmUXXA+b8b Kuw1FrJlXi6KzUv47qLm54D+V6OtfMWDgQpe5APFIm3fla2GoK2DuUpzTI/26bBAZOWc SRP6NPf1RsJlWrvHPfLGW1E31C+bQsPLTZsuxi3UrDhiBt8CydB8r3gMx7/s3wgOAS3J ZEElmzRjUvMcSr+EM4VHyFutlf0gzAbJXjF60S4K68y2Up9VH9+UEH31uxgBZ9B5KGZA 92mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oS4UnHXhxoCVw3AEg75LQHUi0PNiTD2xZsIgnVlYLyE=; b=maOAAk+uSXRZjFKf5lIH5qmCL0PVxFXotwbXvdanhHYNyEaTldxShfN6X3J0D6xpFf u51qq5P+f9VjbI57/7N+COE5y65oz504Jn9uJpfCJiKAH+rkGIp+8GNKumchbfOUkWiG UADr6QbWC/vIAvs/lAqZxXJf51kzyYNfZpZWdLcHGfDxQYYvsR6S3nBWClkfSJ15HZDo 4Ysi2Y9xoYCMX2Wzb/aQkz/b+Ka69kSBc33m8B3QGn7nNIhp00NK7izPWJwgmaNpQrkd BTQRk1xWbKocp0IY1HWfG+FUb3XmN1yH5qubmMLy4enBmvU3eHhTAx/NJgNBKqseE3fI bLLA== X-Gm-Message-State: AKaTC03CmbS/Ox5FBzUFll9AZnlgXXx1mrSNA9FzfSkE+m662dRSquPkqHYpd4IQ8Wiaxg== X-Received: by 10.28.113.197 with SMTP id d66mr3666167wmi.77.1480696697825; Fri, 02 Dec 2016 08:38:17 -0800 (PST) Received: from otyshchenko.kyiv.epam.com (ll-56.209.223.85.sovam.net.ua. [85.223.209.56]) by smtp.gmail.com with ESMTPSA id c187sm4030464wmd.13.2016.12.02.08.38.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Dec 2016 08:38:17 -0800 (PST) From: Oleksandr Tyshchenko To: xen-devel@lists.xenproject.org Date: Fri, 2 Dec 2016 18:38:16 +0200 Message-Id: <1480696696-29833-1-git-send-email-olekstysh@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v1] arm/irq: Reorder check when the IRQ is already used by someone 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 Call irq_get_domain for the IRQ we are interested in only after making sure that it is the guest IRQ to avoid ASSERT(test_bit(_IRQ_GUEST, &desc->status)) triggering. Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Andrii Anisov Reviewed-by: Stefano Stabellini --- xen/arch/arm/irq.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 06d4843..508028b 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -477,26 +477,32 @@ int route_irq_to_guest(struct domain *d, unsigned int virq, */ if ( desc->action != NULL ) { - struct domain *ad = irq_get_domain(desc); - - if ( test_bit(_IRQ_GUEST, &desc->status) && d == ad ) + if ( test_bit(_IRQ_GUEST, &desc->status) ) { - if ( irq_get_guest_info(desc)->virq != virq ) + struct domain *ad = irq_get_domain(desc); + + if ( d == ad ) + { + if ( irq_get_guest_info(desc)->virq != virq ) + { + printk(XENLOG_G_ERR + "d%u: IRQ %u is already assigned to vIRQ %u\n", + d->domain_id, irq, irq_get_guest_info(desc)->virq); + retval = -EBUSY; + } + } + else { - printk(XENLOG_G_ERR - "d%u: IRQ %u is already assigned to vIRQ %u\n", - d->domain_id, irq, irq_get_guest_info(desc)->virq); + printk(XENLOG_G_ERR "IRQ %u is already used by domain %u\n", + irq, ad->domain_id); retval = -EBUSY; } - goto out; } - - if ( test_bit(_IRQ_GUEST, &desc->status) ) - printk(XENLOG_G_ERR "IRQ %u is already used by domain %u\n", - irq, ad->domain_id); else + { printk(XENLOG_G_ERR "IRQ %u is already used by Xen\n", irq); - retval = -EBUSY; + retval = -EBUSY; + } goto out; }