[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC][PATCH 22/45] qemu-kvm: msix: Fire mask notifier o
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [RFC][PATCH 22/45] qemu-kvm: msix: Fire mask notifier on global mask changes |
Date: |
Mon, 17 Oct 2011 14:16:20 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Mon, Oct 17, 2011 at 11:27:56AM +0200, Jan Kiszka wrote:
> Also invoke the mask notifier if the global MSI-X mask is modified. For
> this purpose, we push the notifier call from the per-vector mask update
> to the central msix_handle_mask_update.
>
> Signed-off-by: Jan Kiszka <address@hidden>
This is a bugfix, isn't it?
If yes it should be separated and put on -stable.
> ---
> hw/msix.c | 16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/hw/msix.c b/hw/msix.c
> index 739b56f..247b255 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -221,7 +221,15 @@ static bool msix_is_masked(PCIDevice *dev, int vector)
>
> static void msix_handle_mask_update(PCIDevice *dev, int vector)
> {
> - if (!msix_is_masked(dev, vector) && msix_is_pending(dev, vector)) {
> + bool masked = msix_is_masked(dev, vector);
> + int ret;
> +
> + if (dev->msix_mask_notifier) {
> + ret = dev->msix_mask_notifier(dev, vector,
> + msix_is_masked(dev, vector));
Use 'masked' value here as well?
> + assert(ret >= 0);
> + }
> + if (!masked && msix_is_pending(dev, vector)) {
> msix_clr_pending(dev, vector);
> msix_notify(dev, vector);
> }
> @@ -262,7 +270,6 @@ static void msix_mmio_write(void *opaque,
> target_phys_addr_t addr,
> unsigned int offset = addr & (MSIX_PAGE_SIZE - 1) & ~0x3;
> unsigned int vector = offset / PCI_MSIX_ENTRY_SIZE;
> bool was_masked = msix_is_masked(dev, vector);
> - int r;
>
> pci_set_long(dev->msix_table_page + offset, val);
> if (kvm_enabled() && kvm_irqchip_in_kernel()) {
> @@ -271,11 +278,6 @@ static void msix_mmio_write(void *opaque,
> target_phys_addr_t addr,
>
> if (vector < dev->msix_entries_nr &&
> was_masked != msix_is_masked(dev, vector)) {
> - if (dev->msix_mask_notifier) {
> - r = dev->msix_mask_notifier(dev, vector,
> - msix_is_masked(dev, vector));
> - assert(r >= 0);
> - }
> msix_handle_mask_update(dev, vector);
> }
> }
> --
> 1.7.3.4
- Re: [Qemu-devel] [RFC][PATCH 12/45] msi: Introduce MSIRoutingCache, (continued)
Re: [Qemu-devel] [RFC][PATCH 12/45] msi: Introduce MSIRoutingCache, Michael S. Tsirkin, 2011/10/17
[Qemu-devel] [RFC][PATCH 03/45] msi: Use msi/msix_present more consistently, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 19/45] qemu-kvm: Factor out kvm_msi_irqfd_set, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 21/45] qemu-kvm: msix: Don't fire notifier spuriously on set/unset, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 02/45] msi: Guard msi_reset with msi_present, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 22/45] qemu-kvm: msix: Fire mask notifier on global mask changes, Jan Kiszka, 2011/10/17
- Re: [Qemu-devel] [RFC][PATCH 22/45] qemu-kvm: msix: Fire mask notifier on global mask changes,
Michael S. Tsirkin <=
[Qemu-devel] [RFC][PATCH 31/45] qemu-kvm: Refactor kvm_deassign_irq to kvm_device_irq_deassign, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 29/45] pci-assign: Drop kvm_assigned_irq::host_irq initialization, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 24/45] qemu-kvm: msix: Don't handle mask updated while disabled, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 30/45] pci-assign: Rename assign_irq to assign_intx, Jan Kiszka, 2011/10/17
[Qemu-devel] [RFC][PATCH 23/45] qemu-kvm: Rework MSI-X mask notifier to generic MSI config notifiers, Jan Kiszka, 2011/10/17