From patchwork Tue Mar 18 14:54:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 3854211 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32B31BF540 for ; Wed, 19 Mar 2014 17:48:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69AA920149 for ; Wed, 19 Mar 2014 17:48:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0275120171 for ; Wed, 19 Mar 2014 17:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932112AbaCROzI (ORCPT ); Tue, 18 Mar 2014 10:55:08 -0400 Received: from mail-ee0-f52.google.com ([74.125.83.52]:48307 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753641AbaCROzG (ORCPT ); Tue, 18 Mar 2014 10:55:06 -0400 Received: by mail-ee0-f52.google.com with SMTP id e49so5486188eek.11 for ; Tue, 18 Mar 2014 07:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qGzPVQGVSozTvmEADs6bqmVk7n+A4Qj+XxnR9Cdz04Y=; b=drP7OfghPr+CUT5kBEfjs9F5W2/zlz7hrWCSgBH4v+AsWTVKyu5MCQjmUAbijObz36 UTfzyVRF+6PFJSLDlSwssCk4yRnMJiwixnVmkrjYc16Y9ZLpB4Xxn+3I9065w0g/ym+2 2h18zqfo+CZDbmYdasOA1Exp3myKJKazhuZ3fHxU3HjVvN0CJCI3ZiWpuoM1yjs10lMS +baJnhuZgsAG5/AmZNSWp6TgRkUcnnjNceewu0JozNwJm2TqtYxI/85AdgN/nlU4yDp+ shWwa0DZ51MCNEnCqoWo9TtAJhhy8ze1iL1aChpzOIWJX6v16P2rdeI0Jxiuu9BmA5Y3 gRAg== X-Received: by 10.15.90.201 with SMTP id q49mr5509942eez.65.1395154505333; Tue, 18 Mar 2014 07:55:05 -0700 (PDT) Received: from playground.lan (net-37-117-154-249.cust.vodafonedsl.it. [37.117.154.249]) by mx.google.com with ESMTPSA id i1sm47822320eeo.16.2014.03.18.07.55.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Mar 2014 07:55:04 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org Cc: gleb@kernel.org, mtosatti@redhat.com, kvm@vger.kernel.org Subject: [PATCH 2/4] KVM: ioapic: clear IRR for edge-triggered interrupts at delivery Date: Tue, 18 Mar 2014 15:54:53 +0100 Message-Id: <1395154495-22807-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1395154495-22807-1-git-send-email-pbonzini@redhat.com> References: <1395154495-22807-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This ensures that IRR bits are set in the KVM_GET_IRQCHIP result only if the interrupt is still sitting in the IOAPIC. After the next patches, it avoids spurious reinjection of the interrupt when KVM_SET_IRQCHIP is called. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Williamson --- virt/kvm/ioapic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 0b4914147b9d..25e16a6898ed 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -288,6 +288,9 @@ static int ioapic_service(struct kvm_ioapic *ioapic, int irq, bool line_status) irqe.level = 1; irqe.shorthand = 0; + if (irqe.trig_mode == IOAPIC_EDGE_TRIG) + ioapic->irr &= ~(1 << irq); + if (irq == RTC_GSI && line_status) { BUG_ON(ioapic->rtc_status.pending_eoi != 0); ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe,