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 DA012A09D3; Thu, 20 Oct 2022 11:14:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5ADB42CEB; Thu, 20 Oct 2022 11:14:16 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 3483C42CEA for ; Thu, 20 Oct 2022 11:14:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666257255; x=1697793255; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=dpDkvRz6m4ncs3HWwxud1nlu2PHo7vDI56dHJEpJTuQ=; b=SM0pt0APj2EvlbIL77OJCoUIoXdXkYzG4YcSpOiqseNeSn9w0SHkuvHN zy/jyWpWWO1gRrkSsErX5JFaGCTra3Pb2amTJ8l8P/fHBdfLGwkb31dM4 NE4bzz5Yhc0AMGhgdRzJYHzrbQMwSQB3Lm/dNeaYvIZtobdd+u/tRxE+z ub+tAIcDQFNgfPJsAgmxXz6FVAA7bP52+7aMGDApPGpC35A7ZKvHCSGfo Ulew4yNXTdhuk+FfgsoXZxaFTBEUTww9AL2U6nzlns6HozdnxF/9NKCz+ vYvEJUjiiQ+P1KQcJ3i83tlQh+Hb62NBVcDrdX0lSI13t+v0utNSBPWiA g==; X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="289967874" X-IronPort-AV: E=Sophos;i="5.95,198,1661842800"; d="scan'208";a="289967874" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2022 02:14:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10505"; a="804759843" X-IronPort-AV: E=Sophos;i="5.95,198,1661842800"; d="scan'208";a="804759843" Received: from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.111.102]) by orsmga005.jf.intel.com with ESMTP; 20 Oct 2022 02:14:11 -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 v7 1/2] vhost: introduce DMA vchannel unconfiguration Date: Thu, 20 Oct 2022 09:11:02 +0000 Message-Id: <20221020091103.43422-2-xuan.ding@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221020091103.43422-1-xuan.ding@intel.com> References: <20220814140442.82525-1-xuan.ding@intel.com> <20221020091103.43422-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 | 5 ++ doc/guides/rel_notes/release_22_11.rst | 5 ++ lib/vhost/rte_vhost_async.h | 20 +++++++ lib/vhost/version.map | 3 ++ lib/vhost/vhost.c | 75 ++++++++++++++++++++++++-- 5 files changed, 103 insertions(+), 5 deletions(-) diff --git a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst index bad4d819e1..cdf0c0b026 100644 --- a/doc/guides/prog_guide/vhost_lib.rst +++ b/doc/guides/prog_guide/vhost_lib.rst @@ -323,6 +323,11 @@ 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. After this function is called, + the specified DMA vChannel should no longer be used by the Vhost library. + 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..dc52d1ce2f 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -225,6 +225,11 @@ New Features sysfs entries to adjust the minimum and maximum uncore frequency values, which works on Linux with Intel hardware only. +* **Added DMA vChannel unconfiguration for async vhost.** + + Added support to unconfigure DMA vChannels that are no longer used + by the Vhost library. + * **Rewritten pmdinfo script.** The ``dpdk-pmdinfo.py`` script was rewritten to produce valid JSON only. diff --git a/lib/vhost/rte_vhost_async.h b/lib/vhost/rte_vhost_async.h index 1db2a10124..45c75be55c 100644 --- a/lib/vhost/rte_vhost_async.h +++ b/lib/vhost/rte_vhost_async.h @@ -266,6 +266,26 @@ 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 Vhost asynchronous data path. + * This function should be called when the specified DMA device is no longer + * used by the Vhost library. Before this function is called, make sure there + * does not exist in-flight packets in DMA vChannel. + * + * @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..3f733b4878 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,62 @@ 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; + struct rte_dma_stats stats = { 0 }; + + 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; + } + + if (dma_copy_track[dma_id].nr_vchans == 0) + goto error; + + 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; + } + + dma_copy_track[dma_id].nr_vchans--; + + if (dma_copy_track[dma_id].nr_vchans == 0 && dma_copy_track[dma_id].vchans != NULL) { + rte_free(dma_copy_track[dma_id].vchans); + dma_copy_track[dma_id].vchans = NULL; + } + + if (rte_dma_stats_get(dma_id, vchan_id, &stats) != 0) { + VHOST_LOG_CONFIG("dma", ERR, + "Failed to get stats for DMA %d vChannel %u.\n", dma_id, vchan_id); + goto error; + } + + if (stats.submitted - stats.completed != 0) { + VHOST_LOG_CONFIG("dma", ERR, + "Do not unconfigure when there are inflight packets.\n"); + goto error; + } + + 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); -- 2.17.1