From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgvJv-0007TS-Gp for qemu-devel@nongnu.org; Tue, 29 Sep 2015 09:51:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgvJs-0007T4-31 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 09:51:51 -0400 Received: from lhrrgout.huawei.com ([194.213.3.17]:60358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgvJr-0007Rn-7L for qemu-devel@nongnu.org; Tue, 29 Sep 2015 09:51:48 -0400 References: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> <1443094669-4144-34-git-send-email-marcandre.lureau@redhat.com> From: Claudio Fontana Message-ID: <560A976F.6080005@huawei.com> Date: Tue, 29 Sep 2015 15:51:43 +0200 MIME-Version: 1.0 In-Reply-To: <1443094669-4144-34-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 33/47] ivshmem-server: use a uint16 for client ID 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 > > In practice, the number of VM is limited to MAXUINT16 in ivshmem, so use > the same limit on the server (removes a theorical infinite loop) > > Signed-off-by: Marc-André Lureau > --- > contrib/ivshmem-server/ivshmem-server.c | 11 ++++++++++- > contrib/ivshmem-server/ivshmem-server.h | 2 +- > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/contrib/ivshmem-server/ivshmem-server.c b/contrib/ivshmem-server/ivshmem-server.c > index 16ee583..972fda2 100644 > --- a/contrib/ivshmem-server/ivshmem-server.c > +++ b/contrib/ivshmem-server/ivshmem-server.c > @@ -145,9 +145,18 @@ ivshmem_server_handle_new_conn(IvshmemServer *server) > peer->sock_fd = newfd; > > /* get an unused peer id */ > - while (ivshmem_server_search_peer(server, server->cur_id) != NULL) { > + /* XXX: this could use id allocation such as Linux IDA, or simply > + * a free-list */ > + for (i = 0; i < G_MAXUINT16; i++) { > + if (ivshmem_server_search_peer(server, server->cur_id) == NULL) { > + break; > + } > server->cur_id++; > } > + if (i == G_MAXUINT16) { > + IVSHMEM_SERVER_DEBUG(server, "cannot allocate new client id\n"); > + goto fail; > + } > peer->id = server->cur_id++; > > /* create eventfd, one per vector */ > diff --git a/contrib/ivshmem-server/ivshmem-server.h b/contrib/ivshmem-server/ivshmem-server.h > index cd584fc..2176d5e 100644 > --- a/contrib/ivshmem-server/ivshmem-server.h > +++ b/contrib/ivshmem-server/ivshmem-server.h > @@ -70,7 +70,7 @@ typedef struct IvshmemServer { > size_t shm_size; /**< size of shm */ > int shm_fd; /**< shm file descriptor */ > unsigned n_vectors; /**< number of vectors */ > - long cur_id; /**< id to be given to next client */ > + uint16_t cur_id; /**< id to be given to next client */ > bool verbose; /**< true in verbose mode */ > IvshmemServerPeerList peer_list; /**< list of peers */ > } IvshmemServer; > Reviewed-by: Claudio Fontana