From patchwork Sun Nov 25 03:51:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 201512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5826F2C0093 for ; Sun, 25 Nov 2012 14:53:11 +1100 (EST) Received: from localhost ([::1]:42787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcTHJ-0006At-Iz for incoming@patchwork.ozlabs.org; Sat, 24 Nov 2012 22:53:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcTHC-0006Ad-Ik for qemu-devel@nongnu.org; Sat, 24 Nov 2012 22:53:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcTHB-0001Od-5b for qemu-devel@nongnu.org; Sat, 24 Nov 2012 22:53:02 -0500 Received: from mail-da0-f45.google.com ([209.85.210.45]:49879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcTHA-0001NZ-V3 for qemu-devel@nongnu.org; Sat, 24 Nov 2012 22:53:01 -0500 Received: by mail-da0-f45.google.com with SMTP id w4so2146041dam.4 for ; Sat, 24 Nov 2012 19:53:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=YYYsgWpzwI0ey46WEhWTOFm7Gdc7pac2/TQOofVsQQU=; b=sEDdRRuhAAb7ZTVdfilUZlHmHT6do41d9+mZEBeEiZcbZOeed0AKHCXJRW8u/8VaD0 DJoaMJPZN4gnC21qU0OG5HcF9AchMnU6dyJPL//VTgEuVfJO4dmWBSi6Y3xgyTO+MBLP 3Wg7sOFgx5vnJRYxPT2ZmmOMh+rXUNqVxeuLybOJU8nNHAf1CuJ7R5Kyms5qZOxkqeZi aCaSWBxjGDnZLtkaBRKdcVrJmdXTTkgnezGkE3I83iO3Te+tePMo4zCa5PyeyiehwZKh WMlLSZq/FGDLO/ADcMnyxHY/oubQbC4N6xw3rG5MaWAUcc9N0iFHaVWT/5i8iHhwfIrT sZlQ== Received: by 10.68.132.197 with SMTP id ow5mr27587820pbb.40.1353815580224; Sat, 24 Nov 2012 19:53:00 -0800 (PST) Received: from localhost ([114.245.250.245]) by mx.google.com with ESMTPS id p10sm6353613pax.27.2012.11.24.19.52.52 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Nov 2012 19:52:59 -0800 (PST) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Sun, 25 Nov 2012 11:51:57 +0800 Message-Id: <1353815517-319-2-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1353815517-319-1-git-send-email-qemulist@gmail.com> References: <1353815517-319-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.45 Cc: Jan Kiszka , Cam Macdonell Subject: [Qemu-devel] [PATCH v2 2/2] ivshmem: use irqfd to interrupt among VMs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Liu Ping Fan Using irqfd, so we can avoid switch between kernel and user when VMs interrupts each other. Signed-off-by: Liu Ping Fan --- hw/ivshmem.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/hw/ivshmem.c b/hw/ivshmem.c index 7c8630c..5709e89 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -19,6 +19,7 @@ #include "hw.h" #include "pc.h" #include "pci.h" +#include "msi.h" #include "msix.h" #include "kvm.h" #include "migration.h" @@ -83,6 +84,7 @@ typedef struct IVShmemState { uint32_t vectors; uint32_t features; EventfdEntry *eventfd_table; + int *vector_virqs; Error *migration_blocker; @@ -625,16 +627,62 @@ static int ivshmem_load(QEMUFile* f, void *opaque, int version_id) return 0; } +static int ivshmem_vector_use(PCIDevice *dev, unsigned vector, + MSIMessage msg) +{ + IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev); + int virq; + EventNotifier *n = &s->peers[s->vm_id].eventfds[vector]; + + virq = kvm_irqchip_add_msi_route(kvm_state, msg); + if (virq >= 0 && kvm_irqchip_add_irqfd_notifier(kvm_state, n, virq) >= 0) { + s->vector_virqs[vector] = virq; + qemu_chr_add_handlers(s->eventfd_chr[vector], NULL, NULL, NULL, NULL); + } else if (virq >= 0) { + kvm_irqchip_release_virq(kvm_state, virq); + error_report("ivshmem, can not setup irqfd\n"); + return -1; + } else { + error_report("ivshmem, no enough msi route to setup irqfd\n"); + return -1; + } + + return 0; +} + +static void ivshmem_vector_release(PCIDevice *dev, unsigned vector) +{ + IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev); + EventNotifier *n = &s->peers[s->vm_id].eventfds[vector]; + int virq = s->vector_virqs[vector]; + + if (s->vector_virqs[vector] >= 0) { + kvm_irqchip_remove_irqfd_notifier(kvm_state, n, virq); + kvm_irqchip_release_virq(kvm_state, virq); + s->vector_virqs[vector] = -1; + } +} + static void ivshmem_write_config(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len) { + bool is_enabled, was_enabled = msi_enabled(pci_dev); + pci_default_write_config(pci_dev, address, val, len); + is_enabled = msi_enabled(pci_dev); + if (!was_enabled && is_enabled) { + msix_set_vector_notifiers(pci_dev, ivshmem_vector_use, + ivshmem_vector_release); + } else if (was_enabled && !is_enabled) { + msix_unset_vector_notifiers(pci_dev); + } } static int pci_ivshmem_init(PCIDevice *dev) { IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev); uint8_t *pci_conf; + int i; if (s->sizearg == NULL) s->ivshmem_size = 4 << 20; /* 4 MB default */ @@ -758,7 +806,10 @@ static int pci_ivshmem_init(PCIDevice *dev) } s->dev.config_write = ivshmem_write_config; - + s->vector_virqs = g_new0(int, s->vectors); + for (i = 0; i < s->vectors; i++) { + s->vector_virqs[i] = -1; + } return 0; } @@ -770,6 +821,7 @@ static void pci_ivshmem_uninit(PCIDevice *dev) migrate_del_blocker(s->migration_blocker); error_free(s->migration_blocker); } + g_free(s->vector_virqs); memory_region_destroy(&s->ivshmem_mmio); memory_region_del_subregion(&s->bar, &s->ivshmem);