From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aftoC-0006lP-KX for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aftoA-0001v6-NN for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aftoA-0001tz-Aa for qemu-devel@nongnu.org; Tue, 15 Mar 2016 14:35:06 -0400 From: Markus Armbruster Date: Tue, 15 Mar 2016 19:34:47 +0100 Message-Id: <1458066895-20632-33-git-send-email-armbru@redhat.com> In-Reply-To: <1458066895-20632-1-git-send-email-armbru@redhat.com> References: <1458066895-20632-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 32/40] ivshmem: Simplify memory regions for BAR 2 (shared memory) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: claudio.fontana@huawei.com, cam@cs.ualberta.ca, mlureau@redhat.com, david.marchand@6wind.com, pbonzini@redhat.com ivshmem_realize() puts the shared memory region in a container region. Used to be necessary to permit delayed mapping of the shared memory. However, we recently moved to synchronous mapping, in "ivshmem: Receive shared memory synchronously in realize()" and the commit following it. The container is redundant since then. Drop it. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- hw/misc/ivshmem.c | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 138ae9d..1b1de65 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -82,12 +82,8 @@ typedef struct IVShmemState { CharDriverState *server_chr; MemoryRegion ivshmem_mmio; =20 - /* We might need to register the BAR before we actually have the mem= ory. - * So prepare a container MemoryRegion for the BAR immediately and - * add a subregion when we have the memory. - */ - MemoryRegion bar; - MemoryRegion ivshmem; + MemoryRegion *ivshmem_bar2; /* BAR 2 (shared memory) */ + MemoryRegion server_bar2; /* used with server_chr */ size_t ivshmem_size; /* size of shared memory region */ uint32_t ivshmem_64bit; =20 @@ -487,7 +483,7 @@ static void process_msg_shmem(IVShmemState *s, int fd= , Error **errp) Error *err =3D NULL; void *ptr; =20 - if (memory_region_is_mapped(&s->ivshmem)) { + if (s->ivshmem_bar2) { error_setg(errp, "server sent unexpected shared memory message")= ; close(fd); return; @@ -506,11 +502,10 @@ static void process_msg_shmem(IVShmemState *s, int = fd, Error **errp) close(fd); return; } - memory_region_init_ram_ptr(&s->ivshmem, OBJECT(s), + memory_region_init_ram_ptr(&s->server_bar2, OBJECT(s), "ivshmem.bar2", s->ivshmem_size, ptr); - qemu_set_ram_fd(memory_region_get_ram_addr(&s->ivshmem), fd); - vmstate_register_ram(&s->ivshmem, DEVICE(s)); - memory_region_add_subregion(&s->bar, 0, &s->ivshmem); + qemu_set_ram_fd(memory_region_get_ram_addr(&s->server_bar2), fd); + s->ivshmem_bar2 =3D &s->server_bar2; } =20 static void process_msg_disconnect(IVShmemState *s, uint16_t posn, @@ -702,7 +697,7 @@ static void ivshmem_recv_setup(IVShmemState *s, Error= **errp) * successfully processed the server's shared memory message. * Assert that actually mapped the shared memory: */ - assert(memory_region_is_mapped(&s->ivshmem)); + assert(s->ivshmem_bar2); } =20 /* Select the MSI-X vectors used by device. @@ -903,7 +898,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem_mmio); =20 - memory_region_init(&s->bar, OBJECT(s), "ivshmem-bar2-container", s->= ivshmem_size); if (s->ivshmem_64bit) { attr |=3D PCI_BASE_ADDRESS_MEM_TYPE_64; } @@ -913,15 +907,10 @@ static void pci_ivshmem_realize(PCIDevice *dev, Err= or **errp) } =20 if (s->hostmem !=3D NULL) { - MemoryRegion *mr; - IVSHMEM_DPRINTF("using hostmem\n"); =20 - mr =3D host_memory_backend_get_memory(MEMORY_BACKEND(s->hostmem)= , - &error_abort); - vmstate_register_ram(mr, DEVICE(s)); - memory_region_add_subregion(&s->bar, 0, mr); - pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar); + s->ivshmem_bar2 =3D host_memory_backend_get_memory(s->hostmem, + &error_abort); } else { IVSHMEM_DPRINTF("using shared memory server (socket =3D %s)\n", s->server_chr->filename); @@ -929,8 +918,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) /* we allocate enough space for 16 peers and grow as needed */ resize_peers(s, 16); =20 - pci_register_bar(dev, 2, attr, &s->bar); - /* * Receive setup messages from server synchronously. * Older versions did it asynchronously, but that creates a @@ -951,6 +938,9 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) } } =20 + vmstate_register_ram(s->ivshmem_bar2, DEVICE(s)); + pci_register_bar(PCI_DEVICE(s), 2, attr, s->ivshmem_bar2); + if (s->role_val =3D=3D IVSHMEM_PEER) { error_setg(&s->migration_blocker, "Migration is disabled when using feature 'peer mode'= in device 'ivshmem'"); @@ -968,9 +958,9 @@ static void pci_ivshmem_exit(PCIDevice *dev) error_free(s->migration_blocker); } =20 - if (memory_region_is_mapped(&s->ivshmem)) { + if (memory_region_is_mapped(s->ivshmem_bar2)) { if (!s->hostmem) { - void *addr =3D memory_region_get_ram_ptr(&s->ivshmem); + void *addr =3D memory_region_get_ram_ptr(s->ivshmem_bar2); int fd; =20 if (munmap(addr, s->ivshmem_size) =3D=3D -1) { @@ -978,14 +968,11 @@ static void pci_ivshmem_exit(PCIDevice *dev) strerror(errno)); } =20 - fd =3D qemu_get_ram_fd(memory_region_get_ram_addr(&s->ivshme= m)); - if (fd !=3D -1) { - close(fd); - } + fd =3D qemu_get_ram_fd(memory_region_get_ram_addr(s->ivshmem= _bar2)); + close(fd); } =20 - vmstate_unregister_ram(&s->ivshmem, DEVICE(dev)); - memory_region_del_subregion(&s->bar, &s->ivshmem); + vmstate_unregister_ram(s->ivshmem_bar2, DEVICE(dev)); } =20 if (s->peers) { --=20 2.4.3