From patchwork Fri Feb 3 14:39:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shanker Donthineni X-Patchwork-Id: 9554231 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 EA87E602B7 for ; Fri, 3 Feb 2017 14:40:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC8E6284F1 for ; Fri, 3 Feb 2017 14:40:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D165C284F6; Fri, 3 Feb 2017 14:40:26 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8084D284F1 for ; Fri, 3 Feb 2017 14:40:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753431AbdBCOkN (ORCPT ); Fri, 3 Feb 2017 09:40:13 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:53850 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752721AbdBCOkM (ORCPT ); Fri, 3 Feb 2017 09:40:12 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 853AF60886; Fri, 3 Feb 2017 14:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1486132811; bh=Jmk7OqGvkUI97Z877R/D6HpXgMht8rIv3E4LJBsJJzc=; h=From:To:Cc:Subject:Date:From; b=lQTF8tY5haX04bMcF1GQKPeTt5V8ZrwPn7z8d1YWZGh8mAzh9kHVrMaWtqdGGDj5V rLKbQlJthorMd2QFPiATDjo531Rwu2EHkxsgoOu+3VP9wYmc7YY1zUt6Q+QBMD4M2k a47q1MLBvCIbLdV33Kd043R8jyPatdzG5DBK5uC0= Received: from shankerd-ubuntu.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: shankerd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id DF234607EF; Fri, 3 Feb 2017 14:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1486132810; bh=Jmk7OqGvkUI97Z877R/D6HpXgMht8rIv3E4LJBsJJzc=; h=From:To:Cc:Subject:Date:From; b=e+2IqofaCuc17UrT2WtXPUmU0ZJkkUOnpvSErjRx8pl2d2WkUZuiX4xWDAGEbvn7n KVQxr6o7Fql+Qtgow3X0Jfcm5ZRVFomTpFVJjgEOfsl5RVzn7zyO47yQbH55MRp1iD aze5EY2NHOxhzvavuMFk5D8LgcL7zPLC3C0bgUzE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DF234607EF Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=shankerd@codeaurora.org From: Shanker Donthineni To: Marc Zyngier , Christoffer Dall Cc: linux-kernel , linux-arm-kernel , kvmarm , kvm , Eric Auger , Paolo Bonzini , Vikram Sethi , Shanker Donthineni Subject: [RESEND PATCH] KVM: arm/arm64: vgic: Stop injecting the MSI occurrence twice Date: Fri, 3 Feb 2017 08:39:49 -0600 Message-Id: <1486132790-20890-1-git-send-email-shankerd@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The IRQFD framework calls the architecture dependent function twice if the corresponding GSI type is edge triggered. For ARM, the function kvm_set_msi() is getting called twice whenever the IRQFD receives the event signal. The rest of the code path is trying to inject the MSI without any validation checks. No need to call the function vgic_its_inject_msi() second time to avoid an unnecessary overhead in IRQ queue logic. It also avoids the possibility of VM seeing the MSI twice. Simple fix, return -1 if the argument 'level' value is zero. Signed-off-by: Shanker Donthineni Reviewed-by: Eric Auger Reviewed-by: Christoffer Dall --- Forgot to CC the kvmarm list earlier, including now. virt/kvm/arm/vgic/vgic-irqfd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-irqfd.c b/virt/kvm/arm/vgic/vgic-irqfd.c index d918dcf..f138ed2 100644 --- a/virt/kvm/arm/vgic/vgic-irqfd.c +++ b/virt/kvm/arm/vgic/vgic-irqfd.c @@ -99,6 +99,9 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, if (!vgic_has_its(kvm)) return -ENODEV; + if (!level) + return -1; + return vgic_its_inject_msi(kvm, &msi); }