From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A59048ACF; Tue, 11 Nov 2025 12:40:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B6AD406BB; Tue, 11 Nov 2025 12:40:37 +0100 (CET) Received: from mx0b-00154904.pphosted.com (mx0b-00154904.pphosted.com [148.163.137.20]) by mails.dpdk.org (Postfix) with ESMTP id ED5DE40673 for ; Tue, 11 Nov 2025 12:40:33 +0100 (CET) Received: from pps.filterd (m0170398.ppops.net [127.0.0.1]) by mx0b-00154904.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AB1DSOQ010921 for ; Tue, 11 Nov 2025 06:40:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dell.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=smtpout1; bh=M c4QCpwMBqVtdiNplPwTH3P2vImvAyXTK1plkJLgDV0=; b=JBWyNyI/ZadNEwMFA TYsqTnJ+mLRfDj7sA+T6cJd2IR2jkKS8x1l6bz+kusew1lrCFX+wJfQJAP6QrxEm cMtBhTWBX1Mwy84ROuqx3y5paKhd9JkSdJN/MV1xWNFE2NwhqfnhISeyAX86T90O YnXHgtV0qhchubkWUILov3uO5povkvTVfr4uJ3AxvDdgXLiBFkfqm9cuv+4lvs4w gviNQFAI5sTP4H95j84nIm5ZiGho5721+h6r5YeuI29oCnxYDncby/Sa68y6BVx2 5rRf7ZOylblxWxvhijMZAyJ5A5TKG3J++DXwfc8wjuFo/i1lS76n8/gb3ZpmtqWL SH2QQ== Received: from mx0a-00154901.pphosted.com (mx0a-00154901.pphosted.com [67.231.149.39]) by mx0b-00154904.pphosted.com (PPS) with ESMTPS id 4aa1ydm2nr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Nov 2025 06:40:33 -0500 (EST) Received: from pps.filterd (m0142699.ppops.net [127.0.0.1]) by mx0a-00154901.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AB6mbuw023965 for ; Tue, 11 Nov 2025 06:40:32 -0500 Received: from esapsmtplv05.us.dell.com (esapsmtplv05.us.dell.com [143.166.203.153]) by mx0a-00154901.pphosted.com (PPS) with ESMTPS id 4abwt24p8b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 11 Nov 2025 06:40:31 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dell.com; i=@dell.com; q=dns/txt; s=smtpdev1; t=1762861231; x=1794397231; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mc4QCpwMBqVtdiNplPwTH3P2vImvAyXTK1plkJLgDV0=; b=WOCwo75U7aWLpX/lIfKuMXqjWfSPlhNLOLhdYlPpCDDZKLdp4G2QCT// Yr+YXiUtNduuMlfHLAg/e43n7jEkYQKhBTQsxwa4eUZGogfh7c1yn2oms 3VPxmBVY74ezEGft03QlufgR6MGL80EtAy4SYPS+Gc94pesSsTf31C/dx cEGQ1FGXW0kWgXHJDtDP39HW4ozg9RYthi5d7GzKhgn+QRq1EgfUyLLDp GzEqNpSdAy5yC2gsNj/h7B2XOmBLhqbfAkEfvFx1SuitPg//YddyP0CZc vGzC1jKcN0jnj+U2DSQv+kxdju6b7iYByKJ/3zsPPvjOQk8vXza1/NgOn w==; X-CSE-ConnectionGUID: neereruMRNiAfyy68lWnbA== X-CSE-MsgGUID: eQRtp3hkS52EvQVpO0aboA== X-LoopCount0: from 10.215.64.31 X-MS-Exchange-CrossPremises-AuthAs: Internal Received: from mx2-adc.dell.com (HELO ieorr5-pvwed002.delllabs.net) ([10.215.64.31]) by esapsmtplv05.us.dell.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2025 11:40:30 +0000 Received: from ieorr5-ppwem002.delllabs.net (100.64.0.133) by ieorr5-pvwed002.delllabs.net (10.215.64.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.36; Tue, 11 Nov 2025 05:41:23 -0600 Received: from ieorr5-pvwer002.delllabs.net (100.64.0.135) by ieorr5-ppwem002.delllabs.net (100.64.0.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.36; Tue, 11 Nov 2025 05:40:29 -0600 Received: from localhost (10.240.17.25) by smtprelay.delllabs.net (100.64.0.135) with Microsoft SMTP Server id 15.2.1544.36 via Frontend Transport; Tue, 11 Nov 2025 05:40:29 -0600 From: Pravin M Bathija To: CC: , Subject: [PATCH v4 4/5] vhost_user: Function defs for add/rem mem regions Date: Tue, 11 Nov 2025 11:40:01 +0000 Message-ID: <20251111114002.2902696-5-pravin.bathija@dell.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251111114002.2902696-1-pravin.bathija@dell.com> References: <20251111114002.2902696-1-pravin.bathija@dell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-11_02,2025-11-11_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 phishscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511110027 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA4MDA2MyBTYWx0ZWRfX6FAziUsuzzml 1O7kaJeO4pCh8VYM0KrjmRoPWphp6X5UGwe7/HR9jYKyWQFI+Q4rOvd1O2VAgmiB6OUS83XwmPC QY/YZRksmUYB/dPlbv4JaK5kebx/sIrHGgU4CSdIdoU/k9pLkyaLbm2YZ4kKUhzG4RyHGaVvaG5 1Xz6PHiB32W3FLLLcjrXsVbWTwPINmFvaVHGyXKNPDwTWYUG6OQexKHANiyt5uAvtyaeKCiWLRq h+LvRcG4hMSUyYQ257i47jy9E2DSNtVzxPluVxBgStvDOrRRk9jj49xefAGjmar36dp6V7Wbi3o rrPQh2C/niDVTHdLvUwX37GOocU9tggz+ojLng4ACtbLAKYnNay5O85iPuZb4BtIZlgUfWl5djr FNmA+sAmiQphFaxaamTZRyM41c0ZsQ== X-Authority-Analysis: v=2.4 cv=fI80HJae c=1 sm=1 tr=0 ts=691320b1 cx=c_pps a=j0++y401J6f/BxNAf5EDow==:117 a=t4Iba6VQkoKuxR139xjPXA==:17 a=6UeiqGixMTsA:10 a=ke5jqHz-1hQA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iLNU1ar6AAAA:8 a=ugkO3PKB39lPgV9XgTsA:9 a=gbU3OgOOxF9bX48Letew:22 X-Proofpoint-ORIG-GUID: NWYdjiW1_hMYklLDZvjbulMux-iUXbcJ X-Proofpoint-GUID: NWYdjiW1_hMYklLDZvjbulMux-iUXbcJ X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 spamscore=0 bulkscore=0 phishscore=0 clxscore=1015 adultscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511080063 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org These changes cover the function definition for add/remove memory region calls which are invoked on receiving vhost user message from vhost user front-end (e.g. Qemu). In our case, in addition to testing with qemu front-end, the testing has also been performed with libblkio front-end and spdk/dpdk back-end. We did I/O using libblkio based device driver, to spdk based drives. There are also changes for set_mem_table and new definition for get memory slots. Our changes optimize the set memory table call to use common support functions. Message get memory slots is how the vhost-user front-end queries the vhost-user back-end about the number of memory slots available to be registered by the back-end. In addition support function to invalidate vring is also defined which is used in add/remove memory region functions. Signed-off-by: Pravin M Bathija --- lib/vhost/vhost_user.c | 249 +++++++++++++++++++++++++++++++++++------ 1 file changed, 217 insertions(+), 32 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 7dc21fe42a..d9cf967ba2 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -71,6 +71,9 @@ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_FEATURES, vhost_user_set_features, false, t VHOST_MESSAGE_HANDLER(VHOST_USER_SET_OWNER, vhost_user_set_owner, false, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_RESET_OWNER, vhost_user_reset_owner, false, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_MEM_TABLE, vhost_user_set_mem_table, true, true) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_GET_MAX_MEM_SLOTS, vhost_user_get_max_mem_slots, false, false) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_ADD_MEM_REG, vhost_user_add_mem_reg, true, true) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_REM_MEM_REG, vhost_user_rem_mem_reg, false, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_LOG_BASE, vhost_user_set_log_base, true, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_LOG_FD, vhost_user_set_log_fd, true, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_NUM, vhost_user_set_vring_num, false, true) \ @@ -1520,7 +1523,6 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct virtio_net *dev = *pdev; struct VhostUserMemory *memory = &ctx->msg.payload.memory; struct rte_vhost_mem_region *reg; - int numa_node = SOCKET_ID_ANY; uint64_t mmap_offset; uint32_t i; bool async_notify = false; @@ -1565,39 +1567,13 @@ vhost_user_set_mem_table(struct virtio_net **pdev, if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) vhost_user_iotlb_flush_all(dev); - free_mem_region(dev); + free_all_mem_regions(dev); rte_free(dev->mem); dev->mem = NULL; } - /* - * If VQ 0 has already been allocated, try to allocate on the same - * NUMA node. It can be reallocated later in numa_realloc(). - */ - if (dev->nr_vring > 0) - numa_node = dev->virtqueue[0]->numa_node; - - dev->nr_guest_pages = 0; - if (dev->guest_pages == NULL) { - dev->max_guest_pages = 8; - dev->guest_pages = rte_zmalloc_socket(NULL, - dev->max_guest_pages * - sizeof(struct guest_page), - RTE_CACHE_LINE_SIZE, - numa_node); - if (dev->guest_pages == NULL) { - VHOST_CONFIG_LOG(dev->ifname, ERR, - "failed to allocate memory for dev->guest_pages"); - goto close_msg_fds; - } - } - - dev->mem = rte_zmalloc_socket("vhost-mem-table", sizeof(struct rte_vhost_memory) + - sizeof(struct rte_vhost_mem_region) * memory->nregions, 0, numa_node); - if (dev->mem == NULL) { - VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to allocate memory for dev->mem"); - goto free_guest_pages; - } + if (vhost_user_initialize_memory(pdev) < 0) + goto close_msg_fds; for (i = 0; i < memory->nregions; i++) { reg = &dev->mem->regions[i]; @@ -1661,11 +1637,182 @@ vhost_user_set_mem_table(struct virtio_net **pdev, return RTE_VHOST_MSG_RESULT_OK; free_mem_table: - free_mem_region(dev); + free_all_mem_regions(dev); rte_free(dev->mem); dev->mem = NULL; + rte_free(dev->guest_pages); + dev->guest_pages = NULL; +close_msg_fds: + close_msg_fds(ctx); + return RTE_VHOST_MSG_RESULT_ERR; +} + -free_guest_pages: +static int +vhost_user_get_max_mem_slots(struct virtio_net **pdev __rte_unused, + struct vhu_msg_context *ctx, + int main_fd __rte_unused) +{ + uint32_t max_mem_slots = VHOST_MEMORY_MAX_NREGIONS; + + ctx->msg.payload.u64 = (uint64_t)max_mem_slots; + ctx->msg.size = sizeof(ctx->msg.payload.u64); + ctx->fd_num = 0; + + return RTE_VHOST_MSG_RESULT_REPLY; +} + +static void +dev_invalidate_vrings(struct virtio_net *dev) +{ + uint32_t i; + + for (i = 0; i < dev->nr_vring; i++) { + struct vhost_virtqueue *vq = dev->virtqueue[i]; + + if (!vq) + continue; + + if (vq->desc || vq->avail || vq->used) { + /* vhost_user_lock_all_queue_pairs locked all qps */ + VHOST_USER_ASSERT_LOCK(dev, vq, VHOST_USER_ADD_MEM_REG); + + /* + * If the memory table got updated, the ring addresses + * need to be translated again as virtual addresses have + * changed. + */ + vring_invalidate(dev, vq); + + translate_ring_addresses(&dev, &vq); + } + } +} + +static int +vhost_user_add_mem_reg(struct virtio_net **pdev, + struct vhu_msg_context *ctx, + int main_fd __rte_unused) +{ + uint32_t i; + struct virtio_net *dev = *pdev; + struct VhostUserMemoryRegion *region = &ctx->msg.payload.memory_single.region; + + /* convert first region add to normal memory table set */ + if (dev->mem == NULL) { + if (vhost_user_initialize_memory(pdev) < 0) + goto close_msg_fds; + } + + /* make sure new region will fit */ + if (dev->mem->nregions >= VHOST_MEMORY_MAX_NREGIONS) { + VHOST_CONFIG_LOG(dev->ifname, ERR, "too many memory regions already (%u)", + dev->mem->nregions); + goto close_msg_fds; + } + + /* make sure supplied memory fd present */ + if (ctx->fd_num != 1) { + VHOST_CONFIG_LOG(dev->ifname, ERR, "fd count makes no sense (%u)", ctx->fd_num); + goto close_msg_fds; + } + + /* Make sure no overlap in guest virtual address space */ + if (dev->mem != NULL && dev->mem->nregions > 0) { + for (i = 0; i < VHOST_MEMORY_MAX_NREGIONS; i++) { + struct rte_vhost_mem_region *current_region = &dev->mem->regions[i]; + + if (current_region->mmap_size == 0) + continue; + + uint64_t current_region_guest_start = current_region->guest_user_addr; + uint64_t current_region_guest_end = current_region_guest_start + + current_region->mmap_size - 1; + uint64_t proposed_region_guest_start = region->userspace_addr; + uint64_t proposed_region_guest_end = proposed_region_guest_start + + region->memory_size - 1; + bool overlap = false; + + bool curent_region_guest_start_overlap = + current_region_guest_start >= proposed_region_guest_start && + current_region_guest_start <= proposed_region_guest_end; + bool curent_region_guest_end_overlap = + current_region_guest_end >= proposed_region_guest_start && + current_region_guest_end <= proposed_region_guest_end; + bool proposed_region_guest_start_overlap = + proposed_region_guest_start >= current_region_guest_start && + proposed_region_guest_start <= current_region_guest_end; + bool proposed_region_guest_end_overlap = + proposed_region_guest_end >= current_region_guest_start && + proposed_region_guest_end <= current_region_guest_end; + + overlap = curent_region_guest_start_overlap + || curent_region_guest_end_overlap + || proposed_region_guest_start_overlap + || proposed_region_guest_end_overlap; + + if (overlap) { + VHOST_CONFIG_LOG(dev->ifname, ERR, + "requested memory region overlaps with another region"); + VHOST_CONFIG_LOG(dev->ifname, ERR, + "\tRequested region address:0x%" PRIx64, + region->userspace_addr); + VHOST_CONFIG_LOG(dev->ifname, ERR, + "\tRequested region size:0x%" PRIx64, + region->memory_size); + VHOST_CONFIG_LOG(dev->ifname, ERR, + "\tOverlapping region address:0x%" PRIx64, + current_region->guest_user_addr); + VHOST_CONFIG_LOG(dev->ifname, ERR, + "\tOverlapping region size:0x%" PRIx64, + current_region->mmap_size); + goto close_msg_fds; + } + + } + } + + /* find a new region and set it like memory table set does */ + struct rte_vhost_mem_region *reg = NULL; + + for (i = 0; i < VHOST_MEMORY_MAX_NREGIONS; i++) { + if (dev->mem->regions[i].guest_user_addr == 0) { + reg = &dev->mem->regions[i]; + break; + } + } + if (reg == NULL) { + VHOST_CONFIG_LOG(dev->ifname, ERR, "no free memory region"); + goto close_msg_fds; + } + + reg->guest_phys_addr = region->guest_phys_addr; + reg->guest_user_addr = region->userspace_addr; + reg->size = region->memory_size; + reg->fd = ctx->fds[0]; + + if (vhost_user_mmap_region(dev, reg, region->mmap_offset) < 0) { + VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to mmap region"); + goto close_msg_fds; + } + + dev->mem->nregions++; + + if (dev->async_copy && rte_vfio_is_enabled("vfio")) + async_dma_map_region(dev, reg, true); + + if (vhost_user_postcopy_register(dev, main_fd, ctx) < 0) + goto free_mem_table; + + dev_invalidate_vrings(dev); + dump_guest_pages(dev); + + return RTE_VHOST_MSG_RESULT_OK; + +free_mem_table: + free_all_mem_regions(dev); + rte_free(dev->mem); + dev->mem = NULL; rte_free(dev->guest_pages); dev->guest_pages = NULL; close_msg_fds: @@ -1673,6 +1820,44 @@ vhost_user_set_mem_table(struct virtio_net **pdev, return RTE_VHOST_MSG_RESULT_ERR; } +static int +vhost_user_rem_mem_reg(struct virtio_net **pdev __rte_unused, + struct vhu_msg_context *ctx __rte_unused, + int main_fd __rte_unused) +{ + uint32_t i; + struct virtio_net *dev = *pdev; + struct VhostUserMemoryRegion *region = &ctx->msg.payload.memory_single.region; + + if (dev->mem != NULL && dev->mem->nregions > 0) { + for (i = 0; i < VHOST_MEMORY_MAX_NREGIONS; i++) { + struct rte_vhost_mem_region *current_region = &dev->mem->regions[i]; + + if (current_region->guest_user_addr == 0) + continue; + + /* + * According to the vhost-user specification: + * The memory region to be removed is identified by its guest address, + * user address and size. The mmap offset is ignored. + */ + if (region->userspace_addr == current_region->guest_user_addr + && region->guest_phys_addr == current_region->guest_phys_addr + && region->memory_size == current_region->size) { + if (dev->async_copy && rte_vfio_is_enabled("vfio")) + async_dma_map_region(dev, current_region, false); + dev_invalidate_vrings(dev); + free_mem_region(current_region); + dev->mem->nregions--; + return RTE_VHOST_MSG_RESULT_OK; + } + } + } + + VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to find region"); + return RTE_VHOST_MSG_RESULT_ERR; +} + static bool vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq) { -- 2.43.0