From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: [PATCH v2 4/8] pci-assign: Only calculate maximum MSI-X vector entries once Date: Tue, 31 Jan 2012 22:32:44 -0700 Message-ID: <20120201053244.9843.79456.stgit@bling.home> References: <20120201052203.9843.80792.stgit@bling.home> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: alex.williamson@redhat.com, avi@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, shashidhar.patil@gmail.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:48861 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751420Ab2BAFct (ORCPT ); Wed, 1 Feb 2012 00:32:49 -0500 In-Reply-To: <20120201052203.9843.80792.stgit@bling.home> Sender: kvm-owner@vger.kernel.org List-ID: We'll use this in a few more places for reseting the MSI-X table and ignoring certain accesses, so it seems worth two bytes to not recalculate all the time. Signed-off-by: Alex Williamson --- hw/device-assignment.c | 17 +++++++---------- hw/device-assignment.h | 1 + 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 53c843e..25dff2c 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -964,20 +964,14 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev) static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev) { AssignedDevice *adev = DO_UPCAST(AssignedDevice, dev, pci_dev); - uint16_t entries_nr = 0, entries_max_nr; - int pos = 0, i, r = 0; + uint16_t entries_nr = 0; + int i, r = 0; struct kvm_assigned_msix_nr msix_nr; struct kvm_assigned_msix_entry msix_entry; MSIXTableEntry *entry = adev->msix_table; - pos = pci_find_capability(pci_dev, PCI_CAP_ID_MSIX); - - entries_max_nr = *(uint16_t *)(pci_dev->config + pos + 2); - entries_max_nr &= PCI_MSIX_FLAGS_QSIZE; - entries_max_nr += 1; - /* Get the usable entry number for allocating */ - for (i = 0; i < entries_max_nr; i++, entry++) { + for (i = 0; i < adev->msix_max; i++, entry++) { /* Ignore unused entry even it's unmasked */ if (entry->data == 0) { continue; @@ -1005,7 +999,7 @@ static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev) msix_entry.assigned_dev_id = msix_nr.assigned_dev_id; entries_nr = 0; entry = adev->msix_table; - for (i = 0; i < entries_max_nr; i++, entry++) { + for (i = 0; i < adev->msix_max; i++, entry++) { if (entries_nr >= msix_nr.entry_nr) break; if (entry->data == 0) { @@ -1218,6 +1212,9 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) bar_nr = msix_table_entry & PCI_MSIX_FLAGS_BIRMASK; msix_table_entry &= ~PCI_MSIX_FLAGS_BIRMASK; dev->msix_table_addr = pci_region[bar_nr].base_addr + msix_table_entry; + dev->msix_max = pci_get_word(pci_dev->config + pos + PCI_MSIX_FLAGS); + dev->msix_max &= PCI_MSIX_FLAGS_QSIZE; + dev->msix_max += 1; } /* Minimal PM support, nothing writable, device appears to NAK changes */ diff --git a/hw/device-assignment.h b/hw/device-assignment.h index 2e06ebb..b4bcfa6 100644 --- a/hw/device-assignment.h +++ b/hw/device-assignment.h @@ -117,6 +117,7 @@ typedef struct AssignedDevice { struct kvm_irq_routing_entry *entry; MSIXTableEntry *msix_table; target_phys_addr_t msix_table_addr; + uint16_t msix_max; MemoryRegion mmio; char *configfd_name; int32_t bootindex;