From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgwYB-00022w-QA for qemu-devel@nongnu.org; Tue, 29 Sep 2015 11:10:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgwY7-0007bE-Dn for qemu-devel@nongnu.org; Tue, 29 Sep 2015 11:10:39 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:17841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgwY6-0007Zl-Fl for qemu-devel@nongnu.org; Tue, 29 Sep 2015 11:10:35 -0400 References: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> <1443094669-4144-42-git-send-email-marcandre.lureau@redhat.com> From: Claudio Fontana Message-ID: <560AA9E2.7040501@huawei.com> Date: Tue, 29 Sep 2015 17:10:26 +0200 MIME-Version: 1.0 In-Reply-To: <1443094669-4144-42-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 41/47] ivshmem: do not keep shm_fd open List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: pbonzini@redhat.com, drjones@redhat.com, cam@cs.ualberta.ca, stefanha@redhat.com On 24.09.2015 13:37, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Remove shm_fd from device state, closing it as early as possible to avoid leaks. > > Signed-off-by: Marc-André Lureau > --- > hw/misc/ivshmem.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) > > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index fc1de8d..273db36 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -88,7 +88,6 @@ typedef struct IVShmemState { > MemoryRegion ivshmem; > uint64_t ivshmem_size; /* size of shared memory region */ > uint32_t ivshmem_64bit; > - int shm_fd; /* shared memory file descriptor */ > > Peer *peers; > int nb_peers; /* how many peers we have space for */ > @@ -235,7 +234,7 @@ static uint64_t ivshmem_io_read(void *opaque, hwaddr addr, > > case IVPOSITION: > /* return my VM ID if the memory is mapped */ > - if (s->shm_fd >= 0) { > + if (memory_region_is_mapped(&s->ivshmem)) { > ret = s->vm_id; > } else { > ret = -1; > @@ -356,8 +355,6 @@ static int create_shared_memory_BAR(IVShmemState *s, int fd, uint8_t attr, > return -1; > } > > - s->shm_fd = fd; > - > memory_region_init_ram_ptr(&s->ivshmem, OBJECT(s), "ivshmem.bar2", > s->ivshmem_size, ptr); > vmstate_register_ram(&s->ivshmem, DEVICE(s)); > @@ -535,7 +532,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) > if (incoming_posn == -1) { > void * map_ptr; > > - if (s->shm_fd >= 0) { > + if (memory_region_is_mapped(&s->ivshmem)) { > error_report("shm already initialized"); > close(incoming_fd); > return; > @@ -564,9 +561,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) > > memory_region_add_subregion(&s->bar, 0, &s->ivshmem); > > - /* only store the fd if it is successfully mapped */ > - s->shm_fd = incoming_fd; > - > + close(incoming_fd); > return; > } > > @@ -707,8 +702,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) > PCI_BASE_ADDRESS_MEM_PREFETCH; > Error *local_err = NULL; > > - s->shm_fd = -1; > - > if (s->sizearg == NULL) { > s->ivshmem_size = 4 << 20; /* 4 MB default */ > } else { > @@ -830,6 +823,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) > } > > create_shared_memory_BAR(s, fd, attr, errp); > + close(fd); > } > } > > @@ -845,7 +839,7 @@ static void pci_ivshmem_exit(PCIDevice *dev) > error_free(s->migration_blocker); > } > > - if (s->shm_fd >= 0) { > + if (memory_region_is_mapped(&s->ivshmem)) { > void *addr = memory_region_get_ram_ptr(&s->ivshmem); > > vmstate_unregister_ram(&s->ivshmem, DEVICE(dev)); > Reviewed-by: Claudio Fontana