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 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. -- 2.17.1