From patchwork Thu Aug 29 07:59:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 58229 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E4DD41DFEA; Thu, 29 Aug 2019 10:00:58 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DD4E31D50C; Thu, 29 Aug 2019 10:00:56 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F6608553A; Thu, 29 Aug 2019 08:00:56 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-52.ams2.redhat.com [10.36.112.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CAC15D6B2; Thu, 29 Aug 2019 08:00:51 +0000 (UTC) From: Maxime Coquelin To: tiwei.bie@intel.com, zhihong.wang@intel.com, amorenoz@redhat.com, xiao.w.wang@intel.com, dev@dpdk.org, jfreimann@redhat.com Cc: stable@dpdk.org, Maxime Coquelin Date: Thu, 29 Aug 2019 09:59:56 +0200 Message-Id: <20190829080000.20806-12-maxime.coquelin@redhat.com> In-Reply-To: <20190829080000.20806-1-maxime.coquelin@redhat.com> References: <20190829080000.20806-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 29 Aug 2019 08:00:56 +0000 (UTC) Subject: [dpdk-dev] [PATCH 11/15] net/virtio: add vDPA op to stop and close the device X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch implements the vDPA .dev_close() callback. Signed-off-by: Maxime Coquelin --- drivers/net/virtio/virtio_vdpa.c | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/drivers/net/virtio/virtio_vdpa.c b/drivers/net/virtio/virtio_vdpa.c index 13b4dd07d..691844906 100644 --- a/drivers/net/virtio/virtio_vdpa.c +++ b/drivers/net/virtio/virtio_vdpa.c @@ -436,6 +436,33 @@ virtio_vdpa_start(struct virtio_vdpa_device *dev) return ret; } +static void +virtio_vdpa_stop(struct virtio_vdpa_device *dev) +{ + struct virtio_hw *hw = &dev->hw; + uint32_t i, nr_vring; + int vid = dev->vid; + struct rte_vhost_vring vr; + uint16_t last_used_idx, last_avail_idx; + + nr_vring = rte_vhost_get_vring_num(vid); + + vtpci_reset(hw); + + for (i = 0; i < nr_vring; i++) { + rte_vhost_get_vhost_vring(vid, i, &vr); + + last_used_idx = vr.used->idx; + last_avail_idx = vr.avail->idx; + + rte_vhost_set_vring_base(vid, i, last_avail_idx, + last_used_idx); + } + + rte_free(dev->vqs); + dev->vqs = NULL; +} + static int virtio_vdpa_dev_config(int vid) { @@ -470,11 +497,36 @@ virtio_vdpa_dev_config(int vid) return ret; } +static int +virtio_vdpa_dev_close(int vid) +{ + int did; + struct internal_list *list; + struct virtio_vdpa_device *dev; + + did = rte_vhost_get_vdpa_device_id(vid); + list = find_internal_resource_by_did(did); + if (list == NULL) { + DRV_LOG(ERR, "Invalid device id: %d", did); + return -1; + } + + dev = list->dev; + + rte_spinlock_lock(&dev->lock); + virtio_vdpa_stop(dev); + virtio_vdpa_dma_map(dev, 0); + rte_spinlock_unlock(&dev->lock); + + return 0; +} + static struct rte_vdpa_dev_ops virtio_vdpa_ops = { .get_queue_num = virtio_vdpa_get_queue_num, .get_features = virtio_vdpa_get_features, .get_protocol_features = virtio_vdpa_get_protocol_features, .dev_conf = virtio_vdpa_dev_config, + .dev_close = virtio_vdpa_dev_close, }; static inline int