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 14D8B48AF9; Thu, 13 Nov 2025 13:45:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 634E540EF0; Thu, 13 Nov 2025 13:44:52 +0100 (CET) Received: from mx0a-00154904.pphosted.com (mx0a-00154904.pphosted.com [148.163.133.20]) by mails.dpdk.org (Postfix) with ESMTP id 2384040E24 for ; Thu, 13 Nov 2025 13:44:49 +0100 (CET) Received: from pps.filterd (m0170393.ppops.net [127.0.0.1]) by mx0a-00154904.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AD1HAE6004933 for ; Thu, 13 Nov 2025 07:44:48 -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=A P31IwCmlqQourDAmMg45GhqsyeKuGM29ka2YYFNsDM=; b=r1HsrGVpHzAcAGPls H2YL2CRh9CGcRbPXCdd2td9KCtwMfsndocf6q/O7F/890a2aBCzuLWSfddwbWmjY bl/RbdEqyVaBV/vFi7kiTSZdvg/aGOqqbjj5e+IjcFbIHVIzKIpyJGphzffYoouD JY8mpLox5yY2F8y4nk6Pe95FAzb8pr6UiKWucdJqOdqp4NCNpt1muyR6HFC3cPqd tELwSCiHOcW3fNe30ea4eIpqkzMAtipfBw3mdyYDEoNyhvI4jfTMVlSZK1IwNu91 lrqieRgmsw/O3zxJm+GIoU09ycBTgr5m1SEfbh/kKij1yIBDtM8/jsonv61kj1WI 3pRYA== Received: from mx0a-00154901.pphosted.com (mx0a-00154901.pphosted.com [67.231.149.39]) by mx0a-00154904.pphosted.com (PPS) with ESMTPS id 4aa22qsae1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Nov 2025 07:44:48 -0500 (EST) Received: from pps.filterd (m0090351.ppops.net [127.0.0.1]) by mx0b-00154901.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5ADAlrtK021718 for ; Thu, 13 Nov 2025 07:44:47 -0500 Received: from esapsmtplv06.us.dell.com (esapsmtplv06.us.dell.com [143.166.203.146]) by mx0b-00154901.pphosted.com (PPS) with ESMTPS id 4addw4sbnk-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 13 Nov 2025 07:44:47 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dell.com; i=@dell.com; q=dns/txt; s=smtpdev1; t=1763037888; x=1794573888; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AP31IwCmlqQourDAmMg45GhqsyeKuGM29ka2YYFNsDM=; b=nI9hi7lK7wdRONW4PcU5D5Qb/ei1jtyz1FD/X9bNj4/+x6ChM5gRujdv OY419/uDzfLwze+Au5JZw+EQEMgy1qSY7nk8K83gP7wmvXqd8p8qigmOB 09Om9sVDooGVVkSDg+od+evg4B+S6pCvYvv30gDijzqndJ73ahXfNMiLV zYDB2F5nFpkuKYNJHUz5kGWtT0yPATruSGOM8HjdYryjaMieZdBPeI8GT RlomVKnTH3uYWWz642Q9vprUeberOCTyIvI27jDNrqpNmzYxYI7ukbbgS dklKzCjon/4yp36JMDxluvA2Ias4B0k3yXELSrl46le05tRKLVCv8ouJs g==; X-CSE-ConnectionGUID: UxlHTVOtRWCeLuLtZjSByg== X-CSE-MsgGUID: YK4L4ks3RLiaeUAl6nHSTw== 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 esapsmtplv06.us.dell.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2025 12:44:47 +0000 Received: from ieorr5-ppwem001.delllabs.net (100.64.0.132) 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; Thu, 13 Nov 2025 06:45:41 -0600 Received: from ieorr5-pvwer002.delllabs.net (100.64.0.135) by ieorr5-ppwem001.delllabs.net (100.64.0.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.36; Thu, 13 Nov 2025 06:44:46 -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; Thu, 13 Nov 2025 06:44:45 -0600 From: Pravin M Bathija To: CC: , Subject: [PATCH v5 3/4] vhost_user: support function defines for back-end Date: Thu, 13 Nov 2025 12:44:24 +0000 Message-ID: <20251113124425.2913881-4-pravin.bathija@dell.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251113124425.2913881-1-pravin.bathija@dell.com> References: <20251113124425.2913881-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-13_02,2025-11-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 spamscore=0 suspectscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511130079 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA4MDA2NSBTYWx0ZWRfX/tGBc0a9gumA Nl53JmjPzy0KbJ8Q3QU/NSKXRtyM6ES5/S1uGKSMr/4sP1+7bUIP5kqpu2ITJTjVfHWKMT652Tj Fwc810O5lTuM1J+w49ZzKRwh1BJ1sFcGD9hOuzO7S80UdC7IVF2nlqfWfkTohalxY+8o65XOFKb Y+BVJ45CZ4WKesX4IZvXR+MxwxMQ0R4NlHCLxYQzKX1bAVhRdQjk6NT1Fd1Vxmcx71Z2SViF7Os F+ATn2tniqhJRN35NP0fg7gtFG7qXLGkLfZqj51oP1QckSml1So+DU2QfTwqfJVe2L8rBf8C5zX LCqSAv6gfpqgpL6xYLAR3yfwUkvgxEyYLEbBArri+QDHsAcCJlGCOS9wsqhoIfB1W/BP3OA0WxP a+JR4CerAtgmgvAf3d964QLHlqTjsA== X-Proofpoint-ORIG-GUID: ng5_EZ1qpv0m5zQkDpuR0XlTdoC44YBI X-Proofpoint-GUID: ng5_EZ1qpv0m5zQkDpuR0XlTdoC44YBI X-Authority-Analysis: v=2.4 cv=BMO+bVQG c=1 sm=1 tr=0 ts=6915d2c0 cx=c_pps a=j0++y401J6f/BxNAf5EDow==:117 a=in+AvElAwLqdjTPPAWhuvg==:17 a=6UeiqGixMTsA:10 a=ke5jqHz-1hQA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iLNU1ar6AAAA:8 a=SW-8F9blc6B0F9nJVP4A:9 a=gbU3OgOOxF9bX48Letew:22 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 bulkscore=0 adultscore=0 clxscore=1015 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511080065 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 Here we define support functions which are called from the various vhost-user back-end message functions like set memory table, get memory slots, add memory region, remove memory region. These are essentially common functions to initialize memory, unmap a set of memory regions, perform register copy, align memory addresses and dma map/unmap a single memory region. Signed-off-by: Pravin M Bathija --- lib/vhost/vhost_user.c | 150 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 140 insertions(+), 10 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 4bfb13fb98..7dc21fe42a 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -171,6 +171,80 @@ get_blk_size(int fd) return ret == -1 ? (uint64_t)-1 : (uint64_t)stat.st_blksize; } +static void +async_dma_map_region(struct virtio_net *dev, struct rte_vhost_mem_region *reg, bool do_map) +{ + uint32_t i; + int ret = 0; + int found = 0; + struct guest_page *page; + + uint64_t reg_size = reg->size; + uint64_t host_user_addr = reg->host_user_addr; + + for (i = 0; i < dev->nr_guest_pages; i++) { + page = &dev->guest_pages[i]; + if (host_user_addr == page->host_user_addr) { + found = 1; + break; + } + } + + if (!found) { + VHOST_CONFIG_LOG(dev->ifname, ERR, "DMA engine map: region not found"); + return; + } + + if (do_map) { + while (reg_size) { + page = &dev->guest_pages[i]; + ret = rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD, + page->host_user_addr, + page->host_iova, + page->size); + if (ret) { + if (rte_errno == ENODEV) + return; + + /* DMA mapping errors won't stop VHOST_USER_SET_MEM_TABLE. */ + VHOST_CONFIG_LOG(dev->ifname, ERR, "DMA engine map failed"); + } + + reg_size -= page->size; + ++i; + if (i >= dev->nr_guest_pages) { + /* shouldn't get here */ + VHOST_CONFIG_LOG(dev->ifname, ERR, "DMA engine map: No more pages"); + return; + } + } + } else { + while (reg_size) { + page = &dev->guest_pages[i]; + ret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD, + page->host_user_addr, + page->host_iova, + page->size); + if (ret) { + if (rte_errno == EINVAL) + return; + + /* DMA mapping errors won't stop VHOST_USER_SET_MEM_TABLE. */ + VHOST_CONFIG_LOG(dev->ifname, ERR, "DMA engine unmap failed"); + } + + reg_size -= page->size; + ++i; + if (i >= dev->nr_guest_pages) { + /* shouldn't get here */ + VHOST_CONFIG_LOG(dev->ifname, ERR, "DMA engine unmap: No more pages"); + return; + } + } + } + +} + static void async_dma_map(struct virtio_net *dev, bool do_map) { @@ -225,7 +299,17 @@ async_dma_map(struct virtio_net *dev, bool do_map) } static void -free_mem_region(struct virtio_net *dev) +free_mem_region(struct rte_vhost_mem_region *reg) +{ + if (reg != NULL && reg->host_user_addr) { + munmap(reg->mmap_addr, reg->mmap_size); + close(reg->fd); + memset(reg, 0, sizeof(struct rte_vhost_mem_region)); + } +} + +static void +free_all_mem_regions(struct virtio_net *dev) { uint32_t i; struct rte_vhost_mem_region *reg; @@ -236,12 +320,10 @@ free_mem_region(struct virtio_net *dev) if (dev->async_copy && rte_vfio_is_enabled("vfio")) async_dma_map(dev, false); - for (i = 0; i < dev->mem->nregions; i++) { + for (i = 0; i < VHOST_MEMORY_MAX_NREGIONS; i++) { reg = &dev->mem->regions[i]; - if (reg->host_user_addr) { - munmap(reg->mmap_addr, reg->mmap_size); - close(reg->fd); - } + if (reg->mmap_addr) + free_mem_region(reg); } } @@ -255,7 +337,7 @@ vhost_backend_cleanup(struct virtio_net *dev) vdpa_dev->ops->dev_cleanup(dev->vid); if (dev->mem) { - free_mem_region(dev); + free_all_mem_regions(dev); rte_free(dev->mem); dev->mem = NULL; } @@ -704,7 +786,7 @@ numa_realloc(struct virtio_net **pdev, struct vhost_virtqueue **pvq) vhost_devices[dev->vid] = dev; mem_size = sizeof(struct rte_vhost_memory) + - sizeof(struct rte_vhost_mem_region) * dev->mem->nregions; + sizeof(struct rte_vhost_mem_region) * VHOST_MEMORY_MAX_NREGIONS; mem = rte_realloc_socket(dev->mem, mem_size, 0, node); if (!mem) { VHOST_CONFIG_LOG(dev->ifname, ERR, @@ -808,8 +890,10 @@ hua_to_alignment(struct rte_vhost_memory *mem, void *ptr) uint32_t i; uintptr_t hua = (uintptr_t)ptr; - for (i = 0; i < mem->nregions; i++) { + for (i = 0; i < VHOST_MEMORY_MAX_NREGIONS; i++) { r = &mem->regions[i]; + if (r->host_user_addr == 0) + continue; if (hua >= r->host_user_addr && hua < r->host_user_addr + r->size) { return get_blk_size(r->fd); @@ -1248,8 +1332,12 @@ vhost_user_postcopy_register(struct virtio_net *dev, int main_fd, */ memory = &ctx->msg.payload.memory; for (i = 0; i < memory->nregions; i++) { + int reg_msg_index = 0; reg = &dev->mem->regions[i]; - memory->regions[i].userspace_addr = reg->host_user_addr; + if (reg->host_user_addr == 0) + continue; + memory->regions[reg_msg_index].userspace_addr = reg->host_user_addr; + reg_msg_index++; } /* Send the addresses back to qemu */ @@ -1278,6 +1366,8 @@ vhost_user_postcopy_register(struct virtio_net *dev, int main_fd, /* Now userfault register and we can use the memory */ for (i = 0; i < memory->nregions; i++) { reg = &dev->mem->regions[i]; + if (reg->host_user_addr == 0) + continue; if (vhost_user_postcopy_region_register(dev, reg) < 0) return -1; } @@ -1382,6 +1472,46 @@ vhost_user_mmap_region(struct virtio_net *dev, return 0; } +static int +vhost_user_initialize_memory(struct virtio_net **pdev) +{ + struct virtio_net *dev = *pdev; + int numa_node = SOCKET_ID_ANY; + + /* + * 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 = VHOST_MEMORY_MAX_NREGIONS; + 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"); + return -1; + } + } + + dev->mem = rte_zmalloc_socket("vhost-mem-table", sizeof(struct rte_vhost_memory) + + sizeof(struct rte_vhost_mem_region) * VHOST_MEMORY_MAX_NREGIONS, 0, numa_node); + if (dev->mem == NULL) { + VHOST_CONFIG_LOG(dev->ifname, ERR, "failed to allocate memory for dev->mem"); + rte_free(dev->guest_pages); + dev->guest_pages = NULL; + return -1; + } + + return 0; +} + static int vhost_user_set_mem_table(struct virtio_net **pdev, struct vhu_msg_context *ctx, -- 2.43.0