From patchwork Tue Jan 26 10:15:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 87290 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 BDA91A052A; Tue, 26 Jan 2021 11:17:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3498141317; Tue, 26 Jan 2021 11:17:01 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id B5CA5141311 for ; Tue, 26 Jan 2021 11:16:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611656216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sus7+BRONN28yvDu3g/1CSGUzrQ1kVVJ6XML0WCrhKs=; b=MCUmtftmwyTLWWfY4wPMDVnxEb7GUBSL+TYNXbBa3WWwhiIP04oObz6megyGkTADSaQDqI DDfrVwxUjirA3Hcs9buAJgcyBD9whLztNN71Nv98+LGGZdcshWBwl5zXV4hBovZrnqIwR/ 8Z/zgFnZjBmRj4aDgMa6g3lxI4465nY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-R9BsbZPgPtuCTmEh7jnxWQ-1; Tue, 26 Jan 2021 05:16:54 -0500 X-MC-Unique: R9BsbZPgPtuCTmEh7jnxWQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4C4D80A5CB; Tue, 26 Jan 2021 10:16:53 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.36.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFCD97216D; Tue, 26 Jan 2021 10:16:51 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com, amorenoz@redhat.com, david.marchand@redhat.com Cc: Maxime Coquelin Date: Tue, 26 Jan 2021 11:15:57 +0100 Message-Id: <20210126101639.250481-3-maxime.coquelin@redhat.com> In-Reply-To: <20210126101639.250481-1-maxime.coquelin@redhat.com> References: <20210126101639.250481-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v4 02/44] bus/vdev: add driver IOVA VA mode requirement 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 Sender: "dev" This patch adds driver flag in vdev bus driver so that vdev drivers can require VA IOVA mode to be used, which for example the case of Virtio-user PMD. The patch implements the .get_iommu_class() callback, that is called before devices probing to determine the IOVA mode to be used, and adds a check right before the device is probed to ensure compatible IOVA mode has been selected. It also adds a ABI exception rule to accommodate with an update on the driver registration API Signed-off-by: Maxime Coquelin Signed-off-by: David Marchand Reviewed-by: Chenbo Xia --- devtools/libabigail.abignore | 2 ++ drivers/bus/vdev/rte_bus_vdev.h | 4 ++++ drivers/bus/vdev/vdev.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index 1dc84fa74b..170304c876 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -11,6 +11,8 @@ ; Explicit ignore for driver-only ABI [suppress_type] name = eth_dev_ops +[suppress_function] + name_regexp = rte_vdev_(|un)register ; Ignore fields inserted in cacheline boundary of rte_cryptodev [suppress_type] diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h index f99a41f825..fc315d10fa 100644 --- a/drivers/bus/vdev/rte_bus_vdev.h +++ b/drivers/bus/vdev/rte_bus_vdev.h @@ -113,8 +113,12 @@ struct rte_vdev_driver { rte_vdev_remove_t *remove; /**< Virtual device remove function. */ rte_vdev_dma_map_t *dma_map; /**< Virtual device DMA map function. */ rte_vdev_dma_unmap_t *dma_unmap; /**< Virtual device DMA unmap function. */ + uint32_t drv_flags; /**< Flags RTE_VDEV_DRV_*. */ }; +/** Device driver needs IOVA as VA and cannot work with IOVA as PA */ +#define RTE_VDEV_DRV_NEED_IOVA_AS_VA 0x0001 + /** * Register a virtual device driver. * diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index acfd78828f..9a673347ae 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -189,6 +189,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) { const char *name; struct rte_vdev_driver *driver; + enum rte_iova_mode iova_mode; int ret; if (rte_dev_is_probed(&dev->device)) @@ -199,6 +200,14 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) if (vdev_parse(name, &driver)) return -1; + + iova_mode = rte_eal_iova_mode(); + if ((driver->drv_flags & RTE_VDEV_DRV_NEED_IOVA_AS_VA) && (iova_mode == RTE_IOVA_PA)) { + VDEV_LOG(ERR, "%s requires VA IOVA mode but current mode is PA, not initializing", + name); + return -1; + } + ret = driver->probe(dev); if (ret == 0) dev->device.driver = &driver->driver; @@ -594,6 +603,25 @@ vdev_unplug(struct rte_device *dev) return rte_vdev_uninit(dev->name); } +static enum rte_iova_mode +vdev_get_iommu_class(void) +{ + const char *name; + struct rte_vdev_device *dev; + struct rte_vdev_driver *driver; + + TAILQ_FOREACH(dev, &vdev_device_list, next) { + name = rte_vdev_device_name(dev); + if (vdev_parse(name, &driver)) + continue; + + if (driver->drv_flags & RTE_VDEV_DRV_NEED_IOVA_AS_VA) + return RTE_IOVA_VA; + } + + return RTE_IOVA_DC; +} + static struct rte_bus rte_vdev_bus = { .scan = vdev_scan, .probe = vdev_probe, @@ -603,6 +631,7 @@ static struct rte_bus rte_vdev_bus = { .parse = vdev_parse, .dma_map = vdev_dma_map, .dma_unmap = vdev_dma_unmap, + .get_iommu_class = vdev_get_iommu_class, .dev_iterate = rte_vdev_dev_iterate, };