From patchwork Tue Apr 26 13:19:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 732652 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3QDK4aw030160 for ; Tue, 26 Apr 2011 13:20:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755477Ab1DZNTt (ORCPT ); Tue, 26 Apr 2011 09:19:49 -0400 Received: from goliath.siemens.de ([192.35.17.28]:27487 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755462Ab1DZNTq (ORCPT ); Tue, 26 Apr 2011 09:19:46 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p3QDJeFZ006629; Tue, 26 Apr 2011 15:19:41 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p3QDJepF031993; Tue, 26 Apr 2011 15:19:40 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [PATCH v2 4/9] qemu-kvm: Fix and clean up msix vector use/unuse hooks Date: Tue, 26 Apr 2011 15:19:34 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 26 Apr 2011 13:20:04 +0000 (UTC) Remove the premature return from msix_vector_use if the vector was already in use, this could cause usage counter imbalances. In contrast, the check for msix_entry_used on deletion was redundant. At this chance, rename the internal API to clarify what is added/deleted here. Signed-off-by: Jan Kiszka --- hw/msix.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 52facd4..1bdffb6 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -108,7 +108,7 @@ static void kvm_msix_update(PCIDevice *dev, int vector, } } -static int kvm_msix_add(PCIDevice *dev, unsigned vector) +static int kvm_msix_vector_add(PCIDevice *dev, unsigned vector) { KVMMsiMessage *kmm = dev->msix_irq_entries + vector; int r; @@ -141,11 +141,8 @@ static int kvm_msix_add(PCIDevice *dev, unsigned vector) return 0; } -static void kvm_msix_del(PCIDevice *dev, unsigned vector) +static void kvm_msix_vector_del(PCIDevice *dev, unsigned vector) { - if (dev->msix_entry_used[vector]) { - return; - } kvm_msi_message_del(&dev->msix_irq_entries[vector]); kvm_commit_irq_routes(); } @@ -548,11 +545,9 @@ int msix_vector_use(PCIDevice *dev, unsigned vector) int ret; if (vector >= dev->msix_entries_nr) return -EINVAL; - if (dev->msix_entry_used[vector]) { - return 0; - } - if (kvm_enabled() && kvm_irqchip_in_kernel()) { - ret = kvm_msix_add(dev, vector); + if (kvm_enabled() && kvm_irqchip_in_kernel() && + !dev->msix_entry_used[vector]) { + ret = kvm_msix_vector_add(dev, vector); if (ret) { return ret; } @@ -571,7 +566,7 @@ void msix_vector_unuse(PCIDevice *dev, unsigned vector) return; } if (kvm_enabled() && kvm_irqchip_in_kernel()) { - kvm_msix_del(dev, vector); + kvm_msix_vector_del(dev, vector); } msix_clr_pending(dev, vector); }