From patchwork Thu Oct 13 09:27:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ding, Xuan" X-Patchwork-Id: 118121 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B4F78A00C2; Thu, 13 Oct 2022 11:29:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7476042E0D; Thu, 13 Oct 2022 11:29:27 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id F236D42E0D for ; Thu, 13 Oct 2022 11:29:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665653366; x=1697189366; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=PVE5VRAc/CO1gSkC1EfCQG6qgewFzEk4UjeXaa5JILw=; b=gLu0fUVAagfapAa56W7Lkco//swoZ21k12h9OvMOL9tO5lL6WEKXwuiB iWymyFbhylCDJ9NddcrsMav+lNmqzjt22Lcn0wSftquFbeusEwms4hpFT acMNRp/J93ELQt1cRjnqhLRwXpeq4y+MWt0b5RXwYneuZkuplkRKxui/f v4k4aBeffig3a0qBpAyP9XrFGNRtn7wWKllU0ykvpoP4HE6E0efkJNg9h 35eTmxFUE5x5RR8KwPbb0zgFkV+INVAfuAMALAWFwUhd7xscCFnZpzt2u QCnw+2dl/wRRb+2msovPP+J+jMfr4WHJ4+8gayQ4vkT4Wa2NJqc1mev/O Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10498"; a="305022266" X-IronPort-AV: E=Sophos;i="5.95,180,1661842800"; d="scan'208";a="305022266" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2022 02:29:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10498"; a="769547382" X-IronPort-AV: E=Sophos;i="5.95,180,1661842800"; d="scan'208";a="769547382" Received: from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.111.102]) by fmsmga001.fm.intel.com with ESMTP; 13 Oct 2022 02:29:23 -0700 From: xuan.ding@intel.com To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, jiayu.hu@intel.com, xingguang.he@intel.com, yvonnex.yang@intel.com, cheng1.jiang@intel.com, yuanx.wang@intel.com, wenwux.ma@intel.com, Xuan Ding Subject: [PATCH v5 1/2] vhost: introduce DMA vchannel unconfiguration Date: Thu, 13 Oct 2022 09:27:07 +0000 Message-Id: <20221013092708.4922-2-xuan.ding@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221013092708.4922-1-xuan.ding@intel.com> References: <20220814140442.82525-1-xuan.ding@intel.com> <20221013092708.4922-1-xuan.ding@intel.com> 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 From: Xuan Ding Add a new API rte_vhost_async_dma_unconfigure() to unconfigure DMA vchannels in vhost async data path. Lock protection are also added to protect DMA vchannels configuration and unconfiguration from concurrent calls. Signed-off-by: Xuan Ding --- doc/guides/prog_guide/vhost_lib.rst | 6 +++ doc/guides/rel_notes/release_22_11.rst | 4 ++ lib/vhost/rte_vhost_async.h | 18 +++++++ lib/vhost/version.map | 3 ++ lib/vhost/vhost.c | 69 ++++++++++++++++++++++++-- 5 files changed, 95 insertions(+), 5 deletions(-) diff --git a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst index bad4d819e1..d3cef978d0 100644 --- a/doc/guides/prog_guide/vhost_lib.rst +++ b/doc/guides/prog_guide/vhost_lib.rst @@ -323,6 +323,12 @@ The following is an overview of some key Vhost API functions: Get device type of vDPA device, such as VDPA_DEVICE_TYPE_NET, VDPA_DEVICE_TYPE_BLK. +* ``rte_vhost_async_dma_unconfigure(dma_id, vchan_id)`` + + Clean DMA vChannels finished to use. This function needs to + be called after the deregistration of async DMA vchannel + has been finished. + Vhost-user Implementations -------------------------- diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 2da8bc9661..3be150122c 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -236,6 +236,10 @@ New Features strings $dpdk_binary_or_driver | sed -n 's/^PMD_INFO_STRING= //p' +* **Added DMA vChannel unconfiguration for async vhost.** + + * Added support to unconfigure DMA vChannels that have been unregistered. + Removed Items ------------- diff --git a/lib/vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h index 1db2a10124..6ee4f7258d 100644 --- a/lib/vhost/rte_vhost_async.h +++ b/lib/vhost/rte_vhost_async.h @@ -266,6 +266,24 @@ rte_vhost_async_try_dequeue_burst(int vid, uint16_t queue_id, struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count, int *nr_inflight, int16_t dma_id, uint16_t vchan_id); +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice. + * + * Unconfigure DMA vChannels in asynchronous data path. + * This function should be called after the DMA vChannel has been unregistered. + * + * @param dma_id + * the identifier of DMA device + * @param vchan_id + * the identifier of virtual DMA channel + * @return + * 0 on success, and -1 on failure + */ +__rte_experimental +int +rte_vhost_async_dma_unconfigure(int16_t dma_id, uint16_t vchan_id); + #ifdef __cplusplus } #endif diff --git a/lib/vhost/version.map b/lib/vhost/version.map index 7a00b65740..0b61870870 100644 --- a/lib/vhost/version.map +++ b/lib/vhost/version.map @@ -94,6 +94,9 @@ EXPERIMENTAL { rte_vhost_async_try_dequeue_burst; rte_vhost_driver_get_vdpa_dev_type; rte_vhost_clear_queue; + + # added in 22.11 + rte_vhost_async_dma_unconfigure; }; INTERNAL { diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 8740aa2788..975c0d3297 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -23,6 +23,7 @@ struct virtio_net *vhost_devices[RTE_MAX_VHOST_DEVICE]; pthread_mutex_t vhost_dev_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t vhost_dma_lock = PTHREAD_MUTEX_INITIALIZER; struct vhost_vq_stats_name_off { char name[RTE_VHOST_STATS_NAME_SIZE]; @@ -1844,19 +1845,20 @@ rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id) void *pkts_cmpl_flag_addr; uint16_t max_desc; + pthread_mutex_lock(&vhost_dma_lock); if (!rte_dma_is_valid(dma_id)) { VHOST_LOG_CONFIG("dma", ERR, "DMA %d is not found.\n", dma_id); - return -1; + goto error; } if (rte_dma_info_get(dma_id, &info) != 0) { VHOST_LOG_CONFIG("dma", ERR, "Fail to get DMA %d information.\n", dma_id); - return -1; + goto error; } if (vchan_id >= info.max_vchans) { VHOST_LOG_CONFIG("dma", ERR, "Invalid DMA %d vChannel %u.\n", dma_id, vchan_id); - return -1; + goto error; } if (!dma_copy_track[dma_id].vchans) { @@ -1868,7 +1870,7 @@ rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id) VHOST_LOG_CONFIG("dma", ERR, "Failed to allocate vchans for DMA %d vChannel %u.\n", dma_id, vchan_id); - return -1; + goto error; } dma_copy_track[dma_id].vchans = vchans; @@ -1877,6 +1879,7 @@ rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id) if (dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr) { VHOST_LOG_CONFIG("dma", INFO, "DMA %d vChannel %u already registered.\n", dma_id, vchan_id); + pthread_mutex_unlock(&vhost_dma_lock); return 0; } @@ -1894,7 +1897,7 @@ rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id) rte_free(dma_copy_track[dma_id].vchans); dma_copy_track[dma_id].vchans = NULL; } - return -1; + goto error; } dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr = pkts_cmpl_flag_addr; @@ -1902,7 +1905,12 @@ rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id) dma_copy_track[dma_id].vchans[vchan_id].ring_mask = max_desc - 1; dma_copy_track[dma_id].nr_vchans++; + pthread_mutex_unlock(&vhost_dma_lock); return 0; + +error: + pthread_mutex_unlock(&vhost_dma_lock); + return -1; } int @@ -2091,5 +2099,56 @@ int rte_vhost_vring_stats_reset(int vid, uint16_t queue_id) return 0; } +int +rte_vhost_async_dma_unconfigure(int16_t dma_id, uint16_t vchan_id) +{ + struct rte_dma_info info; + uint16_t max_desc; + int i; + + pthread_mutex_lock(&vhost_dma_lock); + if (!rte_dma_is_valid(dma_id)) { + VHOST_LOG_CONFIG("dma", ERR, "DMA %d is not found.\n", dma_id); + goto error; + } + + if (rte_dma_info_get(dma_id, &info) != 0) { + VHOST_LOG_CONFIG("dma", ERR, "Fail to get DMA %d information.\n", dma_id); + goto error; + } + + if (vchan_id >= info.max_vchans) { + VHOST_LOG_CONFIG("dma", ERR, "Invalid DMA %d vChannel %u.\n", dma_id, vchan_id); + goto error; + } + + max_desc = info.max_desc; + for (i = 0; i < max_desc; i++) { + if (dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr[i] != NULL) { + rte_free(dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr[i]); + dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr[i] = NULL; + } + } + + if (dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr != NULL) { + rte_free(dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr); + dma_copy_track[dma_id].vchans[vchan_id].pkts_cmpl_flag_addr = NULL; + } + + if (dma_copy_track[dma_id].vchans != NULL) { + rte_free(dma_copy_track[dma_id].vchans); + dma_copy_track[dma_id].vchans = NULL; + } + + dma_copy_track[dma_id].nr_vchans--; + + pthread_mutex_unlock(&vhost_dma_lock); + return 0; + +error: + pthread_mutex_unlock(&vhost_dma_lock); + return -1; +} + RTE_LOG_REGISTER_SUFFIX(vhost_config_log_level, config, INFO); RTE_LOG_REGISTER_SUFFIX(vhost_data_log_level, data, WARNING); From patchwork Thu Oct 13 09:27:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ding, Xuan" X-Patchwork-Id: 118122 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 73343A00C2; Thu, 13 Oct 2022 11:29:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6692D42E18; Thu, 13 Oct 2022 11:29:31 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 0714442E17 for ; Thu, 13 Oct 2022 11:29:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665653370; x=1697189370; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=xb19iKann7wcACjv0jg0UXPgpDxW3lS/f2czKBOFujo=; b=fTNxjXlJny+lJDptC7kaKmK+cBO4PxdYDtndOs4yqF9at7KAGOE2+6R4 +KP9Ea3PubNtk6fV2j2SjEYw/my9YRs7h9/IEMstTtgjeP3f3djc+ZRg6 f6xlc/G8rJiI5GNyf/VfmtW/B5fjQvEiK3fC9fOmIGj9uCCv9DORPKb+U mZRpAMGdVU+Ex6DBmSH4pLbAIEGqU6Do5m+qTo7LVICZqe6XgTPR1ig8S ZzJkpn/3nvRy1QzAeVTWOIYZep0cteiHGPEcoNPw9GDW+78PoBM/GbxXi yOjqcK00229eVC/6VSJlLwIQav48eIXYLusCU0oRmMQwOSymnazOGFQc5 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10498"; a="305022269" X-IronPort-AV: E=Sophos;i="5.95,180,1661842800"; d="scan'208";a="305022269" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2022 02:29:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10498"; a="769547393" X-IronPort-AV: E=Sophos;i="5.95,180,1661842800"; d="scan'208";a="769547393" Received: from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.111.102]) by fmsmga001.fm.intel.com with ESMTP; 13 Oct 2022 02:29:27 -0700 From: xuan.ding@intel.com To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, jiayu.hu@intel.com, xingguang.he@intel.com, yvonnex.yang@intel.com, cheng1.jiang@intel.com, yuanx.wang@intel.com, wenwux.ma@intel.com, Xuan Ding Subject: [PATCH v5 2/2] examples/vhost: unconfigure DMA vchannel Date: Thu, 13 Oct 2022 09:27:08 +0000 Message-Id: <20221013092708.4922-3-xuan.ding@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221013092708.4922-1-xuan.ding@intel.com> References: <20220814140442.82525-1-xuan.ding@intel.com> <20221013092708.4922-1-xuan.ding@intel.com> 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 From: Xuan Ding This patch applies rte_vhost_async_dma_unconfigure() to manually free DMA vchannels. Before unconfiguration, make sure the specified DMA device is no longer used by any vhost ports. Signed-off-by: Xuan Ding --- examples/vhost/main.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index ac78704d79..baf7d49116 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -73,6 +73,7 @@ static int total_num_mbufs = NUM_MBUFS_DEFAULT; struct dma_for_vhost dma_bind[RTE_MAX_VHOST_DEVICE]; int16_t dmas_id[RTE_DMADEV_DEFAULT_MAX]; +int16_t dma_ref_count[RTE_DMADEV_DEFAULT_MAX]; static int dma_count; /* mask of enabled ports */ @@ -371,6 +372,7 @@ open_dma(const char *value) done: (dma_info + socketid)->dmas[vring_id].dev_id = dev_id; (dma_info + socketid)->async_flag |= async_flag; + dma_ref_count[dev_id]++; i++; } out: @@ -1562,6 +1564,29 @@ vhost_clear_queue(struct vhost_dev *vdev, uint16_t queue_id) } } +static void +vhost_clear_async(struct vhost_dev *vdev, int vid, uint16_t queue_id) +{ + int16_t dma_id; + + if (!dma_bind[vid].dmas[queue_id].async_enabled) + return; + + vhost_clear_queue(vdev, queue_id); + rte_vhost_async_channel_unregister(vid, queue_id); + dma_bind[vid].dmas[queue_id].async_enabled = false; + + dma_id = dma_bind[vid2socketid[vdev->vid]].dmas[queue_id].dev_id; + dma_ref_count[dma_id]--; + + if (dma_ref_count[dma_id] > 0) + return; + + if (rte_vhost_async_dma_unconfigure(dma_id, 0) < 0) + RTE_LOG(ERR, VHOST_CONFIG, + "Failed to unconfigure DMA %d in vhost.\n", dma_id); +} + /* * Remove a device from the specific data core linked list and from the * main linked list. Synchronization occurs through the use of the @@ -1618,17 +1643,8 @@ destroy_device(int vid) "(%d) device has been removed from data core\n", vdev->vid); - if (dma_bind[vid].dmas[VIRTIO_RXQ].async_enabled) { - vhost_clear_queue(vdev, VIRTIO_RXQ); - rte_vhost_async_channel_unregister(vid, VIRTIO_RXQ); - dma_bind[vid].dmas[VIRTIO_RXQ].async_enabled = false; - } - - if (dma_bind[vid].dmas[VIRTIO_TXQ].async_enabled) { - vhost_clear_queue(vdev, VIRTIO_TXQ); - rte_vhost_async_channel_unregister(vid, VIRTIO_TXQ); - dma_bind[vid].dmas[VIRTIO_TXQ].async_enabled = false; - } + vhost_clear_async(vdev, vid, VIRTIO_RXQ); + vhost_clear_async(vdev, vid, VIRTIO_TXQ); rte_free(vdev); } @@ -1690,8 +1706,6 @@ vhost_async_channel_register(int vid) return rx_ret | tx_ret; } - - /* * A new device is added to a data core. First the device is added to the main linked list * and then allocated to a specific data core.