From patchwork Thu Dec 10 21:46:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 58246 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp763453lbb; Thu, 10 Dec 2015 13:47:44 -0800 (PST) X-Received: by 10.67.5.40 with SMTP id cj8mr19805377pad.98.1449784064846; Thu, 10 Dec 2015 13:47:44 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id n14si22658453pfb.48.2015.12.10.13.47.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Dec 2015 13:47:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a792l-0006Ol-Td; Thu, 10 Dec 2015 21:46:31 +0000 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a792j-0006KR-0d for linux-arm-kernel@lists.infradead.org; Thu, 10 Dec 2015 21:46:30 +0000 Received: by mail-wm0-x22f.google.com with SMTP id c201so52870190wme.0 for ; Thu, 10 Dec 2015 13:46:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=4Dmnh71brplfxnXX4KTuTTFvBMgSVc/QB/tsZPQX6Iw=; b=cEN8Q69iTDscMEbDdDU35BRXKcqGi+1rrRhaX9e3FT+bi/hS+FPPkSBUjA6DiEta2h 5EbnTQOoBiSlGBN49rMhWKt/jKuVFpc/aKjXJxCfEsm1nPhE/YhoVizg3uC23B8MaHgd ZazUBu8fUAyvFN6wiIUYCbF/rebQ8GmsrtLUqECgkrTn+iy85IcyMrqPSWd8hjrSMnTu yHvUn/qxinQ+lOPzhTPZ8NQTn+XijtRGFL7fTgHrr3N3vlZtEFNvl1CaD3KCns10R2uQ Mm+20m5iNQnsQ1YaM5dx9604epVZtSROdjqzJdrfWAXJfd63SlTXWfnOCGBq72XMSc/V LcAQ== 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=4Dmnh71brplfxnXX4KTuTTFvBMgSVc/QB/tsZPQX6Iw=; b=mDRc7ShsMQFKNW1BVB9nkj3mBa9ysPf7x0HmgoRhATjG5qkA2zmGv2T2bx6yH+b4Dz Nnh7D5HK4Z0gKSgsCmRGlV5XHFDLYClcZG3N/lDnkJRZ3GH8QyDfWiaTqxBjGM/v/6Te VElA5aMdhIRdk8yezKwWJTIUV1ko3i/qQm2+HMo4VZE74Cs2JgY2JaG4EN24qx++t9mP +p3doujovZTFp7VSymoRjD50dk5sxa89EdjMCKiTl4I9ko+r02QcYOE8Ys0yLa+LFtMR N7lX/F9tsnWGfwYDvNTGNCkjioA7eB+afovNpZcuOhO4vFoqzTuWi+1prDjLeigQnNJE Gigg== X-Gm-Message-State: ALoCoQnvoYDB4Jsm7+UyN2siERBx84UVNYocxaPZ4zs6WxPj18rQN6bPcxYRk56is2qtChhm5EkzIVbh2keMBAr0BbI2lgP5dA== X-Received: by 10.28.48.10 with SMTP id w10mr1355597wmw.39.1449783966702; Thu, 10 Dec 2015 13:46:06 -0800 (PST) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id 197sm579741wmt.19.2015.12.10.13.46.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Dec 2015 13:46:06 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH] KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check Date: Thu, 10 Dec 2015 22:46:50 +0100 Message-Id: <1449784010-21761-1-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151210_134629_217661_8B66B1EB X-CRM114-Status: GOOD ( 13.48 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22f listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Andre Przywara , Christoffer Dall , kvm@vger.kernel.org, Eric Auger MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org External inputs to the vgic from time to time need to poke into the state of a virtual interrupt, the prime example is the architected timer code. Since the IRQ's active state can be represented in two places; the LR or the distributor, we first loop over the LRs but if not active in the LRs we just return if *any* IRQ is active on the VCPU in question. This is of course bogus, as we should check if the specific IRQ in quesiton is active on the distributor instead. Reported-by: Eric Auger Signed-off-by: Christoffer Dall --- virt/kvm/arm/vgic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.1.2.330.g565301e.dirty _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 65461f8..7a2f449 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1114,7 +1114,7 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map) return true; } - return dist_active_irq(vcpu); + return vgic_irq_is_active(vcpu, map->virt_irq); } /*