From patchwork Fri Mar 21 09:27:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 3871891 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 D79CEBF540 for ; Fri, 21 Mar 2014 09:31:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 131332028D for ; Fri, 21 Mar 2014 09:31:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4351C2025B for ; Fri, 21 Mar 2014 09:31:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965237AbaCUJag (ORCPT ); Fri, 21 Mar 2014 05:30:36 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:62063 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965197AbaCUJ2R (ORCPT ); Fri, 21 Mar 2014 05:28:17 -0400 Received: by mail-ee0-f46.google.com with SMTP id t10so1567802eei.33 for ; Fri, 21 Mar 2014 02:28:16 -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=HxhU/hBp3QWlGQi+bT3tbuy3BNC4jG3LFhCeEBd4RY4=; b=ZQSM8+sTSM4jDZ2rFzojfmfaaqei8BiaBzjd8ezURkmwXArgur84B3wkGtxa1iSbox 4+XxVLLdpIGXcFZuiPOU+cwgEWaE9WkZQ2+f5qPym021sMOqNxWasm5V5eLqRBCjYi5v s+ivdTPEqWWcdxUKc+unIwfKo8ASeYvJpFciOKArKaWuV8mFPGQHZIjE79vSTZjz7F9M kbNbpyk1R5apaVtEHLR7qcYSBZZkpOnH7JlDQjzCyt0YNHHAC/EwkAVktVBYLNS6NvSZ 2n1W1EfxW6HLbkTrhAEDTZrlEC+xHWbFksc+eTJaUk19Wmyeugbm3UXNqapum/nsTA+7 f7Lg== X-Received: by 10.14.110.199 with SMTP id u47mr30659348eeg.74.1395394095978; Fri, 21 Mar 2014 02:28:15 -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 48sm10372690eee.2.2014.03.21.02.28.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Mar 2014 02:28:14 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, gleb@kernel.org, mtosatti@redhat.com, alex.williamson@redhat.com, jan.kiszka@siemens.com Subject: [PATCH v2 2/4] KVM: ioapic: clear IRR for edge-triggered interrupts at delivery Date: Fri, 21 Mar 2014 10:27:59 +0100 Message-Id: <1395394081-16252-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1395394081-16252-1-git-send-email-pbonzini@redhat.com> References: <1395394081-16252-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. Reviewed-by: Alex Williamson Signed-off-by: Paolo Bonzini --- 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,