From nobody Thu May 2 18:19:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=nutanix.com ARC-Seal: i=1; a=rsa-sha256; t=1573025421; cv=none; d=zoho.com; s=zohoarc; b=bP5QQO2Mc+oJY2EsW2o3WqMm5Pg+DnOWRcjcWQzVx12TLdf7QUvVKzzYd3i+IkEEP4JpO2YQbXJidbVTZWQscUHmg29mJASert5CB04A3Pv5rekMiNh/4LnfVOSwSJueKUwdAJwSIOf2xtfDfkUgRI2qvjv9BJJsQeJclgGTsT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573025421; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=vddpnD+0QeiIUtbgiPeX9MYOTqtu1oaW5t5+M8ZK1lY=; b=CrTaIxrGdIr2yr7BdC4TdAH6ctZVURUb4VRxnOWZKQo0J33ZtHHBo1yyWV3qKuynxEPTHNnO+g/keozgGO6ZCAjEwq744yq/xOYOwLHVBZfFXKI/51ShDcTGBUDCRk6CGPpdxlgKl4rpkH5wKy3fu7RbcUcX5Wxp1AUyfyf7r+0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573025421265832.2769916747895; Tue, 5 Nov 2019 23:30:21 -0800 (PST) Received: from localhost ([::1]:53368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSFlk-0005bH-4w for importer@patchew.org; Wed, 06 Nov 2019 02:30:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58728) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSFkp-0004hY-87 for qemu-devel@nongnu.org; Wed, 06 Nov 2019 02:29:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSFkn-0001Dr-NV for qemu-devel@nongnu.org; Wed, 06 Nov 2019 02:29:23 -0500 Received: from [192.146.154.1] (port=26291 helo=mcp01.nutanix.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iSFkn-0001Dh-Fl for qemu-devel@nongnu.org; Wed, 06 Nov 2019 02:29:21 -0500 Received: from localhost.corp.nutanix.com (unknown [10.40.36.164]) by mcp01.nutanix.com (Postfix) with ESMTP id 049B81007D25; Wed, 6 Nov 2019 07:29:20 +0000 (UTC) From: Raphael Norwitz To: qemu-devel@nongnu.org Subject: [PATCH] vhost-user: Refractor vhost_user_set_mem_table Functions Date: Wed, 30 Oct 2019 19:12:05 -0400 Message-Id: <1572477125-25344-2-git-send-email-raphael.norwitz@nutanix.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1572477125-25344-1-git-send-email-raphael.norwitz@nutanix.com> References: <1572477125-25344-1-git-send-email-raphael.norwitz@nutanix.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 192.146.154.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Raphael Norwitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" vhost_user_set_mem_table() and vhost_user_set_mem_table_postcopy() have gotten convoluted, and have some identical code. This change moves the logic populating the VhostUserMemory struct and fds array from vhost_user_set_mem_table() and vhost_user_set_mem_table_postcopy() to a new function, vhost_user_fill_set_mem_table_msg(). No functionality is impacted. Signed-off-by: Raphael Norwitz --- hw/virtio/vhost-user.c | 140 +++++++++++++++++++++++----------------------= ---- 1 file changed, 65 insertions(+), 75 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 02a9b25..183587e 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -405,31 +405,16 @@ static int vhost_user_set_log_base(struct vhost_dev *= dev, uint64_t base, return 0; } =20 -static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, - struct vhost_memory *mem) +static int vhost_user_fill_set_mem_table_msg(struct vhost_user *u, + struct vhost_dev *dev, + struct VhostUserMsg *msg, + int *fds, + size_t *fd_num, + bool postcopy) { - struct vhost_user *u =3D dev->opaque; - int fds[VHOST_MEMORY_MAX_NREGIONS]; int i, fd; - size_t fd_num =3D 0; - VhostUserMsg msg_reply; - int region_i, msg_i; =20 - VhostUserMsg msg =3D { - .hdr.request =3D VHOST_USER_SET_MEM_TABLE, - .hdr.flags =3D VHOST_USER_VERSION, - }; - - if (u->region_rb_len < dev->mem->nregions) { - u->region_rb =3D g_renew(RAMBlock*, u->region_rb, dev->mem->nregio= ns); - u->region_rb_offset =3D g_renew(ram_addr_t, u->region_rb_offset, - dev->mem->nregions); - memset(&(u->region_rb[u->region_rb_len]), '\0', - sizeof(RAMBlock *) * (dev->mem->nregions - u->region_rb_len= )); - memset(&(u->region_rb_offset[u->region_rb_len]), '\0', - sizeof(ram_addr_t) * (dev->mem->nregions - u->region_rb_len= )); - u->region_rb_len =3D dev->mem->nregions; - } + msg->hdr.request =3D VHOST_USER_SET_MEM_TABLE; =20 for (i =3D 0; i < dev->mem->nregions; ++i) { struct vhost_memory_region *reg =3D dev->mem->regions + i; @@ -441,37 +426,75 @@ static int vhost_user_set_mem_table_postcopy(struct v= host_dev *dev, &offset); fd =3D memory_region_get_fd(mr); if (fd > 0) { - trace_vhost_user_set_mem_table_withfd(fd_num, mr->name, - reg->memory_size, - reg->guest_phys_addr, - reg->userspace_addr, off= set); - u->region_rb_offset[i] =3D offset; - u->region_rb[i] =3D mr->ram_block; - msg.payload.memory.regions[fd_num].userspace_addr =3D + if (postcopy) { + trace_vhost_user_set_mem_table_withfd(*fd_num, mr->name, + reg->memory_size, + reg->guest_phys_addr, + reg->userspace_addr,= offset); + u->region_rb_offset[i] =3D offset; + u->region_rb[i] =3D mr->ram_block; + } else if (*fd_num =3D=3D VHOST_MEMORY_MAX_NREGIONS) { + error_report("Failed preparing vhost-user memory table msg= "); + return -1; + } + msg->payload.memory.regions[*fd_num].userspace_addr =3D reg->userspace_addr; - msg.payload.memory.regions[fd_num].memory_size =3D reg->memor= y_size; - msg.payload.memory.regions[fd_num].guest_phys_addr =3D + msg->payload.memory.regions[*fd_num].memory_size =3D reg->mem= ory_size; + msg->payload.memory.regions[*fd_num].guest_phys_addr =3D reg->guest_phys_addr; - msg.payload.memory.regions[fd_num].mmap_offset =3D offset; - assert(fd_num < VHOST_MEMORY_MAX_NREGIONS); - fds[fd_num++] =3D fd; - } else { + msg->payload.memory.regions[*fd_num].mmap_offset =3D offset; + assert(*fd_num < VHOST_MEMORY_MAX_NREGIONS); + fds[(*fd_num)++] =3D fd; + } else if (postcopy) { u->region_rb_offset[i] =3D 0; u->region_rb[i] =3D NULL; } } =20 - msg.payload.memory.nregions =3D fd_num; + msg->payload.memory.nregions =3D *fd_num; =20 - if (!fd_num) { + if (!*fd_num && postcopy) { error_report("Failed initializing vhost-user memory map, " "consider using -object memory-backend-file share=3Do= n"); return -1; } =20 - msg.hdr.size =3D sizeof(msg.payload.memory.nregions); - msg.hdr.size +=3D sizeof(msg.payload.memory.padding); - msg.hdr.size +=3D fd_num * sizeof(VhostUserMemoryRegion); + msg->hdr.size =3D sizeof(msg->payload.memory.nregions); + msg->hdr.size +=3D sizeof(msg->payload.memory.padding); + msg->hdr.size +=3D *fd_num * sizeof(VhostUserMemoryRegion); + + return 1; +} + + +static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, + struct vhost_memory *mem) +{ + struct vhost_user *u =3D dev->opaque; + int fds[VHOST_MEMORY_MAX_NREGIONS]; + size_t fd_num =3D 0; + VhostUserMsg msg_reply; + int region_i, msg_i; + + VhostUserMsg msg =3D { + .hdr.flags =3D VHOST_USER_VERSION, + }; + + if (u->region_rb_len < dev->mem->nregions) { + u->region_rb =3D g_renew(RAMBlock*, u->region_rb, dev->mem->nregio= ns); + u->region_rb_offset =3D g_renew(ram_addr_t, u->region_rb_offset, + dev->mem->nregions); + memset(&(u->region_rb[u->region_rb_len]), '\0', + sizeof(RAMBlock *) * (dev->mem->nregions - u->region_rb_len= )); + memset(&(u->region_rb_offset[u->region_rb_len]), '\0', + sizeof(ram_addr_t) * (dev->mem->nregions - u->region_rb_len= )); + u->region_rb_len =3D dev->mem->nregions; + } +=20 + if (vhost_user_fill_set_mem_table_msg(u, dev, &msg, fds, &fd_num, + true) < 0) { + return -1; + } =20 if (vhost_user_write(dev, &msg, fds, fd_num) < 0) { return -1; @@ -543,7 +566,6 @@ static int vhost_user_set_mem_table(struct vhost_dev *d= ev, { struct vhost_user *u =3D dev->opaque; int fds[VHOST_MEMORY_MAX_NREGIONS]; - int i, fd; size_t fd_num =3D 0; bool do_postcopy =3D u->postcopy_listen && u->postcopy_fd.handler; bool reply_supported =3D virtio_has_feature(dev->protocol_features, @@ -557,7 +579,6 @@ static int vhost_user_set_mem_table(struct vhost_dev *d= ev, } =20 VhostUserMsg msg =3D { - .hdr.request =3D VHOST_USER_SET_MEM_TABLE, .hdr.flags =3D VHOST_USER_VERSION, }; =20 @@ -565,42 +586,11 @@ static int vhost_user_set_mem_table(struct vhost_dev = *dev, msg.hdr.flags |=3D VHOST_USER_NEED_REPLY_MASK; } =20 - for (i =3D 0; i < dev->mem->nregions; ++i) { - struct vhost_memory_region *reg =3D dev->mem->regions + i; - ram_addr_t offset; - MemoryRegion *mr; - - assert((uintptr_t)reg->userspace_addr =3D=3D reg->userspace_addr); - mr =3D memory_region_from_host((void *)(uintptr_t)reg->userspace_a= ddr, - &offset); - fd =3D memory_region_get_fd(mr); - if (fd > 0) { - if (fd_num =3D=3D VHOST_MEMORY_MAX_NREGIONS) { - error_report("Failed preparing vhost-user memory table msg= "); - return -1; - } - msg.payload.memory.regions[fd_num].userspace_addr =3D - reg->userspace_addr; - msg.payload.memory.regions[fd_num].memory_size =3D reg->memor= y_size; - msg.payload.memory.regions[fd_num].guest_phys_addr =3D - reg->guest_phys_addr; - msg.payload.memory.regions[fd_num].mmap_offset =3D offset; - fds[fd_num++] =3D fd; - } - } - - msg.payload.memory.nregions =3D fd_num; - - if (!fd_num) { - error_report("Failed initializing vhost-user memory map, " - "consider using -object memory-backend-file share=3Do= n"); + if (vhost_user_fill_set_mem_table_msg(u, dev, &msg, fds, &fd_num, + false) < 0) { return -1; } =20 - msg.hdr.size =3D sizeof(msg.payload.memory.nregions); - msg.hdr.size +=3D sizeof(msg.payload.memory.padding); - msg.hdr.size +=3D fd_num * sizeof(VhostUserMemoryRegion); - if (vhost_user_write(dev, &msg, fds, fd_num) < 0) { return -1; } --=20 1.8.3.1