fix comment on cpu_register_physical_memory_offset
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v4 1/2 fix comment on cpu_register_physical_memory_offset
We don't require full pages in cpu_register_physical_memory, except for RAM.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- exec.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
exec.c +3 -2
@@ -2291,8 +2291,9 @@ static void *subpage_init (target_phys_addr_t base, ram_addr_t *phys, } \ }while (0 ) -/* register physical memory. 'size' must be a multiple of the target -page size. If (phys_offset & ~TARGET_PAGE_MASK) != 0, then it is an +/* register physical memory. +For RAM, 'size' must be a multiple of the target page size. +If (phys_offset & ~TARGET_PAGE_MASK) != 0, then it is an io memory page. The address used when calling the IO function is the offset from the start of the region, plus region_offset. Both start_addr and region_offset are rounded down to a page boundary
Signature · 1 line
1.6.5.rc2
PATCH v4 2/2 qemu: clean up target page usage in msix
In reply to a message not in the archiveSince cpu_register_phys_memory does not require size to be a multiple of target page size, simply make msix page size 0x1000. Do this in msix, reverting part of 5e520a7d500ec2569d22d80f9ef4272a34cb3c80, as we no longer have to pass target page around.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- hw/msix.c | 49 ++++++++++++++++++++++++------------------------- hw/msix.h | 5 ++--- hw/pci.h | 6 ------ hw/virtio-pci.c | 3 +-- 4 files changed, 27 insertions(+), 36 deletions(-)
hw/msix.c +24 -25
@@ -38,6 +38,13 @@#define MSIX_VECTOR_CTRL 12#define MSIX_ENTRY_SIZE 16#define MSIX_VECTOR_MASK 0x1 + +/* How much space does an MSIX table need. */ +/* The spec requires giving the table structure +* a 4K aligned region all by itself. */ +#define MSIX_PAGE_SIZE 0x1000 +/* Reserve second half of the page for pending bits */ +#define MSIX_PAGE_PENDING (MSIX_PAGE_SIZE / 2)#define MSIX_MAX_ENTRIES 32
@@ -53,12 +60,6 @@/* Flag for interrupt controller to declare MSI-X support */ int msix_supported; -/* Reserve second half of the page for pending bits */ -static int msix_page_pending (PCIDevice *d) -{ -return (d->msix_page_size /2 ); -} -/* Add MSI-X capability to the config space for the device. */ /* Given a bar and its size, add MSI-X table on top of it * and fill MSI-X capability in the config space.
@@ -78,12 +79,13 @@ static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries,/* Add space for MSI-X structures */ if (!bar_size) { - new_size = pdev->msix_page_size; - }else if (bar_size < pdev->msix_page_size) { - bar_size = pdev->msix_page_size; - new_size = pdev->msix_page_size *2 ; - }else + new_size =MSIX_PAGE_SIZE ; + }else if (bar_size <MSIX_PAGE_SIZE ) { + bar_size =MSIX_PAGE_SIZE ; + new_size =MSIX_PAGE_SIZE *2 ; + }else { new_size = bar_size *2 ; + } pdev->msix_bar_size = new_size; config_offset =pci_add_capability (pdev,PCI_CAP_ID_MSIX ,MSIX_CAP_LENGTH );
@@ -95,8 +97,8 @@ static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries,/* Table on top of BAR */ pci_set_long (config +MSIX_TABLE_OFFSET , bar_size | bar_nr);/* Pending bits on top of that */ -pci_set_long (config +MSIX_PBA_OFFSET , (bar_size +msix_page_pending (pdev)) - | bar_nr); +pci_set_long (config +MSIX_PBA_OFFSET , (bar_size +MSIX_PAGE_PENDING ) | + bar_nr); pdev->msix_cap = config_offset;/* Make flags bit writeable. */ pdev->wmask[config_offset +MSIX_ENABLE_OFFSET ] |=MSIX_ENABLE_MASK ;
@@ -126,7 +128,7 @@ void msix_write_config(PCIDevice *dev, uint32_t addr,static uint32_t msix_mmio_readl (void *opaque,target_phys_addr_t addr) {PCIDevice *dev = opaque; -unsigned int offset = addr & (dev->msix_page_size -1 ); +unsigned int offset = addr & (MSIX_PAGE_SIZE -1 );void *page = dev->msix_table_page;uint32_t val =0 ;
@@ -148,7 +150,7 @@ static uint8_t msix_pending_mask(int vector)static uint8_t *msix_pending_byte (PCIDevice *dev,int vector) { -return dev->msix_table_page +msix_page_pending (dev) + vector /8 ; +return dev->msix_table_page +MSIX_PAGE_PENDING + vector /8 ; }static int msix_is_pending (PCIDevice *dev,int vector)
@@ -176,7 +178,7 @@ static void msix_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t val) {PCIDevice *dev = opaque; -unsigned int offset = addr & (dev->msix_page_size -1 ); +unsigned int offset = addr & (MSIX_PAGE_SIZE -1 );int vector = offset /MSIX_ENTRY_SIZE ;memcpy (dev->msix_table_page + offset, &val,4 );if (!msix_is_masked (dev, vector) &&msix_is_pending (dev, vector)) {
@@ -205,7 +207,7 @@ void msix_mmio_map(PCIDevice *d, int region_num, {uint8_t *config = d->config + d->msix_cap;uint32_t table =pci_get_long (config +MSIX_TABLE_OFFSET ); -uint32_t offset = table & ~(d->msix_page_size -1 ); +uint32_t offset = table & ~(MSIX_PAGE_SIZE -1 );/* TODO: for assigned devices, we'll want to make it possible to map * pending bits separately in case they are in a separate bar. */ int table_bir = table &PCI_MSIX_FLAGS_BIRMASK ;
@@ -221,7 +223,7 @@ void msix_mmio_map(PCIDevice *d, int region_num,/* Initialize the MSI-X structures. Note: if MSI-X is supported, BAR size is * modified, it should be retrieved with msix_bar_size. */ int msix_init (struct PCIDevice *dev,unsigned short nentries, -unsigned bar_nr,unsigned bar_size,target_phys_addr_t page_size) +unsigned bar_nr,unsigned bar_size) {int ret;/* Nothing to do if MSI is not supported by interrupt controller */
@@ -234,8 +236,7 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries, dev->msix_entry_used =qemu_mallocz (MSIX_MAX_ENTRIES *sizeof *dev->msix_entry_used); - dev->msix_page_size = page_size; - dev->msix_table_page =qemu_mallocz (dev->msix_page_size); + dev->msix_table_page =qemu_mallocz (MSIX_PAGE_SIZE ); dev->msix_mmio_index =cpu_register_io_memory (msix_mmio_read, msix_mmio_write, dev);
@@ -290,8 +291,7 @@ void msix_save(PCIDevice *dev, QEMUFile *f) }qemu_put_buffer (f, dev->msix_table_page, n *MSIX_ENTRY_SIZE ); -qemu_put_buffer (f, dev->msix_table_page +msix_page_pending (dev), - (n +7 ) /8 ); +qemu_put_buffer (f, dev->msix_table_page +MSIX_PAGE_PENDING , (n +7 ) /8 ); }/* Should be called after restoring the config space. */
@@ -305,8 +305,7 @@ void msix_load(PCIDevice *dev, QEMUFile *f)msix_free_irq_entries (dev);qemu_get_buffer (f, dev->msix_table_page, n *MSIX_ENTRY_SIZE ); -qemu_get_buffer (f, dev->msix_table_page +msix_page_pending (dev), - (n +7 ) /8 ); +qemu_get_buffer (f, dev->msix_table_page +MSIX_PAGE_PENDING , (n +7 ) /8 ); }/* Does device support MSI-X? */
@@ -356,7 +355,7 @@ void msix_reset(PCIDevice *dev)return ;msix_free_irq_entries (dev); dev->config[dev->msix_cap +MSIX_ENABLE_OFFSET ] &=MSIX_ENABLE_MASK ; -memset (dev->msix_table_page,0 , dev->msix_page_size); +memset (dev->msix_table_page,0 ,MSIX_PAGE_SIZE ); }/* PCI spec suggests that devices make it possible for software to configure
hw/msix.h +2 -3
@@ -3,9 +3,8 @@#include "qemu-common.h" -int msix_init (struct PCIDevice *dev,unsigned short nentries, -unsigned bar_nr,unsigned bar_size, -target_phys_addr_t page_size); +int msix_init (PCIDevice *pdev,unsigned short nentries, +unsigned bar_nr,unsigned bar_size);void msix_write_config (PCIDevice *pci_dev,uint32_t address,uint32_t val,int len);
hw/pci.h +0 -6
@@ -214,12 +214,6 @@ struct PCIDevice {uint32_t msix_bar_size;/* Version id needed for VMState */ int32_t version_id; -/* How much space does an MSIX table need. */ -/* The spec requires giving the table structure -* a 4K aligned region all by itself. Align it to -* target pages so that drivers can do passthrough -* on the rest of the region. */ -target_phys_addr_t msix_page_size; }; PCIDevice *pci_register_device(PCIBus *bus, const char *name,
hw/virtio-pci.c +1 -2
@@ -410,8 +410,7 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, config[0x3d ] =1 ; -if (vdev->nvectors && !msix_init (&proxy->pci_dev, vdev->nvectors,1 ,0 , -TARGET_PAGE_SIZE )) { +if (vdev->nvectors && !msix_init (&proxy->pci_dev, vdev->nvectors,1 ,0 )) { pci_register_bar(&proxy->pci_dev, 1, msix_bar_size(&proxy->pci_dev), PCI_ADDRESS_SPACE_MEM,
Signature · 1 line
1.6.5.rc2