From patchwork Thu Sep 29 01:32:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ding, Xuan" X-Patchwork-Id: 117086 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 3FAD1A00C4; Thu, 29 Sep 2022 03:33:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3C4642B6E; Thu, 29 Sep 2022 03:33:25 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 31C1742802 for ; Thu, 29 Sep 2022 03:33:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664415202; x=1695951202; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=C50BcYCqhOhQZ1sGC6iEs3lB3xr2fnCT0eD5zdOxYBY=; b=UETaEq9EGO6JXA2AxaZyFOo8GHGl19jf7yErYqgXPRceQoD7bMCxVlBH TEJeX46c+Z7ZYszq9vuXdR1DTCgCxoJq4yq8BJ9nMvadxsH5b4sCLfn9l xg1vMv16iLN5+eVR0y8H9n2mexAqbyfHEc561p23TeSoqhSnxohk6SSb5 mf2GHKKE/VFRPPNBHy84dH0POpdUq6NCefSQyZT7VkJ99U39eRrA/c9tq B32NepeP/VHTwkG70bYW8zpll093qfksAaA0m86W1CX6ytFeMANtyjRT3 3ogYnuPPrNnf44uwle9ZHLK7m8lW6bi+fFzuefWX0inQvCwP2HjlCdAZs g==; X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="328135472" X-IronPort-AV: E=Sophos;i="5.93,353,1654585200"; d="scan'208";a="328135472" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2022 18:33:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="747638173" X-IronPort-AV: E=Sophos;i="5.93,353,1654585200"; d="scan'208";a="747638173" Received: from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.111.102]) by orsmga004.jf.intel.com with ESMTP; 28 Sep 2022 18:33:15 -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 v3 1/2] vhost: introduce DMA vchannel unconfiguration Date: Thu, 29 Sep 2022 01:32:42 +0000 Message-Id: <20220929013243.15889-2-xuan.ding@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220929013243.15889-1-xuan.ding@intel.com> References: <20220814140442.82525-1-xuan.ding@intel.com> <20220929013243.15889-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 adds 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 | 3 ++ lib/vhost/rte_vhost_async.h | 18 +++++++ lib/vhost/version.map | 3 ++ lib/vhost/vhost.c | 69 ++++++++++++++++++++++++-- 5 files changed, 94 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 684bf74596..a641d8a6b8 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -67,6 +67,9 @@ New Features * Added support to set device link down/up. +* **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 18574346d5..013a6bcc42 100644 --- a/lib/vhost/version.map +++ b/lib/vhost/version.map @@ -96,6 +96,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 aa671f47a3..f0f337bf5b 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; +static rte_spinlock_t vhost_dma_lock = RTE_SPINLOCK_INITIALIZER; struct vhost_vq_stats_name_off { char name[RTE_VHOST_STATS_NAME_SIZE]; @@ -1850,19 +1851,20 @@ rte_vhost_async_dma_configure(int16_t dma_id, uint16_t vchan_id) void *pkts_cmpl_flag_addr; uint16_t max_desc; + rte_spinlock_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) { @@ -1874,7 +1876,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; @@ -1883,6 +1885,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); + rte_spinlock_unlock(&vhost_dma_lock); return 0; } @@ -1900,7 +1903,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; @@ -1908,7 +1911,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++; + rte_spinlock_unlock(&vhost_dma_lock); return 0; + +error: + rte_spinlock_unlock(&vhost_dma_lock); + return -1; } int @@ -2097,5 +2105,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; + + rte_spinlock_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--; + + rte_spinlock_unlock(&vhost_dma_lock); + return 0; + +error: + rte_spinlock_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 Sep 29 01:32:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ding, Xuan" X-Patchwork-Id: 117087 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 BBA9BA00C4; Thu, 29 Sep 2022 03:33:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 04D2142B72; Thu, 29 Sep 2022 03:33:27 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id D522E42802 for ; Thu, 29 Sep 2022 03:33:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664415203; x=1695951203; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WSUAf38m9HT/I+nSHdAP2BGiUThgU1051kigLq/zHhA=; b=W51SyULCrgYCMCoP0ZvMRCYt0em+trc2dx1Di6N69WIsFpuowhf0h+kK CoTjBtubR++XahbCViGmCrXAMS6H4FmV3sLLR3g2iiq1rMWvgh4/92Tv/ ++sntWoUbcv6ugZAf6oMzB4a67fk2yiYNAdvJpa4Toy0IIxbTAwz/7xBm KqPwKVIuu4h2AUhAl0FWVtnGfSTQxCbHIkoOb/wucZqD0S1K6I7gYelPI e0oo0ADD7FBfrq08JHS+054V8WqPMsnlbanSu8trhP7fFC278NLzR0/5N v6gAFOTDdw/qCWxqLzu58LYp6+KqO2/mALU7dzzSB9LNtO/SF1kfMCK9Q w==; X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="328135485" X-IronPort-AV: E=Sophos;i="5.93,353,1654585200"; d="scan'208";a="328135485" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2022 18:33:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10484"; a="747638181" X-IronPort-AV: E=Sophos;i="5.93,353,1654585200"; d="scan'208";a="747638181" Received: from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.111.102]) by orsmga004.jf.intel.com with ESMTP; 28 Sep 2022 18:33:19 -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 v3 2/2] examples/vhost: unconfigure DMA vchannel Date: Thu, 29 Sep 2022 01:32:43 +0000 Message-Id: <20220929013243.15889-3-xuan.ding@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220929013243.15889-1-xuan.ding@intel.com> References: <20220814140442.82525-1-xuan.ding@intel.com> <20220929013243.15889-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() API to manually free DMA vchannels instead of waiting until the program ends to be released. Signed-off-by: Xuan Ding --- examples/vhost/main.c | 45 ++++++++++++++++++++++++++++++------------- examples/vhost/main.h | 1 + 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 0fa4753e70..32f396d88a 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -1558,6 +1558,28 @@ 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; + uint16_t ref_count; + + if (dma_bind[vid].dmas[queue_id].async_enabled) { + 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_bind[vid2socketid[vdev->vid]].dmas[queue_id].dma_ref_count--; + ref_count = dma_bind[vid2socketid[vdev->vid]].dmas[queue_id].dma_ref_count; + + if (ref_count == 0 && dma_id != INVALID_DMA_ID) { + if (rte_vhost_async_dma_unconfigure(dma_id, 0) < 0) + RTE_LOG(ERR, VHOST_PORT, "Failed to unconfigure DMA in vhost.\n"); + } +} + /* * Remove a device from the specific data core linked list and from the * main linked list. Synchronization occurs through the use of the @@ -1614,17 +1636,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); } @@ -1673,14 +1686,19 @@ vhost_async_channel_register(int vid) if (dma_bind[vid2socketid[vid]].dmas[VIRTIO_RXQ].dev_id != INVALID_DMA_ID) { rx_ret = rte_vhost_async_channel_register(vid, VIRTIO_RXQ); - if (rx_ret == 0) + if (rx_ret == 0) { dma_bind[vid2socketid[vid]].dmas[VIRTIO_RXQ].async_enabled = true; + dma_bind[vid2socketid[vid]].dmas[VIRTIO_RXQ].dma_ref_count++; + } + } if (dma_bind[vid2socketid[vid]].dmas[VIRTIO_TXQ].dev_id != INVALID_DMA_ID) { tx_ret = rte_vhost_async_channel_register(vid, VIRTIO_TXQ); - if (tx_ret == 0) + if (tx_ret == 0) { dma_bind[vid2socketid[vid]].dmas[VIRTIO_TXQ].async_enabled = true; + dma_bind[vid2socketid[vid]].dmas[VIRTIO_TXQ].dma_ref_count++; + } } return rx_ret | tx_ret; @@ -1886,6 +1904,7 @@ reset_dma(void) for (j = 0; j < RTE_MAX_QUEUES_PER_PORT * 2; j++) { dma_bind[i].dmas[j].dev_id = INVALID_DMA_ID; dma_bind[i].dmas[j].async_enabled = false; + dma_bind[i].dmas[j].dma_ref_count = 0; } } diff --git a/examples/vhost/main.h b/examples/vhost/main.h index 2fcb8376c5..2b2cf828d3 100644 --- a/examples/vhost/main.h +++ b/examples/vhost/main.h @@ -96,6 +96,7 @@ struct dma_info { struct rte_pci_addr addr; int16_t dev_id; bool async_enabled; + uint16_t dma_ref_count; }; struct dma_for_vhost {