* [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-11 2:26 ` Xia, Chenbo
` (3 more replies)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
` (14 subsequent siblings)
15 siblings, 4 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add new vDPA PMD to support vDPA operation by Xilinx devices.
This patch implements probe and remove functions.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
MAINTAINERS | 6 +
doc/guides/rel_notes/release_21_08.rst | 5 +
doc/guides/vdpadevs/features/sfc.ini | 9 ++
doc/guides/vdpadevs/sfc.rst | 97 +++++++++++
drivers/vdpa/meson.build | 1 +
drivers/vdpa/sfc/meson.build | 33 ++++
drivers/vdpa/sfc/sfc_vdpa.c | 286 +++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 40 +++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 77 +++++++++
drivers/vdpa/sfc/version.map | 3 +
10 files changed, 557 insertions(+)
create mode 100644 doc/guides/vdpadevs/features/sfc.ini
create mode 100644 doc/guides/vdpadevs/sfc.rst
create mode 100644 drivers/vdpa/sfc/meson.build
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
create mode 100644 drivers/vdpa/sfc/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 5877a16..ccc0a2a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1197,6 +1197,12 @@ F: drivers/vdpa/mlx5/
F: doc/guides/vdpadevs/mlx5.rst
F: doc/guides/vdpadevs/features/mlx5.ini
+Xilinx sfc vDPA
+M: Vijay Kumar Srivastava <vsrivast@xilinx.com>
+F: drivers/vdpa/sfc/
+F: doc/guides/vdpadevs/sfc.rst
+F: doc/guides/vdpadevs/features/sfc.ini
+
Eventdev Drivers
----------------
diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
index a6ecfdf..bb9aa83 100644
--- a/doc/guides/rel_notes/release_21_08.rst
+++ b/doc/guides/rel_notes/release_21_08.rst
@@ -55,6 +55,11 @@ New Features
Also, make sure to start the actual text at the margin.
=======================================================
+* **Add new vDPA PMD based on Xilinx devices.**
+
+ Added a new Xilinx vDPA (``sfc_vdpa``) PMD.
+ See the :doc:`../vdpadevs/sfc` guide for more details on this driver.
+
Removed Items
-------------
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
new file mode 100644
index 0000000..71b6158
--- /dev/null
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'sfc' vDPA driver.
+;
+; Refer to default.ini for the full list of available driver features.
+;
+[Features]
+Linux = Y
+x86-64 = Y
+Usage doc = Y
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
new file mode 100644
index 0000000..59f990b
--- /dev/null
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -0,0 +1,97 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright(c) 2021 Xilinx Corporation.
+
+Xilinx vDPA driver
+==================
+
+The Xilinx vDPA (vhost data path acceleration) driver (**librte_pmd_sfc_vdpa**)
+provides support for the Xilinx SN1022 SmartNICs family of 10/25/40/50/100 Gbps
+adapters has support for latest Linux and FreeBSD operating systems.
+
+More information can be found at Xilinx website https://www.xilinx.com.
+
+
+Xilinx vDPA implementation
+--------------------------
+
+ef100 device can be configured in the net device or vDPA mode.
+Adding "class=vdpa" parameter helps to specify that this
+device is to be used in vDPA mode. If this parameter is not specified, device
+will be probed by net/sfc driver and will used as a net device.
+
+This PMD uses libefx (common/sfc_efx) code to access the device firmware.
+
+
+Supported NICs
+--------------
+
+- Xilinx SN1022 SmartNICs
+
+
+Features
+--------
+
+Features of the Xilinx vDPA driver are:
+
+- Compatibility with virtio 0.95 and 1.0
+
+
+Non-supported Features
+----------------------
+
+- Control Queue
+- Multi queue
+- Live Migration
+
+
+Prerequisites
+-------------
+
+Requires firmware version: v1.0.7.0 or higher
+
+Visit `Xilinx Support Downloads <https://www.xilinx.com/support.html>`_
+to get Xilinx Utilities with the latest firmware.
+Follow instructions from Alveo SN1000 SmartNICs User Guide to
+update firmware and configure the adapter.
+
+
+Per-Device Parameters
+~~~~~~~~~~~~~~~~~~~~~
+
+The following per-device parameters can be passed via EAL PCI device
+whitelist option like "-w 02:00.0,arg1=value1,...".
+
+Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
+boolean parameters value.
+
+- ``class`` [net|vdpa] (default **net**)
+
+ Choose the mode of operation of ef100 device.
+ **net** device will work as network device and will be probed by net/sfc driver.
+ **vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
+ If this parameter is not specified then ef100 device will operate as network device.
+
+
+Dynamic Logging Parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+One may leverage EAL option "--log-level" to change default levels
+for the log types supported by the driver. The option is used with
+an argument typically consisting of two parts separated by a colon.
+
+Level value is the last part which takes a symbolic name (or integer).
+Log type is the former part which may shell match syntax.
+Depending on the choice of the expression, the given log level may
+be used either for some specific log type or for a subset of types.
+
+SFC vDPA PMD provides the following log types available for control:
+
+- ``pmd.vdpa.sfc.driver`` (default level is **notice**)
+
+ Affects driver-wide messages unrelated to any particular devices.
+
+- ``pmd.vdpa.sfc.main`` (default level is **notice**)
+
+ Matches a subset of per-port log types registered during runtime.
+ A full name for a particular type may be obtained by appending a
+ dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
index f765fe3..77412c7 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -8,6 +8,7 @@ endif
drivers = [
'ifc',
'mlx5',
+ 'sfc',
]
std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost']
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
new file mode 100644
index 0000000..d916389
--- /dev/null
+++ b/drivers/vdpa/sfc/meson.build
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Copyright(c) 2020-2021 Xilinx, Inc.
+
+if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+ build = false
+ reason = 'only supported on x86_64 and aarch64'
+endif
+
+fmt_name = 'sfc_vdpa'
+extra_flags = []
+
+# Enable more warnings
+extra_flags += [
+ '-Wdisabled-optimization'
+]
+
+# Compiler and version dependent flags
+extra_flags += [
+ '-Waggregate-return',
+ '-Wbad-function-cast'
+]
+
+foreach flag: extra_flags
+ if cc.has_argument(flag)
+ cflags += flag
+ endif
+endforeach
+
+deps += ['common_sfc_efx', 'bus_pci']
+sources = files(
+ 'sfc_vdpa.c',
+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
new file mode 100644
index 0000000..d8faaca
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -0,0 +1,286 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_string_fns.h>
+#include <rte_vfio.h>
+#include <rte_vhost.h>
+
+#include "efx.h"
+#include "sfc_efx.h"
+#include "sfc_vdpa.h"
+
+TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
+static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
+ TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
+
+static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (pdev == sva->pdev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva : NULL;
+}
+
+static int
+sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *dev = sva->pdev;
+ char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
+ int rc;
+
+ if (dev == NULL)
+ goto fail_inval;
+
+ rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
+
+ sva->vfio_container_fd = rte_vfio_container_create();
+ if (sva->vfio_container_fd < 0) {
+ sfc_vdpa_err(sva, "failed to create VFIO container");
+ goto fail_container_create;
+ }
+
+ rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
+ &sva->iommu_group_num);
+ if (rc <= 0) {
+ sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
+ dev_name, rte_strerror(-rc));
+ goto fail_get_group_num;
+ }
+
+ sva->vfio_group_fd =
+ rte_vfio_container_group_bind(sva->vfio_container_fd,
+ sva->iommu_group_num);
+ if (sva->vfio_group_fd < 0) {
+ sfc_vdpa_err(sva,
+ "failed to bind IOMMU group %d to container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ goto fail_group_bind;
+ }
+
+ if (rte_pci_map_device(dev) != 0) {
+ sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
+ dev_name, rte_strerror(rte_errno));
+ goto fail_pci_map_device;
+ }
+
+ sva->vfio_dev_fd = dev->intr_handle.vfio_dev_fd;
+
+ return 0;
+
+fail_pci_map_device:
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+fail_group_bind:
+fail_get_group_num:
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva, "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+
+fail_container_create:
+fail_inval:
+ return -1;
+}
+
+static void
+sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva)
+{
+ rte_pci_unmap_device(sva->pdev);
+
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+}
+
+static int
+sfc_vdpa_set_log_prefix(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ int ret;
+
+ ret = snprintf(sva->log_prefix, sizeof(sva->log_prefix),
+ "PMD: sfc_vdpa " PCI_PRI_FMT " : ",
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+
+ if (ret < 0 || ret >= (int)sizeof(sva->log_prefix)) {
+ SFC_VDPA_GENERIC_LOG(ERR,
+ "reserved log prefix is too short for " PCI_PRI_FMT,
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str, uint32_t ll_default)
+{
+ size_t lt_prefix_str_size = strlen(lt_prefix_str);
+ size_t lt_str_size_max;
+ char *lt_str = NULL;
+ int ret;
+
+ if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
+ ++lt_prefix_str_size; /* Reserve space for prefix separator */
+ lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
+ } else {
+ return RTE_LOGTYPE_PMD;
+ }
+
+ lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
+ if (lt_str == NULL)
+ return RTE_LOGTYPE_PMD;
+
+ strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
+ lt_str[lt_prefix_str_size - 1] = '.';
+ rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
+ lt_str_size_max - lt_prefix_str_size);
+ lt_str[lt_str_size_max - 1] = '\0';
+
+ ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
+ rte_free(lt_str);
+
+ return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
+}
+
+static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
+ { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
+ { .vendor_id = 0, /* sentinel */ },
+};
+
+static int
+sfc_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+ uint32_t logtype_main;
+ int ret = 0;
+
+ if (sfc_efx_dev_class_get(pci_dev->device.devargs) !=
+ SFC_EFX_DEV_CLASS_VDPA) {
+ SFC_VDPA_GENERIC_LOG(INFO,
+ "Incompatible device class: skip probing, should be probed by other sfc driver.");
+ return 1;
+ }
+
+ /*
+ * It will not be probed in the secondary process. As device class
+ * is vdpa so return 0 to avoid probe by other sfc driver
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ logtype_main = sfc_vdpa_register_logtype(&pci_dev->addr,
+ SFC_VDPA_LOGTYPE_MAIN_STR,
+ RTE_LOG_NOTICE);
+
+ sva = rte_zmalloc("sfc_vdpa", sizeof(struct sfc_vdpa_adapter), 0);
+ if (sva == NULL)
+ goto fail_zmalloc;
+
+ sva->pdev = pci_dev;
+ sva->logtype_main = logtype_main;
+
+ ret = sfc_vdpa_set_log_prefix(sva);
+ if (ret != 0)
+ goto fail_set_log_prefix;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "vfio init");
+ if (sfc_vdpa_vfio_setup(sva) < 0) {
+ sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
+ goto fail_vfio_setup;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_vfio_setup:
+fail_set_log_prefix:
+ rte_free(sva);
+
+fail_zmalloc:
+ return -1;
+}
+
+static int
+sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -1;
+
+ sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
+ if (sva == NULL) {
+ sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
+ return -1;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_vfio_teardown(sva);
+
+ rte_free(sva);
+
+ return 0;
+}
+
+static struct rte_pci_driver rte_sfc_vdpa = {
+ .id_table = pci_id_sfc_vdpa_efx_map,
+ .drv_flags = 0,
+ .probe = sfc_vdpa_pci_probe,
+ .remove = sfc_vdpa_pci_remove,
+};
+
+RTE_PMD_REGISTER_PCI(net_sfc_vdpa, rte_sfc_vdpa);
+RTE_PMD_REGISTER_PCI_TABLE(net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_sfc_vdpa, "* vfio-pci");
+RTE_LOG_REGISTER_SUFFIX(sfc_vdpa_logtype_driver, driver, NOTICE);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
new file mode 100644
index 0000000..3b77900
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_H
+#define _SFC_VDPA_H
+
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_bus_pci.h>
+
+#include "sfc_vdpa_log.h"
+
+/* Adapter private data */
+struct sfc_vdpa_adapter {
+ TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ struct rte_pci_device *pdev;
+ struct rte_pci_addr pci_addr;
+
+ char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
+ uint32_t logtype_main;
+
+ int vfio_group_fd;
+ int vfio_dev_fd;
+ int vfio_container_fd;
+ int iommu_group_num;
+};
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str,
+ uint32_t ll_default);
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+
+#endif /* _SFC_VDPA_H */
+
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
new file mode 100644
index 0000000..0a3d6ad
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_LOG_H_
+#define _SFC_VDPA_LOG_H_
+
+/** Generic driver log type */
+extern int sfc_vdpa_logtype_driver;
+
+/** Common log type name prefix */
+#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
+
+/** Log PMD generic message, add a prefix and a line break */
+#define SFC_VDPA_GENERIC_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
+ RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+/** Name prefix for the per-device log type used to report basic information */
+#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+
+#define SFC_VDPA_LOG_PREFIX_MAX 32
+
+/* Log PMD message, automatically add prefix and \n */
+#define SFC_VDPA_LOG(sva, level, type, ...) \
+ rte_log(level, type, \
+ RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ sva->log_prefix, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+#define sfc_vdpa_err(sva, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ SFC_VDPA_LOG(_sva, RTE_LOG_ERR, \
+ _sva->logtype_main, __VA_ARGS__); \
+ } while (0)
+
+#define sfc_vdpa_warn(sva, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ SFC_VDPA_LOG(_sva, RTE_LOG_WARNING, \
+ _sva->logtype_main, __VA_ARGS__); \
+ } while (0)
+
+#define sfc_vdpa_notice(sva, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ SFC_VDPA_LOG(_sva, RTE_LOG_NOTICE, \
+ _sva->logtype_main, __VA_ARGS__); \
+ } while (0)
+
+#define sfc_vdpa_info(sva, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
+ _sva->logtype_main, __VA_ARGS__); \
+ } while (0)
+
+#define sfc_vdpa_log_init(sva, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
+ _sva->logtype_main, \
+ RTE_FMT("%s(): " \
+ RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+ } while (0)
+
+#endif /* _SFC_VDPA_LOG_H_ */
diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
new file mode 100644
index 0000000..4a76d1d
--- /dev/null
+++ b/drivers/vdpa/sfc/version.map
@@ -0,0 +1,3 @@
+DPDK_21 {
+ local: *;
+};
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 ` [dpdk-dev] [PATCH 01/10] " Vijay Srivastava
@ 2021-08-11 2:26 ` Xia, Chenbo
2021-08-13 8:38 ` Andrew Rybchenko
2021-08-13 15:34 ` Stephen Hemminger
` (2 subsequent siblings)
3 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-08-11 2:26 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Wednesday, July 7, 2021 12:44 AM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add new vDPA PMD to support vDPA operation by Xilinx devices.
vDPA operations of Xilinx devices
> This patch implements probe and remove functions.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> MAINTAINERS | 6 +
> doc/guides/rel_notes/release_21_08.rst | 5 +
> doc/guides/vdpadevs/features/sfc.ini | 9 ++
> doc/guides/vdpadevs/sfc.rst | 97 +++++++++++
> drivers/vdpa/meson.build | 1 +
> drivers/vdpa/sfc/meson.build | 33 ++++
> drivers/vdpa/sfc/sfc_vdpa.c | 286
> +++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 40 +++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 77 +++++++++
> drivers/vdpa/sfc/version.map | 3 +
> 10 files changed, 557 insertions(+)
> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
> create mode 100644 doc/guides/vdpadevs/sfc.rst
> create mode 100644 drivers/vdpa/sfc/meson.build
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
> create mode 100644 drivers/vdpa/sfc/version.map
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 5877a16..ccc0a2a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1197,6 +1197,12 @@ F: drivers/vdpa/mlx5/
> F: doc/guides/vdpadevs/mlx5.rst
> F: doc/guides/vdpadevs/features/mlx5.ini
>
> +Xilinx sfc vDPA
> +M: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> +F: drivers/vdpa/sfc/
> +F: doc/guides/vdpadevs/sfc.rst
> +F: doc/guides/vdpadevs/features/sfc.ini
> +
>
> Eventdev Drivers
> ----------------
> diff --git a/doc/guides/rel_notes/release_21_08.rst
> b/doc/guides/rel_notes/release_21_08.rst
> index a6ecfdf..bb9aa83 100644
> --- a/doc/guides/rel_notes/release_21_08.rst
> +++ b/doc/guides/rel_notes/release_21_08.rst
> @@ -55,6 +55,11 @@ New Features
> Also, make sure to start the actual text at the margin.
> =======================================================
>
> +* **Add new vDPA PMD based on Xilinx devices.**
> +
> + Added a new Xilinx vDPA (``sfc_vdpa``) PMD.
> + See the :doc:`../vdpadevs/sfc` guide for more details on this driver.
> +
>
> Removed Items
> -------------
> diff --git a/doc/guides/vdpadevs/features/sfc.ini
> b/doc/guides/vdpadevs/features/sfc.ini
> new file mode 100644
> index 0000000..71b6158
> --- /dev/null
> +++ b/doc/guides/vdpadevs/features/sfc.ini
> @@ -0,0 +1,9 @@
> +;
> +; Supported features of the 'sfc' vDPA driver.
> +;
> +; Refer to default.ini for the full list of available driver features.
> +;
> +[Features]
> +Linux = Y
> +x86-64 = Y
> +Usage doc = Y
> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
> new file mode 100644
> index 0000000..59f990b
> --- /dev/null
> +++ b/doc/guides/vdpadevs/sfc.rst
> @@ -0,0 +1,97 @@
> +.. SPDX-License-Identifier: BSD-3-Clause
> + Copyright(c) 2021 Xilinx Corporation.
> +
> +Xilinx vDPA driver
> +==================
> +
> +The Xilinx vDPA (vhost data path acceleration) driver
> (**librte_pmd_sfc_vdpa**)
> +provides support for the Xilinx SN1022 SmartNICs family of 10/25/40/50/100
> Gbps
> +adapters has support for latest Linux and FreeBSD operating systems.
Adapters that have support for XXX?
> +
> +More information can be found at Xilinx website https://www.xilinx.com.
> +
> +
> +Xilinx vDPA implementation
> +--------------------------
> +
> +ef100 device can be configured in the net device or vDPA mode.
> +Adding "class=vdpa" parameter helps to specify that this
> +device is to be used in vDPA mode. If this parameter is not specified, device
> +will be probed by net/sfc driver and will used as a net device.
> +
> +This PMD uses libefx (common/sfc_efx) code to access the device firmware.
> +
> +
> +Supported NICs
> +--------------
> +
> +- Xilinx SN1022 SmartNICs
> +
> +
> +Features
> +--------
> +
> +Features of the Xilinx vDPA driver are:
> +
> +- Compatibility with virtio 0.95 and 1.0
> +
> +
> +Non-supported Features
> +----------------------
> +
> +- Control Queue
> +- Multi queue
> +- Live Migration
> +
> +
> +Prerequisites
> +-------------
> +
> +Requires firmware version: v1.0.7.0 or higher
> +
> +Visit `Xilinx Support Downloads <https://www.xilinx.com/support.html>`_
> +to get Xilinx Utilities with the latest firmware.
> +Follow instructions from Alveo SN1000 SmartNICs User Guide to
> +update firmware and configure the adapter.
> +
> +
> +Per-Device Parameters
> +~~~~~~~~~~~~~~~~~~~~~
> +
> +The following per-device parameters can be passed via EAL PCI device
> +whitelist option like "-w 02:00.0,arg1=value1,...".
The name 'whitelist' is deprecated in DPDK now. So please use:
allowlist option like "-a 02:00.0,arg1=value1,..."
> +
> +Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
> +boolean parameters value.
> +
> +- ``class`` [net|vdpa] (default **net**)
> +
> + Choose the mode of operation of ef100 device.
> + **net** device will work as network device and will be probed by net/sfc
> driver.
> + **vdpa** device will work as vdpa device and will be probed by vdpa/sfc
> driver.
> + If this parameter is not specified then ef100 device will operate as
> network device.
> +
> +
> +Dynamic Logging Parameters
> +~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +One may leverage EAL option "--log-level" to change default levels
> +for the log types supported by the driver. The option is used with
> +an argument typically consisting of two parts separated by a colon.
> +
> +Level value is the last part which takes a symbolic name (or integer).
> +Log type is the former part which may shell match syntax.
> +Depending on the choice of the expression, the given log level may
> +be used either for some specific log type or for a subset of types.
> +
> +SFC vDPA PMD provides the following log types available for control:
> +
> +- ``pmd.vdpa.sfc.driver`` (default level is **notice**)
> +
> + Affects driver-wide messages unrelated to any particular devices.
> +
> +- ``pmd.vdpa.sfc.main`` (default level is **notice**)
> +
> + Matches a subset of per-port log types registered during runtime.
> + A full name for a particular type may be obtained by appending a
> + dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
> diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
> index f765fe3..77412c7 100644
> --- a/drivers/vdpa/meson.build
> +++ b/drivers/vdpa/meson.build
> @@ -8,6 +8,7 @@ endif
> drivers = [
> 'ifc',
> 'mlx5',
> + 'sfc',
> ]
> std_deps = ['bus_pci', 'kvargs']
> std_deps += ['vhost']
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> new file mode 100644
> index 0000000..d916389
> --- /dev/null
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -0,0 +1,33 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +#
> +# Copyright(c) 2020-2021 Xilinx, Inc.
> +
> +if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and
> (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
> + build = false
> + reason = 'only supported on x86_64 and aarch64'
> +endif
> +
> +fmt_name = 'sfc_vdpa'
> +extra_flags = []
> +
> +# Enable more warnings
> +extra_flags += [
> + '-Wdisabled-optimization'
> +]
> +
> +# Compiler and version dependent flags
> +extra_flags += [
> + '-Waggregate-return',
> + '-Wbad-function-cast'
> +]
> +
> +foreach flag: extra_flags
> + if cc.has_argument(flag)
> + cflags += flag
> + endif
> +endforeach
> +
> +deps += ['common_sfc_efx', 'bus_pci']
> +sources = files(
> + 'sfc_vdpa.c',
> +)
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> new file mode 100644
> index 0000000..d8faaca
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -0,0 +1,286 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <stdbool.h>
> +#include <stdint.h>
> +#include <sys/queue.h>
> +
> +#include <rte_common.h>
> +#include <rte_errno.h>
> +#include <rte_string_fns.h>
> +#include <rte_vfio.h>
> +#include <rte_vhost.h>
> +
> +#include "efx.h"
> +#include "sfc_efx.h"
> +#include "sfc_vdpa.h"
> +
> +TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
> +static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
> + TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
> +
> +static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
> +
> +struct sfc_vdpa_adapter *
> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
> +{
> + bool found = false;
> + struct sfc_vdpa_adapter *sva;
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> +
> + TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
> + if (pdev == sva->pdev) {
> + found = true;
> + break;
> + }
> + }
> +
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + return found ? sva : NULL;
> +}
> +
> +static int
> +sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
> +{
> + struct rte_pci_device *dev = sva->pdev;
> + char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
> + int rc;
> +
> + if (dev == NULL)
> + goto fail_inval;
> +
> + rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
> +
> + sva->vfio_container_fd = rte_vfio_container_create();
> + if (sva->vfio_container_fd < 0) {
> + sfc_vdpa_err(sva, "failed to create VFIO container");
failed -> Failed
I suggest to use capital letter for first letter of every log info.
Please check other logs.
> + goto fail_container_create;
> + }
> +
> + rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
> + &sva->iommu_group_num);
> + if (rc <= 0) {
> + sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
> + dev_name, rte_strerror(-rc));
> + goto fail_get_group_num;
> + }
> +
> + sva->vfio_group_fd =
> + rte_vfio_container_group_bind(sva->vfio_container_fd,
> + sva->iommu_group_num);
> + if (sva->vfio_group_fd < 0) {
> + sfc_vdpa_err(sva,
> + "failed to bind IOMMU group %d to container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + goto fail_group_bind;
> + }
> +
> + if (rte_pci_map_device(dev) != 0) {
> + sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
> + dev_name, rte_strerror(rte_errno));
> + goto fail_pci_map_device;
> + }
> +
> + sva->vfio_dev_fd = dev->intr_handle.vfio_dev_fd;
> +
> + return 0;
> +
> +fail_pci_map_device:
> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
> + sva->iommu_group_num) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to unbind IOMMU group %d from container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + }
> +
> +fail_group_bind:
> +fail_get_group_num:
You can combined these two tags into one with tag name changed.
> + if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
> + sfc_vdpa_err(sva, "failed to destroy container %d",
> + sva->vfio_container_fd);
> + }
> +
> +fail_container_create:
> +fail_inval:
Same here.
> + return -1;
> +}
> +
> +static void
> +sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva)
> +{
> + rte_pci_unmap_device(sva->pdev);
> +
> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
> + sva->iommu_group_num) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to unbind IOMMU group %d from container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + }
> +
> + if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to destroy container %d",
> + sva->vfio_container_fd);
> + }
> +}
> +
> +static int
> +sfc_vdpa_set_log_prefix(struct sfc_vdpa_adapter *sva)
> +{
> + struct rte_pci_device *pci_dev = sva->pdev;
> + int ret;
> +
> + ret = snprintf(sva->log_prefix, sizeof(sva->log_prefix),
> + "PMD: sfc_vdpa " PCI_PRI_FMT " : ",
> + pci_dev->addr.domain, pci_dev->addr.bus,
> + pci_dev->addr.devid, pci_dev->addr.function);
> +
> + if (ret < 0 || ret >= (int)sizeof(sva->log_prefix)) {
> + SFC_VDPA_GENERIC_LOG(ERR,
> + "reserved log prefix is too short for " PCI_PRI_FMT,
> + pci_dev->addr.domain, pci_dev->addr.bus,
> + pci_dev->addr.devid, pci_dev->addr.function);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +uint32_t
> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
> + const char *lt_prefix_str, uint32_t ll_default)
> +{
> + size_t lt_prefix_str_size = strlen(lt_prefix_str);
> + size_t lt_str_size_max;
> + char *lt_str = NULL;
> + int ret;
> +
> + if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
> + ++lt_prefix_str_size; /* Reserve space for prefix separator */
> + lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
> + } else {
> + return RTE_LOGTYPE_PMD;
> + }
> +
> + lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
> + if (lt_str == NULL)
> + return RTE_LOGTYPE_PMD;
> +
> + strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
> + lt_str[lt_prefix_str_size - 1] = '.';
> + rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
> + lt_str_size_max - lt_prefix_str_size);
> + lt_str[lt_str_size_max - 1] = '\0';
> +
> + ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
> + rte_free(lt_str);
> +
> + return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
'()' not needed
> +}
> +
> +static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
> + { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
> + { .vendor_id = 0, /* sentinel */ },
> +};
> +
> +static int
> +sfc_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> + struct rte_pci_device *pci_dev)
> +{
> + struct sfc_vdpa_adapter *sva = NULL;
> + uint32_t logtype_main;
> + int ret = 0;
> +
> + if (sfc_efx_dev_class_get(pci_dev->device.devargs) !=
> + SFC_EFX_DEV_CLASS_VDPA) {
> + SFC_VDPA_GENERIC_LOG(INFO,
> + "Incompatible device class: skip probing, should be probed
> by other sfc driver.");
> + return 1;
> + }
> +
> + /*
> + * It will not be probed in the secondary process. As device class
> + * is vdpa so return 0 to avoid probe by other sfc driver
> + */
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> + return 0;
> +
> + logtype_main = sfc_vdpa_register_logtype(&pci_dev->addr,
> + SFC_VDPA_LOGTYPE_MAIN_STR,
> + RTE_LOG_NOTICE);
> +
> + sva = rte_zmalloc("sfc_vdpa", sizeof(struct sfc_vdpa_adapter), 0);
> + if (sva == NULL)
> + goto fail_zmalloc;
> +
> + sva->pdev = pci_dev;
> + sva->logtype_main = logtype_main;
> +
> + ret = sfc_vdpa_set_log_prefix(sva);
> + if (ret != 0)
> + goto fail_set_log_prefix;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + sfc_vdpa_log_init(sva, "vfio init");
> + if (sfc_vdpa_vfio_setup(sva) < 0) {
> + sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
> + goto fail_vfio_setup;
> + }
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> + TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + sfc_vdpa_log_init(sva, "done");
> +
> + return 0;
> +
> +fail_vfio_setup:
> +fail_set_log_prefix:
Tags can be combined
> + rte_free(sva);
> +
> +fail_zmalloc:
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
> +{
> + struct sfc_vdpa_adapter *sva = NULL;
> +
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> + return -1;
> +
> + sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
> + if (sva == NULL) {
> + sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
> + return -1;
> + }
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> + TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + sfc_vdpa_vfio_teardown(sva);
> +
> + rte_free(sva);
> +
> + return 0;
> +}
> +
> +static struct rte_pci_driver rte_sfc_vdpa = {
> + .id_table = pci_id_sfc_vdpa_efx_map,
> + .drv_flags = 0,
> + .probe = sfc_vdpa_pci_probe,
> + .remove = sfc_vdpa_pci_remove,
> +};
> +
> +RTE_PMD_REGISTER_PCI(net_sfc_vdpa, rte_sfc_vdpa);
> +RTE_PMD_REGISTER_PCI_TABLE(net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);
> +RTE_PMD_REGISTER_KMOD_DEP(net_sfc_vdpa, "* vfio-pci");
> +RTE_LOG_REGISTER_SUFFIX(sfc_vdpa_logtype_driver, driver, NOTICE);
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> new file mode 100644
> index 0000000..3b77900
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -0,0 +1,40 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_H
> +#define _SFC_VDPA_H
> +
> +#include <stdint.h>
> +#include <sys/queue.h>
> +
> +#include <rte_bus_pci.h>
> +
> +#include "sfc_vdpa_log.h"
> +
> +/* Adapter private data */
> +struct sfc_vdpa_adapter {
> + TAILQ_ENTRY(sfc_vdpa_adapter) next;
> + struct rte_pci_device *pdev;
> + struct rte_pci_addr pci_addr;
> +
> + char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
> + uint32_t logtype_main;
> +
> + int vfio_group_fd;
> + int vfio_dev_fd;
> + int vfio_container_fd;
> + int iommu_group_num;
> +};
> +
> +uint32_t
> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
> + const char *lt_prefix_str,
> + uint32_t ll_default);
> +
> +struct sfc_vdpa_adapter *
> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
> +
> +#endif /* _SFC_VDPA_H */
> +
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
> new file mode 100644
> index 0000000..0a3d6ad
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> @@ -0,0 +1,77 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_LOG_H_
> +#define _SFC_VDPA_LOG_H_
> +
> +/** Generic driver log type */
> +extern int sfc_vdpa_logtype_driver;
> +
> +/** Common log type name prefix */
> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
> +
> +/** Log PMD generic message, add a prefix and a line break */
> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
> + rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
> + RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +/** Name prefix for the per-device log type used to report basic information
> */
> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
> +
> +#define SFC_VDPA_LOG_PREFIX_MAX 32
> +
> +/* Log PMD message, automatically add prefix and \n */
> +#define SFC_VDPA_LOG(sva, level, type, ...) \
> + rte_log(level, type, \
> + RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> + sva->log_prefix, \
> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +#define sfc_vdpa_err(sva, ...) \
> + do { \
> + const struct sfc_vdpa_adapter *_sva = (sva); \
> + \
> + SFC_VDPA_LOG(_sva, RTE_LOG_ERR, \
> + _sva->logtype_main, __VA_ARGS__); \
> + } while (0)
> +
> +#define sfc_vdpa_warn(sva, ...) \
> + do { \
> + const struct sfc_vdpa_adapter *_sva = (sva); \
> + \
> + SFC_VDPA_LOG(_sva, RTE_LOG_WARNING, \
> + _sva->logtype_main, __VA_ARGS__); \
> + } while (0)
> +
> +#define sfc_vdpa_notice(sva, ...) \
> + do { \
> + const struct sfc_vdpa_adapter *_sva = (sva); \
> + \
> + SFC_VDPA_LOG(_sva, RTE_LOG_NOTICE, \
> + _sva->logtype_main, __VA_ARGS__); \
> + } while (0)
> +
> +#define sfc_vdpa_info(sva, ...) \
> + do { \
> + const struct sfc_vdpa_adapter *_sva = (sva); \
> + \
> + SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
> + _sva->logtype_main, __VA_ARGS__); \
> + } while (0)
> +
For above log, can't we make log level a parameter?
Then above four define can be one.
Thanks,
Chenbo
> +#define sfc_vdpa_log_init(sva, ...) \
> + do { \
> + const struct sfc_vdpa_adapter *_sva = (sva); \
> + \
> + SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
> + _sva->logtype_main, \
> + RTE_FMT("%s(): " \
> + RTE_FMT_HEAD(__VA_ARGS__ ,), \
> + __func__, \
> + RTE_FMT_TAIL(__VA_ARGS__ ,))); \
> + } while (0)
> +
> +#endif /* _SFC_VDPA_LOG_H_ */
> diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
> new file mode 100644
> index 0000000..4a76d1d
> --- /dev/null
> +++ b/drivers/vdpa/sfc/version.map
> @@ -0,0 +1,3 @@
> +DPDK_21 {
> + local: *;
> +};
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-08-11 2:26 ` Xia, Chenbo
@ 2021-08-13 8:38 ` Andrew Rybchenko
2021-08-13 9:23 ` Xia, Chenbo
0 siblings, 1 reply; 122+ messages in thread
From: Andrew Rybchenko @ 2021-08-13 8:38 UTC (permalink / raw)
To: Xia, Chenbo, Vijay Srivastava, dev
Cc: maxime.coquelin, Vijay Kumar Srivastava
Hi Chenbo,
many thanks for review. See few questions/notes below.
On 8/11/21 5:26 AM, Xia, Chenbo wrote:
> Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Wednesday, July 7, 2021 12:44 AM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Subject: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>>
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add new vDPA PMD to support vDPA operation by Xilinx devices.
>
> vDPA operations of Xilinx devices
>
>> This patch implements probe and remove functions.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
[snip]
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
>> new file mode 100644
>> index 0000000..d8faaca
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
>> @@ -0,0 +1,286 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>> +#include <stdbool.h>
>> +#include <stdint.h>
>> +#include <sys/queue.h>
>> +
>> +#include <rte_common.h>
>> +#include <rte_errno.h>
>> +#include <rte_string_fns.h>
>> +#include <rte_vfio.h>
>> +#include <rte_vhost.h>
>> +
>> +#include "efx.h"
>> +#include "sfc_efx.h"
>> +#include "sfc_vdpa.h"
>> +
>> +TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
>> +static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
>> + TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
>> +
>> +static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
>> +
>> +struct sfc_vdpa_adapter *
>> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
>> +{
>> + bool found = false;
>> + struct sfc_vdpa_adapter *sva;
>> +
>> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
>> +
>> + TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
>> + if (pdev == sva->pdev) {
>> + found = true;
>> + break;
>> + }
>> + }
>> +
>> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
>> +
>> + return found ? sva : NULL;
>> +}
>> +
>> +static int
>> +sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
>> +{
>> + struct rte_pci_device *dev = sva->pdev;
>> + char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
>> + int rc;
>> +
>> + if (dev == NULL)
>> + goto fail_inval;
>> +
>> + rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
>> +
>> + sva->vfio_container_fd = rte_vfio_container_create();
>> + if (sva->vfio_container_fd < 0) {
>> + sfc_vdpa_err(sva, "failed to create VFIO container");
>
> failed -> Failed
>
> I suggest to use capital letter for first letter of every log info.
> Please check other logs.
Why? As far as I know it is not defined. It would make sense if
it is really a start of the log message, sfc_vdpa_* log
messages start from prefix (see macros definition).
>
>> + goto fail_container_create;
>> + }
>> +
>> + rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
>> + &sva->iommu_group_num);
>> + if (rc <= 0) {
>> + sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
>> + dev_name, rte_strerror(-rc));
>> + goto fail_get_group_num;
>> + }
>> +
>> + sva->vfio_group_fd =
>> + rte_vfio_container_group_bind(sva->vfio_container_fd,
>> + sva->iommu_group_num);
>> + if (sva->vfio_group_fd < 0) {
>> + sfc_vdpa_err(sva,
>> + "failed to bind IOMMU group %d to container %d",
>> + sva->iommu_group_num, sva->vfio_container_fd);
>> + goto fail_group_bind;
>> + }
>> +
>> + if (rte_pci_map_device(dev) != 0) {
>> + sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
>> + dev_name, rte_strerror(rte_errno));
>> + goto fail_pci_map_device;
>> + }
>> +
>> + sva->vfio_dev_fd = dev->intr_handle.vfio_dev_fd;
>> +
>> + return 0;
>> +
>> +fail_pci_map_device:
>> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
>> + sva->iommu_group_num) != 0) {
>> + sfc_vdpa_err(sva,
>> + "failed to unbind IOMMU group %d from container %d",
>> + sva->iommu_group_num, sva->vfio_container_fd);
>> + }
>> +
>> +fail_group_bind:
>> +fail_get_group_num:
>
> You can combined these two tags into one with tag name changed.
I think the original code is better. There is no point to
combine. This way code is safer against future changes
between these goto's which could require cleanup.
[snip]
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
>> new file mode 100644
>> index 0000000..0a3d6ad
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
>> @@ -0,0 +1,77 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>> +#ifndef _SFC_VDPA_LOG_H_
>> +#define _SFC_VDPA_LOG_H_
>> +
>> +/** Generic driver log type */
>> +extern int sfc_vdpa_logtype_driver;
>> +
>> +/** Common log type name prefix */
>> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
>> +
>> +/** Log PMD generic message, add a prefix and a line break */
>> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
>> + rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
>> + RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
>> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
>> +
>> +/** Name prefix for the per-device log type used to report basic information
>> */
>> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
>> +
>> +#define SFC_VDPA_LOG_PREFIX_MAX 32
>> +
>> +/* Log PMD message, automatically add prefix and \n */
>> +#define SFC_VDPA_LOG(sva, level, type, ...) \
>> + rte_log(level, type, \
>> + RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
>> + sva->log_prefix, \
>> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
>> +
>> +#define sfc_vdpa_err(sva, ...) \
>> + do { \
>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>> + \
>> + SFC_VDPA_LOG(_sva, RTE_LOG_ERR, \
>> + _sva->logtype_main, __VA_ARGS__); \
>> + } while (0)
>> +
>> +#define sfc_vdpa_warn(sva, ...) \
>> + do { \
>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>> + \
>> + SFC_VDPA_LOG(_sva, RTE_LOG_WARNING, \
>> + _sva->logtype_main, __VA_ARGS__); \
>> + } while (0)
>> +
>> +#define sfc_vdpa_notice(sva, ...) \
>> + do { \
>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>> + \
>> + SFC_VDPA_LOG(_sva, RTE_LOG_NOTICE, \
>> + _sva->logtype_main, __VA_ARGS__); \
>> + } while (0)
>> +
>> +#define sfc_vdpa_info(sva, ...) \
>> + do { \
>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>> + \
>> + SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
>> + _sva->logtype_main, __VA_ARGS__); \
>> + } while (0)
>> +
>
> For above log, can't we make log level a parameter?
> Then above four define can be one.
Yes, it definitely could, but it is more convenient to have
dedicated macros for different log levels and corresponding
lines shorter this way.
Andrew.
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-08-13 8:38 ` Andrew Rybchenko
@ 2021-08-13 9:23 ` Xia, Chenbo
2021-08-13 9:31 ` Andrew Rybchenko
0 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-08-13 9:23 UTC (permalink / raw)
To: Andrew Rybchenko, Vijay Srivastava, dev
Cc: maxime.coquelin, Vijay Kumar Srivastava
Hi Andrew,
> -----Original Message-----
> From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Sent: Friday, August 13, 2021 4:39 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; Vijay Srivastava
> <vijay.srivastava@xilinx.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: Re: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> Hi Chenbo,
>
> many thanks for review. See few questions/notes below.
>
> On 8/11/21 5:26 AM, Xia, Chenbo wrote:
> > Hi Vijay,
> >
> >> -----Original Message-----
> >> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> >> Sent: Wednesday, July 7, 2021 12:44 AM
> >> To: dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> >> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Subject: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
> >>
> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >>
> >> Add new vDPA PMD to support vDPA operation by Xilinx devices.
> >
> > vDPA operations of Xilinx devices
> >
> >> This patch implements probe and remove functions.
> >>
> >> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> [snip]
>
> >> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> >> new file mode 100644
> >> index 0000000..d8faaca
> >> --- /dev/null
> >> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> >> @@ -0,0 +1,286 @@
> >> +/* SPDX-License-Identifier: BSD-3-Clause
> >> + *
> >> + * Copyright(c) 2020-2021 Xilinx, Inc.
> >> + */
> >> +
> >> +#include <stdbool.h>
> >> +#include <stdint.h>
> >> +#include <sys/queue.h>
> >> +
> >> +#include <rte_common.h>
> >> +#include <rte_errno.h>
> >> +#include <rte_string_fns.h>
> >> +#include <rte_vfio.h>
> >> +#include <rte_vhost.h>
> >> +
> >> +#include "efx.h"
> >> +#include "sfc_efx.h"
> >> +#include "sfc_vdpa.h"
> >> +
> >> +TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
> >> +static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
> >> + TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
> >> +
> >> +static pthread_mutex_t sfc_vdpa_adapter_list_lock =
> PTHREAD_MUTEX_INITIALIZER;
> >> +
> >> +struct sfc_vdpa_adapter *
> >> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
> >> +{
> >> + bool found = false;
> >> + struct sfc_vdpa_adapter *sva;
> >> +
> >> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> >> +
> >> + TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
> >> + if (pdev == sva->pdev) {
> >> + found = true;
> >> + break;
> >> + }
> >> + }
> >> +
> >> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> >> +
> >> + return found ? sva : NULL;
> >> +}
> >> +
> >> +static int
> >> +sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
> >> +{
> >> + struct rte_pci_device *dev = sva->pdev;
> >> + char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
> >> + int rc;
> >> +
> >> + if (dev == NULL)
> >> + goto fail_inval;
> >> +
> >> + rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
> >> +
> >> + sva->vfio_container_fd = rte_vfio_container_create();
> >> + if (sva->vfio_container_fd < 0) {
> >> + sfc_vdpa_err(sva, "failed to create VFIO container");
> >
> > failed -> Failed
> >
> > I suggest to use capital letter for first letter of every log info.
> > Please check other logs.
>
> Why? As far as I know it is not defined. It would make sense if
> it is really a start of the log message, sfc_vdpa_* log
> messages start from prefix (see macros definition).
Forgot the prefix here ☹. Ignore the comment.
>
> >
> >> + goto fail_container_create;
> >> + }
> >> +
> >> + rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
> >> + &sva->iommu_group_num);
> >> + if (rc <= 0) {
> >> + sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
> >> + dev_name, rte_strerror(-rc));
> >> + goto fail_get_group_num;
> >> + }
> >> +
> >> + sva->vfio_group_fd =
> >> + rte_vfio_container_group_bind(sva->vfio_container_fd,
> >> + sva->iommu_group_num);
> >> + if (sva->vfio_group_fd < 0) {
> >> + sfc_vdpa_err(sva,
> >> + "failed to bind IOMMU group %d to container %d",
> >> + sva->iommu_group_num, sva->vfio_container_fd);
> >> + goto fail_group_bind;
> >> + }
> >> +
> >> + if (rte_pci_map_device(dev) != 0) {
> >> + sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
> >> + dev_name, rte_strerror(rte_errno));
> >> + goto fail_pci_map_device;
> >> + }
> >> +
> >> + sva->vfio_dev_fd = dev->intr_handle.vfio_dev_fd;
> >> +
> >> + return 0;
> >> +
> >> +fail_pci_map_device:
> >> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
> >> + sva->iommu_group_num) != 0) {
> >> + sfc_vdpa_err(sva,
> >> + "failed to unbind IOMMU group %d from container %d",
> >> + sva->iommu_group_num, sva->vfio_container_fd);
> >> + }
> >> +
> >> +fail_group_bind:
> >> +fail_get_group_num:
> >
> > You can combined these two tags into one with tag name changed.
>
> I think the original code is better. There is no point to
> combine. This way code is safer against future changes
> between these goto's which could require cleanup.
Personally I don't think it's a problem for developer if the tag name is
well chosen. I would prefer a single tag but have no strong opinion since
there's no policy of it.
>
> [snip]
>
> >> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h
> b/drivers/vdpa/sfc/sfc_vdpa_log.h
> >> new file mode 100644
> >> index 0000000..0a3d6ad
> >> --- /dev/null
> >> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> >> @@ -0,0 +1,77 @@
> >> +/* SPDX-License-Identifier: BSD-3-Clause
> >> + *
> >> + * Copyright(c) 2020-2021 Xilinx, Inc.
> >> + */
> >> +
> >> +#ifndef _SFC_VDPA_LOG_H_
> >> +#define _SFC_VDPA_LOG_H_
> >> +
> >> +/** Generic driver log type */
> >> +extern int sfc_vdpa_logtype_driver;
> >> +
> >> +/** Common log type name prefix */
> >> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
> >> +
> >> +/** Log PMD generic message, add a prefix and a line break */
> >> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
> >> + rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
> >> + RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> >> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> >> +
> >> +/** Name prefix for the per-device log type used to report basic
> information
> >> */
> >> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
> >> +
> >> +#define SFC_VDPA_LOG_PREFIX_MAX 32
> >> +
> >> +/* Log PMD message, automatically add prefix and \n */
> >> +#define SFC_VDPA_LOG(sva, level, type, ...) \
> >> + rte_log(level, type, \
> >> + RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> >> + sva->log_prefix, \
> >> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> >> +
> >> +#define sfc_vdpa_err(sva, ...) \
> >> + do { \
> >> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >> + \
> >> + SFC_VDPA_LOG(_sva, RTE_LOG_ERR, \
> >> + _sva->logtype_main, __VA_ARGS__); \
> >> + } while (0)
> >> +
> >> +#define sfc_vdpa_warn(sva, ...) \
> >> + do { \
> >> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >> + \
> >> + SFC_VDPA_LOG(_sva, RTE_LOG_WARNING, \
> >> + _sva->logtype_main, __VA_ARGS__); \
> >> + } while (0)
> >> +
> >> +#define sfc_vdpa_notice(sva, ...) \
> >> + do { \
> >> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >> + \
> >> + SFC_VDPA_LOG(_sva, RTE_LOG_NOTICE, \
> >> + _sva->logtype_main, __VA_ARGS__); \
> >> + } while (0)
> >> +
> >> +#define sfc_vdpa_info(sva, ...) \
> >> + do { \
> >> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >> + \
> >> + SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
> >> + _sva->logtype_main, __VA_ARGS__); \
> >> + } while (0)
> >> +
> >
> > For above log, can't we make log level a parameter?
> > Then above four define can be one.
>
> Yes, it definitely could, but it is more convenient to have
> dedicated macros for different log levels and corresponding
> lines shorter this way.
It could save some chars in one log line but also introduce more
LOC. And you may have to change every macro if things like SFC_VDPA_LOG
or naming of sfc_vdpa_adapter change. I prefer combining but since
the duplication is acceptable, I'll let you balance the pros/cons.
Thanks,
Chenbo
>
> Andrew.
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-08-13 9:23 ` Xia, Chenbo
@ 2021-08-13 9:31 ` Andrew Rybchenko
2021-08-16 1:35 ` Xia, Chenbo
0 siblings, 1 reply; 122+ messages in thread
From: Andrew Rybchenko @ 2021-08-13 9:31 UTC (permalink / raw)
To: Xia, Chenbo, Vijay Srivastava, dev
Cc: maxime.coquelin, Vijay Kumar Srivastava
On 8/13/21 12:23 PM, Xia, Chenbo wrote:
> Hi Andrew,
>
>> -----Original Message-----
>> From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>> Sent: Friday, August 13, 2021 4:39 PM
>> To: Xia, Chenbo <chenbo.xia@intel.com>; Vijay Srivastava
>> <vijay.srivastava@xilinx.com>; dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Subject: Re: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>>
>> Hi Chenbo,
>>
>> many thanks for review. See few questions/notes below.
>>
>> On 8/11/21 5:26 AM, Xia, Chenbo wrote:
>>> Hi Vijay,
>>>
>>>> -----Original Message-----
>>>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>>>> Sent: Wednesday, July 7, 2021 12:44 AM
>>>> To: dev@dpdk.org
>>>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>>>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>>> Subject: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>>>>
>>>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>>>
>>>> Add new vDPA PMD to support vDPA operation by Xilinx devices.
>>>
>>> vDPA operations of Xilinx devices
>>>
>>>> This patch implements probe and remove functions.
>>>>
>>>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
[snip]
>>>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h
>> b/drivers/vdpa/sfc/sfc_vdpa_log.h
>>>> new file mode 100644
>>>> index 0000000..0a3d6ad
>>>> --- /dev/null
>>>> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
>>>> @@ -0,0 +1,77 @@
>>>> +/* SPDX-License-Identifier: BSD-3-Clause
>>>> + *
>>>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>>>> + */
>>>> +
>>>> +#ifndef _SFC_VDPA_LOG_H_
>>>> +#define _SFC_VDPA_LOG_H_
>>>> +
>>>> +/** Generic driver log type */
>>>> +extern int sfc_vdpa_logtype_driver;
>>>> +
>>>> +/** Common log type name prefix */
>>>> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
>>>> +
>>>> +/** Log PMD generic message, add a prefix and a line break */
>>>> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
>>>> + rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
>>>> + RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
>>>> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
>>>> +
>>>> +/** Name prefix for the per-device log type used to report basic
>> information
>>>> */
>>>> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
>>>> +
>>>> +#define SFC_VDPA_LOG_PREFIX_MAX 32
>>>> +
>>>> +/* Log PMD message, automatically add prefix and \n */
>>>> +#define SFC_VDPA_LOG(sva, level, type, ...) \
>>>> + rte_log(level, type, \
>>>> + RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
>>>> + sva->log_prefix, \
>>>> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
>>>> +
>>>> +#define sfc_vdpa_err(sva, ...) \
>>>> + do { \
>>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>>>> + \
>>>> + SFC_VDPA_LOG(_sva, RTE_LOG_ERR, \
>>>> + _sva->logtype_main, __VA_ARGS__); \
>>>> + } while (0)
>>>> +
>>>> +#define sfc_vdpa_warn(sva, ...) \
>>>> + do { \
>>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>>>> + \
>>>> + SFC_VDPA_LOG(_sva, RTE_LOG_WARNING, \
>>>> + _sva->logtype_main, __VA_ARGS__); \
>>>> + } while (0)
>>>> +
>>>> +#define sfc_vdpa_notice(sva, ...) \
>>>> + do { \
>>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>>>> + \
>>>> + SFC_VDPA_LOG(_sva, RTE_LOG_NOTICE, \
>>>> + _sva->logtype_main, __VA_ARGS__); \
>>>> + } while (0)
>>>> +
>>>> +#define sfc_vdpa_info(sva, ...) \
>>>> + do { \
>>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
>>>> + \
>>>> + SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
>>>> + _sva->logtype_main, __VA_ARGS__); \
>>>> + } while (0)
>>>> +
>>>
>>> For above log, can't we make log level a parameter?
>>> Then above four define can be one.
>>
>> Yes, it definitely could, but it is more convenient to have
>> dedicated macros for different log levels and corresponding
>> lines shorter this way.
>
> It could save some chars in one log line but also introduce more
> LOC. And you may have to change every macro if things like SFC_VDPA_LOG
> or naming of sfc_vdpa_adapter change. I prefer combining but since
> the duplication is acceptable, I'll let you balance the pros/cons.
I see your point. I think it should be a macro sfc_vdpa_log()
with log level and other sfc_vpda_*() macros should be just one
liner like sfc_vdpa_log(sva, RTE_LOG_INFO, __VA_ARGS__)
Do I understand correctly that it address your concerns?
Andrew.
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-08-13 9:31 ` Andrew Rybchenko
@ 2021-08-16 1:35 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-08-16 1:35 UTC (permalink / raw)
To: Andrew Rybchenko, Vijay Srivastava, dev
Cc: maxime.coquelin, Vijay Kumar Srivastava
Hi Andrew,
> -----Original Message-----
> From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Sent: Friday, August 13, 2021 5:31 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; Vijay Srivastava
> <vijay.srivastava@xilinx.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: Re: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> On 8/13/21 12:23 PM, Xia, Chenbo wrote:
> > Hi Andrew,
> >
> >> -----Original Message-----
> >> From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> >> Sent: Friday, August 13, 2021 4:39 PM
> >> To: Xia, Chenbo <chenbo.xia@intel.com>; Vijay Srivastava
> >> <vijay.srivastava@xilinx.com>; dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Subject: Re: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
> >>
> >> Hi Chenbo,
> >>
> >> many thanks for review. See few questions/notes below.
> >>
> >> On 8/11/21 5:26 AM, Xia, Chenbo wrote:
> >>> Hi Vijay,
> >>>
> >>>> -----Original Message-----
> >>>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> >>>> Sent: Wednesday, July 7, 2021 12:44 AM
> >>>> To: dev@dpdk.org
> >>>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> >>>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
> <vsrivast@xilinx.com>
> >>>> Subject: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
> >>>>
> >>>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >>>>
> >>>> Add new vDPA PMD to support vDPA operation by Xilinx devices.
> >>>
> >>> vDPA operations of Xilinx devices
> >>>
> >>>> This patch implements probe and remove functions.
> >>>>
> >>>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> [snip]
>
> >>>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h
> >> b/drivers/vdpa/sfc/sfc_vdpa_log.h
> >>>> new file mode 100644
> >>>> index 0000000..0a3d6ad
> >>>> --- /dev/null
> >>>> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> >>>> @@ -0,0 +1,77 @@
> >>>> +/* SPDX-License-Identifier: BSD-3-Clause
> >>>> + *
> >>>> + * Copyright(c) 2020-2021 Xilinx, Inc.
> >>>> + */
> >>>> +
> >>>> +#ifndef _SFC_VDPA_LOG_H_
> >>>> +#define _SFC_VDPA_LOG_H_
> >>>> +
> >>>> +/** Generic driver log type */
> >>>> +extern int sfc_vdpa_logtype_driver;
> >>>> +
> >>>> +/** Common log type name prefix */
> >>>> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
> >>>> +
> >>>> +/** Log PMD generic message, add a prefix and a line break */
> >>>> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
> >>>> + rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
> >>>> + RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> >>>> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> >>>> +
> >>>> +/** Name prefix for the per-device log type used to report basic
> >> information
> >>>> */
> >>>> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
> >>>> +
> >>>> +#define SFC_VDPA_LOG_PREFIX_MAX 32
> >>>> +
> >>>> +/* Log PMD message, automatically add prefix and \n */
> >>>> +#define SFC_VDPA_LOG(sva, level, type, ...) \
> >>>> + rte_log(level, type, \
> >>>> + RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> >>>> + sva->log_prefix, \
> >>>> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> >>>> +
> >>>> +#define sfc_vdpa_err(sva, ...) \
> >>>> + do { \
> >>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >>>> + \
> >>>> + SFC_VDPA_LOG(_sva, RTE_LOG_ERR, \
> >>>> + _sva->logtype_main, __VA_ARGS__); \
> >>>> + } while (0)
> >>>> +
> >>>> +#define sfc_vdpa_warn(sva, ...) \
> >>>> + do { \
> >>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >>>> + \
> >>>> + SFC_VDPA_LOG(_sva, RTE_LOG_WARNING, \
> >>>> + _sva->logtype_main, __VA_ARGS__); \
> >>>> + } while (0)
> >>>> +
> >>>> +#define sfc_vdpa_notice(sva, ...) \
> >>>> + do { \
> >>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >>>> + \
> >>>> + SFC_VDPA_LOG(_sva, RTE_LOG_NOTICE, \
> >>>> + _sva->logtype_main, __VA_ARGS__); \
> >>>> + } while (0)
> >>>> +
> >>>> +#define sfc_vdpa_info(sva, ...) \
> >>>> + do { \
> >>>> + const struct sfc_vdpa_adapter *_sva = (sva); \
> >>>> + \
> >>>> + SFC_VDPA_LOG(_sva, RTE_LOG_INFO, \
> >>>> + _sva->logtype_main, __VA_ARGS__); \
> >>>> + } while (0)
> >>>> +
> >>>
> >>> For above log, can't we make log level a parameter?
> >>> Then above four define can be one.
> >>
> >> Yes, it definitely could, but it is more convenient to have
> >> dedicated macros for different log levels and corresponding
> >> lines shorter this way.
> >
> > It could save some chars in one log line but also introduce more
> > LOC. And you may have to change every macro if things like SFC_VDPA_LOG
> > or naming of sfc_vdpa_adapter change. I prefer combining but since
> > the duplication is acceptable, I'll let you balance the pros/cons.
>
> I see your point. I think it should be a macro sfc_vdpa_log()
> with log level and other sfc_vpda_*() macros should be just one
> liner like sfc_vdpa_log(sva, RTE_LOG_INFO, __VA_ARGS__)
>
> Do I understand correctly that it address your concerns?
Exactly! I'd like this and you can hide RTE_LOG prefix in macro definition
, so it'll be like:
sfc_vdpa_log(sva, INFO, ...)
Thanks,
Chenbo
>
> Andrew.
>
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 ` [dpdk-dev] [PATCH 01/10] " Vijay Srivastava
2021-08-11 2:26 ` Xia, Chenbo
@ 2021-08-13 15:34 ` Stephen Hemminger
2021-08-13 15:36 ` Stephen Hemminger
2021-08-13 15:36 ` Stephen Hemminger
3 siblings, 0 replies; 122+ messages in thread
From: Stephen Hemminger @ 2021-08-13 15:34 UTC (permalink / raw)
To: Vijay Srivastava
Cc: dev, maxime.coquelin, chenbo.xia, andrew.rybchenko,
Vijay Kumar Srivastava
On Tue, 6 Jul 2021 22:14:09 +0530
Vijay Srivastava <vijay.srivastava@xilinx.com> wrote:
> +# Enable more warnings
> +extra_flags += [
> + '-Wdisabled-optimization'
> +]
> +
> +# Compiler and version dependent flags
> +extra_flags += [
> + '-Waggregate-return',
> + '-Wbad-function-cast'
> +]
> +
Having each driver decide on different compiler flags seems like
a bad policy in DPDK.
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 ` [dpdk-dev] [PATCH 01/10] " Vijay Srivastava
2021-08-11 2:26 ` Xia, Chenbo
2021-08-13 15:34 ` Stephen Hemminger
@ 2021-08-13 15:36 ` Stephen Hemminger
2021-10-29 11:32 ` Vijay Kumar Srivastava
2021-08-13 15:36 ` Stephen Hemminger
3 siblings, 1 reply; 122+ messages in thread
From: Stephen Hemminger @ 2021-08-13 15:36 UTC (permalink / raw)
To: Vijay Srivastava
Cc: dev, maxime.coquelin, chenbo.xia, andrew.rybchenko,
Vijay Kumar Srivastava
On Tue, 6 Jul 2021 22:14:09 +0530
Vijay Srivastava <vijay.srivastava@xilinx.com> wrote:
> +uint32_t
> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
> + const char *lt_prefix_str, uint32_t ll_default)
> +{
> + size_t lt_prefix_str_size = strlen(lt_prefix_str);
> + size_t lt_str_size_max;
> + char *lt_str = NULL;
> + int ret;
> +
> + if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
> + ++lt_prefix_str_size; /* Reserve space for prefix separator */
> + lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
> + } else {
> + return RTE_LOGTYPE_PMD;
> + }
> +
> + lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
> + if (lt_str == NULL)
> + return RTE_LOGTYPE_PMD;
> +
> + strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
> + lt_str[lt_prefix_str_size - 1] = '.';
> + rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
> + lt_str_size_max - lt_prefix_str_size);
> + lt_str[lt_str_size_max - 1] = '\0';
> +
> + ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
> + rte_free(lt_str);
> +
> + return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
> +}
This seems like overkill doing per-device log level. Other drivers
aren't doing this.
Once again my advice to DPDK driver developers is "don't be a snowflake"
your driver is not special.
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-08-13 15:36 ` Stephen Hemminger
@ 2021-10-29 11:32 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-10-29 11:32 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, maxime.coquelin, chenbo.xia, andrew.rybchenko
Hi Stephen,
>-----Original Message-----
>From: Stephen Hemminger <stephen@networkplumber.org>
>Sent: Friday, August 13, 2021 9:06 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>Cc: dev@dpdk.org; maxime.coquelin@redhat.com; chenbo.xia@intel.com;
>andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
>Subject: Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
>On Tue, 6 Jul 2021 22:14:09 +0530
>Vijay Srivastava <vijay.srivastava@xilinx.com> wrote:
>
>> +uint32_t
>> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
>> + const char *lt_prefix_str, uint32_t ll_default) {
>> + size_t lt_prefix_str_size = strlen(lt_prefix_str);
>> + size_t lt_str_size_max;
>> + char *lt_str = NULL;
>> + int ret;
>> +
>> + if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
>> + ++lt_prefix_str_size; /* Reserve space for prefix separator */
>> + lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
>> + } else {
>> + return RTE_LOGTYPE_PMD;
>> + }
>> +
>> + lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
>> + if (lt_str == NULL)
>> + return RTE_LOGTYPE_PMD;
>> +
>> + strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
>> + lt_str[lt_prefix_str_size - 1] = '.';
>> + rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
>> + lt_str_size_max - lt_prefix_str_size);
>> + lt_str[lt_str_size_max - 1] = '\0';
>> +
>> + ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
>> + rte_free(lt_str);
>> +
>> + return (ret < 0) ? RTE_LOGTYPE_PMD : ret; }
>
>This seems like overkill doing per-device log level. Other drivers aren't doing
>this.
We use it for the debugging. This feature is useful for us so it's good to have it.
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 ` [dpdk-dev] [PATCH 01/10] " Vijay Srivastava
` (2 preceding siblings ...)
2021-08-13 15:36 ` Stephen Hemminger
@ 2021-08-13 15:36 ` Stephen Hemminger
2021-10-28 18:13 ` Vijay Kumar Srivastava
3 siblings, 1 reply; 122+ messages in thread
From: Stephen Hemminger @ 2021-08-13 15:36 UTC (permalink / raw)
To: Vijay Srivastava
Cc: dev, maxime.coquelin, chenbo.xia, andrew.rybchenko,
Vijay Kumar Srivastava
On Tue, 6 Jul 2021 22:14:09 +0530
Vijay Srivastava <vijay.srivastava@xilinx.com> wrote:
> +static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
> +
Why do you need a pthread_mutex when simple DPDK spin lock will do?
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-08-13 15:36 ` Stephen Hemminger
@ 2021-10-28 18:13 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-10-28 18:13 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev, maxime.coquelin, chenbo.xia, andrew.rybchenko
Hi Stephen,
>-----Original Message-----
>From: Stephen Hemminger <stephen@networkplumber.org>
>Sent: Friday, August 13, 2021 9:07 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>Cc: dev@dpdk.org; maxime.coquelin@redhat.com; chenbo.xia@intel.com;
>andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
>Subject: Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
>On Tue, 6 Jul 2021 22:14:09 +0530
>Vijay Srivastava <vijay.srivastava@xilinx.com> wrote:
>
>> +static pthread_mutex_t sfc_vdpa_adapter_list_lock =
>PTHREAD_MUTEX_INITIALIZER;
>> +
>
>Why do you need a pthread_mutex when simple DPDK spin lock will do?
rte_spinlock_lock is being used in the subsequent patches.
Only for the adapter list (sfc_vdpa_adapter_list) pthread_mutex is being used.
Regards,
Vijay
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
2021-07-06 16:44 ` [dpdk-dev] [PATCH 01/10] " Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 9:16 ` Maxime Coquelin
2021-08-30 10:52 ` Xia, Chenbo
2021-07-06 16:44 ` [dpdk-dev] [PATCH 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
` (13 subsequent siblings)
15 siblings, 2 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add HW initialization and vDPA device registration support.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
doc/guides/vdpadevs/sfc.rst | 6 +
drivers/vdpa/sfc/meson.build | 3 +
drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 322 ++++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
10 files changed, 665 insertions(+), 1 deletion(-)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index 59f990b..abb5900 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types available for control:
Matches a subset of per-port log types registered during runtime.
A full name for a particular type may be obtained by appending a
dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
+
+- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
+
+ Extra logging of the communication with the NIC's management CPU.
+ The format of the log is consumed by the netlogdecode cross-platform
+ tool. May be managed per-port, as explained above.
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index d916389..aac7c51 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -30,4 +30,7 @@ endforeach
deps += ['common_sfc_efx', 'bus_pci']
sources = files(
'sfc_vdpa.c',
+ 'sfc_vdpa_hw.c',
+ 'sfc_vdpa_mcdi.c',
+ 'sfc_vdpa_ops.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index d8faaca..12e8d6e 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -232,6 +232,19 @@ struct sfc_vdpa_adapter *
goto fail_vfio_setup;
}
+ sfc_vdpa_log_init(sva, "hw init");
+ if (sfc_vdpa_hw_init(sva) != 0) {
+ sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
+ goto fail_hw_init;
+ }
+
+ sfc_vdpa_log_init(sva, "dev init");
+ sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
+ if (sva->ops_data == NULL) {
+ sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
+ goto fail_dev_init;
+ }
+
pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
@@ -240,6 +253,12 @@ struct sfc_vdpa_adapter *
return 0;
+fail_dev_init:
+ sfc_vdpa_hw_fini(sva);
+
+fail_hw_init:
+ sfc_vdpa_vfio_teardown(sva);
+
fail_vfio_setup:
fail_set_log_prefix:
rte_free(sva);
@@ -266,6 +285,10 @@ struct sfc_vdpa_adapter *
TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+ sfc_vdpa_device_fini(sva->ops_data);
+
+ sfc_vdpa_hw_fini(sva);
+
sfc_vdpa_vfio_teardown(sva);
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 3b77900..fb97258 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -11,14 +11,38 @@
#include <rte_bus_pci.h>
+#include "sfc_efx.h"
+#include "sfc_efx_mcdi.h"
+#include "sfc_vdpa_debug.h"
#include "sfc_vdpa_log.h"
+#include "sfc_vdpa_ops.h"
+
+#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ /*
+ * PMD setup and configuration is not thread safe. Since it is not
+ * performance sensitive, it is better to guarantee thread-safety
+ * and add device level lock. vDPA control operations which
+ * change its state should acquire the lock.
+ */
+ rte_spinlock_t lock;
struct rte_pci_device *pdev;
struct rte_pci_addr pci_addr;
+ efx_family_t family;
+ efx_nic_t *nic;
+ rte_spinlock_t nic_lock;
+
+ efsys_bar_t mem_bar;
+
+ struct sfc_efx_mcdi mcdi;
+ size_t mcdi_buff_size;
+
+ uint32_t max_queue_count;
+
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
@@ -26,6 +50,7 @@ struct sfc_vdpa_adapter {
int vfio_dev_fd;
int vfio_container_fd;
int iommu_group_num;
+ struct sfc_vdpa_ops_data *ops_data;
};
uint32_t
@@ -36,5 +61,27 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
-#endif /* _SFC_VDPA_H */
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sa);
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp);
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+
+static inline struct sfc_vdpa_adapter *
+sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
+{
+ return (struct sfc_vdpa_adapter *)dev_handle;
+}
+
+#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h b/drivers/vdpa/sfc/sfc_vdpa_debug.h
new file mode 100644
index 0000000..cfa8cc5
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_DEBUG_H_
+#define _SFC_VDPA_DEBUG_H_
+
+#include <rte_debug.h>
+
+#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
+/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
+ * in the driver only.
+ */
+#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
+#else
+/* If the driver debug is not enabled, follow DPDK debug/non-debug */
+#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
+#endif
+
+#endif /* _SFC_VDPA_DEBUG_H_ */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
new file mode 100644
index 0000000..83f3696
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -0,0 +1,322 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <unistd.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_vfio.h>
+
+#include "efx.h"
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_ops.h"
+
+extern uint32_t sfc_logtype_driver;
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
+#endif
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp)
+{
+ void *mcdi_buf;
+ uint64_t mcdi_iova;
+ size_t mcdi_buff_size;
+ int ret;
+
+ mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
+
+ sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
+
+ mcdi_buf = rte_zmalloc(name, mcdi_buff_size, PAGE_SIZE);
+ if (mcdi_buf == NULL) {
+ sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
+ name, (unsigned int)len, rte_strerror(rte_errno));
+ return -ENOMEM;
+ }
+
+ /* IOVA address for MCDI would be re-calculated if mapping
+ * using default IOVA would fail.
+ * TODO: Earlier there was no way to get valid IOVA range.
+ * Recently a patch has been submitted to get the IOVA range
+ * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
+ * in the kernel version >= 5.4. Support to get the default
+ * IOVA address for MCDI buffer using available IOVA range
+ * would be added later. Meanwhile default IOVA for MCDI buffer
+ * is kept at high mem at 2TB. In case of overlap new available
+ * addresses would be searched and same would be used.
+ */
+ mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
+
+ do {
+ ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
+ (uint64_t)mcdi_buf, mcdi_iova,
+ mcdi_buff_size);
+ if (ret == 0)
+ break;
+
+ mcdi_iova = mcdi_iova >> 1;
+ if (mcdi_iova < mcdi_buff_size) {
+ sfc_vdpa_err(sva,
+ "DMA mapping failed for MCDI : %s",
+ rte_strerror(rte_errno));
+ return ret;
+ }
+
+ } while (ret < 0);
+
+ esmp->esm_addr = mcdi_iova;
+ esmp->esm_base = mcdi_buf;
+ sva->mcdi_buff_size = mcdi_buff_size;
+
+ sfc_vdpa_info(sva,
+ "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
+ name, len, esmp->esm_base, esmp->esm_addr);
+
+ return 0;
+}
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp)
+{
+ int ret;
+
+ sfc_vdpa_log_init(sva, "name=%s", esmp->esm_mz->name);
+
+ ret = rte_vfio_container_dma_unmap(sva->vfio_container_fd,
+ (uint64_t)esmp->esm_base,
+ esmp->esm_addr, sva->mcdi_buff_size);
+ if (ret < 0)
+ sfc_vdpa_err(sva, "DMA unmap failed for MCDI : %s",
+ rte_strerror(rte_errno));
+
+ sfc_vdpa_info(sva,
+ "DMA free name=%s => virt=%p iova=%" PRIx64,
+ esmp->esm_mz->name, esmp->esm_base, esmp->esm_addr);
+
+ rte_free((void *)(esmp->esm_base));
+
+ sva->mcdi_buff_size = 0;
+ memset(esmp, 0, sizeof(*esmp));
+}
+
+static int
+sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
+ const efx_bar_region_t *mem_ebrp)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ efsys_bar_t *ebp = &sva->mem_bar;
+ struct rte_mem_resource *res =
+ &pci_dev->mem_resource[mem_ebrp->ebr_index];
+
+ SFC_BAR_LOCK_INIT(ebp, pci_dev->name);
+ ebp->esb_rid = mem_ebrp->ebr_index;
+ ebp->esb_dev = pci_dev;
+ ebp->esb_base = res->addr;
+
+ return 0;
+}
+
+static void
+sfc_vdpa_mem_bar_fini(struct sfc_vdpa_adapter *sva)
+{
+ efsys_bar_t *ebp = &sva->mem_bar;
+
+ SFC_BAR_LOCK_DESTROY(ebp);
+ memset(ebp, 0, sizeof(*ebp));
+}
+
+static int
+sfc_vdpa_nic_probe(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+ int rc;
+
+ rc = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE);
+ if (rc != 0)
+ sfc_vdpa_err(sva, "nic probe failed: %s", rte_strerror(rc));
+
+ return rc;
+}
+
+static int
+sfc_vdpa_estimate_resource_limits(struct sfc_vdpa_adapter *sva)
+{
+ efx_drv_limits_t limits;
+ int rc;
+ uint32_t evq_allocated;
+ uint32_t rxq_allocated;
+ uint32_t txq_allocated;
+ uint32_t max_queue_cnt;
+
+ memset(&limits, 0, sizeof(limits));
+
+ /* Request at least one Rx and Tx queue */
+ limits.edl_min_rxq_count = 1;
+ limits.edl_min_txq_count = 1;
+ /* Management event queue plus event queue for Tx/Rx queue */
+ limits.edl_min_evq_count =
+ 1 + RTE_MAX(limits.edl_min_rxq_count, limits.edl_min_txq_count);
+
+ limits.edl_max_rxq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_txq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_evq_count = 1 + SFC_VDPA_MAX_QUEUE_PAIRS;
+
+ SFC_VDPA_ASSERT(limits.edl_max_evq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_rxq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_txq_count >= limits.edl_min_rxq_count);
+
+ /* Configure the minimum required resources needed for the
+ * driver to operate, and the maximum desired resources that the
+ * driver is capable of using.
+ */
+ sfc_vdpa_log_init(sva, "set drv limit");
+ efx_nic_set_drv_limits(sva->nic, &limits);
+
+ sfc_vdpa_log_init(sva, "init nic");
+ rc = efx_nic_init(sva->nic);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic init failed: %s", rte_strerror(rc));
+ goto fail_nic_init;
+ }
+
+ /* Find resource dimensions assigned by firmware to this function */
+ rc = efx_nic_get_vi_pool(sva->nic, &evq_allocated, &rxq_allocated,
+ &txq_allocated);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "vi pool get failed: %s", rte_strerror(rc));
+ goto fail_get_vi_pool;
+ }
+
+ /* It still may allocate more than maximum, ensure limit */
+ evq_allocated = RTE_MIN(evq_allocated, limits.edl_max_evq_count);
+ rxq_allocated = RTE_MIN(rxq_allocated, limits.edl_max_rxq_count);
+ txq_allocated = RTE_MIN(txq_allocated, limits.edl_max_txq_count);
+
+
+ max_queue_cnt = RTE_MIN(rxq_allocated, txq_allocated);
+ /* Subtract management EVQ not used for traffic */
+ max_queue_cnt = RTE_MIN(evq_allocated - 1, max_queue_cnt);
+
+ SFC_VDPA_ASSERT(max_queue_cnt > 0);
+
+ sva->max_queue_count = max_queue_cnt;
+
+ return 0;
+
+fail_get_vi_pool:
+ efx_nic_fini(sva->nic);
+fail_nic_init:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva)
+{
+ efx_bar_region_t mem_ebr;
+ efx_nic_t *enp;
+ int rc;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "get family");
+ rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
+ if (rc != 0)
+ goto fail_family;
+ sfc_vdpa_log_init(sva,
+ "family is %u, membar is %u,"
+ "function control window offset is %#" PRIx64,
+ sva->family, mem_ebr.ebr_index, mem_ebr.ebr_offset);
+
+ sfc_vdpa_log_init(sva, "init mem bar");
+ rc = sfc_vdpa_mem_bar_init(sva, &mem_ebr);
+ if (rc != 0)
+ goto fail_mem_bar_init;
+
+ sfc_vdpa_log_init(sva, "create nic");
+ rte_spinlock_init(&sva->nic_lock);
+ rc = efx_nic_create(sva->family, (efsys_identifier_t *)sva,
+ &sva->mem_bar, mem_ebr.ebr_offset,
+ &sva->nic_lock, &enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic create failed: %s", rte_strerror(rc));
+ goto fail_nic_create;
+ }
+ sva->nic = enp;
+
+ sfc_vdpa_log_init(sva, "init mcdi");
+ rc = sfc_vdpa_mcdi_init(sva);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "mcdi init failed: %s", rte_strerror(rc));
+ goto fail_mcdi_init;
+ }
+
+ sfc_vdpa_log_init(sva, "probe nic");
+ rc = sfc_vdpa_nic_probe(sva);
+ if (rc != 0)
+ goto fail_nic_probe;
+
+ sfc_vdpa_log_init(sva, "reset nic");
+ rc = efx_nic_reset(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic reset failed: %s", rte_strerror(rc));
+ goto fail_nic_reset;
+ }
+
+ sfc_vdpa_log_init(sva, "estimate resource limits");
+ rc = sfc_vdpa_estimate_resource_limits(sva);
+ if (rc != 0)
+ goto fail_estimate_rsrc_limits;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_estimate_rsrc_limits:
+fail_nic_reset:
+ efx_nic_unprobe(enp);
+
+fail_nic_probe:
+ sfc_vdpa_mcdi_fini(sva);
+
+fail_mcdi_init:
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+fail_nic_create:
+ sfc_vdpa_mem_bar_fini(sva);
+
+fail_mem_bar_init:
+fail_family:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "unprobe nic");
+ efx_nic_unprobe(enp);
+
+ sfc_vdpa_log_init(sva, "mcdi fini");
+ sfc_vdpa_mcdi_fini(sva);
+
+ sfc_vdpa_log_init(sva, "nic fini");
+ efx_nic_fini(enp);
+
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+ sfc_vdpa_mem_bar_fini(sva);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
index 0a3d6ad..59af790 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_log.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -21,6 +21,9 @@
/** Name prefix for the per-device log type used to report basic information */
#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+/** Device MCDI log type name prefix */
+#define SFC_VDPA_LOGTYPE_MCDI_STR SFC_VDPA_LOGTYPE_PREFIX "mcdi"
+
#define SFC_VDPA_LOG_PREFIX_MAX 32
/* Log PMD message, automatically add prefix and \n */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_mcdi.c b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
new file mode 100644
index 0000000..961d2d3
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include "sfc_efx_mcdi.h"
+
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_debug.h"
+#include "sfc_vdpa_log.h"
+
+static sfc_efx_mcdi_dma_alloc_cb sfc_vdpa_mcdi_dma_alloc;
+static int
+sfc_vdpa_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
+ efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ return sfc_vdpa_dma_alloc(sva, name, len, esmp);
+}
+
+static sfc_efx_mcdi_dma_free_cb sfc_vdpa_mcdi_dma_free;
+static void
+sfc_vdpa_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ sfc_vdpa_dma_free(sva, esmp);
+}
+
+static sfc_efx_mcdi_sched_restart_cb sfc_vdpa_mcdi_sched_restart;
+static void
+sfc_vdpa_mcdi_sched_restart(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_vdpa_mcdi_mgmt_evq_poll;
+static void
+sfc_vdpa_mcdi_mgmt_evq_poll(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static const struct sfc_efx_mcdi_ops sfc_vdpa_mcdi_ops = {
+ .dma_alloc = sfc_vdpa_mcdi_dma_alloc,
+ .dma_free = sfc_vdpa_mcdi_dma_free,
+ .sched_restart = sfc_vdpa_mcdi_sched_restart,
+ .mgmt_evq_poll = sfc_vdpa_mcdi_mgmt_evq_poll,
+
+};
+
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva)
+{
+ uint32_t logtype;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ logtype = sfc_vdpa_register_logtype(&(sva->pdev->addr),
+ SFC_VDPA_LOGTYPE_MCDI_STR,
+ RTE_LOG_NOTICE);
+
+ return sfc_efx_mcdi_init(&sva->mcdi, logtype,
+ sva->log_prefix, sva->nic,
+ &sfc_vdpa_mcdi_ops, sva);
+}
+
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva)
+{
+ sfc_vdpa_log_init(sva, "entry");
+ sfc_efx_mcdi_fini(&sva->mcdi);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
new file mode 100644
index 0000000..71696be
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -0,0 +1,129 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_malloc.h>
+#include <rte_vdpa.h>
+#include <rte_vdpa_dev.h>
+#include <rte_vhost.h>
+
+#include "sfc_vdpa_ops.h"
+#include "sfc_vdpa.h"
+
+/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
+ * In subsequent patches these ops would be implemented.
+ */
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(queue_num);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
+ uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_config(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_close(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_vring_state(int vid, int vring, int state)
+{
+ RTE_SET_USED(vid);
+ RTE_SET_USED(vring);
+ RTE_SET_USED(state);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_features(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
+ .get_queue_num = sfc_vdpa_get_queue_num,
+ .get_features = sfc_vdpa_get_features,
+ .get_protocol_features = sfc_vdpa_get_protocol_features,
+ .dev_conf = sfc_vdpa_dev_config,
+ .dev_close = sfc_vdpa_dev_close,
+ .set_vring_state = sfc_vdpa_set_vring_state,
+ .set_features = sfc_vdpa_set_features,
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *dev_handle, enum sfc_vdpa_context context)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_pci_device *pci_dev;
+
+ /* Create vDPA ops context */
+ ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
+ if (ops_data == NULL)
+ return NULL;
+
+ ops_data->vdpa_context = context;
+ ops_data->dev_handle = dev_handle;
+
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev_handle)->pdev;
+
+ /* Register vDPA Device */
+ sfc_vdpa_log_init(dev_handle, "register vDPA device");
+ ops_data->vdpa_dev =
+ rte_vdpa_register_device(&pci_dev->device, &sfc_vdpa_ops);
+ if (ops_data->vdpa_dev == NULL) {
+ sfc_vdpa_err(dev_handle, "vDPA device registration failed");
+ goto fail_register_device;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return ops_data;
+
+fail_register_device:
+ rte_free(ops_data);
+ return NULL;
+}
+
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data)
+{
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
+ rte_free(ops_data);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
new file mode 100644
index 0000000..817b302
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_OPS_H
+#define _SFC_VDPA_OPS_H
+
+#include <rte_vdpa.h>
+
+#define SFC_VDPA_MAX_QUEUE_PAIRS 1
+
+enum sfc_vdpa_context {
+ SFC_VDPA_AS_PF = 0,
+ SFC_VDPA_AS_VF
+};
+
+enum sfc_vdpa_state {
+ SFC_VDPA_STATE_UNINITIALIZED = 0,
+ SFC_VDPA_STATE_INITIALIZED,
+ SFC_VDPA_STATE_NSTATES
+};
+
+struct sfc_vdpa_ops_data {
+ void *dev_handle;
+ struct rte_vdpa_device *vdpa_dev;
+ enum sfc_vdpa_context vdpa_context;
+ enum sfc_vdpa_state state;
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *adapter, enum sfc_vdpa_context context);
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data);
+
+#endif /* _SFC_VDPA_OPS_H */
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-07-06 16:44 ` [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
@ 2021-08-30 9:16 ` Maxime Coquelin
2021-08-30 10:52 ` Xia, Chenbo
1 sibling, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-08-30 9:16 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 7/6/21 6:44 PM, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add HW initialization and vDPA device registration support.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> doc/guides/vdpadevs/sfc.rst | 6 +
> drivers/vdpa/sfc/meson.build | 3 +
> drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
> drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 322 ++++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
> 10 files changed, 665 insertions(+), 1 deletion(-)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>
...
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> new file mode 100644
> index 0000000..83f3696
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -0,0 +1,322 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <unistd.h>
> +
> +#include <rte_common.h>
> +#include <rte_errno.h>
> +#include <rte_vfio.h>
> +
> +#include "efx.h"
> +#include "sfc_vdpa.h"
> +#include "sfc_vdpa_ops.h"
> +
> +extern uint32_t sfc_logtype_driver;
> +
> +#ifndef PAGE_SIZE
> +#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
> +#endif
> +
> +int
> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> + size_t len, efsys_mem_t *esmp)
> +{
> + void *mcdi_buf;
> + uint64_t mcdi_iova;
> + size_t mcdi_buff_size;
> + int ret;
> +
> + mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
> +
> + sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
> +
> + mcdi_buf = rte_zmalloc(name, mcdi_buff_size, PAGE_SIZE);
You might want to allocate on the same NUMA node the device is on?
> + if (mcdi_buf == NULL) {
> + sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
> + name, (unsigned int)len, rte_strerror(rte_errno));
> + return -ENOMEM;
> + }
> +
> + /* IOVA address for MCDI would be re-calculated if mapping
> + * using default IOVA would fail.
> + * TODO: Earlier there was no way to get valid IOVA range.
> + * Recently a patch has been submitted to get the IOVA range
> + * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
> + * in the kernel version >= 5.4. Support to get the default
> + * IOVA address for MCDI buffer using available IOVA range
> + * would be added later. Meanwhile default IOVA for MCDI buffer
> + * is kept at high mem at 2TB. In case of overlap new available
> + * addresses would be searched and same would be used.
> + */
> + mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
> +
> + do {
> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
> + (uint64_t)mcdi_buf, mcdi_iova,
> + mcdi_buff_size);
> + if (ret == 0)
> + break;
> +
> + mcdi_iova = mcdi_iova >> 1;
> + if (mcdi_iova < mcdi_buff_size) {
> + sfc_vdpa_err(sva,
> + "DMA mapping failed for MCDI : %s",
> + rte_strerror(rte_errno));
> + return ret;
You leak mcdi_buf here if DMA map fails.
> + }
> +
> + } while (ret < 0);
> +
> + esmp->esm_addr = mcdi_iova;
> + esmp->esm_base = mcdi_buf;
> + sva->mcdi_buff_size = mcdi_buff_size;
> +
> + sfc_vdpa_info(sva,
> + "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
> + name, len, esmp->esm_base, esmp->esm_addr);
> +
> + return 0;
> +}
> +
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-07-06 16:44 ` [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
2021-08-30 9:16 ` Maxime Coquelin
@ 2021-08-30 10:52 ` Xia, Chenbo
2021-09-03 13:19 ` Vijay Kumar Srivastava
1 sibling, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-08-30 10:52 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Wednesday, July 7, 2021 12:44 AM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH 02/10] vdpa/sfc: add support for device initialization
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add HW initialization and vDPA device registration support.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> doc/guides/vdpadevs/sfc.rst | 6 +
> drivers/vdpa/sfc/meson.build | 3 +
> drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
> drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 322
> ++++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
> 10 files changed, 665 insertions(+), 1 deletion(-)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>
> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
> index 59f990b..abb5900 100644
> --- a/doc/guides/vdpadevs/sfc.rst
> +++ b/doc/guides/vdpadevs/sfc.rst
> @@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types available for
> control:
> Matches a subset of per-port log types registered during runtime.
> A full name for a particular type may be obtained by appending a
> dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
> +
> +- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
> +
> + Extra logging of the communication with the NIC's management CPU.
> + The format of the log is consumed by the netlogdecode cross-platform
> + tool. May be managed per-port, as explained above.
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> index d916389..aac7c51 100644
> --- a/drivers/vdpa/sfc/meson.build
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -30,4 +30,7 @@ endforeach
> deps += ['common_sfc_efx', 'bus_pci']
> sources = files(
> 'sfc_vdpa.c',
> + 'sfc_vdpa_hw.c',
> + 'sfc_vdpa_mcdi.c',
> + 'sfc_vdpa_ops.c',
> )
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index d8faaca..12e8d6e 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -232,6 +232,19 @@ struct sfc_vdpa_adapter *
> goto fail_vfio_setup;
> }
>
> + sfc_vdpa_log_init(sva, "hw init");
> + if (sfc_vdpa_hw_init(sva) != 0) {
> + sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
> + goto fail_hw_init;
> + }
> +
> + sfc_vdpa_log_init(sva, "dev init");
> + sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
> + if (sva->ops_data == NULL) {
> + sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
> + goto fail_dev_init;
> + }
> +
> pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> @@ -240,6 +253,12 @@ struct sfc_vdpa_adapter *
>
> return 0;
>
> +fail_dev_init:
> + sfc_vdpa_hw_fini(sva);
> +
> +fail_hw_init:
> + sfc_vdpa_vfio_teardown(sva);
> +
> fail_vfio_setup:
> fail_set_log_prefix:
> rte_free(sva);
> @@ -266,6 +285,10 @@ struct sfc_vdpa_adapter *
> TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
>
> + sfc_vdpa_device_fini(sva->ops_data);
> +
> + sfc_vdpa_hw_fini(sva);
> +
> sfc_vdpa_vfio_teardown(sva);
>
> rte_free(sva);
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> index 3b77900..fb97258 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -11,14 +11,38 @@
>
> #include <rte_bus_pci.h>
>
> +#include "sfc_efx.h"
> +#include "sfc_efx_mcdi.h"
> +#include "sfc_vdpa_debug.h"
> #include "sfc_vdpa_log.h"
> +#include "sfc_vdpa_ops.h"
> +
> +#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
>
> /* Adapter private data */
> struct sfc_vdpa_adapter {
> TAILQ_ENTRY(sfc_vdpa_adapter) next;
> + /*
> + * PMD setup and configuration is not thread safe. Since it is not
> + * performance sensitive, it is better to guarantee thread-safety
> + * and add device level lock. vDPA control operations which
> + * change its state should acquire the lock.
> + */
> + rte_spinlock_t lock;
> struct rte_pci_device *pdev;
> struct rte_pci_addr pci_addr;
>
> + efx_family_t family;
> + efx_nic_t *nic;
> + rte_spinlock_t nic_lock;
> +
> + efsys_bar_t mem_bar;
> +
> + struct sfc_efx_mcdi mcdi;
> + size_t mcdi_buff_size;
> +
> + uint32_t max_queue_count;
> +
> char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
> uint32_t logtype_main;
>
> @@ -26,6 +50,7 @@ struct sfc_vdpa_adapter {
> int vfio_dev_fd;
> int vfio_container_fd;
> int iommu_group_num;
> + struct sfc_vdpa_ops_data *ops_data;
> };
>
> uint32_t
> @@ -36,5 +61,27 @@ struct sfc_vdpa_adapter {
> struct sfc_vdpa_adapter *
> sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
>
> -#endif /* _SFC_VDPA_H */
> +int
> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
> +void
> +sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sa);
Better to align the name here: sa -> sva
>
> +int
> +sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
> +void
> +sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
> +
> +int
> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> + size_t len, efsys_mem_t *esmp);
> +
> +void
> +sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
> +
> +static inline struct sfc_vdpa_adapter *
> +sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
> +{
> + return (struct sfc_vdpa_adapter *)dev_handle;
> +}
> +
> +#endif /* _SFC_VDPA_H */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h
> b/drivers/vdpa/sfc/sfc_vdpa_debug.h
> new file mode 100644
> index 0000000..cfa8cc5
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_DEBUG_H_
> +#define _SFC_VDPA_DEBUG_H_
> +
> +#include <rte_debug.h>
> +
> +#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
> +/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
> + * in the driver only.
> + */
> +#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
> +#else
> +/* If the driver debug is not enabled, follow DPDK debug/non-debug */
> +#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
> +#endif
> +
> +#endif /* _SFC_VDPA_DEBUG_H_ */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> new file mode 100644
> index 0000000..83f3696
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -0,0 +1,322 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <unistd.h>
> +
> +#include <rte_common.h>
> +#include <rte_errno.h>
> +#include <rte_vfio.h>
> +
> +#include "efx.h"
> +#include "sfc_vdpa.h"
> +#include "sfc_vdpa_ops.h"
> +
> +extern uint32_t sfc_logtype_driver;
> +
> +#ifndef PAGE_SIZE
> +#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
> +#endif
> +
> +int
> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> + size_t len, efsys_mem_t *esmp)
> +{
> + void *mcdi_buf;
> + uint64_t mcdi_iova;
> + size_t mcdi_buff_size;
> + int ret;
> +
> + mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
> +
> + sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
> +
> + mcdi_buf = rte_zmalloc(name, mcdi_buff_size, PAGE_SIZE);
> + if (mcdi_buf == NULL) {
> + sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
> + name, (unsigned int)len, rte_strerror(rte_errno));
> + return -ENOMEM;
> + }
> +
> + /* IOVA address for MCDI would be re-calculated if mapping
What is MCDI?
> + * using default IOVA would fail.
> + * TODO: Earlier there was no way to get valid IOVA range.
> + * Recently a patch has been submitted to get the IOVA range
> + * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
> + * in the kernel version >= 5.4. Support to get the default
> + * IOVA address for MCDI buffer using available IOVA range
> + * would be added later. Meanwhile default IOVA for MCDI buffer
> + * is kept at high mem at 2TB. In case of overlap new available
> + * addresses would be searched and same would be used.
> + */
> + mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
> +
> + do {
> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
> + (uint64_t)mcdi_buf, mcdi_iova,
> + mcdi_buff_size);
> + if (ret == 0)
> + break;
> +
> + mcdi_iova = mcdi_iova >> 1;
> + if (mcdi_iova < mcdi_buff_size) {
> + sfc_vdpa_err(sva,
> + "DMA mapping failed for MCDI : %s",
> + rte_strerror(rte_errno));
> + return ret;
> + }
> +
> + } while (ret < 0);
Is this DMA region for some hardware-specific control msg?
And how do you make sure this IOVA space you defined in this driver will
not conflict with the IOVA space that vdpa device consumer (Most likely QEMU)
defines (If QEMU, IOVA = guest physical address)
Thanks,
Chenbo
> +
> + esmp->esm_addr = mcdi_iova;
> + esmp->esm_base = mcdi_buf;
> + sva->mcdi_buff_size = mcdi_buff_size;
> +
> + sfc_vdpa_info(sva,
> + "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
> + name, len, esmp->esm_base, esmp->esm_addr);
> +
> + return 0;
> +}
> +
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-08-30 10:52 ` Xia, Chenbo
@ 2021-09-03 13:19 ` Vijay Kumar Srivastava
2021-09-06 3:02 ` Xia, Chenbo
0 siblings, 1 reply; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-09-03 13:19 UTC (permalink / raw)
To: Xia, Chenbo, dev
Cc: maxime.coquelin, andrew.rybchenko, Harpreet Singh Anand,
Praveen Kumar Jain
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Monday, August 30, 2021 4:22 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
>Kumar Srivastava <vsrivast@xilinx.com>
>Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
>
>Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Wednesday, July 7, 2021 12:44 AM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
>> <vsrivast@xilinx.com>
>> Subject: [PATCH 02/10] vdpa/sfc: add support for device initialization
>>
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add HW initialization and vDPA device registration support.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> ---
[snip]
>> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
>> + size_t len, efsys_mem_t *esmp)
>> +{
>> + void *mcdi_buf;
>> + uint64_t mcdi_iova;
>> + size_t mcdi_buff_size;
>> + int ret;
>> +
>> + mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
>> +
>> + sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
>> +
>> + mcdi_buf = rte_zmalloc(name, mcdi_buff_size, PAGE_SIZE);
>> + if (mcdi_buf == NULL) {
>> + sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x:
>%s",
>> + name, (unsigned int)len, rte_strerror(rte_errno));
>> + return -ENOMEM;
>> + }
>> +
>> + /* IOVA address for MCDI would be re-calculated if mapping
>
>What is MCDI?
MCDI is a control interface between driver and firmware.
It is used by the host drivers to configure the adapter and retrieve status.
>> + * using default IOVA would fail.
>> + * TODO: Earlier there was no way to get valid IOVA range.
>> + * Recently a patch has been submitted to get the IOVA range
>> + * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
>> + * in the kernel version >= 5.4. Support to get the default
>> + * IOVA address for MCDI buffer using available IOVA range
>> + * would be added later. Meanwhile default IOVA for MCDI buffer
>> + * is kept at high mem at 2TB. In case of overlap new available
>> + * addresses would be searched and same would be used.
>> + */
>> + mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
>> +
>> + do {
>> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
>> + (uint64_t)mcdi_buf,
>mcdi_iova,
>> + mcdi_buff_size);
>> + if (ret == 0)
>> + break;
>> +
>> + mcdi_iova = mcdi_iova >> 1;
>> + if (mcdi_iova < mcdi_buff_size) {
>> + sfc_vdpa_err(sva,
>> + "DMA mapping failed for MCDI : %s",
>> + rte_strerror(rte_errno));
>> + return ret;
>> + }
>> +
>> + } while (ret < 0);
>
>Is this DMA region for some hardware-specific control msg?
>
>And how do you make sure this IOVA space you defined in this driver will not
>conflict with the IOVA space that vdpa device consumer (Most likely QEMU)
>defines (If QEMU, IOVA = guest physical address)
Currently IOVA for MCDI buffer is kept at very high mem at 2TB.
To handle IOVA overlap detection scenario a patch is in progress which will be submitted soon.
In that patch, upon IOVA overlap detection new available IOVA would be calculated and MCDI buffer would be remapped to new IOVA.
[snip]
Thanks,
Vijay
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-09-03 13:19 ` Vijay Kumar Srivastava
@ 2021-09-06 3:02 ` Xia, Chenbo
2021-10-01 17:31 ` Vijay Kumar Srivastava
0 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-09-06 3:02 UTC (permalink / raw)
To: Vijay Kumar Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Harpreet Singh Anand,
Praveen Kumar Jain
Hi,
> -----Original Message-----
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Sent: Friday, September 3, 2021 9:20 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet Singh
> Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
> Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
>
>
> Hi Chenbo,
>
> >-----Original Message-----
> >From: Xia, Chenbo <chenbo.xia@intel.com>
> >Sent: Monday, August 30, 2021 4:22 PM
> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
> >Kumar Srivastava <vsrivast@xilinx.com>
> >Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
> >
> >Hi Vijay,
> >
> >> -----Original Message-----
> >> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> >> Sent: Wednesday, July 7, 2021 12:44 AM
> >> To: dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> >> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
> >> <vsrivast@xilinx.com>
> >> Subject: [PATCH 02/10] vdpa/sfc: add support for device initialization
> >>
> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >>
> >> Add HW initialization and vDPA device registration support.
> >>
> >> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> ---
>
> [snip]
>
> >> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> >> + size_t len, efsys_mem_t *esmp)
> >> +{
> >> + void *mcdi_buf;
> >> + uint64_t mcdi_iova;
> >> + size_t mcdi_buff_size;
> >> + int ret;
> >> +
> >> + mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
> >> +
> >> + sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
> >> +
> >> + mcdi_buf = rte_zmalloc(name, mcdi_buff_size, PAGE_SIZE);
> >> + if (mcdi_buf == NULL) {
> >> + sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x:
> >%s",
> >> + name, (unsigned int)len, rte_strerror(rte_errno));
> >> + return -ENOMEM;
> >> + }
> >> +
> >> + /* IOVA address for MCDI would be re-calculated if mapping
> >
> >What is MCDI?
>
> MCDI is a control interface between driver and firmware.
> It is used by the host drivers to configure the adapter and retrieve status.
Cool, thanks for explanation.
>
> >> + * using default IOVA would fail.
> >> + * TODO: Earlier there was no way to get valid IOVA range.
> >> + * Recently a patch has been submitted to get the IOVA range
> >> + * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
> >> + * in the kernel version >= 5.4. Support to get the default
> >> + * IOVA address for MCDI buffer using available IOVA range
> >> + * would be added later. Meanwhile default IOVA for MCDI buffer
> >> + * is kept at high mem at 2TB. In case of overlap new available
> >> + * addresses would be searched and same would be used.
> >> + */
> >> + mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
> >> +
> >> + do {
> >> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
> >> + (uint64_t)mcdi_buf,
> >mcdi_iova,
> >> + mcdi_buff_size);
> >> + if (ret == 0)
> >> + break;
> >> +
> >> + mcdi_iova = mcdi_iova >> 1;
> >> + if (mcdi_iova < mcdi_buff_size) {
> >> + sfc_vdpa_err(sva,
> >> + "DMA mapping failed for MCDI : %s",
> >> + rte_strerror(rte_errno));
> >> + return ret;
> >> + }
> >> +
> >> + } while (ret < 0);
> >
> >Is this DMA region for some hardware-specific control msg?
> >
> >And how do you make sure this IOVA space you defined in this driver will not
> >conflict with the IOVA space that vdpa device consumer (Most likely QEMU)
> >defines (If QEMU, IOVA = guest physical address)
>
> Currently IOVA for MCDI buffer is kept at very high mem at 2TB.
OK. That sounds a work-around to me but we can't make assumption of consumer not
using that address range. And there is a security issue here, please see below
comment.
>
> To handle IOVA overlap detection scenario a patch is in progress which will be
> submitted soon.
> In that patch, upon IOVA overlap detection new available IOVA would be
> calculated and MCDI buffer would be remapped to new IOVA.
Let's say there is a malicious guest who knows your initial IOVA range that is set
up by your driver (even if it does not know, it can use tests to know. So use static
IOVA range in host is more dangerous). It can use that address in any DMA-able queue
and make DMA into the vdpa app. I think it could cause some security issue as you
let guest easily writing host memory.
For now I don't see a perfect solution except PASID(Process Address Space ID). IIRC,
We could let QEMU have a primary PASID and vdpa app have a secondary PASID so that
VM can't perform DMA to vdpa app. But since it needs HW support and related support
in vfio is not mature, I don't think we are able to use that solution now.
Any solution you can think of for your HW?
Thanks,
Chenbo
>
> [snip]
>
> Thanks,
> Vijay
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-09-06 3:02 ` Xia, Chenbo
@ 2021-10-01 17:31 ` Vijay Kumar Srivastava
2021-10-09 3:06 ` Xia, Chenbo
0 siblings, 1 reply; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-10-01 17:31 UTC (permalink / raw)
To: Xia, Chenbo, dev
Cc: maxime.coquelin, andrew.rybchenko, Harpreet Singh Anand,
Praveen Kumar Jain
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Monday, September 6, 2021 8:32 AM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet
>Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
>Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
>
>Hi,
>
>> -----Original Message-----
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Sent: Friday, September 3, 2021 9:20 PM
>> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru;
>> Harpreet Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain
>> <praveenj@xilinx.com>
>> Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device
>> initialization
>>
[snip]
>> To handle IOVA overlap detection scenario a patch is in progress
>> which will be submitted soon.
>> In that patch, upon IOVA overlap detection new available IOVA would
>> be calculated and MCDI buffer would be remapped to new IOVA.
>Let's say there is a malicious guest who knows your initial IOVA range that is set
>up by your driver (even if it does not know, it can use tests to know. So use static
>IOVA range in host is more dangerous).
Upcoming patch will handle IOVA conflict scenario. With that patch hardcoded IOVA would not be needed.
If malicious guest will try to use MCDI IOVA address then vDPA driver would detect IOVA overlap and would remap MCDI buffer to another available IOVA address.
This IOVA address is for MCDI buffer which is used for the control path.
Just by only writing to MCDI buffer does not imply that malicious guest can send any control message to NIC to modify HW configuration.
>It can use that address in any DMA-able queue and make DMA into the vdpa app. I think it could cause some security issue
>as you let guest easily writing host memory.
Can you please elaborate on this ?
In what scenarios host physical address can be accessed by malicious guest ?
>For now I don't see a perfect solution except PASID(Process Address Space ID).
>IIRC, We could let QEMU have a primary PASID and vdpa app have a secondary
>PASID so that VM can't perform DMA to vdpa app. But since it needs HW support
>and related support in vfio is not mature, I don't think we are able to use that
>solution now.
>Any solution you can think of for your HW?
Yes, It can be used. Our next version of HW will have the PASID support.
Regards,
Vijay
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-10-01 17:31 ` Vijay Kumar Srivastava
@ 2021-10-09 3:06 ` Xia, Chenbo
2021-10-18 10:06 ` Vijay Kumar Srivastava
0 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-10-09 3:06 UTC (permalink / raw)
To: Vijay Kumar Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Harpreet Singh Anand,
Praveen Kumar Jain
Hi Vijay,
> -----Original Message-----
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Sent: Saturday, October 2, 2021 1:32 AM
> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet
> Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
> Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
>
> Hi Chenbo,
>
> >-----Original Message-----
> >From: Xia, Chenbo <chenbo.xia@intel.com>
> >Sent: Monday, September 6, 2021 8:32 AM
> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet
> >Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
> >Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device
> initialization
> >
> >Hi,
> >
> >> -----Original Message-----
> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Sent: Friday, September 3, 2021 9:20 PM
> >> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru;
> >> Harpreet Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain
> >> <praveenj@xilinx.com>
> >> Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device
> >> initialization
> >>
>
> [snip]
>
> >> To handle IOVA overlap detection scenario a patch is in progress
> >> which will be submitted soon.
> >> In that patch, upon IOVA overlap detection new available IOVA would
> >> be calculated and MCDI buffer would be remapped to new IOVA.
> >Let's say there is a malicious guest who knows your initial IOVA range
> that is set
> >up by your driver (even if it does not know, it can use tests to know. So
> use static
> >IOVA range in host is more dangerous).
> Upcoming patch will handle IOVA conflict scenario. With that patch
> hardcoded IOVA would not be needed.
> If malicious guest will try to use MCDI IOVA address then vDPA driver
> would detect IOVA overlap and would remap MCDI buffer to another available
> IOVA address.
Yes, I think I know your solution of driver solving the overlap problem.
> This IOVA address is for MCDI buffer which is used for the control path.
> Just by only writing to MCDI buffer does not imply that malicious guest
> can send any control message to NIC to modify HW configuration.
>
> >It can use that address in any DMA-able queue and make DMA into the vdpa
> app. I think it could cause some security issue
> >as you let guest easily writing host memory.
> Can you please elaborate on this ?
> In what scenarios host physical address can be accessed by malicious
> guest ?
As I have not reviewed the full series and not familiar with your HW.
You can correct my understanding below:
I think your vdpa HW (let's say a VF) have two DMA regions: one in guest (w/o vIOMMU)
and the other in vdpa app. Both share the same IOVA address space, and we
don't want them overlap. Let's say we can make sure no overlap will happen and take
an example here: guest DMA region's IOVA (GPA) range is 0x0000 to 0x1000 and vdpa app's
is 0x1000 to 0x2000. A malicious guest could use a malicious driver to write 0x1500
in its virtio RX ring, so that HW will DMA to that address when packets come. Then
the malicious guest performed an DMA to host memory. Although the guest does not
know IOVA range of vdpa app, he can randomly guess to do the attack.
Any solution your HW/driver can prevent this from happening without PASID? Or do I
miss something here?
Thanks,
Chenbo
>
> >For now I don't see a perfect solution except PASID(Process Address Space
> ID).
> >IIRC, We could let QEMU have a primary PASID and vdpa app have a
> secondary
> >PASID so that VM can't perform DMA to vdpa app. But since it needs HW
> support
> >and related support in vfio is not mature, I don't think we are able to
> use that
> >solution now.
> >Any solution you can think of for your HW?
> Yes, It can be used. Our next version of HW will have the PASID support.
>
> Regards,
> Vijay
>
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-10-09 3:06 ` Xia, Chenbo
@ 2021-10-18 10:06 ` Vijay Kumar Srivastava
2021-10-19 2:16 ` Xia, Chenbo
0 siblings, 1 reply; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-10-18 10:06 UTC (permalink / raw)
To: Xia, Chenbo, dev
Cc: maxime.coquelin, andrew.rybchenko, Harpreet Singh Anand,
Praveen Kumar Jain
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Saturday, October 9, 2021 8:36 AM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet
>Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
>Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
>
>Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Sent: Saturday, October 2, 2021 1:32 AM
>> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru;
>> Harpreet Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain
>> <praveenj@xilinx.com>
>> Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device
>> initialization
>>
>> Hi Chenbo,
>>
>> >-----Original Message-----
>> >From: Xia, Chenbo <chenbo.xia@intel.com>
>> >Sent: Monday, September 6, 2021 8:32 AM
>> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru;
>> >Harpreet Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain
>> ><praveenj@xilinx.com>
>> >Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device
>> initialization
[Snip]
>I think your vdpa HW (let's say a VF) have two DMA regions: one in guest (w/o
>vIOMMU) and the other in vdpa app. Both share the same IOVA address space,
>and we don't want them overlap. Let's say we can make sure no overlap will
>happen and take an example here: guest DMA region's IOVA (GPA) range is
>0x0000 to 0x1000 and vdpa app's is 0x1000 to 0x2000. A malicious guest could
>use a malicious driver to write 0x1500 in its virtio RX ring, so that HW will DMA
>to that address when packets come. Then the malicious guest performed an
>DMA to host memory. Although the guest does not know IOVA range of vdpa
>app, he can randomly guess to do the attack.
>
>Any solution your HW/driver can prevent this from happening without PASID?
>Or do I miss something here ?
Rx packet will carry headers making highly unlikely any proper MCDI data can be written to the IOVA address (for MCDI buffer) to work with by the FW.
Writing to the buffer does not imply to issue the MCDI message. Even if MCDI is sent then FW is resilient enough to identify the incorrect MCDI and will reject the message.
This is going to affect only to VF on which malicious guest is present, as this MCDI buffer is specific to the corresponding VF.
So it won't affect any control path operation on the any other VF or host.
For SW assisted Live migration implemented in the ifcvf vDPA driver it uses hard coded IOVA addresses for mediated vring. Could it have similar issue ?
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-10-18 10:06 ` Vijay Kumar Srivastava
@ 2021-10-19 2:16 ` Xia, Chenbo
2021-10-25 6:11 ` Vijay Kumar Srivastava
0 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-10-19 2:16 UTC (permalink / raw)
To: Vijay Kumar Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Harpreet Singh Anand,
Praveen Kumar Jain
Hi Vijay,
> -----Original Message-----
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Sent: Monday, October 18, 2021 6:06 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet Singh
> Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
> Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
>
> Hi Chenbo,
>
> >-----Original Message-----
> >From: Xia, Chenbo <chenbo.xia@intel.com>
> >Sent: Saturday, October 9, 2021 8:36 AM
> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet
> >Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
> >Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
> >
> >Hi Vijay,
> >
> >> -----Original Message-----
> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Sent: Saturday, October 2, 2021 1:32 AM
> >> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru;
> >> Harpreet Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain
> >> <praveenj@xilinx.com>
> >> Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device
> >> initialization
> >>
> >> Hi Chenbo,
> >>
> >> >-----Original Message-----
> >> >From: Xia, Chenbo <chenbo.xia@intel.com>
> >> >Sent: Monday, September 6, 2021 8:32 AM
> >> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
> >> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru;
> >> >Harpreet Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain
> >> ><praveenj@xilinx.com>
> >> >Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device
> >> initialization
>
> [Snip]
>
> >I think your vdpa HW (let's say a VF) have two DMA regions: one in guest (w/o
> >vIOMMU) and the other in vdpa app. Both share the same IOVA address space,
> >and we don't want them overlap. Let's say we can make sure no overlap will
> >happen and take an example here: guest DMA region's IOVA (GPA) range is
> >0x0000 to 0x1000 and vdpa app's is 0x1000 to 0x2000. A malicious guest could
> >use a malicious driver to write 0x1500 in its virtio RX ring, so that HW will
> DMA
> >to that address when packets come. Then the malicious guest performed an
> >DMA to host memory. Although the guest does not know IOVA range of vdpa
> >app, he can randomly guess to do the attack.
> >
> >Any solution your HW/driver can prevent this from happening without PASID?
> >Or do I miss something here ?
>
> Rx packet will carry headers making highly unlikely any proper MCDI data can
> be written to the IOVA address (for MCDI buffer) to work with by the FW.
> Writing to the buffer does not imply to issue the MCDI message. Even if MCDI
> is sent then FW is resilient enough to identify the incorrect MCDI and will
> reject the message.
>
> This is going to affect only to VF on which malicious guest is present, as
> this MCDI buffer is specific to the corresponding VF.
> So it won't affect any control path operation on the any other VF or host.
OK. So it's very hard to do attack with the FW detection. But about 'won't affect
host', I think it depends on how you handle the DMA-ed control messages. Take a bad
example: if one DMA address saves a pointer and the malicious DMA makes the pointer
be NULL, it will segfaults the program (But I don't think this will happen in your driver,
just help you understand my point). So please check the control messages handling
is robust.
And in the future, I would like to see this problem solved by PASID when your HW has
the support.
>
> For SW assisted Live migration implemented in the ifcvf vDPA driver it uses
> hard coded IOVA addresses for mediated vring. Could it have similar issue ?
Good point. It will and I think we may also need to check if will affect the host program,
or deprecated the feature later.
Thanks,
Chenbo
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization
2021-10-19 2:16 ` Xia, Chenbo
@ 2021-10-25 6:11 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-10-25 6:11 UTC (permalink / raw)
To: Xia, Chenbo, dev
Cc: maxime.coquelin, andrew.rybchenko, Harpreet Singh Anand,
Praveen Kumar Jain
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Tuesday, October 19, 2021 7:47 AM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Harpreet
>Singh Anand <hanand@xilinx.com>; Praveen Kumar Jain <praveenj@xilinx.com>
>Subject: RE: [PATCH 02/10] vdpa/sfc: add support for device initialization
[Snip]
>> Rx packet will carry headers making highly unlikely any proper MCDI
>> data can be written to the IOVA address (for MCDI buffer) to work with by the
>FW.
>> Writing to the buffer does not imply to issue the MCDI message. Even
>> if MCDI is sent then FW is resilient enough to identify the incorrect
>> MCDI and will reject the message.
>>
>> This is going to affect only to VF on which malicious guest is
>> present, as this MCDI buffer is specific to the corresponding VF.
>> So it won't affect any control path operation on the any other VF or host.
>
>OK. So it's very hard to do attack with the FW detection. But about 'won't affect
>host', I think it depends on how you handle the DMA-ed control messages. Take
>a bad
>example: if one DMA address saves a pointer and the malicious DMA makes the
>pointer be NULL, it will segfaults the program (But I don't think this will happen
>in your driver, just help you understand my point). So please check the control
>messages handling is robust.
Yes, It is highly unlikely that it can affect the host.
>And in the future, I would like to see this problem solved by PASID when your
>HW has the support.
Yes. Sure.
Regards,
Vijay
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 03/10] vdpa/sfc: add support to get device and protocol features
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
2021-07-06 16:44 ` [dpdk-dev] [PATCH 01/10] " Vijay Srivastava
2021-07-06 16:44 ` [dpdk-dev] [PATCH 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 9:34 ` Maxime Coquelin
2021-07-06 16:44 ` [dpdk-dev] [PATCH 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
` (12 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_feature and get_protocol_features.
This patch retrieves device supported features and enables
protocol features.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
doc/guides/vdpadevs/features/sfc.ini | 10 ++++
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/version.map | 10 ++++
drivers/vdpa/sfc/sfc_vdpa.c | 20 ++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 2 +
drivers/vdpa/sfc/sfc_vdpa_hw.c | 13 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 91 ++++++++++++++++++++++++++++++++----
drivers/vdpa/sfc/sfc_vdpa_ops.h | 3 ++
8 files changed, 142 insertions(+), 9 deletions(-)
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
index 71b6158..700d061 100644
--- a/doc/guides/vdpadevs/features/sfc.ini
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -4,6 +4,16 @@
; Refer to default.ini for the full list of available driver features.
;
[Features]
+csum = Y
+guest csum = Y
+host tso4 = Y
+host tso6 = Y
+version 1 = Y
+mrg rxbuf = Y
+any layout = Y
+in_order = Y
+proto host notifier = Y
+IOMMU platform = Y
Linux = Y
x86-64 = Y
Usage doc = Y
diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
index d133d61..37ec6b9 100644
--- a/drivers/common/sfc_efx/efsys.h
+++ b/drivers/common/sfc_efx/efsys.h
@@ -187,7 +187,7 @@
#define EFSYS_OPT_MAE 1
-#define EFSYS_OPT_VIRTIO 0
+#define EFSYS_OPT_VIRTIO 1
/* ID */
diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index 5e724fd..03670c8 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -226,6 +226,16 @@ INTERNAL {
efx_txq_nbufs;
efx_txq_size;
+ efx_virtio_fini;
+ efx_virtio_get_doorbell_offset;
+ efx_virtio_get_features;
+ efx_virtio_init;
+ efx_virtio_qcreate;
+ efx_virtio_qdestroy;
+ efx_virtio_qstart;
+ efx_virtio_qstop;
+ efx_virtio_verify_features;
+
sfc_efx_dev_class_get;
sfc_efx_family;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index 12e8d6e..9c12dcb 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -43,6 +43,26 @@ struct sfc_vdpa_adapter *
return found ? sva : NULL;
}
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (vdpa_dev == sva->ops_data->vdpa_dev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva->ops_data : NULL;
+}
+
static int
sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index fb97258..08075e5 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -60,6 +60,8 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev);
int
sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index 83f3696..84e680f 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -273,10 +273,20 @@
if (rc != 0)
goto fail_estimate_rsrc_limits;
+ sfc_vdpa_log_init(sva, "init virtio");
+ rc = efx_virtio_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "virtio init failed: %s", rte_strerror(rc));
+ goto fail_virtio_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_virtio_init:
+ efx_nic_fini(enp);
+
fail_estimate_rsrc_limits:
fail_nic_reset:
efx_nic_unprobe(enp);
@@ -305,6 +315,9 @@
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_log_init(sva, "virtio fini");
+ efx_virtio_fini(enp);
+
sfc_vdpa_log_init(sva, "unprobe nic");
efx_nic_unprobe(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 71696be..5750944 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,17 +3,31 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
#include <rte_vhost.h>
+#include "efx.h"
#include "sfc_vdpa_ops.h"
#include "sfc_vdpa.h"
-/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
- * In subsequent patches these ops would be implemented.
+/* These protocol features are needed to enable notifier ctrl */
+#define SFC_VDPA_PROTOCOL_FEATURES \
+ ((1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD))
+
+/*
+ * Set of features which are enabled by default.
+ * Protocol feature bit is needed to enable notification notifier ctrl.
*/
+#define SFC_VDPA_DEFAULT_FEATURES \
+ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
+
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
@@ -24,22 +38,67 @@
}
static int
+sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ uint64_t dev_features;
+ efx_nic_t *nic;
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+
+ rc = efx_virtio_get_features(nic, EFX_VIRTIO_DEVICE_TYPE_NET,
+ &dev_features);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "could not read device feature: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ ops_data->dev_features = dev_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "device supported virtio features : 0x%" PRIx64,
+ ops_data->dev_features);
+
+ return 0;
+}
+
+static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = ops_data->drv_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = SFC_VDPA_PROTOCOL_FEATURES;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_protocol_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
@@ -91,6 +150,7 @@ struct sfc_vdpa_ops_data *
{
struct sfc_vdpa_ops_data *ops_data;
struct rte_pci_device *pci_dev;
+ int rc;
/* Create vDPA ops context */
ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
@@ -111,10 +171,25 @@ struct sfc_vdpa_ops_data *
goto fail_register_device;
}
+ /* Read supported device features */
+ sfc_vdpa_log_init(dev_handle, "get device feature");
+ rc = sfc_vdpa_get_device_features(ops_data);
+ if (rc != 0)
+ goto fail_get_dev_feature;
+
+ /* Driver features are superset of device supported feature
+ * and any additional features supported by the driver.
+ */
+ ops_data->drv_features =
+ ops_data->dev_features | SFC_VDPA_DEFAULT_FEATURES;
+
ops_data->state = SFC_VDPA_STATE_INITIALIZED;
return ops_data;
+fail_get_dev_feature:
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
fail_register_device:
rte_free(ops_data);
return NULL;
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 817b302..21cbb73 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -26,6 +26,9 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+
+ uint64_t dev_features;
+ uint64_t drv_features;
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 03/10] vdpa/sfc: add support to get device and protocol features
2021-07-06 16:44 ` [dpdk-dev] [PATCH 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
@ 2021-08-30 9:34 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-08-30 9:34 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 7/6/21 6:44 PM, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops get_feature and get_protocol_features.
> This patch retrieves device supported features and enables
> protocol features.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> doc/guides/vdpadevs/features/sfc.ini | 10 ++++
> drivers/common/sfc_efx/efsys.h | 2 +-
> drivers/common/sfc_efx/version.map | 10 ++++
> drivers/vdpa/sfc/sfc_vdpa.c | 20 ++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 2 +
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 13 ++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 91 ++++++++++++++++++++++++++++++++----
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 3 ++
> 8 files changed, 142 insertions(+), 9 deletions(-)
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 04/10] vdpa/sfc: get device supported max queue count
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (2 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 9:35 ` Maxime Coquelin
2021-07-06 16:44 ` [dpdk-dev] [PATCH 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
` (11 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_queue_num to get the maximum number
of queues supported by the device.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 5750944..6c702e1 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -31,10 +31,20 @@
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(queue_num);
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
+ *queue_num);
+
+ return 0;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 04/10] vdpa/sfc: get device supported max queue count
2021-07-06 16:44 ` [dpdk-dev] [PATCH 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
@ 2021-08-30 9:35 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-08-30 9:35 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 7/6/21 6:44 PM, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops get_queue_num to get the maximum number
> of queues supported by the device.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 05/10] vdpa/sfc: add support to get VFIO device fd
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (3 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 9:39 ` Maxime Coquelin
2021-07-06 16:44 ` [dpdk-dev] [PATCH 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
` (10 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_vfio_device_fd to get the VFIO device fd.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 6c702e1..5253adb 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -145,6 +145,29 @@
return -1;
}
+static int
+sfc_vdpa_get_vfio_device_fd(int vid)
+{
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ int vfio_dev_fd;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ sfc_vdpa_info(dev, "vDPA ops get_vfio_device_fd :: vfio fd : %d",
+ vfio_dev_fd);
+
+ return vfio_dev_fd;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -153,6 +176,7 @@
.dev_close = sfc_vdpa_dev_close,
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
+ .get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (4 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 11:35 ` Maxime Coquelin
2021-07-06 16:44 ` [dpdk-dev] [PATCH 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
` (9 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops dev_conf and dev_close for DMA mapping,
interrupt and virtqueue configurations.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa.c | 6 +
drivers/vdpa/sfc/sfc_vdpa.h | 43 ++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 70 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 527 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 28 +++
5 files changed, 654 insertions(+), 20 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index 9c12dcb..ca13483 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -246,6 +246,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_adapter_lock_init(sva);
+
sfc_vdpa_log_init(sva, "vfio init");
if (sfc_vdpa_vfio_setup(sva) < 0) {
sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
@@ -280,6 +282,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
fail_vfio_setup:
+ sfc_vdpa_adapter_lock_fini(sva);
+
fail_set_log_prefix:
rte_free(sva);
@@ -311,6 +315,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
+ sfc_vdpa_adapter_lock_fini(sva);
+
rte_free(sva);
return 0;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 08075e5..b103b0a 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -80,10 +80,53 @@ struct sfc_vdpa_ops_data *
void
sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
return (struct sfc_vdpa_adapter *)dev_handle;
}
+/*
+ * Add wrapper functions to acquire/release lock to be able to remove or
+ * change the lock in one place.
+ */
+static inline void
+sfc_vdpa_adapter_lock_init(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_init(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_is_locked(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_is_locked(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_lock(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_trylock(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_trylock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_unlock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_unlock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock_fini(__rte_unused struct sfc_vdpa_adapter *sva)
+{
+ /* Just for symmetry of the API */
+}
+
#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index 84e680f..047bcc4 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -8,6 +8,7 @@
#include <rte_common.h>
#include <rte_errno.h>
#include <rte_vfio.h>
+#include <rte_vhost.h>
#include "efx.h"
#include "sfc_vdpa.h"
@@ -104,6 +105,75 @@
memset(esmp, 0, sizeof(*esmp));
}
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *ops_data, bool do_map)
+{
+ uint32_t i, j;
+ int rc;
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ int vfio_container_fd;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_container_fd =
+ sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd;
+
+ rc = rte_vhost_get_mem_table(ops_data->vid, &vhost_mem);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "failed to get VM memory layout");
+ goto error;
+ }
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (do_map) {
+ rc = rte_vfio_container_dma_map(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA map failed : %s",
+ rte_strerror(rte_errno));
+ goto failed_vfio_dma_map;
+ }
+ } else {
+ rc = rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA unmap failed : %s",
+ rte_strerror(rte_errno));
+ goto error;
+ }
+ }
+ }
+
+ free(vhost_mem);
+
+ return 0;
+
+failed_vfio_dma_map:
+ for (j = 0; j < i; j++) {
+ mem_reg = &vhost_mem->regions[j];
+ rc = rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ }
+
+error:
+ if (vhost_mem)
+ free(vhost_mem);
+
+ return rc;
+}
+
static int
sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
const efx_bar_region_t *mem_ebrp)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 5253adb..4228044 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,10 +3,13 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <sys/ioctl.h>
+
#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
+#include <rte_vfio.h>
#include <rte_vhost.h>
#include "efx.h"
@@ -28,24 +31,12 @@
#define SFC_VDPA_DEFAULT_FEATURES \
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
-static int
-sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
-{
- struct sfc_vdpa_ops_data *ops_data;
- void *dev;
-
- ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
- if (ops_data == NULL)
- return -1;
-
- dev = ops_data->dev_handle;
- *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+#define SFC_VDPA_MSIX_IRQ_SET_BUF_LEN \
+ (sizeof(struct vfio_irq_set) + \
+ sizeof(int) * (SFC_VDPA_MAX_QUEUE_PAIRS * 2 + 1))
- sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
- *queue_num);
-
- return 0;
-}
+/* It will be used for target VF when calling function is not PF */
+#define SFC_VDPA_VF_NULL 0xFFFF
static int
sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
@@ -74,6 +65,438 @@
return 0;
}
+static uint64_t
+hva_to_gpa(int vid, uint64_t hva)
+{
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ uint32_t i;
+ uint64_t gpa = 0;
+
+ if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
+ goto error;
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (hva >= mem_reg->host_user_addr &&
+ hva < mem_reg->host_user_addr + mem_reg->size) {
+ gpa = (hva - mem_reg->host_user_addr) +
+ mem_reg->guest_phys_addr;
+ break;
+ }
+ }
+
+error:
+ if (vhost_mem)
+ free(vhost_mem);
+ return gpa;
+}
+
+static int
+sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int *irq_fd_ptr;
+ int vfio_dev_fd;
+ uint32_t i, num_vring;
+ struct rte_vhost_vring vring;
+ struct vfio_irq_set *irq_set;
+ struct rte_pci_device *pci_dev;
+ char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
+ void *dev;
+
+ num_vring = rte_vhost_get_vring_num(ops_data->vid);
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev;
+
+ irq_set = (struct vfio_irq_set *)irq_set_buf;
+ irq_set->argsz = sizeof(irq_set_buf);
+ irq_set->count = num_vring + 1;
+ irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
+ VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set->start = 0;
+ irq_fd_ptr = (int *)&irq_set->data;
+ irq_fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] = pci_dev->intr_handle.fd;
+
+ for (i = 0; i < num_vring; i++) {
+ rte_vhost_get_vhost_vring(ops_data->vid, i, &vring);
+ irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
+ }
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error enabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_disable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int vfio_dev_fd;
+ struct vfio_irq_set *irq_set;
+ char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ irq_set = (struct vfio_irq_set *)irq_set_buf;
+ irq_set->argsz = sizeof(irq_set_buf);
+ irq_set->count = 0;
+ irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set->start = 0;
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error disabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_get_vring_info(struct sfc_vdpa_ops_data *ops_data,
+ int vq_num, struct sfc_vdpa_vring_info *vring)
+{
+ int rc;
+ uint64_t gpa;
+ struct rte_vhost_vring vq;
+
+ rc = rte_vhost_get_vhost_vring(ops_data->vid, vq_num, &vq);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vhost vring failed: %s", rte_strerror(rc));
+ return rc;
+ }
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.desc);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for descriptor ring.");
+ goto fail_vring_map;
+ }
+ vring->desc = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.avail);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for available ring.");
+ goto fail_vring_map;
+ }
+ vring->avail = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.used);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for used ring.");
+ goto fail_vring_map;
+ }
+ vring->used = gpa;
+
+ vring->size = vq.size;
+
+ rc = rte_vhost_get_vring_base(ops_data->vid, vq_num,
+ &vring->last_avail_idx,
+ &vring->last_used_idx);
+
+ return rc;
+
+fail_vring_map:
+ return -1;
+}
+
+static int
+sfc_vdpa_virtq_start(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_t *vq;
+ struct sfc_vdpa_vring_info vring;
+ efx_virtio_vq_cfg_t vq_cfg;
+ efx_virtio_vq_dyncfg_t vq_dyncfg;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ rc = sfc_vdpa_get_vring_info(ops_data, vq_num, &vring);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vring info failed: %s", rte_strerror(rc));
+ goto fail_vring_info;
+ }
+
+ vq_cfg.evvc_target_vf = SFC_VDPA_VF_NULL;
+
+ /* even virtqueue for RX and odd for TX */
+ if (vq_num % 2) {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_TXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (TXQ)", vq_num);
+ } else {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_RXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (RXQ)", vq_num);
+ }
+
+ vq_cfg.evvc_vq_num = vq_num;
+ vq_cfg.evvc_desc_tbl_addr = vring.desc;
+ vq_cfg.evvc_avail_ring_addr = vring.avail;
+ vq_cfg.evvc_used_ring_addr = vring.used;
+ vq_cfg.evvc_vq_size = vring.size;
+
+ vq_dyncfg.evvd_vq_pidx = vring.last_used_idx;
+ vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx;
+
+ /* MSI-X vector is function-relative */
+ vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num;
+ if (ops_data->vdpa_context == SFC_VDPA_AS_VF)
+ vq_cfg.evvc_pas_id = 0;
+ vq_cfg.evcc_features = ops_data->dev_features &
+ ops_data->req_features;
+
+ /* Start virtqueue */
+ rc = efx_virtio_qstart(vq, &vq_cfg, &vq_dyncfg);
+ if (rc != 0) {
+ /* destroy virtqueue */
+ sfc_vdpa_err(ops_data->dev_handle,
+ "virtqueue start failed: %s",
+ rte_strerror(rc));
+ efx_virtio_qdestroy(vq);
+ goto fail_virtio_qstart;
+ }
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "virtqueue started successfully for vq_num %d", vq_num);
+
+ ops_data->vq_cxt[vq_num].enable = B_TRUE;
+
+ return rc;
+
+fail_virtio_qstart:
+fail_vring_info:
+ return rc;
+}
+
+static int
+sfc_vdpa_virtq_stop(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_dyncfg_t vq_idx;
+ efx_virtio_vq_t *vq;
+
+ if (ops_data->vq_cxt[vq_num].enable != B_TRUE)
+ return -1;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ /* stop the vq */
+ rc = efx_virtio_qstop(vq, &vq_idx);
+ if (rc == 0) {
+ ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_cidx;
+ ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_pidx;
+ }
+ ops_data->vq_cxt[vq_num].enable = B_FALSE;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_configure(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc, i;
+ int nr_vring;
+ int max_vring_cnt;
+ efx_virtio_vq_t *vq;
+ efx_nic_t *nic;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ nic = sfc_vdpa_adapter_by_dev_handle(dev)->nic;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_INITIALIZED);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURING;
+
+ nr_vring = rte_vhost_get_vring_num(ops_data->vid);
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ /* number of vring should not be more than supported max vq count */
+ if (nr_vring > max_vring_cnt) {
+ sfc_vdpa_err(dev,
+ "nr_vring (%d) is > max vring count (%d)",
+ nr_vring, max_vring_cnt);
+ goto fail_vring_num;
+ }
+
+ rc = sfc_vdpa_dma_map(ops_data, true);
+ if (rc) {
+ sfc_vdpa_err(dev,
+ "DMA map failed: %s", rte_strerror(rc));
+ goto fail_dma_map;
+ }
+
+ for (i = 0; i < nr_vring; i++) {
+ rc = efx_virtio_qcreate(nic, &vq);
+ if ((rc != 0) || (vq == NULL)) {
+ sfc_vdpa_err(dev,
+ "virtqueue create failed: %s",
+ rte_strerror(rc));
+ goto fail_vq_create;
+ }
+
+ /* store created virtqueue context */
+ ops_data->vq_cxt[i].vq = vq;
+ }
+
+ ops_data->vq_count = i;
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return 0;
+
+fail_vq_create:
+ sfc_vdpa_dma_map(ops_data, false);
+
+fail_dma_map:
+fail_vring_num:
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return -1;
+}
+
+static void
+sfc_vdpa_close(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+
+ if (ops_data->state != SFC_VDPA_STATE_CONFIGURED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_CLOSING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ if (ops_data->vq_cxt[i].vq == NULL)
+ continue;
+
+ efx_virtio_qdestroy(ops_data->vq_cxt[i].vq);
+ }
+
+ sfc_vdpa_dma_map(ops_data, false);
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+}
+
+static void
+sfc_vdpa_stop(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+ int rc;
+
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_STOPPING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ rc = sfc_vdpa_virtq_stop(ops_data, i);
+ if (rc != 0)
+ continue;
+ }
+
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+}
+
+static int
+sfc_vdpa_start(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, j;
+ int rc;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_CONFIGURED);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->state = SFC_VDPA_STATE_STARTING;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "enable interrupts");
+ rc = sfc_vdpa_enable_vfio_intr(ops_data);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "vfio intr allocation failed: %s",
+ rte_strerror(rc));
+ goto fail_enable_vfio_intr;
+ }
+
+ rte_vhost_get_negotiated_features(ops_data->vid,
+ &ops_data->req_features);
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "negotiated feature : 0x%" PRIx64,
+ ops_data->req_features);
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "starting vq# %d", i);
+ rc = sfc_vdpa_virtq_start(ops_data, i);
+ if (rc != 0)
+ goto fail_vq_start;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_STARTED;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vq_start:
+ /* stop already started virtqueues */
+ for (j = 0; j < i; j++)
+ sfc_vdpa_virtq_stop(ops_data, j);
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+fail_enable_vfio_intr:
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
+ *queue_num);
+
+ return 0;
+}
+
static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
@@ -114,7 +537,53 @@
static int
sfc_vdpa_dev_config(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ int rc;
+ struct sfc_vdpa_ops_data *ops_data;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->vid = vid;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "configuring");
+ rc = sfc_vdpa_configure(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_config;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "starting");
+ rc = sfc_vdpa_start(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_start;
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): software relay for notify is used.",
+ vdpa_dev->device->name);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vdpa_start:
+ sfc_vdpa_close(ops_data);
+
+fail_vdpa_config:
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
return -1;
}
@@ -122,9 +591,27 @@
static int
sfc_vdpa_dev_close(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_stop(ops_data);
+ sfc_vdpa_close(ops_data);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return 0;
}
static int
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 21cbb73..8d553c5 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -18,17 +18,45 @@ enum sfc_vdpa_context {
enum sfc_vdpa_state {
SFC_VDPA_STATE_UNINITIALIZED = 0,
SFC_VDPA_STATE_INITIALIZED,
+ SFC_VDPA_STATE_CONFIGURING,
+ SFC_VDPA_STATE_CONFIGURED,
+ SFC_VDPA_STATE_CLOSING,
+ SFC_VDPA_STATE_CLOSED,
+ SFC_VDPA_STATE_STARTING,
+ SFC_VDPA_STATE_STARTED,
+ SFC_VDPA_STATE_STOPPING,
SFC_VDPA_STATE_NSTATES
};
+struct sfc_vdpa_vring_info {
+ uint64_t desc;
+ uint64_t avail;
+ uint64_t used;
+ uint64_t size;
+ uint16_t last_avail_idx;
+ uint16_t last_used_idx;
+};
+
+typedef struct sfc_vdpa_vq_context_s {
+ uint8_t enable;
+ uint32_t pidx;
+ uint32_t cidx;
+ efx_virtio_vq_t *vq;
+} sfc_vdpa_vq_context_t;
+
struct sfc_vdpa_ops_data {
void *dev_handle;
+ int vid;
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
uint64_t dev_features;
uint64_t drv_features;
+ uint64_t req_features;
+
+ uint16_t vq_count;
+ struct sfc_vdpa_vq_context_s vq_cxt[SFC_VDPA_MAX_QUEUE_PAIRS * 2];
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-07-06 16:44 ` [dpdk-dev] [PATCH 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
@ 2021-08-30 11:35 ` Maxime Coquelin
2021-09-03 13:22 ` Vijay Kumar Srivastava
0 siblings, 1 reply; 122+ messages in thread
From: Maxime Coquelin @ 2021-08-30 11:35 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 7/6/21 6:44 PM, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops dev_conf and dev_close for DMA mapping,
> interrupt and virtqueue configurations.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> drivers/vdpa/sfc/sfc_vdpa.c | 6 +
> drivers/vdpa/sfc/sfc_vdpa.h | 43 ++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 70 ++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 527 ++++++++++++++++++++++++++++++++++++++--
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 28 +++
> 5 files changed, 654 insertions(+), 20 deletions(-)
>
...
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> index 84e680f..047bcc4 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -8,6 +8,7 @@
> #include <rte_common.h>
> #include <rte_errno.h>
> #include <rte_vfio.h>
> +#include <rte_vhost.h>
>
> #include "efx.h"
> #include "sfc_vdpa.h"
> @@ -104,6 +105,75 @@
> memset(esmp, 0, sizeof(*esmp));
> }
>
> +int
> +sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *ops_data, bool do_map)
> +{
> + uint32_t i, j;
> + int rc;
> + struct rte_vhost_memory *vhost_mem = NULL;
> + struct rte_vhost_mem_region *mem_reg = NULL;
> + int vfio_container_fd;
> + void *dev;
> +
> + dev = ops_data->dev_handle;
> + vfio_container_fd =
> + sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd;
> +
> + rc = rte_vhost_get_mem_table(ops_data->vid, &vhost_mem);
> + if (rc < 0) {
> + sfc_vdpa_err(dev,
> + "failed to get VM memory layout");
> + goto error;
> + }
> +
> + for (i = 0; i < vhost_mem->nregions; i++) {
> + mem_reg = &vhost_mem->regions[i];
> +
> + if (do_map) {
> + rc = rte_vfio_container_dma_map(vfio_container_fd,
> + mem_reg->host_user_addr,
> + mem_reg->guest_phys_addr,
> + mem_reg->size);
> + if (rc < 0) {
> + sfc_vdpa_err(dev,
> + "DMA map failed : %s",
> + rte_strerror(rte_errno));
> + goto failed_vfio_dma_map;
> + }
> + } else {
> + rc = rte_vfio_container_dma_unmap(vfio_container_fd,
> + mem_reg->host_user_addr,
> + mem_reg->guest_phys_addr,
> + mem_reg->size);
> + if (rc < 0) {
> + sfc_vdpa_err(dev,
> + "DMA unmap failed : %s",
> + rte_strerror(rte_errno));
> + goto error;
> + }
> + }
> + }
> +
> + free(vhost_mem);
> +
> + return 0;
> +
> +failed_vfio_dma_map:
> + for (j = 0; j < i; j++) {
> + mem_reg = &vhost_mem->regions[j];
> + rc = rte_vfio_container_dma_unmap(vfio_container_fd,
> + mem_reg->host_user_addr,
> + mem_reg->guest_phys_addr,
> + mem_reg->size);
> + }
> +
> +error:
> + if (vhost_mem)
The NULL check is not necessary, free() takes care of doing it.
> + free(vhost_mem);
> +
> + return rc;
> +}
> +
> static int
> sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
> const efx_bar_region_t *mem_ebrp)
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
...
>
> +static uint64_t
> +hva_to_gpa(int vid, uint64_t hva)
> +{
> + struct rte_vhost_memory *vhost_mem = NULL;
> + struct rte_vhost_mem_region *mem_reg = NULL;
> + uint32_t i;
> + uint64_t gpa = 0;
> +
> + if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
> + goto error;
> +
> + for (i = 0; i < vhost_mem->nregions; i++) {
> + mem_reg = &vhost_mem->regions[i];
> +
> + if (hva >= mem_reg->host_user_addr &&
> + hva < mem_reg->host_user_addr + mem_reg->size) {
> + gpa = (hva - mem_reg->host_user_addr) +
> + mem_reg->guest_phys_addr;
> + break;
> + }
> + }
> +
> +error:
> + if (vhost_mem)
Ditto.
> + free(vhost_mem);
> + return gpa;
> +}
> +
> +static int
> +sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int rc;
> + int *irq_fd_ptr;
> + int vfio_dev_fd;
> + uint32_t i, num_vring;
> + struct rte_vhost_vring vring;
> + struct vfio_irq_set *irq_set;
> + struct rte_pci_device *pci_dev;
> + char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
> + void *dev;
> +
> + num_vring = rte_vhost_get_vring_num(ops_data->vid);
> + dev = ops_data->dev_handle;
> + vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
> + pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev;
> +
> + irq_set = (struct vfio_irq_set *)irq_set_buf;
> + irq_set->argsz = sizeof(irq_set_buf);
> + irq_set->count = num_vring + 1;
> + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
> + VFIO_IRQ_SET_ACTION_TRIGGER;
> + irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
> + irq_set->start = 0;
> + irq_fd_ptr = (int *)&irq_set->data;
> + irq_fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] = pci_dev->intr_handle.fd;
> +
> + for (i = 0; i < num_vring; i++) {
> + rte_vhost_get_vhost_vring(ops_data->vid, i, &vring);
This function may fail (even if really unlikely that it happens), maybe
better to avoid using non-initialized callfd value if it happened.
> + irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
> + }
> +
> + rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
> + if (rc) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "error enabling MSI-X interrupts: %s",
> + strerror(errno));
> + return -1;
> + }
> +
> + return 0;
> +}
> +
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-08-30 11:35 ` Maxime Coquelin
@ 2021-09-03 13:22 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-09-03 13:22 UTC (permalink / raw)
To: Maxime Coquelin, dev
Cc: chenbo.xia, andrew.rybchenko, Harpreet Singh Anand, Praveen Kumar Jain
Hi Maxime,
>-----Original Message-----
>From: Maxime Coquelin <maxime.coquelin@redhat.com>
>Sent: Monday, August 30, 2021 5:06 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: chenbo.xia@intel.com; andrew.rybchenko@oktetlabs.ru; Vijay Kumar
>Srivastava <vsrivast@xilinx.com>
>Subject: Re: [PATCH 06/10] vdpa/sfc: add support for dev conf and dev close
>ops
>
>
>
>On 7/6/21 6:44 PM, Vijay Srivastava wrote:
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
[snip]
>rte_vfio_container_dma_unmap(vfio_container_fd,
>> + mem_reg->host_user_addr,
>> + mem_reg->guest_phys_addr,
>> + mem_reg->size);
>> + if (rc < 0) {
>> + sfc_vdpa_err(dev,
>> + "DMA unmap failed : %s",
>> + rte_strerror(rte_errno));
>> + goto error;
>> + }
>> + }
>> + }
>> +
>> + free(vhost_mem);
>> +
>> + return 0;
>> +
>> +failed_vfio_dma_map:
>> + for (j = 0; j < i; j++) {
>> + mem_reg = &vhost_mem->regions[j];
>> + rc = rte_vfio_container_dma_unmap(vfio_container_fd,
>> + mem_reg->host_user_addr,
>> + mem_reg->guest_phys_addr,
>> + mem_reg->size);
>> + }
>> +
>> +error:
>> + if (vhost_mem)
>
>The NULL check is not necessary, free() takes care of doing it.
OK.
>> + free(vhost_mem);
>> +
>> + return rc;
>> +}
>> +
>> static int
>> sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
>> const efx_bar_region_t *mem_ebrp) diff --git
>> a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
>
>...
>
>>
>> +static uint64_t
>> +hva_to_gpa(int vid, uint64_t hva)
>> +{
>> + struct rte_vhost_memory *vhost_mem = NULL;
>> + struct rte_vhost_mem_region *mem_reg = NULL;
>> + uint32_t i;
>> + uint64_t gpa = 0;
>> +
>> + if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
>> + goto error;
>> +
>> + for (i = 0; i < vhost_mem->nregions; i++) {
>> + mem_reg = &vhost_mem->regions[i];
>> +
>> + if (hva >= mem_reg->host_user_addr &&
>> + hva < mem_reg->host_user_addr + mem_reg-
>>size) {
>> + gpa = (hva - mem_reg->host_user_addr) +
>> + mem_reg->guest_phys_addr;
>> + break;
>> + }
>> + }
>> +
>> +error:
>> + if (vhost_mem)
>
>Ditto.
>
>> + free(vhost_mem);
>> + return gpa;
>> +}
>> +
>> +static int
>> +sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data) {
>> + int rc;
>> + int *irq_fd_ptr;
>> + int vfio_dev_fd;
>> + uint32_t i, num_vring;
>> + struct rte_vhost_vring vring;
>> + struct vfio_irq_set *irq_set;
>> + struct rte_pci_device *pci_dev;
>> + char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
>> + void *dev;
>> +
>> + num_vring = rte_vhost_get_vring_num(ops_data->vid);
>> + dev = ops_data->dev_handle;
>> + vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
>> + pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev;
>> +
>> + irq_set = (struct vfio_irq_set *)irq_set_buf;
>> + irq_set->argsz = sizeof(irq_set_buf);
>> + irq_set->count = num_vring + 1;
>> + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
>> + VFIO_IRQ_SET_ACTION_TRIGGER;
>> + irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
>> + irq_set->start = 0;
>> + irq_fd_ptr = (int *)&irq_set->data;
>> + irq_fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] = pci_dev->intr_handle.fd;
>> +
>> + for (i = 0; i < num_vring; i++) {
>> + rte_vhost_get_vhost_vring(ops_data->vid, i, &vring);
>
>This function may fail (even if really unlikely that it happens), maybe better to
>avoid using non-initialized callfd value if it happened.
>
OK. I will do it in the v2.
[snip]
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 07/10] vdpa/sfc: add support to get queue notify area info
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (5 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 13:22 ` Maxime Coquelin
2021-07-06 16:44 ` [dpdk-dev] [PATCH 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
` (8 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement the vDPA ops get_notify_area to get the notify
area info of the queue.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 166 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +
2 files changed, 162 insertions(+), 6 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 4228044..a7b9085 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,6 +3,8 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <pthread.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <rte_errno.h>
@@ -534,6 +536,67 @@
return 0;
}
+static void *
+sfc_vdpa_notify_ctrl(void *arg)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ int vid;
+
+ ops_data = arg;
+ if (ops_data == NULL)
+ return NULL;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ vid = ops_data->vid;
+
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): Notifier could not get configured",
+ ops_data->vdpa_dev->device->name);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return NULL;
+}
+
+static int
+sfc_vdpa_setup_notify_ctrl(int vid)
+{
+ int ret;
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ ops_data->is_notify_thread_started = false;
+
+ /*
+ * Use rte_vhost_host_notifier_ctrl in a thread to avoid
+ * dead lock scenario when multiple VFs are used in single vdpa
+ * application and multiple VFs are passed to a single VM.
+ */
+ ret = pthread_create(&ops_data->notify_tid, NULL,
+ sfc_vdpa_notify_ctrl, ops_data);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to create notify_ctrl thread: %s",
+ rte_strerror(ret));
+ return -1;
+ }
+ ops_data->is_notify_thread_started = true;
+
+ return 0;
+}
+
static int
sfc_vdpa_dev_config(int vid)
{
@@ -567,18 +630,19 @@
if (rc != 0)
goto fail_vdpa_start;
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+ rc = sfc_vdpa_setup_notify_ctrl(vid);
+ if (rc != 0)
+ goto fail_vdpa_notify;
- sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
- if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
- sfc_vdpa_info(ops_data->dev_handle,
- "vDPA (%s): software relay for notify is used.",
- vdpa_dev->device->name);
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_vdpa_notify:
+ sfc_vdpa_stop(ops_data);
+
fail_vdpa_start:
sfc_vdpa_close(ops_data);
@@ -591,6 +655,7 @@
static int
sfc_vdpa_dev_close(int vid)
{
+ int ret;
struct rte_vdpa_device *vdpa_dev;
struct sfc_vdpa_ops_data *ops_data;
@@ -605,6 +670,23 @@
}
sfc_vdpa_adapter_lock(ops_data->dev_handle);
+ if (ops_data->is_notify_thread_started == true) {
+ void *status;
+ ret = pthread_cancel(ops_data->notify_tid);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to cancel notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+
+ ret = pthread_join(ops_data->notify_tid, &status);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to join terminated notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+ }
+ ops_data->is_notify_thread_started = false;
sfc_vdpa_stop(ops_data);
sfc_vdpa_close(ops_data);
@@ -655,6 +737,77 @@
return vfio_dev_fd;
}
+static int
+sfc_vdpa_get_notify_area(int vid, int qid, uint64_t *offset, uint64_t *size)
+{
+ int ret;
+ efx_nic_t *nic;
+ int vfio_dev_fd;
+ efx_rc_t rc;
+ unsigned int bar_offset;
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ struct vfio_region_info reg = { .argsz = sizeof(reg) };
+ const efx_nic_cfg_t *encp;
+ int max_vring_cnt;
+ int64_t len;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+ encp = efx_nic_cfg_get(nic);
+
+ if (qid >= max_vring_cnt) {
+ sfc_vdpa_err(dev, "invalid qid : %d", qid);
+ return -1;
+ }
+
+ if (ops_data->vq_cxt[qid].enable != B_TRUE) {
+ sfc_vdpa_err(dev, "vq is not enabled");
+ return -1;
+ }
+
+ rc = efx_virtio_get_doorbell_offset(ops_data->vq_cxt[qid].vq,
+ &bar_offset);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "failed to get doorbell offset: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ reg.index = sfc_vdpa_adapter_by_dev_handle(dev)->mem_bar.esb_rid;
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_REGION_INFO, ®);
+ if (ret != 0) {
+ sfc_vdpa_err(dev, "could not get device region info: %s",
+ strerror(errno));
+ return ret;
+ }
+
+ *offset = reg.offset + bar_offset;
+
+ len = (1U << encp->enc_vi_window_shift) / 2;
+ if (len >= sysconf(_SC_PAGESIZE))
+ *size = sysconf(_SC_PAGESIZE);
+ else
+ return -1;
+
+ sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64,
+ *offset);
+
+ return 0;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -664,6 +817,7 @@
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
.get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
+ .get_notify_area = sfc_vdpa_get_notify_area,
};
struct sfc_vdpa_ops_data *
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 8d553c5..f7523ef 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -50,6 +50,8 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+ pthread_t notify_tid;
+ bool is_notify_thread_started;
uint64_t dev_features;
uint64_t drv_features;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 07/10] vdpa/sfc: add support to get queue notify area info
2021-07-06 16:44 ` [dpdk-dev] [PATCH 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
@ 2021-08-30 13:22 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-08-30 13:22 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 7/6/21 6:44 PM, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement the vDPA ops get_notify_area to get the notify
> area info of the queue.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 166 ++++++++++++++++++++++++++++++++++++++--
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +
> 2 files changed, 162 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
...
> +static int
> +sfc_vdpa_get_notify_area(int vid, int qid, uint64_t *offset, uint64_t *size)
> +{
> + int ret;
> + efx_nic_t *nic;
> + int vfio_dev_fd;
> + efx_rc_t rc;
> + unsigned int bar_offset;
> + struct rte_vdpa_device *vdpa_dev;
> + struct sfc_vdpa_ops_data *ops_data;
> + struct vfio_region_info reg = { .argsz = sizeof(reg) };
> + const efx_nic_cfg_t *encp;
> + int max_vring_cnt;
> + int64_t len;
> + void *dev;
> +
> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + dev = ops_data->dev_handle;
> +
> + vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
> + max_vring_cnt =
> + (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
> +
> + nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
> + encp = efx_nic_cfg_get(nic);
> +
> + if (qid >= max_vring_cnt) {
> + sfc_vdpa_err(dev, "invalid qid : %d", qid);
> + return -1;
> + }
> +
> + if (ops_data->vq_cxt[qid].enable != B_TRUE) {
> + sfc_vdpa_err(dev, "vq is not enabled");
> + return -1;
> + }
> +
> + rc = efx_virtio_get_doorbell_offset(ops_data->vq_cxt[qid].vq,
> + &bar_offset);
> + if (rc != 0) {
> + sfc_vdpa_err(dev, "failed to get doorbell offset: %s",
> + rte_strerror(rc));
> + return rc;
> + }
> +
> + reg.index = sfc_vdpa_adapter_by_dev_handle(dev)->mem_bar.esb_rid;
> + ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_REGION_INFO, ®);
> + if (ret != 0) {
> + sfc_vdpa_err(dev, "could not get device region info: %s",
> + strerror(errno));
> + return ret;
> + }
> +
> + *offset = reg.offset + bar_offset;
> +
> + len = (1U << encp->enc_vi_window_shift) / 2;
> + if (len >= sysconf(_SC_PAGESIZE))
> + *size = sysconf(_SC_PAGESIZE);
> + else
> + return -1;
This error case may deserve an error messageto be logged.
> +
> + sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64,
> + *offset);
> +
> + return 0;
> +}
> +
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 08/10] vdpa/sfc: add support for MAC filter config
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (6 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 13:47 ` Maxime Coquelin
2021-07-06 16:44 ` [dpdk-dev] [PATCH 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
` (7 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add support for unicast and broadcast MAC filter configuration.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
doc/guides/vdpadevs/sfc.rst | 4 ++
drivers/vdpa/sfc/meson.build | 1 +
drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
drivers/vdpa/sfc/sfc_vdpa_filter.c | 144 +++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
7 files changed, 238 insertions(+)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index abb5900..ae5ef42 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -71,6 +71,10 @@ boolean parameters value.
**vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
If this parameter is not specified then ef100 device will operate as network device.
+- ``mac`` [mac address]
+
+ Configures MAC address which would be used to setup MAC filters.
+
Dynamic Logging Parameters
~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index aac7c51..f69cba9 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -33,4 +33,5 @@ sources = files(
'sfc_vdpa_hw.c',
'sfc_vdpa_mcdi.c',
'sfc_vdpa_ops.c',
+ 'sfc_vdpa_filter.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index ca13483..703aa9e 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -8,7 +8,9 @@
#include <sys/queue.h>
#include <rte_common.h>
+#include <rte_devargs.h>
#include <rte_errno.h>
+#include <rte_kvargs.h>
#include <rte_string_fns.h>
#include <rte_vfio.h>
#include <rte_vhost.h>
@@ -202,6 +204,31 @@ struct sfc_vdpa_ops_data *
return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
}
+static int
+sfc_vdpa_kvargs_parse(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ struct rte_devargs *devargs = pci_dev->device.devargs;
+ /*
+ * To get the device class a mandatory param 'class' is being
+ * used so included SFC_EFX_KVARG_DEV_CLASS in the param list.
+ */
+ const char **params = (const char *[]){
+ SFC_EFX_KVARG_DEV_CLASS,
+ SFC_VDPA_MAC_ADDR,
+ NULL,
+ };
+
+ if (devargs == NULL)
+ return 0;
+
+ sva->kvargs = rte_kvargs_parse(devargs->args, params);
+ if (sva->kvargs == NULL)
+ return -EINVAL;
+
+ return 0;
+}
+
static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
{ RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
{ .vendor_id = 0, /* sentinel */ },
@@ -244,6 +271,10 @@ struct sfc_vdpa_ops_data *
if (ret != 0)
goto fail_set_log_prefix;
+ ret = sfc_vdpa_kvargs_parse(sva);
+ if (ret != 0)
+ goto fail_kvargs_parse;
+
sfc_vdpa_log_init(sva, "entry");
sfc_vdpa_adapter_lock_init(sva);
@@ -284,6 +315,7 @@ struct sfc_vdpa_ops_data *
fail_vfio_setup:
sfc_vdpa_adapter_lock_fini(sva);
+fail_kvargs_parse:
fail_set_log_prefix:
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index b103b0a..fd480ca 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -17,8 +17,29 @@
#include "sfc_vdpa_log.h"
#include "sfc_vdpa_ops.h"
+#define SFC_VDPA_MAC_ADDR "mac"
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
+/* Broadcast & Unicast MAC filters are supported */
+#define SFC_MAX_SUPPORTED_FILTERS 2
+
+/*
+ * Get function-local index of the associated VI from the
+ * virtqueue number. Queue 0 is reserved for MCDI
+ */
+#define SFC_VDPA_GET_VI_INDEX(vq_num) (((vq_num) / 2) + 1)
+
+enum sfc_vdpa_filter_type {
+ SFC_VDPA_BCAST_MAC_FILTER = 0,
+ SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_FILTER_NTYPE
+};
+
+typedef struct sfc_vdpa_filter_s {
+ int filter_cnt;
+ efx_filter_spec_t spec[SFC_MAX_SUPPORTED_FILTERS];
+} sfc_vdpa_filter_t;
+
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
@@ -32,6 +53,8 @@ struct sfc_vdpa_adapter {
struct rte_pci_device *pdev;
struct rte_pci_addr pci_addr;
+ struct rte_kvargs *kvargs;
+
efx_family_t family;
efx_nic_t *nic;
rte_spinlock_t nic_lock;
@@ -46,6 +69,8 @@ struct sfc_vdpa_adapter {
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
+ sfc_vdpa_filter_t filters;
+
int vfio_group_fd;
int vfio_dev_fd;
int vfio_container_fd;
@@ -83,6 +108,11 @@ struct sfc_vdpa_ops_data *
int
sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+int
+sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data);
+int
+sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
new file mode 100644
index 0000000..03b6a5d
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -0,0 +1,144 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_errno.h>
+#include <rte_ether.h>
+#include <rte_kvargs.h>
+
+#include "efx.h"
+#include "efx_impl.h"
+#include "sfc_vdpa.h"
+
+static inline int
+sfc_vdpa_get_eth_addr(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ struct rte_ether_addr *mac_addr = extra_args;
+
+ if (value == NULL || extra_args == NULL)
+ return -EINVAL;
+
+ /* Convert string with Ethernet address to an ether_addr */
+ rte_ether_unformat_addr(value, mac_addr);
+
+ return 0;
+}
+
+static int
+sfc_vdpa_set_mac_filter(efx_nic_t *nic, efx_filter_spec_t *spec,
+ int qid, uint8_t *eth_addr)
+{
+ int rc;
+
+ if (nic == NULL || spec == NULL)
+ return -1;
+
+ spec->efs_priority = EFX_FILTER_PRI_MANUAL;
+ spec->efs_flags = EFX_FILTER_FLAG_RX;
+ spec->efs_dmaq_id = qid;
+
+ rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
+ if (rc != 0)
+ return rc;
+
+ rc = efx_filter_insert(nic, spec);
+ if (rc != 0)
+ return rc;
+
+ return rc;
+}
+
+int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int qid;
+ efx_nic_t *nic;
+ struct rte_ether_addr bcast_eth_addr;
+ struct rte_ether_addr ucast_eth_addr;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_filter_spec_t *spec;
+
+ if (ops_data == NULL)
+ return -1;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ nic = sva->nic;
+
+ sfc_vdpa_log_init(sva, "process kvarg");
+
+ /* skip MAC filter configuration if mac address is not provided */
+ if (rte_kvargs_count(sva->kvargs, SFC_VDPA_MAC_ADDR) == 0) {
+ sfc_vdpa_warn(sva,
+ "MAC address is not provided, skipping MAC Filter Config");
+ return -1;
+ }
+
+ rc = rte_kvargs_process(sva->kvargs, SFC_VDPA_MAC_ADDR,
+ &sfc_vdpa_get_eth_addr,
+ &ucast_eth_addr);
+ if (rc < 0)
+ return -1;
+
+ /* create filters on the base queue */
+ qid = SFC_VDPA_GET_VI_INDEX(0);
+
+ sfc_vdpa_log_init(sva, "insert broadcast mac filter");
+
+ EFX_MAC_BROADCAST_ADDR_SET(bcast_eth_addr.addr_bytes);
+ spec = &sva->filters.spec[SFC_VDPA_BCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic,
+ spec, qid,
+ bcast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(ops_data->dev_handle,
+ "broadcast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "insert unicast mac filter");
+ spec = &sva->filters.spec[SFC_VDPA_UCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic,
+ spec, qid,
+ ucast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "unicast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return rc;
+}
+
+int sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, rc = 0;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_nic_t *nic;
+
+ if (ops_data == NULL)
+ return -1;
+
+ nic = sva->nic;
+
+ for (i = 0; i < sva->filters.filter_cnt; i++) {
+ rc = efx_filter_remove(nic, &(sva->filters.spec[i]));
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "remove HW filter failed for entry %d: %s",
+ i, rte_strerror(rc));
+ }
+
+ sva->filters.filter_cnt = 0;
+
+ return rc;
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index 047bcc4..3a98c8c 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -350,10 +350,20 @@
goto fail_virtio_init;
}
+ sfc_vdpa_log_init(sva, "init filter");
+ rc = efx_filter_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "filter init failed: %s", rte_strerror(rc));
+ goto fail_filter_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_filter_init:
+ efx_virtio_fini(enp);
+
fail_virtio_init:
efx_nic_fini(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index a7b9085..f14b385 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -423,6 +423,8 @@
sfc_vdpa_disable_vfio_intr(ops_data);
+ sfc_vdpa_filter_remove(ops_data);
+
ops_data->state = SFC_VDPA_STATE_CONFIGURED;
}
@@ -462,12 +464,27 @@
goto fail_vq_start;
}
+ ops_data->vq_count = i;
+
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "configure MAC filters");
+ rc = sfc_vdpa_filter_config(ops_data);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "MAC filter config failed: %s",
+ rte_strerror(rc));
+ goto fail_filter_cfg;
+ }
+
ops_data->state = SFC_VDPA_STATE_STARTED;
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_filter_cfg:
+ /* remove already created filters */
+ sfc_vdpa_filter_remove(ops_data);
fail_vq_start:
/* stop already started virtqueues */
for (j = 0; j < i; j++)
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 08/10] vdpa/sfc: add support for MAC filter config
2021-07-06 16:44 ` [dpdk-dev] [PATCH 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
@ 2021-08-30 13:47 ` Maxime Coquelin
2021-09-03 13:20 ` Vijay Kumar Srivastava
0 siblings, 1 reply; 122+ messages in thread
From: Maxime Coquelin @ 2021-08-30 13:47 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 7/6/21 6:44 PM, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add support for unicast and broadcast MAC filter configuration.
I wonder whether we should not add an API to the vDPA framework for this
MAC management, as this is something generic.
What do you think?
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> doc/guides/vdpadevs/sfc.rst | 4 ++
> drivers/vdpa/sfc/meson.build | 1 +
> drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 144 +++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
> 7 files changed, 238 insertions(+)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
>
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 08/10] vdpa/sfc: add support for MAC filter config
2021-08-30 13:47 ` Maxime Coquelin
@ 2021-09-03 13:20 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-09-03 13:20 UTC (permalink / raw)
To: Maxime Coquelin, dev
Cc: chenbo.xia, andrew.rybchenko, Harpreet Singh Anand, Praveen Kumar Jain
Hi Maxime,
>-----Original Message-----
>From: Maxime Coquelin <maxime.coquelin@redhat.com>
>Sent: Monday, August 30, 2021 7:18 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: chenbo.xia@intel.com; andrew.rybchenko@oktetlabs.ru; Vijay Kumar
>Srivastava <vsrivast@xilinx.com>
>Subject: Re: [PATCH 08/10] vdpa/sfc: add support for MAC filter config
>
>
>
>On 7/6/21 6:44 PM, Vijay Srivastava wrote:
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add support for unicast and broadcast MAC filter configuration.
>
>I wonder whether we should not add an API to the vDPA framework for this
>MAC management, as this is something generic.
>
>What do you think?
I think it's good idea to add an API for MAC configuration in vDPA framework.
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> ---
>> doc/guides/vdpadevs/sfc.rst | 4 ++
>> drivers/vdpa/sfc/meson.build | 1 +
>> drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
>> drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
>> drivers/vdpa/sfc/sfc_vdpa_filter.c | 144
>+++++++++++++++++++++++++++++++++++++
>> drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
>> drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
>> 7 files changed, 238 insertions(+)
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
>>
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 09/10] vdpa/sfc: add support to set vring state
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (7 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-08-30 13:58 ` Maxime Coquelin
2021-07-06 16:44 ` [dpdk-dev] [PATCH 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
` (6 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implements vDPA ops set_vring_state to configure vring state.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 54 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index f14b385..5a3b766 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -716,11 +716,57 @@
static int
sfc_vdpa_set_vring_state(int vid, int vring, int state)
{
- RTE_SET_USED(vid);
- RTE_SET_USED(vring);
- RTE_SET_USED(state);
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_vdpa_device *vdpa_dev;
+ efx_rc_t rc;
+ int vring_max;
+ void *dev;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ sfc_vdpa_info(dev,
+ "vDPA ops set_vring_state: vid: %d, vring: %d, state:%d",
+ vid, vring, state);
+
+ vring_max = (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ if (vring < 0 || vring > vring_max) {
+ sfc_vdpa_err(dev, "received invalid vring id : %d to set state",
+ vring);
+ return -1;
+ }
+
+ /*
+ * Skip if device is not yet started. virtqueues state can be
+ * changed once it is created and other configurations are done.
+ */
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return 0;
+
+ if (ops_data->vq_cxt[vring].enable == state)
+ return 0;
+
+ if (state == 0) {
+ rc = sfc_vdpa_virtq_stop(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue stop failed: %s",
+ rte_strerror(rc));
+ }
+ } else {
+ rc = sfc_vdpa_virtq_start(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue start failed: %s",
+ rte_strerror(rc));
+ }
+ }
+
+ return rc;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 09/10] vdpa/sfc: add support to set vring state
2021-07-06 16:44 ` [dpdk-dev] [PATCH 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
@ 2021-08-30 13:58 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-08-30 13:58 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 7/6/21 6:44 PM, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implements vDPA ops set_vring_state to configure vring state.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 54 ++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 50 insertions(+), 4 deletions(-)
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH 10/10] vdpa/sfc: set a multicast filter during vDPA init
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (8 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
@ 2021-07-06 16:44 ` Vijay Srivastava
2021-07-07 8:30 ` [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Xia, Chenbo
` (5 subsequent siblings)
15 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-07-06 16:44 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Insert unknown multicast filter to allow IPv6 neighbor discovery
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa.h | 3 ++-
drivers/vdpa/sfc/sfc_vdpa_filter.c | 19 +++++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index fd480ca..68bf79a 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -21,7 +21,7 @@
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Broadcast & Unicast MAC filters are supported */
-#define SFC_MAX_SUPPORTED_FILTERS 2
+#define SFC_MAX_SUPPORTED_FILTERS 3
/*
* Get function-local index of the associated VI from the
@@ -32,6 +32,7 @@
enum sfc_vdpa_filter_type {
SFC_VDPA_BCAST_MAC_FILTER = 0,
SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_MCAST_DST_FILTER = 2,
SFC_VDPA_FILTER_NTYPE
};
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
index 03b6a5d..74204d3 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_filter.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -39,8 +39,12 @@
spec->efs_flags = EFX_FILTER_FLAG_RX;
spec->efs_dmaq_id = qid;
- rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
- eth_addr);
+ if (eth_addr == NULL)
+ rc = efx_filter_spec_set_mc_def(spec);
+ else
+ rc = efx_filter_spec_set_eth_local(spec,
+ EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
if (rc != 0)
return rc;
@@ -114,6 +118,17 @@ int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
else
sva->filters.filter_cnt++;
+ sfc_vdpa_log_init(sva, "insert unknown mcast filter");
+ spec = &sva->filters.spec[SFC_VDPA_MCAST_DST_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic, spec, qid, NULL);
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "mcast filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
sfc_vdpa_log_init(sva, "done");
return rc;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (9 preceding siblings ...)
2021-07-06 16:44 ` [dpdk-dev] [PATCH 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
@ 2021-07-07 8:30 ` Xia, Chenbo
2021-07-07 11:09 ` Andrew Rybchenko
` (4 subsequent siblings)
15 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-07-07 8:30 UTC (permalink / raw)
To: Vijay Srivastava, dev, Yigit, Ferruh
Cc: maxime.coquelin, andrew.rybchenko, Vijay Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Wednesday, July 7, 2021 12:44 AM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> This patch series introduces vDPA driver for Xilinx devices.
> The Xilinx vDPA (vhost data path acceleration) provides
> support for the Xilinx SN1022 SmartNICs.
>
> This Patch series includes following patches:
>
> Vijay Kumar Srivastava (10):
> vdpa/sfc: introduce Xilinx vDPA driver
> vdpa/sfc: add support for device initialization
> vdpa/sfc: add support to get device and protocol features
> vdpa/sfc: get device supported max queue count
> vdpa/sfc: add support to get VFIO device fd
> vdpa/sfc: add support for dev conf and dev close ops
> vdpa/sfc: add support to get queue notify area info
> vdpa/sfc: add support for MAC filter config
> vdpa/sfc: add support to set vring state
> vdpa/sfc: set a multicast filter during vDPA init
>
[...]
> 1.8.3.1
Did you register to mail-list? Your patch was not in mail list as the log says
you are not a member of it. And @Yigit, Ferruh helped you release the mails this
time. Please register to mail-list first if you have not, or there will be problems
when you reply/send new versions.
Thanks,
Chenbo
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (10 preceding siblings ...)
2021-07-07 8:30 ` [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Xia, Chenbo
@ 2021-07-07 11:09 ` Andrew Rybchenko
2021-10-27 13:18 ` Maxime Coquelin
` (3 subsequent siblings)
15 siblings, 0 replies; 122+ messages in thread
From: Andrew Rybchenko @ 2021-07-07 11:09 UTC (permalink / raw)
To: Vijay Srivastava, dev; +Cc: maxime.coquelin, chenbo.xia, Vijay Srivastava
On 7/6/21 7:44 PM, Vijay Srivastava wrote:
> This patch series introduces vDPA driver for Xilinx devices.
> The Xilinx vDPA (vhost data path acceleration) provides
> support for the Xilinx SN1022 SmartNICs.
>
> This Patch series includes following patches:
>
> Vijay Kumar Srivastava (10):
> vdpa/sfc: introduce Xilinx vDPA driver
> vdpa/sfc: add support for device initialization
> vdpa/sfc: add support to get device and protocol features
> vdpa/sfc: get device supported max queue count
> vdpa/sfc: add support to get VFIO device fd
> vdpa/sfc: add support for dev conf and dev close ops
> vdpa/sfc: add support to get queue notify area info
> vdpa/sfc: add support for MAC filter config
> vdpa/sfc: add support to set vring state
> vdpa/sfc: set a multicast filter during vDPA init
Series-acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (11 preceding siblings ...)
2021-07-07 11:09 ` Andrew Rybchenko
@ 2021-10-27 13:18 ` Maxime Coquelin
2021-10-27 15:04 ` Andrew Rybchenko
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (2 subsequent siblings)
15 siblings, 1 reply; 122+ messages in thread
From: Maxime Coquelin @ 2021-10-27 13:18 UTC (permalink / raw)
To: Vijay Srivastava, dev; +Cc: chenbo.xia, andrew.rybchenko, Vijay Srivastava
Hi Vijay,
-rc2 deadline is approaching, do you think v2 will be ready on time so
that we can have your driver in v21.11?
Thanks,
Maxime
On 7/6/21 18:44, Vijay Srivastava wrote:
> This patch series introduces vDPA driver for Xilinx devices.
> The Xilinx vDPA (vhost data path acceleration) provides
> support for the Xilinx SN1022 SmartNICs.
>
> This Patch series includes following patches:
>
> Vijay Kumar Srivastava (10):
> vdpa/sfc: introduce Xilinx vDPA driver
> vdpa/sfc: add support for device initialization
> vdpa/sfc: add support to get device and protocol features
> vdpa/sfc: get device supported max queue count
> vdpa/sfc: add support to get VFIO device fd
> vdpa/sfc: add support for dev conf and dev close ops
> vdpa/sfc: add support to get queue notify area info
> vdpa/sfc: add support for MAC filter config
> vdpa/sfc: add support to set vring state
> vdpa/sfc: set a multicast filter during vDPA init
>
> MAINTAINERS | 6 +
> doc/guides/rel_notes/release_21_08.rst | 5 +
> doc/guides/vdpadevs/features/sfc.ini | 19 +
> doc/guides/vdpadevs/sfc.rst | 107 ++++
> drivers/common/sfc_efx/efsys.h | 2 +-
> drivers/common/sfc_efx/version.map | 10 +
> drivers/vdpa/meson.build | 1 +
> drivers/vdpa/sfc/meson.build | 37 ++
> drivers/vdpa/sfc/sfc_vdpa.c | 367 +++++++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 163 ++++++
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 159 ++++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 415 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 80 +++
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 942 +++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 69 +++
> drivers/vdpa/sfc/version.map | 3 +
> 18 files changed, 2479 insertions(+), 1 deletion(-)
> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
> create mode 100644 doc/guides/vdpadevs/sfc.rst
> create mode 100644 drivers/vdpa/sfc/meson.build
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
> create mode 100644 drivers/vdpa/sfc/version.map
>
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-27 13:18 ` Maxime Coquelin
@ 2021-10-27 15:04 ` Andrew Rybchenko
2021-10-27 19:56 ` Maxime Coquelin
2021-10-28 18:01 ` Vijay Kumar Srivastava
0 siblings, 2 replies; 122+ messages in thread
From: Andrew Rybchenko @ 2021-10-27 15:04 UTC (permalink / raw)
To: Maxime Coquelin, Vijay Srivastava, dev; +Cc: chenbo.xia, Vijay Srivastava
Hi Maxime,
On 10/27/21 4:18 PM, Maxime Coquelin wrote:
> Hi Vijay,
>
> -rc2 deadline is approaching, do you think v2 will be ready on time so
> that we can have your driver in v21.11?
Vijay is working on a it. We have v2, but it does not work after rebase
on rc1. Hopefully Vijay will sort it out shortly.
Thanks,
Andrew.
>
> Thanks,
> Maxime
>
> On 7/6/21 18:44, Vijay Srivastava wrote:
>> This patch series introduces vDPA driver for Xilinx devices.
>> The Xilinx vDPA (vhost data path acceleration) provides
>> support for the Xilinx SN1022 SmartNICs.
>>
>> This Patch series includes following patches:
>>
>> Vijay Kumar Srivastava (10):
>> vdpa/sfc: introduce Xilinx vDPA driver
>> vdpa/sfc: add support for device initialization
>> vdpa/sfc: add support to get device and protocol features
>> vdpa/sfc: get device supported max queue count
>> vdpa/sfc: add support to get VFIO device fd
>> vdpa/sfc: add support for dev conf and dev close ops
>> vdpa/sfc: add support to get queue notify area info
>> vdpa/sfc: add support for MAC filter config
>> vdpa/sfc: add support to set vring state
>> vdpa/sfc: set a multicast filter during vDPA init
>>
>> MAINTAINERS | 6 +
>> doc/guides/rel_notes/release_21_08.rst | 5 +
>> doc/guides/vdpadevs/features/sfc.ini | 19 +
>> doc/guides/vdpadevs/sfc.rst | 107 ++++
>> drivers/common/sfc_efx/efsys.h | 2 +-
>> drivers/common/sfc_efx/version.map | 10 +
>> drivers/vdpa/meson.build | 1 +
>> drivers/vdpa/sfc/meson.build | 37 ++
>> drivers/vdpa/sfc/sfc_vdpa.c | 367 +++++++++++++
>> drivers/vdpa/sfc/sfc_vdpa.h | 163 ++++++
>> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
>> drivers/vdpa/sfc/sfc_vdpa_filter.c | 159 ++++++
>> drivers/vdpa/sfc/sfc_vdpa_hw.c | 415 +++++++++++++++
>> drivers/vdpa/sfc/sfc_vdpa_log.h | 80 +++
>> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
>> drivers/vdpa/sfc/sfc_vdpa_ops.c | 942
>> +++++++++++++++++++++++++++++++++
>> drivers/vdpa/sfc/sfc_vdpa_ops.h | 69 +++
>> drivers/vdpa/sfc/version.map | 3 +
>> 18 files changed, 2479 insertions(+), 1 deletion(-)
>> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
>> create mode 100644 doc/guides/vdpadevs/sfc.rst
>> create mode 100644 drivers/vdpa/sfc/meson.build
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>> create mode 100644 drivers/vdpa/sfc/version.map
>>
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-27 15:04 ` Andrew Rybchenko
@ 2021-10-27 19:56 ` Maxime Coquelin
2021-10-28 18:01 ` Vijay Kumar Srivastava
1 sibling, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-10-27 19:56 UTC (permalink / raw)
To: Andrew Rybchenko, Vijay Srivastava, dev; +Cc: chenbo.xia, Vijay Srivastava
Hi Andrew,
On 10/27/21 17:04, Andrew Rybchenko wrote:
> Hi Maxime,
>
> On 10/27/21 4:18 PM, Maxime Coquelin wrote:
>> Hi Vijay,
>>
>> -rc2 deadline is approaching, do you think v2 will be ready on time so
>> that we can have your driver in v21.11?
>
> Vijay is working on a it. We have v2, but it does not work after rebase
> on rc1. Hopefully Vijay will sort it out shortly.
Thanks for the update.
In case you are still stuck with this regression tomorrow end of day,
feel free to send it anyway mentioning it is not working, so that we can
have time for a v3 if necessary.
Maxime
> Thanks,
> Andrew.
>
>>
>> Thanks,
>> Maxime
>>
>> On 7/6/21 18:44, Vijay Srivastava wrote:
>>> This patch series introduces vDPA driver for Xilinx devices.
>>> The Xilinx vDPA (vhost data path acceleration) provides
>>> support for the Xilinx SN1022 SmartNICs.
>>>
>>> This Patch series includes following patches:
>>>
>>> Vijay Kumar Srivastava (10):
>>> vdpa/sfc: introduce Xilinx vDPA driver
>>> vdpa/sfc: add support for device initialization
>>> vdpa/sfc: add support to get device and protocol features
>>> vdpa/sfc: get device supported max queue count
>>> vdpa/sfc: add support to get VFIO device fd
>>> vdpa/sfc: add support for dev conf and dev close ops
>>> vdpa/sfc: add support to get queue notify area info
>>> vdpa/sfc: add support for MAC filter config
>>> vdpa/sfc: add support to set vring state
>>> vdpa/sfc: set a multicast filter during vDPA init
>>>
>>> MAINTAINERS | 6 +
>>> doc/guides/rel_notes/release_21_08.rst | 5 +
>>> doc/guides/vdpadevs/features/sfc.ini | 19 +
>>> doc/guides/vdpadevs/sfc.rst | 107 ++++
>>> drivers/common/sfc_efx/efsys.h | 2 +-
>>> drivers/common/sfc_efx/version.map | 10 +
>>> drivers/vdpa/meson.build | 1 +
>>> drivers/vdpa/sfc/meson.build | 37 ++
>>> drivers/vdpa/sfc/sfc_vdpa.c | 367 +++++++++++++
>>> drivers/vdpa/sfc/sfc_vdpa.h | 163 ++++++
>>> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
>>> drivers/vdpa/sfc/sfc_vdpa_filter.c | 159 ++++++
>>> drivers/vdpa/sfc/sfc_vdpa_hw.c | 415 +++++++++++++++
>>> drivers/vdpa/sfc/sfc_vdpa_log.h | 80 +++
>>> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
>>> drivers/vdpa/sfc/sfc_vdpa_ops.c | 942
>>> +++++++++++++++++++++++++++++++++
>>> drivers/vdpa/sfc/sfc_vdpa_ops.h | 69 +++
>>> drivers/vdpa/sfc/version.map | 3 +
>>> 18 files changed, 2479 insertions(+), 1 deletion(-)
>>> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
>>> create mode 100644 doc/guides/vdpadevs/sfc.rst
>>> create mode 100644 drivers/vdpa/sfc/meson.build
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>>> create mode 100644 drivers/vdpa/sfc/version.map
>>>
>
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-27 15:04 ` Andrew Rybchenko
2021-10-27 19:56 ` Maxime Coquelin
@ 2021-10-28 18:01 ` Vijay Kumar Srivastava
1 sibling, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-10-28 18:01 UTC (permalink / raw)
To: Andrew Rybchenko, Maxime Coquelin, dev; +Cc: chenbo.xia
HI Maxime,
With the rc1 code base, an issue https://bugs.dpdk.org/show_bug.cgi?id=862 was observed.
Due to this vDPA app was not working properly. After fixing this issue (Fix needs to be submitted)
vDPA app is working fine with the this patch series.
Regards,
Vijay
>-----Original Message-----
>From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>Sent: Wednesday, October 27, 2021 8:35 PM
>To: Maxime Coquelin <maxime.coquelin@redhat.com>; Vijay Kumar Srivastava
><vsrivast@xilinx.com>; dev@dpdk.org
>Cc: chenbo.xia@intel.com; Vijay Kumar Srivastava <vsrivast@xilinx.com>
>Subject: Re: [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver
>
>Hi Maxime,
>
>On 10/27/21 4:18 PM, Maxime Coquelin wrote:
>> Hi Vijay,
>>
>> -rc2 deadline is approaching, do you think v2 will be ready on time so
>> that we can have your driver in v21.11?
>
>Vijay is working on a it. We have v2, but it does not work after rebase on rc1.
>Hopefully Vijay will sort it out shortly.
>
>Thanks,
>Andrew.
>
>>
>> Thanks,
>> Maxime
>>
>> On 7/6/21 18:44, Vijay Srivastava wrote:
>>> This patch series introduces vDPA driver for Xilinx devices.
>>> The Xilinx vDPA (vhost data path acceleration) provides support for
>>> the Xilinx SN1022 SmartNICs.
>>>
>>> This Patch series includes following patches:
>>>
>>> Vijay Kumar Srivastava (10):
>>> vdpa/sfc: introduce Xilinx vDPA driver
>>> vdpa/sfc: add support for device initialization
>>> vdpa/sfc: add support to get device and protocol features
>>> vdpa/sfc: get device supported max queue count
>>> vdpa/sfc: add support to get VFIO device fd
>>> vdpa/sfc: add support for dev conf and dev close ops
>>> vdpa/sfc: add support to get queue notify area info
>>> vdpa/sfc: add support for MAC filter config
>>> vdpa/sfc: add support to set vring state
>>> vdpa/sfc: set a multicast filter during vDPA init
>>>
>>> MAINTAINERS | 6 +
>>> doc/guides/rel_notes/release_21_08.rst | 5 +
>>> doc/guides/vdpadevs/features/sfc.ini | 19 +
>>> doc/guides/vdpadevs/sfc.rst | 107 ++++
>>> drivers/common/sfc_efx/efsys.h | 2 +-
>>> drivers/common/sfc_efx/version.map | 10 +
>>> drivers/vdpa/meson.build | 1 +
>>> drivers/vdpa/sfc/meson.build | 37 ++
>>> drivers/vdpa/sfc/sfc_vdpa.c | 367 +++++++++++++
>>> drivers/vdpa/sfc/sfc_vdpa.h | 163 ++++++
>>> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
>>> drivers/vdpa/sfc/sfc_vdpa_filter.c | 159 ++++++
>>> drivers/vdpa/sfc/sfc_vdpa_hw.c | 415 +++++++++++++++
>>> drivers/vdpa/sfc/sfc_vdpa_log.h | 80 +++
>>> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
>>> drivers/vdpa/sfc/sfc_vdpa_ops.c | 942
>>> +++++++++++++++++++++++++++++++++
>>> drivers/vdpa/sfc/sfc_vdpa_ops.h | 69 +++
>>> drivers/vdpa/sfc/version.map | 3 +
>>> 18 files changed, 2479 insertions(+), 1 deletion(-)
>>> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
>>> create mode 100644 doc/guides/vdpadevs/sfc.rst
>>> create mode 100644 drivers/vdpa/sfc/meson.build
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
>>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>>> create mode 100644 drivers/vdpa/sfc/version.map
>>>
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (12 preceding siblings ...)
2021-10-27 13:18 ` Maxime Coquelin
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 01/10] " Vijay Srivastava
` (11 more replies)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
15 siblings, 12 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Srivastava
This patch series introduces vDPA driver for Xilinx devices.
The Xilinx vDPA (vhost data path acceleration) provides
support for the Xilinx SN1022 SmartNICs.
Vijay Kumar Srivastava (10):
vdpa/sfc: introduce Xilinx vDPA driver
vdpa/sfc: add support for device initialization
vdpa/sfc: add support to get device and protocol features
vdpa/sfc: get device supported max queue count
vdpa/sfc: add support to get VFIO device fd
vdpa/sfc: add support for dev conf and dev close ops
vdpa/sfc: add support to get queue notify area info
vdpa/sfc: add support for MAC filter config
vdpa/sfc: add support to set vring state
vdpa/sfc: set a multicast filter during vDPA init
MAINTAINERS | 6 +
doc/guides/rel_notes/release_21_11.rst | 5 +
doc/guides/vdpadevs/features/sfc.ini | 19 +
doc/guides/vdpadevs/sfc.rst | 107 ++++
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/version.map | 10 +
drivers/vdpa/meson.build | 1 +
drivers/vdpa/sfc/meson.build | 37 ++
drivers/vdpa/sfc/sfc_vdpa.c | 367 +++++++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 163 ++++++
drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
drivers/vdpa/sfc/sfc_vdpa_filter.c | 159 ++++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 419 +++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 59 ++
drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 947 +++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.h | 69 +++
drivers/vdpa/sfc/version.map | 3 +
18 files changed, 2467 insertions(+), 1 deletion(-)
create mode 100644 doc/guides/vdpadevs/features/sfc.ini
create mode 100644 doc/guides/vdpadevs/sfc.rst
create mode 100644 drivers/vdpa/sfc/meson.build
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
create mode 100644 drivers/vdpa/sfc/version.map
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 8:21 ` Xia, Chenbo
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
` (10 subsequent siblings)
11 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add new vDPA PMD to support vDPA operation by Xilinx devices.
This patch implements probe and remove functions.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
v2:
* Updated logging mcaros to remove redundant code.
MAINTAINERS | 6 +
doc/guides/rel_notes/release_21_11.rst | 5 +
doc/guides/vdpadevs/features/sfc.ini | 9 ++
doc/guides/vdpadevs/sfc.rst | 97 +++++++++++
drivers/vdpa/meson.build | 1 +
drivers/vdpa/sfc/meson.build | 33 ++++
drivers/vdpa/sfc/sfc_vdpa.c | 286 +++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 40 +++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 56 +++++++
drivers/vdpa/sfc/version.map | 3 +
10 files changed, 536 insertions(+)
create mode 100644 doc/guides/vdpadevs/features/sfc.ini
create mode 100644 doc/guides/vdpadevs/sfc.rst
create mode 100644 drivers/vdpa/sfc/meson.build
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
create mode 100644 drivers/vdpa/sfc/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index be2c9b6..5d12c49 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1236,6 +1236,12 @@ F: drivers/vdpa/mlx5/
F: doc/guides/vdpadevs/mlx5.rst
F: doc/guides/vdpadevs/features/mlx5.ini
+Xilinx sfc vDPA
+M: Vijay Kumar Srivastava <vsrivast@xilinx.com>
+F: drivers/vdpa/sfc/
+F: doc/guides/vdpadevs/sfc.rst
+F: doc/guides/vdpadevs/features/sfc.ini
+
Eventdev Drivers
----------------
diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index 1ccac87..bd0a604 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -305,6 +305,11 @@ New Features
* Pcapng format with timestamps and meta-data.
* Fixes packet capture with stripped VLAN tags.
+* **Add new vDPA PMD based on Xilinx devices.**
+
+ Added a new Xilinx vDPA (``sfc_vdpa``) PMD.
+ See the :doc:`../vdpadevs/sfc` guide for more details on this driver.
+
Removed Items
-------------
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
new file mode 100644
index 0000000..71b6158
--- /dev/null
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'sfc' vDPA driver.
+;
+; Refer to default.ini for the full list of available driver features.
+;
+[Features]
+Linux = Y
+x86-64 = Y
+Usage doc = Y
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
new file mode 100644
index 0000000..59f990b
--- /dev/null
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -0,0 +1,97 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright(c) 2021 Xilinx Corporation.
+
+Xilinx vDPA driver
+==================
+
+The Xilinx vDPA (vhost data path acceleration) driver (**librte_pmd_sfc_vdpa**)
+provides support for the Xilinx SN1022 SmartNICs family of 10/25/40/50/100 Gbps
+adapters has support for latest Linux and FreeBSD operating systems.
+
+More information can be found at Xilinx website https://www.xilinx.com.
+
+
+Xilinx vDPA implementation
+--------------------------
+
+ef100 device can be configured in the net device or vDPA mode.
+Adding "class=vdpa" parameter helps to specify that this
+device is to be used in vDPA mode. If this parameter is not specified, device
+will be probed by net/sfc driver and will used as a net device.
+
+This PMD uses libefx (common/sfc_efx) code to access the device firmware.
+
+
+Supported NICs
+--------------
+
+- Xilinx SN1022 SmartNICs
+
+
+Features
+--------
+
+Features of the Xilinx vDPA driver are:
+
+- Compatibility with virtio 0.95 and 1.0
+
+
+Non-supported Features
+----------------------
+
+- Control Queue
+- Multi queue
+- Live Migration
+
+
+Prerequisites
+-------------
+
+Requires firmware version: v1.0.7.0 or higher
+
+Visit `Xilinx Support Downloads <https://www.xilinx.com/support.html>`_
+to get Xilinx Utilities with the latest firmware.
+Follow instructions from Alveo SN1000 SmartNICs User Guide to
+update firmware and configure the adapter.
+
+
+Per-Device Parameters
+~~~~~~~~~~~~~~~~~~~~~
+
+The following per-device parameters can be passed via EAL PCI device
+whitelist option like "-w 02:00.0,arg1=value1,...".
+
+Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
+boolean parameters value.
+
+- ``class`` [net|vdpa] (default **net**)
+
+ Choose the mode of operation of ef100 device.
+ **net** device will work as network device and will be probed by net/sfc driver.
+ **vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
+ If this parameter is not specified then ef100 device will operate as network device.
+
+
+Dynamic Logging Parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+One may leverage EAL option "--log-level" to change default levels
+for the log types supported by the driver. The option is used with
+an argument typically consisting of two parts separated by a colon.
+
+Level value is the last part which takes a symbolic name (or integer).
+Log type is the former part which may shell match syntax.
+Depending on the choice of the expression, the given log level may
+be used either for some specific log type or for a subset of types.
+
+SFC vDPA PMD provides the following log types available for control:
+
+- ``pmd.vdpa.sfc.driver`` (default level is **notice**)
+
+ Affects driver-wide messages unrelated to any particular devices.
+
+- ``pmd.vdpa.sfc.main`` (default level is **notice**)
+
+ Matches a subset of per-port log types registered during runtime.
+ A full name for a particular type may be obtained by appending a
+ dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
index f765fe3..77412c7 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -8,6 +8,7 @@ endif
drivers = [
'ifc',
'mlx5',
+ 'sfc',
]
std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost']
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
new file mode 100644
index 0000000..d916389
--- /dev/null
+++ b/drivers/vdpa/sfc/meson.build
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Copyright(c) 2020-2021 Xilinx, Inc.
+
+if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+ build = false
+ reason = 'only supported on x86_64 and aarch64'
+endif
+
+fmt_name = 'sfc_vdpa'
+extra_flags = []
+
+# Enable more warnings
+extra_flags += [
+ '-Wdisabled-optimization'
+]
+
+# Compiler and version dependent flags
+extra_flags += [
+ '-Waggregate-return',
+ '-Wbad-function-cast'
+]
+
+foreach flag: extra_flags
+ if cc.has_argument(flag)
+ cflags += flag
+ endif
+endforeach
+
+deps += ['common_sfc_efx', 'bus_pci']
+sources = files(
+ 'sfc_vdpa.c',
+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
new file mode 100644
index 0000000..a6e1a9e
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -0,0 +1,286 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_string_fns.h>
+#include <rte_vfio.h>
+#include <rte_vhost.h>
+
+#include "efx.h"
+#include "sfc_efx.h"
+#include "sfc_vdpa.h"
+
+TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
+static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
+ TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
+
+static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (pdev == sva->pdev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva : NULL;
+}
+
+static int
+sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *dev = sva->pdev;
+ char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
+ int rc;
+
+ if (dev == NULL)
+ goto fail_inval;
+
+ rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
+
+ sva->vfio_container_fd = rte_vfio_container_create();
+ if (sva->vfio_container_fd < 0) {
+ sfc_vdpa_err(sva, "failed to create VFIO container");
+ goto fail_container_create;
+ }
+
+ rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
+ &sva->iommu_group_num);
+ if (rc <= 0) {
+ sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
+ dev_name, rte_strerror(-rc));
+ goto fail_get_group_num;
+ }
+
+ sva->vfio_group_fd =
+ rte_vfio_container_group_bind(sva->vfio_container_fd,
+ sva->iommu_group_num);
+ if (sva->vfio_group_fd < 0) {
+ sfc_vdpa_err(sva,
+ "failed to bind IOMMU group %d to container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ goto fail_group_bind;
+ }
+
+ if (rte_pci_map_device(dev) != 0) {
+ sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
+ dev_name, rte_strerror(rte_errno));
+ goto fail_pci_map_device;
+ }
+
+ sva->vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+
+ return 0;
+
+fail_pci_map_device:
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+fail_group_bind:
+fail_get_group_num:
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva, "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+
+fail_container_create:
+fail_inval:
+ return -1;
+}
+
+static void
+sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva)
+{
+ rte_pci_unmap_device(sva->pdev);
+
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+}
+
+static int
+sfc_vdpa_set_log_prefix(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ int ret;
+
+ ret = snprintf(sva->log_prefix, sizeof(sva->log_prefix),
+ "PMD: sfc_vdpa " PCI_PRI_FMT " : ",
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+
+ if (ret < 0 || ret >= (int)sizeof(sva->log_prefix)) {
+ SFC_VDPA_GENERIC_LOG(ERR,
+ "reserved log prefix is too short for " PCI_PRI_FMT,
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str, uint32_t ll_default)
+{
+ size_t lt_prefix_str_size = strlen(lt_prefix_str);
+ size_t lt_str_size_max;
+ char *lt_str = NULL;
+ int ret;
+
+ if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
+ ++lt_prefix_str_size; /* Reserve space for prefix separator */
+ lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
+ } else {
+ return RTE_LOGTYPE_PMD;
+ }
+
+ lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
+ if (lt_str == NULL)
+ return RTE_LOGTYPE_PMD;
+
+ strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
+ lt_str[lt_prefix_str_size - 1] = '.';
+ rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
+ lt_str_size_max - lt_prefix_str_size);
+ lt_str[lt_str_size_max - 1] = '\0';
+
+ ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
+ rte_free(lt_str);
+
+ return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
+}
+
+static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
+ { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
+ { .vendor_id = 0, /* sentinel */ },
+};
+
+static int
+sfc_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+ uint32_t logtype_main;
+ int ret = 0;
+
+ if (sfc_efx_dev_class_get(pci_dev->device.devargs) !=
+ SFC_EFX_DEV_CLASS_VDPA) {
+ SFC_VDPA_GENERIC_LOG(INFO,
+ "Incompatible device class: skip probing, should be probed by other sfc driver.");
+ return 1;
+ }
+
+ /*
+ * It will not be probed in the secondary process. As device class
+ * is vdpa so return 0 to avoid probe by other sfc driver
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ logtype_main = sfc_vdpa_register_logtype(&pci_dev->addr,
+ SFC_VDPA_LOGTYPE_MAIN_STR,
+ RTE_LOG_NOTICE);
+
+ sva = rte_zmalloc("sfc_vdpa", sizeof(struct sfc_vdpa_adapter), 0);
+ if (sva == NULL)
+ goto fail_zmalloc;
+
+ sva->pdev = pci_dev;
+ sva->logtype_main = logtype_main;
+
+ ret = sfc_vdpa_set_log_prefix(sva);
+ if (ret != 0)
+ goto fail_set_log_prefix;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "vfio init");
+ if (sfc_vdpa_vfio_setup(sva) < 0) {
+ sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
+ goto fail_vfio_setup;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_vfio_setup:
+fail_set_log_prefix:
+ rte_free(sva);
+
+fail_zmalloc:
+ return -1;
+}
+
+static int
+sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -1;
+
+ sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
+ if (sva == NULL) {
+ sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
+ return -1;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_vfio_teardown(sva);
+
+ rte_free(sva);
+
+ return 0;
+}
+
+static struct rte_pci_driver rte_sfc_vdpa = {
+ .id_table = pci_id_sfc_vdpa_efx_map,
+ .drv_flags = 0,
+ .probe = sfc_vdpa_pci_probe,
+ .remove = sfc_vdpa_pci_remove,
+};
+
+RTE_PMD_REGISTER_PCI(net_sfc_vdpa, rte_sfc_vdpa);
+RTE_PMD_REGISTER_PCI_TABLE(net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_sfc_vdpa, "* vfio-pci");
+RTE_LOG_REGISTER_SUFFIX(sfc_vdpa_logtype_driver, driver, NOTICE);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
new file mode 100644
index 0000000..3b77900
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_H
+#define _SFC_VDPA_H
+
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_bus_pci.h>
+
+#include "sfc_vdpa_log.h"
+
+/* Adapter private data */
+struct sfc_vdpa_adapter {
+ TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ struct rte_pci_device *pdev;
+ struct rte_pci_addr pci_addr;
+
+ char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
+ uint32_t logtype_main;
+
+ int vfio_group_fd;
+ int vfio_dev_fd;
+ int vfio_container_fd;
+ int iommu_group_num;
+};
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str,
+ uint32_t ll_default);
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+
+#endif /* _SFC_VDPA_H */
+
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
new file mode 100644
index 0000000..858e5ee
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_LOG_H_
+#define _SFC_VDPA_LOG_H_
+
+/** Generic driver log type */
+extern int sfc_vdpa_logtype_driver;
+
+/** Common log type name prefix */
+#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
+
+/** Log PMD generic message, add a prefix and a line break */
+#define SFC_VDPA_GENERIC_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
+ RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+/** Name prefix for the per-device log type used to report basic information */
+#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+
+#define SFC_VDPA_LOG_PREFIX_MAX 32
+
+/* Log PMD message, automatically add prefix and \n */
+#define SFC_VDPA_LOG(sva, level, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ rte_log(RTE_LOG_ ## level, _sva->logtype_main, \
+ RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ _sva->log_prefix, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+ } while (0)
+
+#define sfc_vdpa_err(sva, ...) \
+ SFC_VDPA_LOG(sva, ERR, __VA_ARGS__)
+
+#define sfc_vdpa_warn(sva, ...) \
+ SFC_VDPA_LOG(sva, WARNING, __VA_ARGS__)
+
+#define sfc_vdpa_notice(sva, ...) \
+ SFC_VDPA_LOG(sva, NOTICE, __VA_ARGS__)
+
+#define sfc_vdpa_info(sva, ...) \
+ SFC_VDPA_LOG(sva, INFO, __VA_ARGS__)
+
+#define sfc_vdpa_log_init(sva, ...) \
+ SFC_VDPA_LOG(sva, INFO, \
+ RTE_FMT("%s(): " \
+ RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+#endif /* _SFC_VDPA_LOG_H_ */
diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
new file mode 100644
index 0000000..4a76d1d
--- /dev/null
+++ b/drivers/vdpa/sfc/version.map
@@ -0,0 +1,3 @@
+DPDK_21 {
+ local: *;
+};
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v2 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 01/10] " Vijay Srivastava
@ 2021-10-28 8:21 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-10-28 8:21 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava,
Stephen Hemminger
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Thursday, October 28, 2021 3:55 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v2 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add new vDPA PMD to support vDPA operation by Xilinx devices.
> This patch implements probe and remove functions.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> ---
I believe my comments (some grammar problems and 'use allowlist instead of
whiltelist') and Stephen's comments for v1 are not addressed.
Please address them in v1 first.
Thanks,
Chenbo
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v2 02/10] vdpa/sfc: add support for device initialization
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 01/10] " Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
` (9 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add HW initialization and vDPA device registration support.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
v2:
* Used rte_memzone_reserve_aligned for mcdi buffer allocation.
* Freeing mcdi buff when DMA map fails.
* Fixed one typo.
doc/guides/vdpadevs/sfc.rst | 6 +
drivers/vdpa/sfc/meson.build | 3 +
drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 327 ++++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
10 files changed, 670 insertions(+), 1 deletion(-)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index 59f990b..abb5900 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types available for control:
Matches a subset of per-port log types registered during runtime.
A full name for a particular type may be obtained by appending a
dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
+
+- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
+
+ Extra logging of the communication with the NIC's management CPU.
+ The format of the log is consumed by the netlogdecode cross-platform
+ tool. May be managed per-port, as explained above.
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index d916389..aac7c51 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -30,4 +30,7 @@ endforeach
deps += ['common_sfc_efx', 'bus_pci']
sources = files(
'sfc_vdpa.c',
+ 'sfc_vdpa_hw.c',
+ 'sfc_vdpa_mcdi.c',
+ 'sfc_vdpa_ops.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index a6e1a9e..00fa94a 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -232,6 +232,19 @@ struct sfc_vdpa_adapter *
goto fail_vfio_setup;
}
+ sfc_vdpa_log_init(sva, "hw init");
+ if (sfc_vdpa_hw_init(sva) != 0) {
+ sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
+ goto fail_hw_init;
+ }
+
+ sfc_vdpa_log_init(sva, "dev init");
+ sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
+ if (sva->ops_data == NULL) {
+ sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
+ goto fail_dev_init;
+ }
+
pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
@@ -240,6 +253,12 @@ struct sfc_vdpa_adapter *
return 0;
+fail_dev_init:
+ sfc_vdpa_hw_fini(sva);
+
+fail_hw_init:
+ sfc_vdpa_vfio_teardown(sva);
+
fail_vfio_setup:
fail_set_log_prefix:
rte_free(sva);
@@ -266,6 +285,10 @@ struct sfc_vdpa_adapter *
TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+ sfc_vdpa_device_fini(sva->ops_data);
+
+ sfc_vdpa_hw_fini(sva);
+
sfc_vdpa_vfio_teardown(sva);
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 3b77900..046f25d 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -11,14 +11,38 @@
#include <rte_bus_pci.h>
+#include "sfc_efx.h"
+#include "sfc_efx_mcdi.h"
+#include "sfc_vdpa_debug.h"
#include "sfc_vdpa_log.h"
+#include "sfc_vdpa_ops.h"
+
+#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ /*
+ * PMD setup and configuration is not thread safe. Since it is not
+ * performance sensitive, it is better to guarantee thread-safety
+ * and add device level lock. vDPA control operations which
+ * change its state should acquire the lock.
+ */
+ rte_spinlock_t lock;
struct rte_pci_device *pdev;
struct rte_pci_addr pci_addr;
+ efx_family_t family;
+ efx_nic_t *nic;
+ rte_spinlock_t nic_lock;
+
+ efsys_bar_t mem_bar;
+
+ struct sfc_efx_mcdi mcdi;
+ size_t mcdi_buff_size;
+
+ uint32_t max_queue_count;
+
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
@@ -26,6 +50,7 @@ struct sfc_vdpa_adapter {
int vfio_dev_fd;
int vfio_container_fd;
int iommu_group_num;
+ struct sfc_vdpa_ops_data *ops_data;
};
uint32_t
@@ -36,5 +61,27 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
-#endif /* _SFC_VDPA_H */
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva);
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp);
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+
+static inline struct sfc_vdpa_adapter *
+sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
+{
+ return (struct sfc_vdpa_adapter *)dev_handle;
+}
+
+#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h b/drivers/vdpa/sfc/sfc_vdpa_debug.h
new file mode 100644
index 0000000..cfa8cc5
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_DEBUG_H_
+#define _SFC_VDPA_DEBUG_H_
+
+#include <rte_debug.h>
+
+#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
+/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
+ * in the driver only.
+ */
+#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
+#else
+/* If the driver debug is not enabled, follow DPDK debug/non-debug */
+#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
+#endif
+
+#endif /* _SFC_VDPA_DEBUG_H_ */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
new file mode 100644
index 0000000..7c256ff
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -0,0 +1,327 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <unistd.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_vfio.h>
+
+#include "efx.h"
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_ops.h"
+
+extern uint32_t sfc_logtype_driver;
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
+#endif
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp)
+{
+ uint64_t mcdi_iova;
+ size_t mcdi_buff_size;
+ const struct rte_memzone *mz = NULL;
+ int numa_node = sva->pdev->device.numa_node;
+ int ret;
+
+ mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
+
+ sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
+
+ mz = rte_memzone_reserve_aligned(name, mcdi_buff_size,
+ numa_node,
+ RTE_MEMZONE_IOVA_CONTIG,
+ PAGE_SIZE);
+ if (mz == NULL) {
+ sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
+ name, (unsigned int)len, rte_strerror(rte_errno));
+ return -ENOMEM;
+ }
+
+ /* IOVA address for MCDI would be re-calculated if mapping
+ * using default IOVA would fail.
+ * TODO: Earlier there was no way to get valid IOVA range.
+ * Recently a patch has been submitted to get the IOVA range
+ * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
+ * in the kernel version >= 5.4. Support to get the default
+ * IOVA address for MCDI buffer using available IOVA range
+ * would be added later. Meanwhile default IOVA for MCDI buffer
+ * is kept at high mem at 2TB. In case of overlap new available
+ * addresses would be searched and same would be used.
+ */
+ mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
+
+ do {
+ ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
+ (uint64_t)mz->addr, mcdi_iova,
+ mcdi_buff_size);
+ if (ret == 0)
+ break;
+
+ mcdi_iova = mcdi_iova >> 1;
+ if (mcdi_iova < mcdi_buff_size) {
+ sfc_vdpa_err(sva,
+ "DMA mapping failed for MCDI : %s",
+ rte_strerror(rte_errno));
+ rte_memzone_free(mz);
+ return ret;
+ }
+
+ } while (ret < 0);
+
+ esmp->esm_addr = mcdi_iova;
+ esmp->esm_base = mz->addr;
+ sva->mcdi_buff_size = mcdi_buff_size;
+
+ sfc_vdpa_info(sva,
+ "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
+ name, len, esmp->esm_base, esmp->esm_addr);
+
+ return 0;
+}
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp)
+{
+ int ret;
+
+ sfc_vdpa_log_init(sva, "name=%s", esmp->esm_mz->name);
+
+ ret = rte_vfio_container_dma_unmap(sva->vfio_container_fd,
+ (uint64_t)esmp->esm_base,
+ esmp->esm_addr, sva->mcdi_buff_size);
+ if (ret < 0)
+ sfc_vdpa_err(sva, "DMA unmap failed for MCDI : %s",
+ rte_strerror(rte_errno));
+
+ sfc_vdpa_info(sva,
+ "DMA free name=%s => virt=%p iova=%" PRIx64,
+ esmp->esm_mz->name, esmp->esm_base, esmp->esm_addr);
+
+ rte_free((void *)(esmp->esm_base));
+
+ sva->mcdi_buff_size = 0;
+ memset(esmp, 0, sizeof(*esmp));
+}
+
+static int
+sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
+ const efx_bar_region_t *mem_ebrp)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ efsys_bar_t *ebp = &sva->mem_bar;
+ struct rte_mem_resource *res =
+ &pci_dev->mem_resource[mem_ebrp->ebr_index];
+
+ SFC_BAR_LOCK_INIT(ebp, pci_dev->name);
+ ebp->esb_rid = mem_ebrp->ebr_index;
+ ebp->esb_dev = pci_dev;
+ ebp->esb_base = res->addr;
+
+ return 0;
+}
+
+static void
+sfc_vdpa_mem_bar_fini(struct sfc_vdpa_adapter *sva)
+{
+ efsys_bar_t *ebp = &sva->mem_bar;
+
+ SFC_BAR_LOCK_DESTROY(ebp);
+ memset(ebp, 0, sizeof(*ebp));
+}
+
+static int
+sfc_vdpa_nic_probe(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+ int rc;
+
+ rc = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE);
+ if (rc != 0)
+ sfc_vdpa_err(sva, "nic probe failed: %s", rte_strerror(rc));
+
+ return rc;
+}
+
+static int
+sfc_vdpa_estimate_resource_limits(struct sfc_vdpa_adapter *sva)
+{
+ efx_drv_limits_t limits;
+ int rc;
+ uint32_t evq_allocated;
+ uint32_t rxq_allocated;
+ uint32_t txq_allocated;
+ uint32_t max_queue_cnt;
+
+ memset(&limits, 0, sizeof(limits));
+
+ /* Request at least one Rx and Tx queue */
+ limits.edl_min_rxq_count = 1;
+ limits.edl_min_txq_count = 1;
+ /* Management event queue plus event queue for Tx/Rx queue */
+ limits.edl_min_evq_count =
+ 1 + RTE_MAX(limits.edl_min_rxq_count, limits.edl_min_txq_count);
+
+ limits.edl_max_rxq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_txq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_evq_count = 1 + SFC_VDPA_MAX_QUEUE_PAIRS;
+
+ SFC_VDPA_ASSERT(limits.edl_max_evq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_rxq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_txq_count >= limits.edl_min_rxq_count);
+
+ /* Configure the minimum required resources needed for the
+ * driver to operate, and the maximum desired resources that the
+ * driver is capable of using.
+ */
+ sfc_vdpa_log_init(sva, "set drv limit");
+ efx_nic_set_drv_limits(sva->nic, &limits);
+
+ sfc_vdpa_log_init(sva, "init nic");
+ rc = efx_nic_init(sva->nic);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic init failed: %s", rte_strerror(rc));
+ goto fail_nic_init;
+ }
+
+ /* Find resource dimensions assigned by firmware to this function */
+ rc = efx_nic_get_vi_pool(sva->nic, &evq_allocated, &rxq_allocated,
+ &txq_allocated);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "vi pool get failed: %s", rte_strerror(rc));
+ goto fail_get_vi_pool;
+ }
+
+ /* It still may allocate more than maximum, ensure limit */
+ evq_allocated = RTE_MIN(evq_allocated, limits.edl_max_evq_count);
+ rxq_allocated = RTE_MIN(rxq_allocated, limits.edl_max_rxq_count);
+ txq_allocated = RTE_MIN(txq_allocated, limits.edl_max_txq_count);
+
+
+ max_queue_cnt = RTE_MIN(rxq_allocated, txq_allocated);
+ /* Subtract management EVQ not used for traffic */
+ max_queue_cnt = RTE_MIN(evq_allocated - 1, max_queue_cnt);
+
+ SFC_VDPA_ASSERT(max_queue_cnt > 0);
+
+ sva->max_queue_count = max_queue_cnt;
+
+ return 0;
+
+fail_get_vi_pool:
+ efx_nic_fini(sva->nic);
+fail_nic_init:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva)
+{
+ efx_bar_region_t mem_ebr;
+ efx_nic_t *enp;
+ int rc;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "get family");
+ rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
+ if (rc != 0)
+ goto fail_family;
+ sfc_vdpa_log_init(sva,
+ "family is %u, membar is %u,"
+ "function control window offset is %#" PRIx64,
+ sva->family, mem_ebr.ebr_index, mem_ebr.ebr_offset);
+
+ sfc_vdpa_log_init(sva, "init mem bar");
+ rc = sfc_vdpa_mem_bar_init(sva, &mem_ebr);
+ if (rc != 0)
+ goto fail_mem_bar_init;
+
+ sfc_vdpa_log_init(sva, "create nic");
+ rte_spinlock_init(&sva->nic_lock);
+ rc = efx_nic_create(sva->family, (efsys_identifier_t *)sva,
+ &sva->mem_bar, mem_ebr.ebr_offset,
+ &sva->nic_lock, &enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic create failed: %s", rte_strerror(rc));
+ goto fail_nic_create;
+ }
+ sva->nic = enp;
+
+ sfc_vdpa_log_init(sva, "init mcdi");
+ rc = sfc_vdpa_mcdi_init(sva);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "mcdi init failed: %s", rte_strerror(rc));
+ goto fail_mcdi_init;
+ }
+
+ sfc_vdpa_log_init(sva, "probe nic");
+ rc = sfc_vdpa_nic_probe(sva);
+ if (rc != 0)
+ goto fail_nic_probe;
+
+ sfc_vdpa_log_init(sva, "reset nic");
+ rc = efx_nic_reset(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic reset failed: %s", rte_strerror(rc));
+ goto fail_nic_reset;
+ }
+
+ sfc_vdpa_log_init(sva, "estimate resource limits");
+ rc = sfc_vdpa_estimate_resource_limits(sva);
+ if (rc != 0)
+ goto fail_estimate_rsrc_limits;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_estimate_rsrc_limits:
+fail_nic_reset:
+ efx_nic_unprobe(enp);
+
+fail_nic_probe:
+ sfc_vdpa_mcdi_fini(sva);
+
+fail_mcdi_init:
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+fail_nic_create:
+ sfc_vdpa_mem_bar_fini(sva);
+
+fail_mem_bar_init:
+fail_family:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "unprobe nic");
+ efx_nic_unprobe(enp);
+
+ sfc_vdpa_log_init(sva, "mcdi fini");
+ sfc_vdpa_mcdi_fini(sva);
+
+ sfc_vdpa_log_init(sva, "nic fini");
+ efx_nic_fini(enp);
+
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+ sfc_vdpa_mem_bar_fini(sva);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
index 858e5ee..4e7a84f 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_log.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -21,6 +21,9 @@
/** Name prefix for the per-device log type used to report basic information */
#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+/** Device MCDI log type name prefix */
+#define SFC_VDPA_LOGTYPE_MCDI_STR SFC_VDPA_LOGTYPE_PREFIX "mcdi"
+
#define SFC_VDPA_LOG_PREFIX_MAX 32
/* Log PMD message, automatically add prefix and \n */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_mcdi.c b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
new file mode 100644
index 0000000..961d2d3
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include "sfc_efx_mcdi.h"
+
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_debug.h"
+#include "sfc_vdpa_log.h"
+
+static sfc_efx_mcdi_dma_alloc_cb sfc_vdpa_mcdi_dma_alloc;
+static int
+sfc_vdpa_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
+ efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ return sfc_vdpa_dma_alloc(sva, name, len, esmp);
+}
+
+static sfc_efx_mcdi_dma_free_cb sfc_vdpa_mcdi_dma_free;
+static void
+sfc_vdpa_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ sfc_vdpa_dma_free(sva, esmp);
+}
+
+static sfc_efx_mcdi_sched_restart_cb sfc_vdpa_mcdi_sched_restart;
+static void
+sfc_vdpa_mcdi_sched_restart(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_vdpa_mcdi_mgmt_evq_poll;
+static void
+sfc_vdpa_mcdi_mgmt_evq_poll(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static const struct sfc_efx_mcdi_ops sfc_vdpa_mcdi_ops = {
+ .dma_alloc = sfc_vdpa_mcdi_dma_alloc,
+ .dma_free = sfc_vdpa_mcdi_dma_free,
+ .sched_restart = sfc_vdpa_mcdi_sched_restart,
+ .mgmt_evq_poll = sfc_vdpa_mcdi_mgmt_evq_poll,
+
+};
+
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva)
+{
+ uint32_t logtype;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ logtype = sfc_vdpa_register_logtype(&(sva->pdev->addr),
+ SFC_VDPA_LOGTYPE_MCDI_STR,
+ RTE_LOG_NOTICE);
+
+ return sfc_efx_mcdi_init(&sva->mcdi, logtype,
+ sva->log_prefix, sva->nic,
+ &sfc_vdpa_mcdi_ops, sva);
+}
+
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva)
+{
+ sfc_vdpa_log_init(sva, "entry");
+ sfc_efx_mcdi_fini(&sva->mcdi);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
new file mode 100644
index 0000000..71696be
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -0,0 +1,129 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_malloc.h>
+#include <rte_vdpa.h>
+#include <rte_vdpa_dev.h>
+#include <rte_vhost.h>
+
+#include "sfc_vdpa_ops.h"
+#include "sfc_vdpa.h"
+
+/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
+ * In subsequent patches these ops would be implemented.
+ */
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(queue_num);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
+ uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_config(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_close(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_vring_state(int vid, int vring, int state)
+{
+ RTE_SET_USED(vid);
+ RTE_SET_USED(vring);
+ RTE_SET_USED(state);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_features(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
+ .get_queue_num = sfc_vdpa_get_queue_num,
+ .get_features = sfc_vdpa_get_features,
+ .get_protocol_features = sfc_vdpa_get_protocol_features,
+ .dev_conf = sfc_vdpa_dev_config,
+ .dev_close = sfc_vdpa_dev_close,
+ .set_vring_state = sfc_vdpa_set_vring_state,
+ .set_features = sfc_vdpa_set_features,
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *dev_handle, enum sfc_vdpa_context context)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_pci_device *pci_dev;
+
+ /* Create vDPA ops context */
+ ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
+ if (ops_data == NULL)
+ return NULL;
+
+ ops_data->vdpa_context = context;
+ ops_data->dev_handle = dev_handle;
+
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev_handle)->pdev;
+
+ /* Register vDPA Device */
+ sfc_vdpa_log_init(dev_handle, "register vDPA device");
+ ops_data->vdpa_dev =
+ rte_vdpa_register_device(&pci_dev->device, &sfc_vdpa_ops);
+ if (ops_data->vdpa_dev == NULL) {
+ sfc_vdpa_err(dev_handle, "vDPA device registration failed");
+ goto fail_register_device;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return ops_data;
+
+fail_register_device:
+ rte_free(ops_data);
+ return NULL;
+}
+
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data)
+{
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
+ rte_free(ops_data);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
new file mode 100644
index 0000000..817b302
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_OPS_H
+#define _SFC_VDPA_OPS_H
+
+#include <rte_vdpa.h>
+
+#define SFC_VDPA_MAX_QUEUE_PAIRS 1
+
+enum sfc_vdpa_context {
+ SFC_VDPA_AS_PF = 0,
+ SFC_VDPA_AS_VF
+};
+
+enum sfc_vdpa_state {
+ SFC_VDPA_STATE_UNINITIALIZED = 0,
+ SFC_VDPA_STATE_INITIALIZED,
+ SFC_VDPA_STATE_NSTATES
+};
+
+struct sfc_vdpa_ops_data {
+ void *dev_handle;
+ struct rte_vdpa_device *vdpa_dev;
+ enum sfc_vdpa_context vdpa_context;
+ enum sfc_vdpa_state state;
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *adapter, enum sfc_vdpa_context context);
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data);
+
+#endif /* _SFC_VDPA_OPS_H */
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 03/10] vdpa/sfc: add support to get device and protocol features
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 01/10] " Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
` (8 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_feature and get_protocol_features.
This patch retrieves device supported features and enables
protocol features.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
doc/guides/vdpadevs/features/sfc.ini | 10 ++++
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/version.map | 10 ++++
drivers/vdpa/sfc/sfc_vdpa.c | 20 ++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 2 +
drivers/vdpa/sfc/sfc_vdpa_hw.c | 13 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 91 ++++++++++++++++++++++++++++++++----
drivers/vdpa/sfc/sfc_vdpa_ops.h | 3 ++
8 files changed, 142 insertions(+), 9 deletions(-)
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
index 71b6158..700d061 100644
--- a/doc/guides/vdpadevs/features/sfc.ini
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -4,6 +4,16 @@
; Refer to default.ini for the full list of available driver features.
;
[Features]
+csum = Y
+guest csum = Y
+host tso4 = Y
+host tso6 = Y
+version 1 = Y
+mrg rxbuf = Y
+any layout = Y
+in_order = Y
+proto host notifier = Y
+IOMMU platform = Y
Linux = Y
x86-64 = Y
Usage doc = Y
diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
index d133d61..37ec6b9 100644
--- a/drivers/common/sfc_efx/efsys.h
+++ b/drivers/common/sfc_efx/efsys.h
@@ -187,7 +187,7 @@
#define EFSYS_OPT_MAE 1
-#define EFSYS_OPT_VIRTIO 0
+#define EFSYS_OPT_VIRTIO 1
/* ID */
diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index 642a62e..ec86220 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -247,6 +247,16 @@ INTERNAL {
efx_txq_nbufs;
efx_txq_size;
+ efx_virtio_fini;
+ efx_virtio_get_doorbell_offset;
+ efx_virtio_get_features;
+ efx_virtio_init;
+ efx_virtio_qcreate;
+ efx_virtio_qdestroy;
+ efx_virtio_qstart;
+ efx_virtio_qstop;
+ efx_virtio_verify_features;
+
sfc_efx_dev_class_get;
sfc_efx_family;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index 00fa94a..4927698 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -43,6 +43,26 @@ struct sfc_vdpa_adapter *
return found ? sva : NULL;
}
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (vdpa_dev == sva->ops_data->vdpa_dev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva->ops_data : NULL;
+}
+
static int
sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 046f25d..c10c3d3 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -60,6 +60,8 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev);
int
sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index 7c256ff..7a67bd8 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -278,10 +278,20 @@
if (rc != 0)
goto fail_estimate_rsrc_limits;
+ sfc_vdpa_log_init(sva, "init virtio");
+ rc = efx_virtio_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "virtio init failed: %s", rte_strerror(rc));
+ goto fail_virtio_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_virtio_init:
+ efx_nic_fini(enp);
+
fail_estimate_rsrc_limits:
fail_nic_reset:
efx_nic_unprobe(enp);
@@ -310,6 +320,9 @@
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_log_init(sva, "virtio fini");
+ efx_virtio_fini(enp);
+
sfc_vdpa_log_init(sva, "unprobe nic");
efx_nic_unprobe(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 71696be..5750944 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,17 +3,31 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
#include <rte_vhost.h>
+#include "efx.h"
#include "sfc_vdpa_ops.h"
#include "sfc_vdpa.h"
-/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
- * In subsequent patches these ops would be implemented.
+/* These protocol features are needed to enable notifier ctrl */
+#define SFC_VDPA_PROTOCOL_FEATURES \
+ ((1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD))
+
+/*
+ * Set of features which are enabled by default.
+ * Protocol feature bit is needed to enable notification notifier ctrl.
*/
+#define SFC_VDPA_DEFAULT_FEATURES \
+ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
+
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
@@ -24,22 +38,67 @@
}
static int
+sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ uint64_t dev_features;
+ efx_nic_t *nic;
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+
+ rc = efx_virtio_get_features(nic, EFX_VIRTIO_DEVICE_TYPE_NET,
+ &dev_features);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "could not read device feature: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ ops_data->dev_features = dev_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "device supported virtio features : 0x%" PRIx64,
+ ops_data->dev_features);
+
+ return 0;
+}
+
+static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = ops_data->drv_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = SFC_VDPA_PROTOCOL_FEATURES;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_protocol_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
@@ -91,6 +150,7 @@ struct sfc_vdpa_ops_data *
{
struct sfc_vdpa_ops_data *ops_data;
struct rte_pci_device *pci_dev;
+ int rc;
/* Create vDPA ops context */
ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
@@ -111,10 +171,25 @@ struct sfc_vdpa_ops_data *
goto fail_register_device;
}
+ /* Read supported device features */
+ sfc_vdpa_log_init(dev_handle, "get device feature");
+ rc = sfc_vdpa_get_device_features(ops_data);
+ if (rc != 0)
+ goto fail_get_dev_feature;
+
+ /* Driver features are superset of device supported feature
+ * and any additional features supported by the driver.
+ */
+ ops_data->drv_features =
+ ops_data->dev_features | SFC_VDPA_DEFAULT_FEATURES;
+
ops_data->state = SFC_VDPA_STATE_INITIALIZED;
return ops_data;
+fail_get_dev_feature:
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
fail_register_device:
rte_free(ops_data);
return NULL;
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 817b302..21cbb73 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -26,6 +26,9 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+
+ uint64_t dev_features;
+ uint64_t drv_features;
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 04/10] vdpa/sfc: get device supported max queue count
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (2 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
` (7 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_queue_num to get the maximum number
of queues supported by the device.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 5750944..6c702e1 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -31,10 +31,20 @@
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(queue_num);
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
+ *queue_num);
+
+ return 0;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 05/10] vdpa/sfc: add support to get VFIO device fd
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (3 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
` (6 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_vfio_device_fd to get the VFIO device fd.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 6c702e1..5253adb 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -145,6 +145,29 @@
return -1;
}
+static int
+sfc_vdpa_get_vfio_device_fd(int vid)
+{
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ int vfio_dev_fd;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ sfc_vdpa_info(dev, "vDPA ops get_vfio_device_fd :: vfio fd : %d",
+ vfio_dev_fd);
+
+ return vfio_dev_fd;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -153,6 +176,7 @@
.dev_close = sfc_vdpa_dev_close,
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
+ .get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (4 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
` (5 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops dev_conf and dev_close for DMA mapping,
interrupt and virtqueue configurations.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
v2:
* Removed redundant null check while calling free().
* Added error handling for rte_vhost_get_vhost_vring().
drivers/vdpa/sfc/sfc_vdpa.c | 6 +
drivers/vdpa/sfc/sfc_vdpa.h | 43 ++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 69 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 530 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 28 +++
5 files changed, 656 insertions(+), 20 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index 4927698..9ffea59 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -246,6 +246,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_adapter_lock_init(sva);
+
sfc_vdpa_log_init(sva, "vfio init");
if (sfc_vdpa_vfio_setup(sva) < 0) {
sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
@@ -280,6 +282,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
fail_vfio_setup:
+ sfc_vdpa_adapter_lock_fini(sva);
+
fail_set_log_prefix:
rte_free(sva);
@@ -311,6 +315,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
+ sfc_vdpa_adapter_lock_fini(sva);
+
rte_free(sva);
return 0;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index c10c3d3..1bf96e7 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -80,10 +80,53 @@ struct sfc_vdpa_ops_data *
void
sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
return (struct sfc_vdpa_adapter *)dev_handle;
}
+/*
+ * Add wrapper functions to acquire/release lock to be able to remove or
+ * change the lock in one place.
+ */
+static inline void
+sfc_vdpa_adapter_lock_init(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_init(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_is_locked(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_is_locked(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_lock(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_trylock(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_trylock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_unlock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_unlock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock_fini(__rte_unused struct sfc_vdpa_adapter *sva)
+{
+ /* Just for symmetry of the API */
+}
+
#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index 7a67bd8..b473708 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -8,6 +8,7 @@
#include <rte_common.h>
#include <rte_errno.h>
#include <rte_vfio.h>
+#include <rte_vhost.h>
#include "efx.h"
#include "sfc_vdpa.h"
@@ -109,6 +110,74 @@
memset(esmp, 0, sizeof(*esmp));
}
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *ops_data, bool do_map)
+{
+ uint32_t i, j;
+ int rc;
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ int vfio_container_fd;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_container_fd =
+ sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd;
+
+ rc = rte_vhost_get_mem_table(ops_data->vid, &vhost_mem);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "failed to get VM memory layout");
+ goto error;
+ }
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (do_map) {
+ rc = rte_vfio_container_dma_map(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA map failed : %s",
+ rte_strerror(rte_errno));
+ goto failed_vfio_dma_map;
+ }
+ } else {
+ rc = rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA unmap failed : %s",
+ rte_strerror(rte_errno));
+ goto error;
+ }
+ }
+ }
+
+ free(vhost_mem);
+
+ return 0;
+
+failed_vfio_dma_map:
+ for (j = 0; j < i; j++) {
+ mem_reg = &vhost_mem->regions[j];
+ rc = rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ }
+
+error:
+ free(vhost_mem);
+
+ return rc;
+}
+
static int
sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
const efx_bar_region_t *mem_ebrp)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 5253adb..de1c81a 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,10 +3,13 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <sys/ioctl.h>
+
#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
+#include <rte_vfio.h>
#include <rte_vhost.h>
#include "efx.h"
@@ -28,24 +31,12 @@
#define SFC_VDPA_DEFAULT_FEATURES \
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
-static int
-sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
-{
- struct sfc_vdpa_ops_data *ops_data;
- void *dev;
-
- ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
- if (ops_data == NULL)
- return -1;
-
- dev = ops_data->dev_handle;
- *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+#define SFC_VDPA_MSIX_IRQ_SET_BUF_LEN \
+ (sizeof(struct vfio_irq_set) + \
+ sizeof(int) * (SFC_VDPA_MAX_QUEUE_PAIRS * 2 + 1))
- sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
- *queue_num);
-
- return 0;
-}
+/* It will be used for target VF when calling function is not PF */
+#define SFC_VDPA_VF_NULL 0xFFFF
static int
sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
@@ -74,6 +65,441 @@
return 0;
}
+static uint64_t
+hva_to_gpa(int vid, uint64_t hva)
+{
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ uint32_t i;
+ uint64_t gpa = 0;
+
+ if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
+ goto error;
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (hva >= mem_reg->host_user_addr &&
+ hva < mem_reg->host_user_addr + mem_reg->size) {
+ gpa = (hva - mem_reg->host_user_addr) +
+ mem_reg->guest_phys_addr;
+ break;
+ }
+ }
+
+error:
+ free(vhost_mem);
+ return gpa;
+}
+
+static int
+sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int *irq_fd_ptr;
+ int vfio_dev_fd;
+ uint32_t i, num_vring;
+ struct rte_vhost_vring vring;
+ struct vfio_irq_set *irq_set;
+ struct rte_pci_device *pci_dev;
+ char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
+ void *dev;
+
+ num_vring = rte_vhost_get_vring_num(ops_data->vid);
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev;
+
+ irq_set = (struct vfio_irq_set *)irq_set_buf;
+ irq_set->argsz = sizeof(irq_set_buf);
+ irq_set->count = num_vring + 1;
+ irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
+ VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set->start = 0;
+ irq_fd_ptr = (int *)&irq_set->data;
+ irq_fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] =
+ rte_intr_fd_get(pci_dev->intr_handle);
+
+ for (i = 0; i < num_vring; i++) {
+ rc = rte_vhost_get_vhost_vring(ops_data->vid, i, &vring);
+ if (rc)
+ return -1;
+
+ irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
+ }
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error enabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_disable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int vfio_dev_fd;
+ struct vfio_irq_set *irq_set;
+ char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ irq_set = (struct vfio_irq_set *)irq_set_buf;
+ irq_set->argsz = sizeof(irq_set_buf);
+ irq_set->count = 0;
+ irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set->start = 0;
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error disabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_get_vring_info(struct sfc_vdpa_ops_data *ops_data,
+ int vq_num, struct sfc_vdpa_vring_info *vring)
+{
+ int rc;
+ uint64_t gpa;
+ struct rte_vhost_vring vq;
+
+ rc = rte_vhost_get_vhost_vring(ops_data->vid, vq_num, &vq);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vhost vring failed: %s", rte_strerror(rc));
+ return rc;
+ }
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.desc);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for descriptor ring.");
+ goto fail_vring_map;
+ }
+ vring->desc = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.avail);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for available ring.");
+ goto fail_vring_map;
+ }
+ vring->avail = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.used);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for used ring.");
+ goto fail_vring_map;
+ }
+ vring->used = gpa;
+
+ vring->size = vq.size;
+
+ rc = rte_vhost_get_vring_base(ops_data->vid, vq_num,
+ &vring->last_avail_idx,
+ &vring->last_used_idx);
+
+ return rc;
+
+fail_vring_map:
+ return -1;
+}
+
+static int
+sfc_vdpa_virtq_start(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_t *vq;
+ struct sfc_vdpa_vring_info vring;
+ efx_virtio_vq_cfg_t vq_cfg;
+ efx_virtio_vq_dyncfg_t vq_dyncfg;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ rc = sfc_vdpa_get_vring_info(ops_data, vq_num, &vring);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vring info failed: %s", rte_strerror(rc));
+ goto fail_vring_info;
+ }
+
+ vq_cfg.evvc_target_vf = SFC_VDPA_VF_NULL;
+
+ /* even virtqueue for RX and odd for TX */
+ if (vq_num % 2) {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_TXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (TXQ)", vq_num);
+ } else {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_RXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (RXQ)", vq_num);
+ }
+
+ vq_cfg.evvc_vq_num = vq_num;
+ vq_cfg.evvc_desc_tbl_addr = vring.desc;
+ vq_cfg.evvc_avail_ring_addr = vring.avail;
+ vq_cfg.evvc_used_ring_addr = vring.used;
+ vq_cfg.evvc_vq_size = vring.size;
+
+ vq_dyncfg.evvd_vq_pidx = vring.last_used_idx;
+ vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx;
+
+ /* MSI-X vector is function-relative */
+ vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num;
+ if (ops_data->vdpa_context == SFC_VDPA_AS_VF)
+ vq_cfg.evvc_pas_id = 0;
+ vq_cfg.evcc_features = ops_data->dev_features &
+ ops_data->req_features;
+
+ /* Start virtqueue */
+ rc = efx_virtio_qstart(vq, &vq_cfg, &vq_dyncfg);
+ if (rc != 0) {
+ /* destroy virtqueue */
+ sfc_vdpa_err(ops_data->dev_handle,
+ "virtqueue start failed: %s",
+ rte_strerror(rc));
+ efx_virtio_qdestroy(vq);
+ goto fail_virtio_qstart;
+ }
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "virtqueue started successfully for vq_num %d", vq_num);
+
+ ops_data->vq_cxt[vq_num].enable = B_TRUE;
+
+ return rc;
+
+fail_virtio_qstart:
+fail_vring_info:
+ return rc;
+}
+
+static int
+sfc_vdpa_virtq_stop(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_dyncfg_t vq_idx;
+ efx_virtio_vq_t *vq;
+
+ if (ops_data->vq_cxt[vq_num].enable != B_TRUE)
+ return -1;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ /* stop the vq */
+ rc = efx_virtio_qstop(vq, &vq_idx);
+ if (rc == 0) {
+ ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_cidx;
+ ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_pidx;
+ }
+ ops_data->vq_cxt[vq_num].enable = B_FALSE;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_configure(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc, i;
+ int nr_vring;
+ int max_vring_cnt;
+ efx_virtio_vq_t *vq;
+ efx_nic_t *nic;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ nic = sfc_vdpa_adapter_by_dev_handle(dev)->nic;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_INITIALIZED);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURING;
+
+ nr_vring = rte_vhost_get_vring_num(ops_data->vid);
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ /* number of vring should not be more than supported max vq count */
+ if (nr_vring > max_vring_cnt) {
+ sfc_vdpa_err(dev,
+ "nr_vring (%d) is > max vring count (%d)",
+ nr_vring, max_vring_cnt);
+ goto fail_vring_num;
+ }
+
+ rc = sfc_vdpa_dma_map(ops_data, true);
+ if (rc) {
+ sfc_vdpa_err(dev,
+ "DMA map failed: %s", rte_strerror(rc));
+ goto fail_dma_map;
+ }
+
+ for (i = 0; i < nr_vring; i++) {
+ rc = efx_virtio_qcreate(nic, &vq);
+ if ((rc != 0) || (vq == NULL)) {
+ sfc_vdpa_err(dev,
+ "virtqueue create failed: %s",
+ rte_strerror(rc));
+ goto fail_vq_create;
+ }
+
+ /* store created virtqueue context */
+ ops_data->vq_cxt[i].vq = vq;
+ }
+
+ ops_data->vq_count = i;
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return 0;
+
+fail_vq_create:
+ sfc_vdpa_dma_map(ops_data, false);
+
+fail_dma_map:
+fail_vring_num:
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return -1;
+}
+
+static void
+sfc_vdpa_close(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+
+ if (ops_data->state != SFC_VDPA_STATE_CONFIGURED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_CLOSING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ if (ops_data->vq_cxt[i].vq == NULL)
+ continue;
+
+ efx_virtio_qdestroy(ops_data->vq_cxt[i].vq);
+ }
+
+ sfc_vdpa_dma_map(ops_data, false);
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+}
+
+static void
+sfc_vdpa_stop(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+ int rc;
+
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_STOPPING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ rc = sfc_vdpa_virtq_stop(ops_data, i);
+ if (rc != 0)
+ continue;
+ }
+
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+}
+
+static int
+sfc_vdpa_start(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, j;
+ int rc;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_CONFIGURED);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->state = SFC_VDPA_STATE_STARTING;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "enable interrupts");
+ rc = sfc_vdpa_enable_vfio_intr(ops_data);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "vfio intr allocation failed: %s",
+ rte_strerror(rc));
+ goto fail_enable_vfio_intr;
+ }
+
+ rte_vhost_get_negotiated_features(ops_data->vid,
+ &ops_data->req_features);
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "negotiated feature : 0x%" PRIx64,
+ ops_data->req_features);
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "starting vq# %d", i);
+ rc = sfc_vdpa_virtq_start(ops_data, i);
+ if (rc != 0)
+ goto fail_vq_start;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_STARTED;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vq_start:
+ /* stop already started virtqueues */
+ for (j = 0; j < i; j++)
+ sfc_vdpa_virtq_stop(ops_data, j);
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+fail_enable_vfio_intr:
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
+ *queue_num);
+
+ return 0;
+}
+
static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
@@ -114,7 +540,53 @@
static int
sfc_vdpa_dev_config(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ int rc;
+ struct sfc_vdpa_ops_data *ops_data;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->vid = vid;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "configuring");
+ rc = sfc_vdpa_configure(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_config;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "starting");
+ rc = sfc_vdpa_start(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_start;
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): software relay for notify is used.",
+ vdpa_dev->device->name);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vdpa_start:
+ sfc_vdpa_close(ops_data);
+
+fail_vdpa_config:
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
return -1;
}
@@ -122,9 +594,27 @@
static int
sfc_vdpa_dev_close(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_stop(ops_data);
+ sfc_vdpa_close(ops_data);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return 0;
}
static int
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 21cbb73..8d553c5 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -18,17 +18,45 @@ enum sfc_vdpa_context {
enum sfc_vdpa_state {
SFC_VDPA_STATE_UNINITIALIZED = 0,
SFC_VDPA_STATE_INITIALIZED,
+ SFC_VDPA_STATE_CONFIGURING,
+ SFC_VDPA_STATE_CONFIGURED,
+ SFC_VDPA_STATE_CLOSING,
+ SFC_VDPA_STATE_CLOSED,
+ SFC_VDPA_STATE_STARTING,
+ SFC_VDPA_STATE_STARTED,
+ SFC_VDPA_STATE_STOPPING,
SFC_VDPA_STATE_NSTATES
};
+struct sfc_vdpa_vring_info {
+ uint64_t desc;
+ uint64_t avail;
+ uint64_t used;
+ uint64_t size;
+ uint16_t last_avail_idx;
+ uint16_t last_used_idx;
+};
+
+typedef struct sfc_vdpa_vq_context_s {
+ uint8_t enable;
+ uint32_t pidx;
+ uint32_t cidx;
+ efx_virtio_vq_t *vq;
+} sfc_vdpa_vq_context_t;
+
struct sfc_vdpa_ops_data {
void *dev_handle;
+ int vid;
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
uint64_t dev_features;
uint64_t drv_features;
+ uint64_t req_features;
+
+ uint16_t vq_count;
+ struct sfc_vdpa_vq_context_s vq_cxt[SFC_VDPA_MAX_QUEUE_PAIRS * 2];
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 07/10] vdpa/sfc: add support to get queue notify area info
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (5 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
` (4 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement the vDPA ops get_notify_area to get the notify
area info of the queue.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
v2:
* Added error log in sfc_vdpa_get_notify_area.
drivers/vdpa/sfc/sfc_vdpa_ops.c | 168 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +
2 files changed, 164 insertions(+), 6 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index de1c81a..774d73e 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,6 +3,8 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <pthread.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <rte_errno.h>
@@ -537,6 +539,67 @@
return 0;
}
+static void *
+sfc_vdpa_notify_ctrl(void *arg)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ int vid;
+
+ ops_data = arg;
+ if (ops_data == NULL)
+ return NULL;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ vid = ops_data->vid;
+
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): Notifier could not get configured",
+ ops_data->vdpa_dev->device->name);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return NULL;
+}
+
+static int
+sfc_vdpa_setup_notify_ctrl(int vid)
+{
+ int ret;
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ ops_data->is_notify_thread_started = false;
+
+ /*
+ * Use rte_vhost_host_notifier_ctrl in a thread to avoid
+ * dead lock scenario when multiple VFs are used in single vdpa
+ * application and multiple VFs are passed to a single VM.
+ */
+ ret = pthread_create(&ops_data->notify_tid, NULL,
+ sfc_vdpa_notify_ctrl, ops_data);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to create notify_ctrl thread: %s",
+ rte_strerror(ret));
+ return -1;
+ }
+ ops_data->is_notify_thread_started = true;
+
+ return 0;
+}
+
static int
sfc_vdpa_dev_config(int vid)
{
@@ -570,18 +633,19 @@
if (rc != 0)
goto fail_vdpa_start;
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+ rc = sfc_vdpa_setup_notify_ctrl(vid);
+ if (rc != 0)
+ goto fail_vdpa_notify;
- sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
- if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
- sfc_vdpa_info(ops_data->dev_handle,
- "vDPA (%s): software relay for notify is used.",
- vdpa_dev->device->name);
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_vdpa_notify:
+ sfc_vdpa_stop(ops_data);
+
fail_vdpa_start:
sfc_vdpa_close(ops_data);
@@ -594,6 +658,7 @@
static int
sfc_vdpa_dev_close(int vid)
{
+ int ret;
struct rte_vdpa_device *vdpa_dev;
struct sfc_vdpa_ops_data *ops_data;
@@ -608,6 +673,23 @@
}
sfc_vdpa_adapter_lock(ops_data->dev_handle);
+ if (ops_data->is_notify_thread_started == true) {
+ void *status;
+ ret = pthread_cancel(ops_data->notify_tid);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to cancel notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+
+ ret = pthread_join(ops_data->notify_tid, &status);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to join terminated notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+ }
+ ops_data->is_notify_thread_started = false;
sfc_vdpa_stop(ops_data);
sfc_vdpa_close(ops_data);
@@ -658,6 +740,79 @@
return vfio_dev_fd;
}
+static int
+sfc_vdpa_get_notify_area(int vid, int qid, uint64_t *offset, uint64_t *size)
+{
+ int ret;
+ efx_nic_t *nic;
+ int vfio_dev_fd;
+ efx_rc_t rc;
+ unsigned int bar_offset;
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ struct vfio_region_info reg = { .argsz = sizeof(reg) };
+ const efx_nic_cfg_t *encp;
+ int max_vring_cnt;
+ int64_t len;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+ encp = efx_nic_cfg_get(nic);
+
+ if (qid >= max_vring_cnt) {
+ sfc_vdpa_err(dev, "invalid qid : %d", qid);
+ return -1;
+ }
+
+ if (ops_data->vq_cxt[qid].enable != B_TRUE) {
+ sfc_vdpa_err(dev, "vq is not enabled");
+ return -1;
+ }
+
+ rc = efx_virtio_get_doorbell_offset(ops_data->vq_cxt[qid].vq,
+ &bar_offset);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "failed to get doorbell offset: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ reg.index = sfc_vdpa_adapter_by_dev_handle(dev)->mem_bar.esb_rid;
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_REGION_INFO, ®);
+ if (ret != 0) {
+ sfc_vdpa_err(dev, "could not get device region info: %s",
+ strerror(errno));
+ return ret;
+ }
+
+ *offset = reg.offset + bar_offset;
+
+ len = (1U << encp->enc_vi_window_shift) / 2;
+ if (len >= sysconf(_SC_PAGESIZE)) {
+ *size = sysconf(_SC_PAGESIZE);
+ } else {
+ sfc_vdpa_err(dev, "invalid VI window size : 0x%" PRIx64, len);
+ return -1;
+ }
+
+ sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64,
+ *offset);
+
+ return 0;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -667,6 +822,7 @@
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
.get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
+ .get_notify_area = sfc_vdpa_get_notify_area,
};
struct sfc_vdpa_ops_data *
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 8d553c5..f7523ef 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -50,6 +50,8 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+ pthread_t notify_tid;
+ bool is_notify_thread_started;
uint64_t dev_features;
uint64_t drv_features;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 08/10] vdpa/sfc: add support for MAC filter config
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (6 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
` (3 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add support for unicast and broadcast MAC filter configuration.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
doc/guides/vdpadevs/sfc.rst | 4 ++
drivers/vdpa/sfc/meson.build | 1 +
drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
drivers/vdpa/sfc/sfc_vdpa_filter.c | 144 +++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
7 files changed, 238 insertions(+)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index abb5900..ae5ef42 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -71,6 +71,10 @@ boolean parameters value.
**vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
If this parameter is not specified then ef100 device will operate as network device.
+- ``mac`` [mac address]
+
+ Configures MAC address which would be used to setup MAC filters.
+
Dynamic Logging Parameters
~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index aac7c51..f69cba9 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -33,4 +33,5 @@ sources = files(
'sfc_vdpa_hw.c',
'sfc_vdpa_mcdi.c',
'sfc_vdpa_ops.c',
+ 'sfc_vdpa_filter.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index 9ffea59..012616b 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -8,7 +8,9 @@
#include <sys/queue.h>
#include <rte_common.h>
+#include <rte_devargs.h>
#include <rte_errno.h>
+#include <rte_kvargs.h>
#include <rte_string_fns.h>
#include <rte_vfio.h>
#include <rte_vhost.h>
@@ -202,6 +204,31 @@ struct sfc_vdpa_ops_data *
return (ret < 0) ? RTE_LOGTYPE_PMD : ret;
}
+static int
+sfc_vdpa_kvargs_parse(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ struct rte_devargs *devargs = pci_dev->device.devargs;
+ /*
+ * To get the device class a mandatory param 'class' is being
+ * used so included SFC_EFX_KVARG_DEV_CLASS in the param list.
+ */
+ const char **params = (const char *[]){
+ RTE_DEVARGS_KEY_CLASS,
+ SFC_VDPA_MAC_ADDR,
+ NULL,
+ };
+
+ if (devargs == NULL)
+ return 0;
+
+ sva->kvargs = rte_kvargs_parse(devargs->args, params);
+ if (sva->kvargs == NULL)
+ return -EINVAL;
+
+ return 0;
+}
+
static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
{ RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
{ .vendor_id = 0, /* sentinel */ },
@@ -244,6 +271,10 @@ struct sfc_vdpa_ops_data *
if (ret != 0)
goto fail_set_log_prefix;
+ ret = sfc_vdpa_kvargs_parse(sva);
+ if (ret != 0)
+ goto fail_kvargs_parse;
+
sfc_vdpa_log_init(sva, "entry");
sfc_vdpa_adapter_lock_init(sva);
@@ -284,6 +315,7 @@ struct sfc_vdpa_ops_data *
fail_vfio_setup:
sfc_vdpa_adapter_lock_fini(sva);
+fail_kvargs_parse:
fail_set_log_prefix:
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 1bf96e7..dbd099f 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -17,8 +17,29 @@
#include "sfc_vdpa_log.h"
#include "sfc_vdpa_ops.h"
+#define SFC_VDPA_MAC_ADDR "mac"
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
+/* Broadcast & Unicast MAC filters are supported */
+#define SFC_MAX_SUPPORTED_FILTERS 2
+
+/*
+ * Get function-local index of the associated VI from the
+ * virtqueue number. Queue 0 is reserved for MCDI
+ */
+#define SFC_VDPA_GET_VI_INDEX(vq_num) (((vq_num) / 2) + 1)
+
+enum sfc_vdpa_filter_type {
+ SFC_VDPA_BCAST_MAC_FILTER = 0,
+ SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_FILTER_NTYPE
+};
+
+typedef struct sfc_vdpa_filter_s {
+ int filter_cnt;
+ efx_filter_spec_t spec[SFC_MAX_SUPPORTED_FILTERS];
+} sfc_vdpa_filter_t;
+
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
@@ -32,6 +53,8 @@ struct sfc_vdpa_adapter {
struct rte_pci_device *pdev;
struct rte_pci_addr pci_addr;
+ struct rte_kvargs *kvargs;
+
efx_family_t family;
efx_nic_t *nic;
rte_spinlock_t nic_lock;
@@ -46,6 +69,8 @@ struct sfc_vdpa_adapter {
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
+ sfc_vdpa_filter_t filters;
+
int vfio_group_fd;
int vfio_dev_fd;
int vfio_container_fd;
@@ -83,6 +108,11 @@ struct sfc_vdpa_ops_data *
int
sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+int
+sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data);
+int
+sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
new file mode 100644
index 0000000..03b6a5d
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -0,0 +1,144 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_errno.h>
+#include <rte_ether.h>
+#include <rte_kvargs.h>
+
+#include "efx.h"
+#include "efx_impl.h"
+#include "sfc_vdpa.h"
+
+static inline int
+sfc_vdpa_get_eth_addr(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ struct rte_ether_addr *mac_addr = extra_args;
+
+ if (value == NULL || extra_args == NULL)
+ return -EINVAL;
+
+ /* Convert string with Ethernet address to an ether_addr */
+ rte_ether_unformat_addr(value, mac_addr);
+
+ return 0;
+}
+
+static int
+sfc_vdpa_set_mac_filter(efx_nic_t *nic, efx_filter_spec_t *spec,
+ int qid, uint8_t *eth_addr)
+{
+ int rc;
+
+ if (nic == NULL || spec == NULL)
+ return -1;
+
+ spec->efs_priority = EFX_FILTER_PRI_MANUAL;
+ spec->efs_flags = EFX_FILTER_FLAG_RX;
+ spec->efs_dmaq_id = qid;
+
+ rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
+ if (rc != 0)
+ return rc;
+
+ rc = efx_filter_insert(nic, spec);
+ if (rc != 0)
+ return rc;
+
+ return rc;
+}
+
+int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int qid;
+ efx_nic_t *nic;
+ struct rte_ether_addr bcast_eth_addr;
+ struct rte_ether_addr ucast_eth_addr;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_filter_spec_t *spec;
+
+ if (ops_data == NULL)
+ return -1;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ nic = sva->nic;
+
+ sfc_vdpa_log_init(sva, "process kvarg");
+
+ /* skip MAC filter configuration if mac address is not provided */
+ if (rte_kvargs_count(sva->kvargs, SFC_VDPA_MAC_ADDR) == 0) {
+ sfc_vdpa_warn(sva,
+ "MAC address is not provided, skipping MAC Filter Config");
+ return -1;
+ }
+
+ rc = rte_kvargs_process(sva->kvargs, SFC_VDPA_MAC_ADDR,
+ &sfc_vdpa_get_eth_addr,
+ &ucast_eth_addr);
+ if (rc < 0)
+ return -1;
+
+ /* create filters on the base queue */
+ qid = SFC_VDPA_GET_VI_INDEX(0);
+
+ sfc_vdpa_log_init(sva, "insert broadcast mac filter");
+
+ EFX_MAC_BROADCAST_ADDR_SET(bcast_eth_addr.addr_bytes);
+ spec = &sva->filters.spec[SFC_VDPA_BCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic,
+ spec, qid,
+ bcast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(ops_data->dev_handle,
+ "broadcast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "insert unicast mac filter");
+ spec = &sva->filters.spec[SFC_VDPA_UCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic,
+ spec, qid,
+ ucast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "unicast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return rc;
+}
+
+int sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, rc = 0;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_nic_t *nic;
+
+ if (ops_data == NULL)
+ return -1;
+
+ nic = sva->nic;
+
+ for (i = 0; i < sva->filters.filter_cnt; i++) {
+ rc = efx_filter_remove(nic, &(sva->filters.spec[i]));
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "remove HW filter failed for entry %d: %s",
+ i, rte_strerror(rc));
+ }
+
+ sva->filters.filter_cnt = 0;
+
+ return rc;
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index b473708..5307b03 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -354,10 +354,20 @@
goto fail_virtio_init;
}
+ sfc_vdpa_log_init(sva, "init filter");
+ rc = efx_filter_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "filter init failed: %s", rte_strerror(rc));
+ goto fail_filter_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_filter_init:
+ efx_virtio_fini(enp);
+
fail_virtio_init:
efx_nic_fini(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 774d73e..8551b65 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -426,6 +426,8 @@
sfc_vdpa_disable_vfio_intr(ops_data);
+ sfc_vdpa_filter_remove(ops_data);
+
ops_data->state = SFC_VDPA_STATE_CONFIGURED;
}
@@ -465,12 +467,27 @@
goto fail_vq_start;
}
+ ops_data->vq_count = i;
+
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "configure MAC filters");
+ rc = sfc_vdpa_filter_config(ops_data);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "MAC filter config failed: %s",
+ rte_strerror(rc));
+ goto fail_filter_cfg;
+ }
+
ops_data->state = SFC_VDPA_STATE_STARTED;
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_filter_cfg:
+ /* remove already created filters */
+ sfc_vdpa_filter_remove(ops_data);
fail_vq_start:
/* stop already started virtqueues */
for (j = 0; j < i; j++)
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 09/10] vdpa/sfc: add support to set vring state
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (7 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
` (2 subsequent siblings)
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implements vDPA ops set_vring_state to configure vring state.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 54 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 8551b65..3430643 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -719,11 +719,57 @@
static int
sfc_vdpa_set_vring_state(int vid, int vring, int state)
{
- RTE_SET_USED(vid);
- RTE_SET_USED(vring);
- RTE_SET_USED(state);
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_vdpa_device *vdpa_dev;
+ efx_rc_t rc;
+ int vring_max;
+ void *dev;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ sfc_vdpa_info(dev,
+ "vDPA ops set_vring_state: vid: %d, vring: %d, state:%d",
+ vid, vring, state);
+
+ vring_max = (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ if (vring < 0 || vring > vring_max) {
+ sfc_vdpa_err(dev, "received invalid vring id : %d to set state",
+ vring);
+ return -1;
+ }
+
+ /*
+ * Skip if device is not yet started. virtqueues state can be
+ * changed once it is created and other configurations are done.
+ */
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return 0;
+
+ if (ops_data->vq_cxt[vring].enable == state)
+ return 0;
+
+ if (state == 0) {
+ rc = sfc_vdpa_virtq_stop(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue stop failed: %s",
+ rte_strerror(rc));
+ }
+ } else {
+ rc = sfc_vdpa_virtq_start(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue start failed: %s",
+ rte_strerror(rc));
+ }
+ }
+
+ return rc;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v2 10/10] vdpa/sfc: set a multicast filter during vDPA init
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (8 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
@ 2021-10-28 7:54 ` Vijay Srivastava
2021-10-28 8:08 ` [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver Xia, Chenbo
2021-10-28 14:35 ` Maxime Coquelin
11 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-28 7:54 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Insert unknown multicast filter to allow IPv6 neighbor discovery
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
drivers/vdpa/sfc/sfc_vdpa.h | 3 ++-
drivers/vdpa/sfc/sfc_vdpa_filter.c | 19 +++++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index dbd099f..bedc76c 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -21,7 +21,7 @@
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Broadcast & Unicast MAC filters are supported */
-#define SFC_MAX_SUPPORTED_FILTERS 2
+#define SFC_MAX_SUPPORTED_FILTERS 3
/*
* Get function-local index of the associated VI from the
@@ -32,6 +32,7 @@
enum sfc_vdpa_filter_type {
SFC_VDPA_BCAST_MAC_FILTER = 0,
SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_MCAST_DST_FILTER = 2,
SFC_VDPA_FILTER_NTYPE
};
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
index 03b6a5d..74204d3 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_filter.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -39,8 +39,12 @@
spec->efs_flags = EFX_FILTER_FLAG_RX;
spec->efs_dmaq_id = qid;
- rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
- eth_addr);
+ if (eth_addr == NULL)
+ rc = efx_filter_spec_set_mc_def(spec);
+ else
+ rc = efx_filter_spec_set_eth_local(spec,
+ EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
if (rc != 0)
return rc;
@@ -114,6 +118,17 @@ int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
else
sva->filters.filter_cnt++;
+ sfc_vdpa_log_init(sva, "insert unknown mcast filter");
+ spec = &sva->filters.spec[SFC_VDPA_MCAST_DST_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic, spec, qid, NULL);
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "mcast filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
sfc_vdpa_log_init(sva, "done");
return rc;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (9 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
@ 2021-10-28 8:08 ` Xia, Chenbo
2021-10-28 8:11 ` Maxime Coquelin
2021-10-28 14:35 ` Maxime Coquelin
11 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-10-28 8:08 UTC (permalink / raw)
To: Vijay Srivastava, dev; +Cc: maxime.coquelin, andrew.rybchenko, Vijay Srivastava
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Thursday, October 28, 2021 3:55 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> This patch series introduces vDPA driver for Xilinx devices.
> The Xilinx vDPA (vhost data path acceleration) provides
> support for the Xilinx SN1022 SmartNICs.
>
> Vijay Kumar Srivastava (10):
> vdpa/sfc: introduce Xilinx vDPA driver
> vdpa/sfc: add support for device initialization
> vdpa/sfc: add support to get device and protocol features
> vdpa/sfc: get device supported max queue count
> vdpa/sfc: add support to get VFIO device fd
> vdpa/sfc: add support for dev conf and dev close ops
> vdpa/sfc: add support to get queue notify area info
> vdpa/sfc: add support for MAC filter config
> vdpa/sfc: add support to set vring state
> vdpa/sfc: set a multicast filter during vDPA init
>
> 1.8.3.1
I remember Maxime added R-by in some patches? And Andrew also acked
the whole series?
If yes, you should add those tags in new version.
Thanks,
Chenbo
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-28 8:08 ` [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver Xia, Chenbo
@ 2021-10-28 8:11 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-10-28 8:11 UTC (permalink / raw)
To: Xia, Chenbo, Vijay Srivastava, dev; +Cc: andrew.rybchenko, Vijay Srivastava
On 10/28/21 10:08, Xia, Chenbo wrote:
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Thursday, October 28, 2021 3:55 PM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Srivastava <vsrivast@xilinx.com>
>> Subject: [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
>>
>> This patch series introduces vDPA driver for Xilinx devices.
>> The Xilinx vDPA (vhost data path acceleration) provides
>> support for the Xilinx SN1022 SmartNICs.
>>
>> Vijay Kumar Srivastava (10):
>> vdpa/sfc: introduce Xilinx vDPA driver
>> vdpa/sfc: add support for device initialization
>> vdpa/sfc: add support to get device and protocol features
>> vdpa/sfc: get device supported max queue count
>> vdpa/sfc: add support to get VFIO device fd
>> vdpa/sfc: add support for dev conf and dev close ops
>> vdpa/sfc: add support to get queue notify area info
>> vdpa/sfc: add support for MAC filter config
>> vdpa/sfc: add support to set vring state
>> vdpa/sfc: set a multicast filter during vDPA init
>>
>> 1.8.3.1
>
> I remember Maxime added R-by in some patches? And Andrew also acked
> the whole series?
>
> If yes, you should add those tags in new version.
Agree with Chenbo, but I'd like to add that it should be done only on
patches that were not significantly reworked.
Maxime
> Thanks,
> Chenbo
>
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
` (10 preceding siblings ...)
2021-10-28 8:08 ` [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver Xia, Chenbo
@ 2021-10-28 14:35 ` Maxime Coquelin
2021-10-28 18:03 ` Vijay Kumar Srivastava
11 siblings, 1 reply; 122+ messages in thread
From: Maxime Coquelin @ 2021-10-28 14:35 UTC (permalink / raw)
To: Vijay Srivastava, dev; +Cc: chenbo.xia, andrew.rybchenko, Vijay Srivastava
On 10/28/21 09:54, Vijay Srivastava wrote:
> This patch series introduces vDPA driver for Xilinx devices.
> The Xilinx vDPA (vhost data path acceleration) provides
> support for the Xilinx SN1022 SmartNICs.
>
> Vijay Kumar Srivastava (10):
> vdpa/sfc: introduce Xilinx vDPA driver
> vdpa/sfc: add support for device initialization
> vdpa/sfc: add support to get device and protocol features
> vdpa/sfc: get device supported max queue count
> vdpa/sfc: add support to get VFIO device fd
> vdpa/sfc: add support for dev conf and dev close ops
> vdpa/sfc: add support to get queue notify area info
> vdpa/sfc: add support for MAC filter config
> vdpa/sfc: add support to set vring state
> vdpa/sfc: set a multicast filter during vDPA init
>
> MAINTAINERS | 6 +
> doc/guides/rel_notes/release_21_11.rst | 5 +
> doc/guides/vdpadevs/features/sfc.ini | 19 +
> doc/guides/vdpadevs/sfc.rst | 107 ++++
> drivers/common/sfc_efx/efsys.h | 2 +-
> drivers/common/sfc_efx/version.map | 10 +
> drivers/vdpa/meson.build | 1 +
> drivers/vdpa/sfc/meson.build | 37 ++
> drivers/vdpa/sfc/sfc_vdpa.c | 367 +++++++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 163 ++++++
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 159 ++++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 419 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 59 ++
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 947 +++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 69 +++
> drivers/vdpa/sfc/version.map | 3 +
> 18 files changed, 2467 insertions(+), 1 deletion(-)
> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
> create mode 100644 doc/guides/vdpadevs/sfc.rst
> create mode 100644 drivers/vdpa/sfc/meson.build
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
> create mode 100644 drivers/vdpa/sfc/version.map
>
Please also note that doc build is failing:
http://mails.dpdk.org/archives/test-report/2021-October/235652.html
"
Warning, treated as error:
/home/runner/work/dpdk/dpdk/doc/guides/vdpadevs/sfc.rst:document isn't
included in any toctree
"
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-28 14:35 ` Maxime Coquelin
@ 2021-10-28 18:03 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-10-28 18:03 UTC (permalink / raw)
To: Maxime Coquelin, dev; +Cc: chenbo.xia, andrew.rybchenko
Hi Maxime,
>-----Original Message-----
>From: Maxime Coquelin <maxime.coquelin@redhat.com>
>Sent: Thursday, October 28, 2021 8:05 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: chenbo.xia@intel.com; andrew.rybchenko@oktetlabs.ru; Vijay Kumar
>Srivastava <vsrivast@xilinx.com>
>Subject: Re: [PATCH v2 00/10] vdpa/sfc: introduce Xilinx vDPA driver
>
>
>
>On 10/28/21 09:54, Vijay Srivastava wrote:
>> This patch series introduces vDPA driver for Xilinx devices.
>> The Xilinx vDPA (vhost data path acceleration) provides support for
>> the Xilinx SN1022 SmartNICs.
[SNIP]
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>> create mode 100644 drivers/vdpa/sfc/version.map
>>
>
>Please also note that doc build is failing:
>http://mails.dpdk.org/archives/test-report/2021-October/235652.html
>
>"
>Warning, treated as error:
>/home/runner/work/dpdk/dpdk/doc/guides/vdpadevs/sfc.rst:document isn't
>included in any toctree "
Now including it in the toctree of vdpadevs/index.rst.
Regards,
Vijay
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (13 preceding siblings ...)
2021-10-28 7:54 ` [dpdk-dev] [PATCH v2 " Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 01/10] " Vijay Srivastava
` (9 more replies)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
15 siblings, 10 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Srivastava
This patch series introduces vDPA driver for Xilinx devices.
The Xilinx vDPA (vhost data path acceleration) provides
support for the Xilinx SN1022 SmartNICs.
Vijay Kumar Srivastava (10):
vdpa/sfc: introduce Xilinx vDPA driver
vdpa/sfc: add support for device initialization
vdpa/sfc: add support to get device and protocol features
vdpa/sfc: get device supported max queue count
vdpa/sfc: add support to get VFIO device fd
vdpa/sfc: add support for dev conf and dev close ops
vdpa/sfc: add support to get queue notify area info
vdpa/sfc: add support for MAC filter config
vdpa/sfc: add support to set vring state
vdpa/sfc: set a multicast filter during vDPA init
MAINTAINERS | 6 +
doc/guides/rel_notes/release_21_11.rst | 5 +
doc/guides/vdpadevs/features/sfc.ini | 19 +
doc/guides/vdpadevs/index.rst | 2 +
doc/guides/vdpadevs/sfc.rst | 107 ++++
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/version.map | 10 +
drivers/vdpa/meson.build | 1 +
drivers/vdpa/sfc/meson.build | 26 +
drivers/vdpa/sfc/sfc_vdpa.c | 367 +++++++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 163 ++++++
drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
drivers/vdpa/sfc/sfc_vdpa_filter.c | 159 ++++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 419 +++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 59 ++
drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 947 +++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.h | 69 +++
drivers/vdpa/sfc/version.map | 3 +
19 files changed, 2458 insertions(+), 1 deletion(-)
create mode 100644 doc/guides/vdpadevs/features/sfc.ini
create mode 100644 doc/guides/vdpadevs/sfc.rst
create mode 100644 drivers/vdpa/sfc/meson.build
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
create mode 100644 drivers/vdpa/sfc/version.map
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-10-29 20:07 ` Mattias Rönnblom
2021-11-01 8:30 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
` (8 subsequent siblings)
9 siblings, 2 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add new vDPA PMD to support vDPA operations of Xilinx devices.
This patch implements probe and remove functions.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Updated logging macros to remove redundant code.
v3:
* Replaced depreciated whitelist with allowlist.
* Text corrections in the sfc.rst and commit msg.
* Added sfc in the toctree of doc/guides/vdpadevs/index.rst.
* Removed extra compiler flags.
MAINTAINERS | 6 +
doc/guides/rel_notes/release_21_11.rst | 5 +
doc/guides/vdpadevs/features/sfc.ini | 9 ++
doc/guides/vdpadevs/index.rst | 2 +
doc/guides/vdpadevs/sfc.rst | 97 +++++++++++
drivers/vdpa/meson.build | 1 +
drivers/vdpa/sfc/meson.build | 22 +++
drivers/vdpa/sfc/sfc_vdpa.c | 286 +++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 40 +++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 56 +++++++
drivers/vdpa/sfc/version.map | 3 +
11 files changed, 527 insertions(+)
create mode 100644 doc/guides/vdpadevs/features/sfc.ini
create mode 100644 doc/guides/vdpadevs/sfc.rst
create mode 100644 drivers/vdpa/sfc/meson.build
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
create mode 100644 drivers/vdpa/sfc/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index be2c9b6..5d12c49 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1236,6 +1236,12 @@ F: drivers/vdpa/mlx5/
F: doc/guides/vdpadevs/mlx5.rst
F: doc/guides/vdpadevs/features/mlx5.ini
+Xilinx sfc vDPA
+M: Vijay Kumar Srivastava <vsrivast@xilinx.com>
+F: drivers/vdpa/sfc/
+F: doc/guides/vdpadevs/sfc.rst
+F: doc/guides/vdpadevs/features/sfc.ini
+
Eventdev Drivers
----------------
diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index 1ccac87..bd0a604 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -305,6 +305,11 @@ New Features
* Pcapng format with timestamps and meta-data.
* Fixes packet capture with stripped VLAN tags.
+* **Add new vDPA PMD based on Xilinx devices.**
+
+ Added a new Xilinx vDPA (``sfc_vdpa``) PMD.
+ See the :doc:`../vdpadevs/sfc` guide for more details on this driver.
+
Removed Items
-------------
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
new file mode 100644
index 0000000..71b6158
--- /dev/null
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'sfc' vDPA driver.
+;
+; Refer to default.ini for the full list of available driver features.
+;
+[Features]
+Linux = Y
+x86-64 = Y
+Usage doc = Y
diff --git a/doc/guides/vdpadevs/index.rst b/doc/guides/vdpadevs/index.rst
index 1a13efe..f1a946e 100644
--- a/doc/guides/vdpadevs/index.rst
+++ b/doc/guides/vdpadevs/index.rst
@@ -14,3 +14,5 @@ which can be used from an application through vhost API.
features_overview
ifc
mlx5
+ sfc
+
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
new file mode 100644
index 0000000..44e694f
--- /dev/null
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -0,0 +1,97 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright(c) 2021 Xilinx Corporation.
+
+Xilinx vDPA driver
+==================
+
+The Xilinx vDPA (vhost data path acceleration) driver (**librte_pmd_sfc_vdpa**)
+provides support for the Xilinx SN1022 SmartNICs family of 10/25/40/50/100 Gbps
+adapters that have support for latest Linux and FreeBSD operating systems.
+
+More information can be found at Xilinx website https://www.xilinx.com.
+
+
+Xilinx vDPA implementation
+--------------------------
+
+ef100 device can be configured in the net device or vDPA mode.
+Adding "class=vdpa" parameter helps to specify that this
+device is to be used in vDPA mode. If this parameter is not specified, device
+will be probed by net/sfc driver and will used as a net device.
+
+This PMD uses libefx (common/sfc_efx) code to access the device firmware.
+
+
+Supported NICs
+--------------
+
+- Xilinx SN1022 SmartNICs
+
+
+Features
+--------
+
+Features of the Xilinx vDPA driver are:
+
+- Compatibility with virtio 0.95 and 1.0
+
+
+Non-supported Features
+----------------------
+
+- Control Queue
+- Multi queue
+- Live Migration
+
+
+Prerequisites
+-------------
+
+Requires firmware version: v1.0.7.0 or higher
+
+Visit `Xilinx Support Downloads <https://www.xilinx.com/support.html>`_
+to get Xilinx Utilities with the latest firmware.
+Follow instructions from Alveo SN1000 SmartNICs User Guide to
+update firmware and configure the adapter.
+
+
+Per-Device Parameters
+~~~~~~~~~~~~~~~~~~~~~
+
+The following per-device parameters can be passed via EAL PCI device
+allowlist option like "-a 02:00.0,arg1=value1,...".
+
+Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
+boolean parameters value.
+
+- ``class`` [net|vdpa] (default **net**)
+
+ Choose the mode of operation of ef100 device.
+ **net** device will work as network device and will be probed by net/sfc driver.
+ **vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
+ If this parameter is not specified then ef100 device will operate as network device.
+
+
+Dynamic Logging Parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+One may leverage EAL option "--log-level" to change default levels
+for the log types supported by the driver. The option is used with
+an argument typically consisting of two parts separated by a colon.
+
+Level value is the last part which takes a symbolic name (or integer).
+Log type is the former part which may shell match syntax.
+Depending on the choice of the expression, the given log level may
+be used either for some specific log type or for a subset of types.
+
+SFC vDPA PMD provides the following log types available for control:
+
+- ``pmd.vdpa.sfc.driver`` (default level is **notice**)
+
+ Affects driver-wide messages unrelated to any particular devices.
+
+- ``pmd.vdpa.sfc.main`` (default level is **notice**)
+
+ Matches a subset of per-port log types registered during runtime.
+ A full name for a particular type may be obtained by appending a
+ dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
index f765fe3..77412c7 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -8,6 +8,7 @@ endif
drivers = [
'ifc',
'mlx5',
+ 'sfc',
]
std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost']
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
new file mode 100644
index 0000000..4255d65
--- /dev/null
+++ b/drivers/vdpa/sfc/meson.build
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Copyright(c) 2020-2021 Xilinx, Inc.
+
+if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+ build = false
+ reason = 'only supported on x86_64 and aarch64'
+endif
+
+fmt_name = 'sfc_vdpa'
+extra_flags = []
+
+foreach flag: extra_flags
+ if cc.has_argument(flag)
+ cflags += flag
+ endif
+endforeach
+
+deps += ['common_sfc_efx', 'bus_pci']
+sources = files(
+ 'sfc_vdpa.c',
+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
new file mode 100644
index 0000000..d85c52b
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -0,0 +1,286 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_string_fns.h>
+#include <rte_vfio.h>
+#include <rte_vhost.h>
+
+#include "efx.h"
+#include "sfc_efx.h"
+#include "sfc_vdpa.h"
+
+TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
+static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
+ TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
+
+static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (pdev == sva->pdev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva : NULL;
+}
+
+static int
+sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *dev = sva->pdev;
+ char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
+ int rc;
+
+ if (dev == NULL)
+ goto fail_inval;
+
+ rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
+
+ sva->vfio_container_fd = rte_vfio_container_create();
+ if (sva->vfio_container_fd < 0) {
+ sfc_vdpa_err(sva, "failed to create VFIO container");
+ goto fail_container_create;
+ }
+
+ rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
+ &sva->iommu_group_num);
+ if (rc <= 0) {
+ sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
+ dev_name, rte_strerror(-rc));
+ goto fail_get_group_num;
+ }
+
+ sva->vfio_group_fd =
+ rte_vfio_container_group_bind(sva->vfio_container_fd,
+ sva->iommu_group_num);
+ if (sva->vfio_group_fd < 0) {
+ sfc_vdpa_err(sva,
+ "failed to bind IOMMU group %d to container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ goto fail_group_bind;
+ }
+
+ if (rte_pci_map_device(dev) != 0) {
+ sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
+ dev_name, rte_strerror(rte_errno));
+ goto fail_pci_map_device;
+ }
+
+ sva->vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+
+ return 0;
+
+fail_pci_map_device:
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+fail_group_bind:
+fail_get_group_num:
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva, "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+
+fail_container_create:
+fail_inval:
+ return -1;
+}
+
+static void
+sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva)
+{
+ rte_pci_unmap_device(sva->pdev);
+
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+}
+
+static int
+sfc_vdpa_set_log_prefix(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ int ret;
+
+ ret = snprintf(sva->log_prefix, sizeof(sva->log_prefix),
+ "PMD: sfc_vdpa " PCI_PRI_FMT " : ",
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+
+ if (ret < 0 || ret >= (int)sizeof(sva->log_prefix)) {
+ SFC_VDPA_GENERIC_LOG(ERR,
+ "reserved log prefix is too short for " PCI_PRI_FMT,
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str, uint32_t ll_default)
+{
+ size_t lt_prefix_str_size = strlen(lt_prefix_str);
+ size_t lt_str_size_max;
+ char *lt_str = NULL;
+ int ret;
+
+ if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
+ ++lt_prefix_str_size; /* Reserve space for prefix separator */
+ lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
+ } else {
+ return RTE_LOGTYPE_PMD;
+ }
+
+ lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
+ if (lt_str == NULL)
+ return RTE_LOGTYPE_PMD;
+
+ strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
+ lt_str[lt_prefix_str_size - 1] = '.';
+ rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
+ lt_str_size_max - lt_prefix_str_size);
+ lt_str[lt_str_size_max - 1] = '\0';
+
+ ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
+ rte_free(lt_str);
+
+ return ret < 0 ? RTE_LOGTYPE_PMD : ret;
+}
+
+static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
+ { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
+ { .vendor_id = 0, /* sentinel */ },
+};
+
+static int
+sfc_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+ uint32_t logtype_main;
+ int ret = 0;
+
+ if (sfc_efx_dev_class_get(pci_dev->device.devargs) !=
+ SFC_EFX_DEV_CLASS_VDPA) {
+ SFC_VDPA_GENERIC_LOG(INFO,
+ "Incompatible device class: skip probing, should be probed by other sfc driver.");
+ return 1;
+ }
+
+ /*
+ * It will not be probed in the secondary process. As device class
+ * is vdpa so return 0 to avoid probe by other sfc driver
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ logtype_main = sfc_vdpa_register_logtype(&pci_dev->addr,
+ SFC_VDPA_LOGTYPE_MAIN_STR,
+ RTE_LOG_NOTICE);
+
+ sva = rte_zmalloc("sfc_vdpa", sizeof(struct sfc_vdpa_adapter), 0);
+ if (sva == NULL)
+ goto fail_zmalloc;
+
+ sva->pdev = pci_dev;
+ sva->logtype_main = logtype_main;
+
+ ret = sfc_vdpa_set_log_prefix(sva);
+ if (ret != 0)
+ goto fail_set_log_prefix;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "vfio init");
+ if (sfc_vdpa_vfio_setup(sva) < 0) {
+ sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
+ goto fail_vfio_setup;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_vfio_setup:
+fail_set_log_prefix:
+ rte_free(sva);
+
+fail_zmalloc:
+ return -1;
+}
+
+static int
+sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -1;
+
+ sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
+ if (sva == NULL) {
+ sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
+ return -1;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_vfio_teardown(sva);
+
+ rte_free(sva);
+
+ return 0;
+}
+
+static struct rte_pci_driver rte_sfc_vdpa = {
+ .id_table = pci_id_sfc_vdpa_efx_map,
+ .drv_flags = 0,
+ .probe = sfc_vdpa_pci_probe,
+ .remove = sfc_vdpa_pci_remove,
+};
+
+RTE_PMD_REGISTER_PCI(net_sfc_vdpa, rte_sfc_vdpa);
+RTE_PMD_REGISTER_PCI_TABLE(net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_sfc_vdpa, "* vfio-pci");
+RTE_LOG_REGISTER_SUFFIX(sfc_vdpa_logtype_driver, driver, NOTICE);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
new file mode 100644
index 0000000..3b77900
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_H
+#define _SFC_VDPA_H
+
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_bus_pci.h>
+
+#include "sfc_vdpa_log.h"
+
+/* Adapter private data */
+struct sfc_vdpa_adapter {
+ TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ struct rte_pci_device *pdev;
+ struct rte_pci_addr pci_addr;
+
+ char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
+ uint32_t logtype_main;
+
+ int vfio_group_fd;
+ int vfio_dev_fd;
+ int vfio_container_fd;
+ int iommu_group_num;
+};
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str,
+ uint32_t ll_default);
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+
+#endif /* _SFC_VDPA_H */
+
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
new file mode 100644
index 0000000..858e5ee
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_LOG_H_
+#define _SFC_VDPA_LOG_H_
+
+/** Generic driver log type */
+extern int sfc_vdpa_logtype_driver;
+
+/** Common log type name prefix */
+#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
+
+/** Log PMD generic message, add a prefix and a line break */
+#define SFC_VDPA_GENERIC_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
+ RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+/** Name prefix for the per-device log type used to report basic information */
+#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+
+#define SFC_VDPA_LOG_PREFIX_MAX 32
+
+/* Log PMD message, automatically add prefix and \n */
+#define SFC_VDPA_LOG(sva, level, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ rte_log(RTE_LOG_ ## level, _sva->logtype_main, \
+ RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ _sva->log_prefix, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+ } while (0)
+
+#define sfc_vdpa_err(sva, ...) \
+ SFC_VDPA_LOG(sva, ERR, __VA_ARGS__)
+
+#define sfc_vdpa_warn(sva, ...) \
+ SFC_VDPA_LOG(sva, WARNING, __VA_ARGS__)
+
+#define sfc_vdpa_notice(sva, ...) \
+ SFC_VDPA_LOG(sva, NOTICE, __VA_ARGS__)
+
+#define sfc_vdpa_info(sva, ...) \
+ SFC_VDPA_LOG(sva, INFO, __VA_ARGS__)
+
+#define sfc_vdpa_log_init(sva, ...) \
+ SFC_VDPA_LOG(sva, INFO, \
+ RTE_FMT("%s(): " \
+ RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+#endif /* _SFC_VDPA_LOG_H_ */
diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
new file mode 100644
index 0000000..4a76d1d
--- /dev/null
+++ b/drivers/vdpa/sfc/version.map
@@ -0,0 +1,3 @@
+DPDK_21 {
+ local: *;
+};
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 01/10] " Vijay Srivastava
@ 2021-10-29 20:07 ` Mattias Rönnblom
2021-11-01 8:13 ` Vijay Kumar Srivastava
2021-11-01 8:30 ` Xia, Chenbo
1 sibling, 1 reply; 122+ messages in thread
From: Mattias Rönnblom @ 2021-10-29 20:07 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 2021-10-29 16:46, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add new vDPA PMD to support vDPA operations of Xilinx devices.
> This patch implements probe and remove functions.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Updated logging macros to remove redundant code.
>
> v3:
> * Replaced depreciated whitelist with allowlist.
> * Text corrections in the sfc.rst and commit msg.
> * Added sfc in the toctree of doc/guides/vdpadevs/index.rst.
> * Removed extra compiler flags.
>
> MAINTAINERS | 6 +
> doc/guides/rel_notes/release_21_11.rst | 5 +
> doc/guides/vdpadevs/features/sfc.ini | 9 ++
> doc/guides/vdpadevs/index.rst | 2 +
> doc/guides/vdpadevs/sfc.rst | 97 +++++++++++
> drivers/vdpa/meson.build | 1 +
> drivers/vdpa/sfc/meson.build | 22 +++
> drivers/vdpa/sfc/sfc_vdpa.c | 286 +++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 40 +++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 56 +++++++
> drivers/vdpa/sfc/version.map | 3 +
> 11 files changed, 527 insertions(+)
> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
> create mode 100644 doc/guides/vdpadevs/sfc.rst
> create mode 100644 drivers/vdpa/sfc/meson.build
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
> create mode 100644 drivers/vdpa/sfc/version.map
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index be2c9b6..5d12c49 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1236,6 +1236,12 @@ F: drivers/vdpa/mlx5/
> F: doc/guides/vdpadevs/mlx5.rst
> F: doc/guides/vdpadevs/features/mlx5.ini
>
> +Xilinx sfc vDPA
> +M: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> +F: drivers/vdpa/sfc/
> +F: doc/guides/vdpadevs/sfc.rst
> +F: doc/guides/vdpadevs/features/sfc.ini
> +
>
> Eventdev Drivers
> ----------------
> diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
> index 1ccac87..bd0a604 100644
> --- a/doc/guides/rel_notes/release_21_11.rst
> +++ b/doc/guides/rel_notes/release_21_11.rst
> @@ -305,6 +305,11 @@ New Features
> * Pcapng format with timestamps and meta-data.
> * Fixes packet capture with stripped VLAN tags.
>
> +* **Add new vDPA PMD based on Xilinx devices.**
> +
> + Added a new Xilinx vDPA (``sfc_vdpa``) PMD.
> + See the :doc:`../vdpadevs/sfc` guide for more details on this driver.
> +
>
> Removed Items
> -------------
> diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
> new file mode 100644
> index 0000000..71b6158
> --- /dev/null
> +++ b/doc/guides/vdpadevs/features/sfc.ini
> @@ -0,0 +1,9 @@
> +;
> +; Supported features of the 'sfc' vDPA driver.
> +;
> +; Refer to default.ini for the full list of available driver features.
> +;
> +[Features]
> +Linux = Y
> +x86-64 = Y
> +Usage doc = Y
> diff --git a/doc/guides/vdpadevs/index.rst b/doc/guides/vdpadevs/index.rst
> index 1a13efe..f1a946e 100644
> --- a/doc/guides/vdpadevs/index.rst
> +++ b/doc/guides/vdpadevs/index.rst
> @@ -14,3 +14,5 @@ which can be used from an application through vhost API.
> features_overview
> ifc
> mlx5
> + sfc
> +
> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
> new file mode 100644
> index 0000000..44e694f
> --- /dev/null
> +++ b/doc/guides/vdpadevs/sfc.rst
> @@ -0,0 +1,97 @@
> +.. SPDX-License-Identifier: BSD-3-Clause
> + Copyright(c) 2021 Xilinx Corporation.
> +
> +Xilinx vDPA driver
> +==================
> +
> +The Xilinx vDPA (vhost data path acceleration) driver (**librte_pmd_sfc_vdpa**)
> +provides support for the Xilinx SN1022 SmartNICs family of 10/25/40/50/100 Gbps
> +adapters that have support for latest Linux and FreeBSD operating systems.
> +
> +More information can be found at Xilinx website https://www.xilinx.com.
> +
> +
> +Xilinx vDPA implementation
> +--------------------------
> +
> +ef100 device can be configured in the net device or vDPA mode.
> +Adding "class=vdpa" parameter helps to specify that this
> +device is to be used in vDPA mode. If this parameter is not specified, device
> +will be probed by net/sfc driver and will used as a net device.
> +
> +This PMD uses libefx (common/sfc_efx) code to access the device firmware.
> +
> +
> +Supported NICs
> +--------------
> +
> +- Xilinx SN1022 SmartNICs
> +
> +
> +Features
> +--------
> +
> +Features of the Xilinx vDPA driver are:
> +
> +- Compatibility with virtio 0.95 and 1.0
> +
> +
> +Non-supported Features
> +----------------------
> +
> +- Control Queue
> +- Multi queue
> +- Live Migration
> +
> +
> +Prerequisites
> +-------------
> +
> +Requires firmware version: v1.0.7.0 or higher
> +
> +Visit `Xilinx Support Downloads <https://www.xilinx.com/support.html>`_
> +to get Xilinx Utilities with the latest firmware.
> +Follow instructions from Alveo SN1000 SmartNICs User Guide to
> +update firmware and configure the adapter.
> +
> +
> +Per-Device Parameters
> +~~~~~~~~~~~~~~~~~~~~~
> +
> +The following per-device parameters can be passed via EAL PCI device
> +allowlist option like "-a 02:00.0,arg1=value1,...".
> +
> +Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
> +boolean parameters value.
> +
> +- ``class`` [net|vdpa] (default **net**)
> +
> + Choose the mode of operation of ef100 device.
> + **net** device will work as network device and will be probed by net/sfc driver.
> + **vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
> + If this parameter is not specified then ef100 device will operate as network device.
> +
> +
> +Dynamic Logging Parameters
> +~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +One may leverage EAL option "--log-level" to change default levels
> +for the log types supported by the driver. The option is used with
> +an argument typically consisting of two parts separated by a colon.
> +
> +Level value is the last part which takes a symbolic name (or integer).
> +Log type is the former part which may shell match syntax.
> +Depending on the choice of the expression, the given log level may
> +be used either for some specific log type or for a subset of types.
> +
> +SFC vDPA PMD provides the following log types available for control:
> +
> +- ``pmd.vdpa.sfc.driver`` (default level is **notice**)
> +
> + Affects driver-wide messages unrelated to any particular devices.
> +
> +- ``pmd.vdpa.sfc.main`` (default level is **notice**)
> +
> + Matches a subset of per-port log types registered during runtime.
> + A full name for a particular type may be obtained by appending a
> + dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
> diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
> index f765fe3..77412c7 100644
> --- a/drivers/vdpa/meson.build
> +++ b/drivers/vdpa/meson.build
> @@ -8,6 +8,7 @@ endif
> drivers = [
> 'ifc',
> 'mlx5',
> + 'sfc',
> ]
> std_deps = ['bus_pci', 'kvargs']
> std_deps += ['vhost']
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> new file mode 100644
> index 0000000..4255d65
> --- /dev/null
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -0,0 +1,22 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +#
> +# Copyright(c) 2020-2021 Xilinx, Inc.
> +
> +if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
> + build = false
> + reason = 'only supported on x86_64 and aarch64'
> +endif
> +
> +fmt_name = 'sfc_vdpa'
> +extra_flags = []
> +
> +foreach flag: extra_flags
> + if cc.has_argument(flag)
> + cflags += flag
> + endif
> +endforeach
> +
> +deps += ['common_sfc_efx', 'bus_pci']
> +sources = files(
> + 'sfc_vdpa.c',
> +)
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> new file mode 100644
> index 0000000..d85c52b
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -0,0 +1,286 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <stdbool.h>
> +#include <stdint.h>
> +#include <sys/queue.h>
> +
> +#include <rte_common.h>
> +#include <rte_errno.h>
> +#include <rte_string_fns.h>
> +#include <rte_vfio.h>
> +#include <rte_vhost.h>
> +
> +#include "efx.h"
> +#include "sfc_efx.h"
> +#include "sfc_vdpa.h"
> +
> +TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
> +static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
> + TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
> +
> +static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
> +
> +struct sfc_vdpa_adapter *
> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
> +{
> + bool found = false;
> + struct sfc_vdpa_adapter *sva;
Remove found flag and set sva to NULL here instead.
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> +
> + TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
> + if (pdev == sva->pdev) {
> + found = true;
> + break;
> + }
> + }
> +
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + return found ? sva : NULL;
> +}
> +
> +static int
> +sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
> +{
> + struct rte_pci_device *dev = sva->pdev;
> + char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
> + int rc;
> +
> + if (dev == NULL)
> + goto fail_inval;
> +
> + rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
> +
> + sva->vfio_container_fd = rte_vfio_container_create();
> + if (sva->vfio_container_fd < 0) {
> + sfc_vdpa_err(sva, "failed to create VFIO container");
> + goto fail_container_create;
> + }
> +
> + rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
> + &sva->iommu_group_num);
> + if (rc <= 0) {
Only rc < 0 guarantees that rte_errno is set.
> + sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
> + dev_name, rte_strerror(-rc));
> + goto fail_get_group_num;
> + }
> +
> + sva->vfio_group_fd =
> + rte_vfio_container_group_bind(sva->vfio_container_fd,
> + sva->iommu_group_num);
> + if (sva->vfio_group_fd < 0) {
> + sfc_vdpa_err(sva,
> + "failed to bind IOMMU group %d to container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + goto fail_group_bind;
> + }
> +
> + if (rte_pci_map_device(dev) != 0) {
> + sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
> + dev_name, rte_strerror(rte_errno));
> + goto fail_pci_map_device;
> + }
> +
> + sva->vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
> +
> + return 0;
> +
> +fail_pci_map_device:
> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
> + sva->iommu_group_num) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to unbind IOMMU group %d from container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + }
> +
> +fail_group_bind:
> +fail_get_group_num:
> + if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
Don't use braces for single statements, per DPDK coding style.
> + sfc_vdpa_err(sva, "failed to destroy container %d",
> + sva->vfio_container_fd);
> + }
> +
> +fail_container_create:
> +fail_inval:
> + return -1;
> +}
> +
> +static void
> +sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva)
> +{
> + rte_pci_unmap_device(sva->pdev);
> +
> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
> + sva->iommu_group_num) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to unbind IOMMU group %d from container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + }
> +
> + if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to destroy container %d",
> + sva->vfio_container_fd);
> + }
> +}
> +
> +static int
> +sfc_vdpa_set_log_prefix(struct sfc_vdpa_adapter *sva)
> +{
> + struct rte_pci_device *pci_dev = sva->pdev;
> + int ret;
> +
> + ret = snprintf(sva->log_prefix, sizeof(sva->log_prefix),
> + "PMD: sfc_vdpa " PCI_PRI_FMT " : ",
> + pci_dev->addr.domain, pci_dev->addr.bus,
> + pci_dev->addr.devid, pci_dev->addr.function);
> +
> + if (ret < 0 || ret >= (int)sizeof(sva->log_prefix)) {
> + SFC_VDPA_GENERIC_LOG(ERR,
> + "reserved log prefix is too short for " PCI_PRI_FMT,
> + pci_dev->addr.domain, pci_dev->addr.bus,
> + pci_dev->addr.devid, pci_dev->addr.function);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +uint32_t
> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
> + const char *lt_prefix_str, uint32_t ll_default)
> +{
> + size_t lt_prefix_str_size = strlen(lt_prefix_str);
> + size_t lt_str_size_max;
> + char *lt_str = NULL;
> + int ret;
> +
> + if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
> + ++lt_prefix_str_size; /* Reserve space for prefix separator */
> + lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
> + } else {
> + return RTE_LOGTYPE_PMD;
> + }
> +
> + lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
> + if (lt_str == NULL)
> + return RTE_LOGTYPE_PMD;
> +
> + strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
> + lt_str[lt_prefix_str_size - 1] = '.';
> + rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
> + lt_str_size_max - lt_prefix_str_size);
> + lt_str[lt_str_size_max - 1] = '\0';
> +
> + ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
> + rte_free(lt_str);
> +
> + return ret < 0 ? RTE_LOGTYPE_PMD : ret;
> +}
> +
> +static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
> + { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
> + { .vendor_id = 0, /* sentinel */ },
> +};
> +
> +static int
> +sfc_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> + struct rte_pci_device *pci_dev)
> +{
> + struct sfc_vdpa_adapter *sva = NULL;
> + uint32_t logtype_main;
> + int ret = 0;
> +
> + if (sfc_efx_dev_class_get(pci_dev->device.devargs) !=
> + SFC_EFX_DEV_CLASS_VDPA) {
> + SFC_VDPA_GENERIC_LOG(INFO,
> + "Incompatible device class: skip probing, should be probed by other sfc driver.");
> + return 1;
> + }
> +
> + /*
> + * It will not be probed in the secondary process. As device class
> + * is vdpa so return 0 to avoid probe by other sfc driver
> + */
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> + return 0;
> +
> + logtype_main = sfc_vdpa_register_logtype(&pci_dev->addr,
> + SFC_VDPA_LOGTYPE_MAIN_STR,
> + RTE_LOG_NOTICE);
> +
> + sva = rte_zmalloc("sfc_vdpa", sizeof(struct sfc_vdpa_adapter), 0);
> + if (sva == NULL)
> + goto fail_zmalloc;
> +
> + sva->pdev = pci_dev;
> + sva->logtype_main = logtype_main;
> +
> + ret = sfc_vdpa_set_log_prefix(sva);
> + if (ret != 0)
> + goto fail_set_log_prefix;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + sfc_vdpa_log_init(sva, "vfio init");
> + if (sfc_vdpa_vfio_setup(sva) < 0) {
> + sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
> + goto fail_vfio_setup;
> + }
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> + TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + sfc_vdpa_log_init(sva, "done");
> +
> + return 0;
> +
> +fail_vfio_setup:
> +fail_set_log_prefix:
> + rte_free(sva);
> +
> +fail_zmalloc:
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
> +{
> + struct sfc_vdpa_adapter *sva = NULL;
> +
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> + return -1;
> +
> + sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
> + if (sva == NULL) {
> + sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
> + return -1;
> + }
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> + TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + sfc_vdpa_vfio_teardown(sva);
> +
> + rte_free(sva);
> +
> + return 0;
> +}
> +
> +static struct rte_pci_driver rte_sfc_vdpa = {
> + .id_table = pci_id_sfc_vdpa_efx_map,
> + .drv_flags = 0,
> + .probe = sfc_vdpa_pci_probe,
> + .remove = sfc_vdpa_pci_remove,
> +};
> +
> +RTE_PMD_REGISTER_PCI(net_sfc_vdpa, rte_sfc_vdpa);
> +RTE_PMD_REGISTER_PCI_TABLE(net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);
> +RTE_PMD_REGISTER_KMOD_DEP(net_sfc_vdpa, "* vfio-pci");
> +RTE_LOG_REGISTER_SUFFIX(sfc_vdpa_logtype_driver, driver, NOTICE);
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> new file mode 100644
> index 0000000..3b77900
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -0,0 +1,40 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_H
> +#define _SFC_VDPA_H
> +
> +#include <stdint.h>
> +#include <sys/queue.h>
> +
> +#include <rte_bus_pci.h>
> +
> +#include "sfc_vdpa_log.h"
> +
> +/* Adapter private data */
> +struct sfc_vdpa_adapter {
> + TAILQ_ENTRY(sfc_vdpa_adapter) next;
> + struct rte_pci_device *pdev;
> + struct rte_pci_addr pci_addr;
> +
> + char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
> + uint32_t logtype_main;
> +
> + int vfio_group_fd;
> + int vfio_dev_fd;
> + int vfio_container_fd;
> + int iommu_group_num;
> +};
> +
> +uint32_t
> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
> + const char *lt_prefix_str,
> + uint32_t ll_default);
> +
> +struct sfc_vdpa_adapter *
> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
> +
> +#endif /* _SFC_VDPA_H */
> +
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
> new file mode 100644
> index 0000000..858e5ee
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> @@ -0,0 +1,56 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_LOG_H_
> +#define _SFC_VDPA_LOG_H_
> +
> +/** Generic driver log type */
> +extern int sfc_vdpa_logtype_driver;
> +
> +/** Common log type name prefix */
> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
> +
> +/** Log PMD generic message, add a prefix and a line break */
> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
> + rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
> + RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +/** Name prefix for the per-device log type used to report basic information */
> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
> +
> +#define SFC_VDPA_LOG_PREFIX_MAX 32
> +
> +/* Log PMD message, automatically add prefix and \n */
> +#define SFC_VDPA_LOG(sva, level, ...) \
> + do { \
> + const struct sfc_vdpa_adapter *_sva = (sva); \
> + \
> + rte_log(RTE_LOG_ ## level, _sva->logtype_main, \
> + RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> + _sva->log_prefix, \
> + RTE_FMT_TAIL(__VA_ARGS__ ,))); \
> + } while (0)
> +
> +#define sfc_vdpa_err(sva, ...) \
> + SFC_VDPA_LOG(sva, ERR, __VA_ARGS__)
> +
> +#define sfc_vdpa_warn(sva, ...) \
> + SFC_VDPA_LOG(sva, WARNING, __VA_ARGS__)
> +
> +#define sfc_vdpa_notice(sva, ...) \
> + SFC_VDPA_LOG(sva, NOTICE, __VA_ARGS__)
> +
> +#define sfc_vdpa_info(sva, ...) \
> + SFC_VDPA_LOG(sva, INFO, __VA_ARGS__)
> +
> +#define sfc_vdpa_log_init(sva, ...) \
> + SFC_VDPA_LOG(sva, INFO, \
> + RTE_FMT("%s(): " \
> + RTE_FMT_HEAD(__VA_ARGS__ ,), \
> + __func__, \
> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +#endif /* _SFC_VDPA_LOG_H_ */
> diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
> new file mode 100644
> index 0000000..4a76d1d
> --- /dev/null
> +++ b/drivers/vdpa/sfc/version.map
> @@ -0,0 +1,3 @@
> +DPDK_21 {
> + local: *;
> +};
>
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-29 20:07 ` Mattias Rönnblom
@ 2021-11-01 8:13 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-11-01 8:13 UTC (permalink / raw)
To: Mattias Rönnblom, dev
Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Praveen Kumar Jain
Hi Mattias,
>-----Original Message-----
>From: Mattias Rönnblom <hofors@lysator.liu.se>
>Sent: Saturday, October 30, 2021 1:38 AM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; chenbo.xia@intel.com;
>andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
><vsrivast@xilinx.com>
>Subject: Re: [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx
>vDPA driver
>
>On 2021-10-29 16:46, Vijay Srivastava wrote:
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
[SNIP]
>>
>> +struct sfc_vdpa_adapter *
>> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev) {
>> + bool found = false;
>> + struct sfc_vdpa_adapter *sva;
>
>Remove found flag and set sva to NULL here instead.
This flag is needed for the scenario when pdev != sva->pdev.
In this scenario, sva would be non-null and it should not be returned.
So I think it's OK to keep this flag.
>> +
>> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
>> +
>> + TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
>> + if (pdev == sva->pdev) {
>> + found = true;
>> + break;
>> + }
>> + }
>> +
>> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
>> +
>> + return found ? sva : NULL;
>> +}
>> +
>> +static int
>> +sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva) {
>> + struct rte_pci_device *dev = sva->pdev;
>> + char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
>> + int rc;
>> +
>> + if (dev == NULL)
>> + goto fail_inval;
>> +
>> + rte_pci_device_name(&dev->addr, dev_name,
>RTE_DEV_NAME_MAX_LEN);
>> +
>> + sva->vfio_container_fd = rte_vfio_container_create();
>> + if (sva->vfio_container_fd < 0) {
>> + sfc_vdpa_err(sva, "failed to create VFIO container");
>> + goto fail_container_create;
>> + }
>> +
>> + rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
>> + &sva->iommu_group_num);
>> + if (rc <= 0) {
>
>Only rc < 0 guarantees that rte_errno is set.
rte_vfio_get_group_num retunrs >0 on success 0 for non-existent group or VFIO <0 for errors so used check '(rc <= 0)' looks OK.
>> + sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
>> + dev_name, rte_strerror(-rc));
>> + goto fail_get_group_num;
>> + }
>> +
>> + sva->vfio_group_fd =
>> + rte_vfio_container_group_bind(sva->vfio_container_fd,
>> + sva->iommu_group_num);
>> + if (sva->vfio_group_fd < 0) {
>> + sfc_vdpa_err(sva,
>> + "failed to bind IOMMU group %d to container %d",
>> + sva->iommu_group_num, sva->vfio_container_fd);
>> + goto fail_group_bind;
>> + }
>> +
>> + if (rte_pci_map_device(dev) != 0) {
>> + sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
>> + dev_name, rte_strerror(rte_errno));
>> + goto fail_pci_map_device;
>> + }
>> +
>> + sva->vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
>> +
>> + return 0;
>> +
>> +fail_pci_map_device:
>> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
>> + sva->iommu_group_num) != 0) {
>> + sfc_vdpa_err(sva,
>> + "failed to unbind IOMMU group %d from container
>%d",
>> + sva->iommu_group_num, sva->vfio_container_fd);
>> + }
>> +
>> +fail_group_bind:
>> +fail_get_group_num:
>> + if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
>
>Don't use braces for single statements, per DPDK coding style.
As per DPDK coding guidelines :
"Do not use braces ({ and }) for control statements with zero or just a single statement, unless that statement is more
than a single line in which case the braces are permitted."
I believe it can be applied here as well as it has more than one line.
Regards,
Vijay
>> + sfc_vdpa_err(sva, "failed to destroy container %d",
>> + sva->vfio_container_fd);
>> + }
[SNIP]
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 01/10] " Vijay Srivastava
2021-10-29 20:07 ` Mattias Rönnblom
@ 2021-11-01 8:30 ` Xia, Chenbo
2021-11-01 8:59 ` Andrew Rybchenko
2021-11-01 9:53 ` Vijay Kumar Srivastava
1 sibling, 2 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-01 8:30 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add new vDPA PMD to support vDPA operations of Xilinx devices.
> This patch implements probe and remove functions.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Note that your patch is not rebased on the latest commit. Reviewers
may have trouble to review your patch.
> ---
> v2:
> * Updated logging macros to remove redundant code.
>
> v3:
> * Replaced depreciated whitelist with allowlist.
> * Text corrections in the sfc.rst and commit msg.
> * Added sfc in the toctree of doc/guides/vdpadevs/index.rst.
> * Removed extra compiler flags.
>
> MAINTAINERS | 6 +
> doc/guides/rel_notes/release_21_11.rst | 5 +
> doc/guides/vdpadevs/features/sfc.ini | 9 ++
> doc/guides/vdpadevs/index.rst | 2 +
> doc/guides/vdpadevs/sfc.rst | 97 +++++++++++
> drivers/vdpa/meson.build | 1 +
> drivers/vdpa/sfc/meson.build | 22 +++
> drivers/vdpa/sfc/sfc_vdpa.c | 286
> +++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 40 +++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 56 +++++++
> drivers/vdpa/sfc/version.map | 3 +
> 11 files changed, 527 insertions(+)
> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
> create mode 100644 doc/guides/vdpadevs/sfc.rst
> create mode 100644 drivers/vdpa/sfc/meson.build
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
> create mode 100644 drivers/vdpa/sfc/version.map
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index be2c9b6..5d12c49 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1236,6 +1236,12 @@ F: drivers/vdpa/mlx5/
> F: doc/guides/vdpadevs/mlx5.rst
> F: doc/guides/vdpadevs/features/mlx5.ini
>
> +Xilinx sfc vDPA
> +M: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> +F: drivers/vdpa/sfc/
> +F: doc/guides/vdpadevs/sfc.rst
> +F: doc/guides/vdpadevs/features/sfc.ini
> +
>
> Eventdev Drivers
> ----------------
> diff --git a/doc/guides/rel_notes/release_21_11.rst
> b/doc/guides/rel_notes/release_21_11.rst
> index 1ccac87..bd0a604 100644
> --- a/doc/guides/rel_notes/release_21_11.rst
> +++ b/doc/guides/rel_notes/release_21_11.rst
> @@ -305,6 +305,11 @@ New Features
> * Pcapng format with timestamps and meta-data.
> * Fixes packet capture with stripped VLAN tags.
>
> +* **Add new vDPA PMD based on Xilinx devices.**
Add -> Added
> +
> + Added a new Xilinx vDPA (``sfc_vdpa``) PMD.
> + See the :doc:`../vdpadevs/sfc` guide for more details on this driver.
> +
>
> Removed Items
> -------------
> diff --git a/doc/guides/vdpadevs/features/sfc.ini
> b/doc/guides/vdpadevs/features/sfc.ini
> new file mode 100644
> index 0000000..71b6158
> --- /dev/null
> +++ b/doc/guides/vdpadevs/features/sfc.ini
> @@ -0,0 +1,9 @@
> +;
> +; Supported features of the 'sfc' vDPA driver.
> +;
> +; Refer to default.ini for the full list of available driver features.
> +;
> +[Features]
> +Linux = Y
> +x86-64 = Y
> +Usage doc = Y
> diff --git a/doc/guides/vdpadevs/index.rst b/doc/guides/vdpadevs/index.rst
> index 1a13efe..f1a946e 100644
> --- a/doc/guides/vdpadevs/index.rst
> +++ b/doc/guides/vdpadevs/index.rst
> @@ -14,3 +14,5 @@ which can be used from an application through vhost API.
> features_overview
> ifc
> mlx5
> + sfc
> +
The above blank line not needed.
> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
> new file mode 100644
> index 0000000..44e694f
> --- /dev/null
> +++ b/doc/guides/vdpadevs/sfc.rst
> @@ -0,0 +1,97 @@
> +.. SPDX-License-Identifier: BSD-3-Clause
> + Copyright(c) 2021 Xilinx Corporation.
> +
> +Xilinx vDPA driver
> +==================
> +
> +The Xilinx vDPA (vhost data path acceleration) driver
> (**librte_pmd_sfc_vdpa**)
> +provides support for the Xilinx SN1022 SmartNICs family of 10/25/40/50/100
> Gbps
> +adapters that have support for latest Linux and FreeBSD operating systems.
> +
> +More information can be found at Xilinx website https://www.xilinx.com.
> +
> +
> +Xilinx vDPA implementation
> +--------------------------
> +
> +ef100 device can be configured in the net device or vDPA mode.
> +Adding "class=vdpa" parameter helps to specify that this
> +device is to be used in vDPA mode. If this parameter is not specified, device
> +will be probed by net/sfc driver and will used as a net device.
> +
> +This PMD uses libefx (common/sfc_efx) code to access the device firmware.
> +
> +
> +Supported NICs
> +--------------
> +
> +- Xilinx SN1022 SmartNICs
> +
> +
> +Features
> +--------
> +
> +Features of the Xilinx vDPA driver are:
> +
> +- Compatibility with virtio 0.95 and 1.0
> +
> +
> +Non-supported Features
> +----------------------
> +
> +- Control Queue
> +- Multi queue
> +- Live Migration
> +
> +
> +Prerequisites
> +-------------
> +
> +Requires firmware version: v1.0.7.0 or higher
> +
> +Visit `Xilinx Support Downloads <https://www.xilinx.com/support.html>`_
> +to get Xilinx Utilities with the latest firmware.
> +Follow instructions from Alveo SN1000 SmartNICs User Guide to
> +update firmware and configure the adapter.
> +
> +
> +Per-Device Parameters
> +~~~~~~~~~~~~~~~~~~~~~
> +
> +The following per-device parameters can be passed via EAL PCI device
> +allowlist option like "-a 02:00.0,arg1=value1,...".
> +
> +Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
> +boolean parameters value.
> +
> +- ``class`` [net|vdpa] (default **net**)
> +
> + Choose the mode of operation of ef100 device.
> + **net** device will work as network device and will be probed by net/sfc
> driver.
> + **vdpa** device will work as vdpa device and will be probed by vdpa/sfc
> driver.
> + If this parameter is not specified then ef100 device will operate as
> network device.
> +
> +
> +Dynamic Logging Parameters
> +~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +One may leverage EAL option "--log-level" to change default levels
> +for the log types supported by the driver. The option is used with
> +an argument typically consisting of two parts separated by a colon.
> +
> +Level value is the last part which takes a symbolic name (or integer).
> +Log type is the former part which may shell match syntax.
> +Depending on the choice of the expression, the given log level may
> +be used either for some specific log type or for a subset of types.
> +
> +SFC vDPA PMD provides the following log types available for control:
> +
> +- ``pmd.vdpa.sfc.driver`` (default level is **notice**)
> +
> + Affects driver-wide messages unrelated to any particular devices.
> +
> +- ``pmd.vdpa.sfc.main`` (default level is **notice**)
> +
> + Matches a subset of per-port log types registered during runtime.
> + A full name for a particular type may be obtained by appending a
> + dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
> diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
> index f765fe3..77412c7 100644
> --- a/drivers/vdpa/meson.build
> +++ b/drivers/vdpa/meson.build
> @@ -8,6 +8,7 @@ endif
> drivers = [
> 'ifc',
> 'mlx5',
> + 'sfc',
> ]
> std_deps = ['bus_pci', 'kvargs']
> std_deps += ['vhost']
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> new file mode 100644
> index 0000000..4255d65
> --- /dev/null
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -0,0 +1,22 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +#
> +# Copyright(c) 2020-2021 Xilinx, Inc.
> +
> +if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and
> (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
> + build = false
> + reason = 'only supported on x86_64 and aarch64'
> +endif
> +
> +fmt_name = 'sfc_vdpa'
> +extra_flags = []
> +
> +foreach flag: extra_flags
> + if cc.has_argument(flag)
> + cflags += flag
> + endif
> +endforeach
> +
> +deps += ['common_sfc_efx', 'bus_pci']
> +sources = files(
> + 'sfc_vdpa.c',
> +)
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> new file mode 100644
> index 0000000..d85c52b
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -0,0 +1,286 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <stdbool.h>
> +#include <stdint.h>
> +#include <sys/queue.h>
> +
> +#include <rte_common.h>
> +#include <rte_errno.h>
> +#include <rte_string_fns.h>
> +#include <rte_vfio.h>
> +#include <rte_vhost.h>
> +
> +#include "efx.h"
> +#include "sfc_efx.h"
> +#include "sfc_vdpa.h"
> +
> +TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
> +static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
> + TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
> +
> +static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
> +
> +struct sfc_vdpa_adapter *
> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
> +{
> + bool found = false;
> + struct sfc_vdpa_adapter *sva;
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> +
> + TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
> + if (pdev == sva->pdev) {
> + found = true;
> + break;
> + }
> + }
> +
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + return found ? sva : NULL;
> +}
> +
> +static int
> +sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
> +{
> + struct rte_pci_device *dev = sva->pdev;
> + char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
> + int rc;
> +
> + if (dev == NULL)
I think it will never happen
> + goto fail_inval;
> +
> + rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
> +
> + sva->vfio_container_fd = rte_vfio_container_create();
> + if (sva->vfio_container_fd < 0) {
> + sfc_vdpa_err(sva, "failed to create VFIO container");
> + goto fail_container_create;
> + }
> +
> + rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
> + &sva->iommu_group_num);
> + if (rc <= 0) {
> + sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
> + dev_name, rte_strerror(-rc));
> + goto fail_get_group_num;
> + }
> +
> + sva->vfio_group_fd =
> + rte_vfio_container_group_bind(sva->vfio_container_fd,
DPDK allows up to 100 chars per line. Please check all code that do not
need new lines. It will make the code look better.
> + sva->iommu_group_num);
> + if (sva->vfio_group_fd < 0) {
> + sfc_vdpa_err(sva,
> + "failed to bind IOMMU group %d to container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + goto fail_group_bind;
> + }
> +
> + if (rte_pci_map_device(dev) != 0) {
> + sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
> + dev_name, rte_strerror(rte_errno));
> + goto fail_pci_map_device;
> + }
> +
> + sva->vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
> +
> + return 0;
> +
> +fail_pci_map_device:
> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
> + sva->iommu_group_num) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to unbind IOMMU group %d from container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + }
> +
> +fail_group_bind:
> +fail_get_group_num:
> + if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
> + sfc_vdpa_err(sva, "failed to destroy container %d",
> + sva->vfio_container_fd);
> + }
> +
> +fail_container_create:
> +fail_inval:
> + return -1;
> +}
> +
> +static void
> +sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva)
> +{
> + rte_pci_unmap_device(sva->pdev);
> +
> + if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
> + sva->iommu_group_num) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to unbind IOMMU group %d from container %d",
> + sva->iommu_group_num, sva->vfio_container_fd);
> + }
> +
> + if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
> + sfc_vdpa_err(sva,
> + "failed to destroy container %d",
> + sva->vfio_container_fd);
> + }
> +}
> +
> +static int
> +sfc_vdpa_set_log_prefix(struct sfc_vdpa_adapter *sva)
> +{
> + struct rte_pci_device *pci_dev = sva->pdev;
> + int ret;
> +
> + ret = snprintf(sva->log_prefix, sizeof(sva->log_prefix),
> + "PMD: sfc_vdpa " PCI_PRI_FMT " : ",
> + pci_dev->addr.domain, pci_dev->addr.bus,
> + pci_dev->addr.devid, pci_dev->addr.function);
> +
> + if (ret < 0 || ret >= (int)sizeof(sva->log_prefix)) {
> + SFC_VDPA_GENERIC_LOG(ERR,
> + "reserved log prefix is too short for " PCI_PRI_FMT,
> + pci_dev->addr.domain, pci_dev->addr.bus,
> + pci_dev->addr.devid, pci_dev->addr.function);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +uint32_t
> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
> + const char *lt_prefix_str, uint32_t ll_default)
> +{
> + size_t lt_prefix_str_size = strlen(lt_prefix_str);
> + size_t lt_str_size_max;
> + char *lt_str = NULL;
> + int ret;
> +
> + if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
> + ++lt_prefix_str_size; /* Reserve space for prefix separator */
> + lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
> + } else {
> + return RTE_LOGTYPE_PMD;
> + }
> +
> + lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
> + if (lt_str == NULL)
> + return RTE_LOGTYPE_PMD;
> +
> + strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
> + lt_str[lt_prefix_str_size - 1] = '.';
> + rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
> + lt_str_size_max - lt_prefix_str_size);
> + lt_str[lt_str_size_max - 1] = '\0';
> +
> + ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
> + rte_free(lt_str);
> +
> + return ret < 0 ? RTE_LOGTYPE_PMD : ret;
> +}
> +
> +static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
> + { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
> + { .vendor_id = 0, /* sentinel */ },
> +};
> +
> +static int
> +sfc_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> + struct rte_pci_device *pci_dev)
> +{
> + struct sfc_vdpa_adapter *sva = NULL;
> + uint32_t logtype_main;
> + int ret = 0;
> +
> + if (sfc_efx_dev_class_get(pci_dev->device.devargs) !=
> + SFC_EFX_DEV_CLASS_VDPA) {
> + SFC_VDPA_GENERIC_LOG(INFO,
> + "Incompatible device class: skip probing, should be probed
> by other sfc driver.");
> + return 1;
> + }
> +
> + /*
> + * It will not be probed in the secondary process. As device class
> + * is vdpa so return 0 to avoid probe by other sfc driver
> + */
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> + return 0;
> +
> + logtype_main = sfc_vdpa_register_logtype(&pci_dev->addr,
> + SFC_VDPA_LOGTYPE_MAIN_STR,
> + RTE_LOG_NOTICE);
> +
> + sva = rte_zmalloc("sfc_vdpa", sizeof(struct sfc_vdpa_adapter), 0);
> + if (sva == NULL)
> + goto fail_zmalloc;
> +
> + sva->pdev = pci_dev;
> + sva->logtype_main = logtype_main;
> +
> + ret = sfc_vdpa_set_log_prefix(sva);
> + if (ret != 0)
> + goto fail_set_log_prefix;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + sfc_vdpa_log_init(sva, "vfio init");
> + if (sfc_vdpa_vfio_setup(sva) < 0) {
> + sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
> + goto fail_vfio_setup;
> + }
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> + TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + sfc_vdpa_log_init(sva, "done");
> +
> + return 0;
> +
> +fail_vfio_setup:
> +fail_set_log_prefix:
> + rte_free(sva);
> +
> +fail_zmalloc:
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
> +{
> + struct sfc_vdpa_adapter *sva = NULL;
> +
> + if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> + return -1;
> +
> + sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
> + if (sva == NULL) {
> + sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
> + return -1;
> + }
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> + TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + sfc_vdpa_vfio_teardown(sva);
> +
> + rte_free(sva);
> +
> + return 0;
> +}
> +
> +static struct rte_pci_driver rte_sfc_vdpa = {
> + .id_table = pci_id_sfc_vdpa_efx_map,
> + .drv_flags = 0,
> + .probe = sfc_vdpa_pci_probe,
> + .remove = sfc_vdpa_pci_remove,
> +};
> +
> +RTE_PMD_REGISTER_PCI(net_sfc_vdpa, rte_sfc_vdpa);
> +RTE_PMD_REGISTER_PCI_TABLE(net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);
> +RTE_PMD_REGISTER_KMOD_DEP(net_sfc_vdpa, "* vfio-pci");
> +RTE_LOG_REGISTER_SUFFIX(sfc_vdpa_logtype_driver, driver, NOTICE);
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> new file mode 100644
> index 0000000..3b77900
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -0,0 +1,40 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_H
> +#define _SFC_VDPA_H
> +
> +#include <stdint.h>
> +#include <sys/queue.h>
> +
> +#include <rte_bus_pci.h>
> +
> +#include "sfc_vdpa_log.h"
> +
> +/* Adapter private data */
> +struct sfc_vdpa_adapter {
> + TAILQ_ENTRY(sfc_vdpa_adapter) next;
> + struct rte_pci_device *pdev;
> + struct rte_pci_addr pci_addr;
I don't think pci_addr is needed, you can get it through pdev.
Thanks,
Chenbo
> +
> + char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
> + uint32_t logtype_main;
> +
> + int vfio_group_fd;
> + int vfio_dev_fd;
> + int vfio_container_fd;
> + int iommu_group_num;
> +};
> +
> +uint32_t
> +sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
> + const char *lt_prefix_str,
> + uint32_t ll_default);
> +
> +struct sfc_vdpa_adapter *
> +sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
> +
> +#endif /* _SFC_VDPA_H */
> +
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
> new file mode 100644
> index 0000000..858e5ee
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> @@ -0,0 +1,56 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_LOG_H_
> +#define _SFC_VDPA_LOG_H_
> +
> +/** Generic driver log type */
> +extern int sfc_vdpa_logtype_driver;
> +
> +/** Common log type name prefix */
> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
> +
> +/** Log PMD generic message, add a prefix and a line break */
> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
> + rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
> + RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +/** Name prefix for the per-device log type used to report basic information
> */
> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
> +
> +#define SFC_VDPA_LOG_PREFIX_MAX 32
> +
> +/* Log PMD message, automatically add prefix and \n */
> +#define SFC_VDPA_LOG(sva, level, ...) \
> + do { \
> + const struct sfc_vdpa_adapter *_sva = (sva); \
> + \
> + rte_log(RTE_LOG_ ## level, _sva->logtype_main, \
> + RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> + _sva->log_prefix, \
> + RTE_FMT_TAIL(__VA_ARGS__ ,))); \
> + } while (0)
> +
> +#define sfc_vdpa_err(sva, ...) \
> + SFC_VDPA_LOG(sva, ERR, __VA_ARGS__)
> +
> +#define sfc_vdpa_warn(sva, ...) \
> + SFC_VDPA_LOG(sva, WARNING, __VA_ARGS__)
> +
> +#define sfc_vdpa_notice(sva, ...) \
> + SFC_VDPA_LOG(sva, NOTICE, __VA_ARGS__)
> +
> +#define sfc_vdpa_info(sva, ...) \
> + SFC_VDPA_LOG(sva, INFO, __VA_ARGS__)
> +
> +#define sfc_vdpa_log_init(sva, ...) \
> + SFC_VDPA_LOG(sva, INFO, \
> + RTE_FMT("%s(): " \
> + RTE_FMT_HEAD(__VA_ARGS__ ,), \
> + __func__, \
> + RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +#endif /* _SFC_VDPA_LOG_H_ */
> diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
> new file mode 100644
> index 0000000..4a76d1d
> --- /dev/null
> +++ b/drivers/vdpa/sfc/version.map
> @@ -0,0 +1,3 @@
> +DPDK_21 {
> + local: *;
> +};
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-01 8:30 ` Xia, Chenbo
@ 2021-11-01 8:59 ` Andrew Rybchenko
2021-11-01 9:10 ` Xia, Chenbo
2021-11-01 9:53 ` Vijay Kumar Srivastava
1 sibling, 1 reply; 122+ messages in thread
From: Andrew Rybchenko @ 2021-11-01 8:59 UTC (permalink / raw)
To: Xia, Chenbo, Vijay Srivastava, dev
Cc: maxime.coquelin, Vijay Kumar Srivastava
Hi Chenbo,
Thanks for review.
Few questions from me below on your review notes.
Andrew.
On 11/1/21 11:30 AM, Xia, Chenbo wrote:
> Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Friday, October 29, 2021 10:47 PM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Subject: [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>>
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add new vDPA PMD to support vDPA operations of Xilinx devices.
>> This patch implements probe and remove functions.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>
> Note that your patch is not rebased on the latest commit. Reviewers
> may have trouble to review your patch.
>
[snip]
>> + sva->vfio_group_fd =
>> + rte_vfio_container_group_bind(sva->vfio_container_fd,
>
> DPDK allows up to 100 chars per line. Please check all code that do not
> need new lines. It will make the code look better.
I'm sorry, but as far as I know permissive to have up to 100 chars
does not enforce to stretch all lines. Or am I missing something in
coding style? IMHO, it is still *allowed* to avoid lines longer than
80 chars.
[snip]
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-01 8:59 ` Andrew Rybchenko
@ 2021-11-01 9:10 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-01 9:10 UTC (permalink / raw)
To: Andrew Rybchenko, Vijay Srivastava, dev
Cc: maxime.coquelin, Vijay Kumar Srivastava
> -----Original Message-----
> From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Sent: Monday, November 1, 2021 5:00 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; Vijay Srivastava
> <vijay.srivastava@xilinx.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: Re: [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> Hi Chenbo,
>
> Thanks for review.
> Few questions from me below on your review notes.
>
> Andrew.
>
> On 11/1/21 11:30 AM, Xia, Chenbo wrote:
> > Hi Vijay,
> >
> >> -----Original Message-----
> >> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> >> Sent: Friday, October 29, 2021 10:47 PM
> >> To: dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> >> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Subject: [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
> >>
> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >>
> >> Add new vDPA PMD to support vDPA operations of Xilinx devices.
> >> This patch implements probe and remove functions.
> >>
> >> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> >
> > Note that your patch is not rebased on the latest commit. Reviewers
> > may have trouble to review your patch.
> >
>
> [snip]
>
> >> + sva->vfio_group_fd =
> >> + rte_vfio_container_group_bind(sva->vfio_container_fd,
> >
> > DPDK allows up to 100 chars per line. Please check all code that do not
> > need new lines. It will make the code look better.
>
> I'm sorry, but as far as I know permissive to have up to 100 chars
> does not enforce to stretch all lines. Or am I missing something in
> coding style? IMHO, it is still *allowed* to avoid lines longer than
> 80 chars.
You are correct. 80 chars is still allowed. You can keep it if it's your
preference. I just thought most people would choose 100 chars for a case
above. But you can choose on your own :)
/Chenbo
>
> [snip]
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-01 8:30 ` Xia, Chenbo
2021-11-01 8:59 ` Andrew Rybchenko
@ 2021-11-01 9:53 ` Vijay Kumar Srivastava
1 sibling, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-11-01 9:53 UTC (permalink / raw)
To: Xia, Chenbo, dev; +Cc: maxime.coquelin, andrew.rybchenko
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Monday, November 1, 2021 2:01 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
>Kumar Srivastava <vsrivast@xilinx.com>
>Subject: RE: [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
>Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Friday, October 29, 2021 10:47 PM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
>> <vsrivast@xilinx.com>
>> Subject: [PATCH v3 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>>
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add new vDPA PMD to support vDPA operations of Xilinx devices.
>> This patch implements probe and remove functions.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>
>Note that your patch is not rebased on the latest commit. Reviewers may have
>trouble to review your patch.
Ack.
When I had prepared the patch series I needed patches from main (or next-net) due to changes
in the intr_handle (internal) as at that time next-virtio was not updated.
>> ---
>> v2:
[SNIP]
>> --- a/doc/guides/vdpadevs/index.rst
>> +++ b/doc/guides/vdpadevs/index.rst
>> @@ -14,3 +14,5 @@ which can be used from an application through vhost
>API.
>> features_overview
>> ifc
>> mlx5
>> + sfc
>> +
>
>The above blank line not needed.
Ack.
>> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
>> +sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva) {
>> + struct rte_pci_device *dev = sva->pdev;
>> + char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
>> + int rc;
>> +
>> + if (dev == NULL)
>
>I think it will never happen
Yes, This check can be removed.
>> + goto fail_inval;
>> +
>> + rte_pci_device_name(&dev->addr, dev_name,
>RTE_DEV_NAME_MAX_LEN);
[SNIP]
>> +#include <rte_bus_pci.h>
>> +
>> +#include "sfc_vdpa_log.h"
>> +
>> +/* Adapter private data */
>> +struct sfc_vdpa_adapter {
>> + TAILQ_ENTRY(sfc_vdpa_adapter) next;
>> + struct rte_pci_device *pdev;
>> + struct rte_pci_addr pci_addr;
>
>I don't think pci_addr is needed, you can get it through pdev.
Ack.
>> +
>> + char
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 01/10] " Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-10-29 20:21 ` Mattias Rönnblom
2021-11-01 11:48 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
` (7 subsequent siblings)
9 siblings, 2 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add HW initialization and vDPA device registration support.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Used rte_memzone_reserve_aligned for mcdi buffer allocation.
* Freeing mcdi buff when DMA map fails.
* Fixed one typo.
doc/guides/vdpadevs/sfc.rst | 6 +
drivers/vdpa/sfc/meson.build | 3 +
drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 327 ++++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
10 files changed, 670 insertions(+), 1 deletion(-)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index 44e694f..d06c427 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types available for control:
Matches a subset of per-port log types registered during runtime.
A full name for a particular type may be obtained by appending a
dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
+
+- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
+
+ Extra logging of the communication with the NIC's management CPU.
+ The format of the log is consumed by the netlogdecode cross-platform
+ tool. May be managed per-port, as explained above.
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index 4255d65..dc333de 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -19,4 +19,7 @@ endforeach
deps += ['common_sfc_efx', 'bus_pci']
sources = files(
'sfc_vdpa.c',
+ 'sfc_vdpa_hw.c',
+ 'sfc_vdpa_mcdi.c',
+ 'sfc_vdpa_ops.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index d85c52b..b7eca56 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -232,6 +232,19 @@ struct sfc_vdpa_adapter *
goto fail_vfio_setup;
}
+ sfc_vdpa_log_init(sva, "hw init");
+ if (sfc_vdpa_hw_init(sva) != 0) {
+ sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
+ goto fail_hw_init;
+ }
+
+ sfc_vdpa_log_init(sva, "dev init");
+ sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
+ if (sva->ops_data == NULL) {
+ sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
+ goto fail_dev_init;
+ }
+
pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
@@ -240,6 +253,12 @@ struct sfc_vdpa_adapter *
return 0;
+fail_dev_init:
+ sfc_vdpa_hw_fini(sva);
+
+fail_hw_init:
+ sfc_vdpa_vfio_teardown(sva);
+
fail_vfio_setup:
fail_set_log_prefix:
rte_free(sva);
@@ -266,6 +285,10 @@ struct sfc_vdpa_adapter *
TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+ sfc_vdpa_device_fini(sva->ops_data);
+
+ sfc_vdpa_hw_fini(sva);
+
sfc_vdpa_vfio_teardown(sva);
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 3b77900..046f25d 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -11,14 +11,38 @@
#include <rte_bus_pci.h>
+#include "sfc_efx.h"
+#include "sfc_efx_mcdi.h"
+#include "sfc_vdpa_debug.h"
#include "sfc_vdpa_log.h"
+#include "sfc_vdpa_ops.h"
+
+#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ /*
+ * PMD setup and configuration is not thread safe. Since it is not
+ * performance sensitive, it is better to guarantee thread-safety
+ * and add device level lock. vDPA control operations which
+ * change its state should acquire the lock.
+ */
+ rte_spinlock_t lock;
struct rte_pci_device *pdev;
struct rte_pci_addr pci_addr;
+ efx_family_t family;
+ efx_nic_t *nic;
+ rte_spinlock_t nic_lock;
+
+ efsys_bar_t mem_bar;
+
+ struct sfc_efx_mcdi mcdi;
+ size_t mcdi_buff_size;
+
+ uint32_t max_queue_count;
+
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
@@ -26,6 +50,7 @@ struct sfc_vdpa_adapter {
int vfio_dev_fd;
int vfio_container_fd;
int iommu_group_num;
+ struct sfc_vdpa_ops_data *ops_data;
};
uint32_t
@@ -36,5 +61,27 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
-#endif /* _SFC_VDPA_H */
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva);
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp);
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+
+static inline struct sfc_vdpa_adapter *
+sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
+{
+ return (struct sfc_vdpa_adapter *)dev_handle;
+}
+
+#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h b/drivers/vdpa/sfc/sfc_vdpa_debug.h
new file mode 100644
index 0000000..cfa8cc5
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_DEBUG_H_
+#define _SFC_VDPA_DEBUG_H_
+
+#include <rte_debug.h>
+
+#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
+/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
+ * in the driver only.
+ */
+#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
+#else
+/* If the driver debug is not enabled, follow DPDK debug/non-debug */
+#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
+#endif
+
+#endif /* _SFC_VDPA_DEBUG_H_ */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
new file mode 100644
index 0000000..7c256ff
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -0,0 +1,327 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <unistd.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_vfio.h>
+
+#include "efx.h"
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_ops.h"
+
+extern uint32_t sfc_logtype_driver;
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
+#endif
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp)
+{
+ uint64_t mcdi_iova;
+ size_t mcdi_buff_size;
+ const struct rte_memzone *mz = NULL;
+ int numa_node = sva->pdev->device.numa_node;
+ int ret;
+
+ mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
+
+ sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
+
+ mz = rte_memzone_reserve_aligned(name, mcdi_buff_size,
+ numa_node,
+ RTE_MEMZONE_IOVA_CONTIG,
+ PAGE_SIZE);
+ if (mz == NULL) {
+ sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
+ name, (unsigned int)len, rte_strerror(rte_errno));
+ return -ENOMEM;
+ }
+
+ /* IOVA address for MCDI would be re-calculated if mapping
+ * using default IOVA would fail.
+ * TODO: Earlier there was no way to get valid IOVA range.
+ * Recently a patch has been submitted to get the IOVA range
+ * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
+ * in the kernel version >= 5.4. Support to get the default
+ * IOVA address for MCDI buffer using available IOVA range
+ * would be added later. Meanwhile default IOVA for MCDI buffer
+ * is kept at high mem at 2TB. In case of overlap new available
+ * addresses would be searched and same would be used.
+ */
+ mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
+
+ do {
+ ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
+ (uint64_t)mz->addr, mcdi_iova,
+ mcdi_buff_size);
+ if (ret == 0)
+ break;
+
+ mcdi_iova = mcdi_iova >> 1;
+ if (mcdi_iova < mcdi_buff_size) {
+ sfc_vdpa_err(sva,
+ "DMA mapping failed for MCDI : %s",
+ rte_strerror(rte_errno));
+ rte_memzone_free(mz);
+ return ret;
+ }
+
+ } while (ret < 0);
+
+ esmp->esm_addr = mcdi_iova;
+ esmp->esm_base = mz->addr;
+ sva->mcdi_buff_size = mcdi_buff_size;
+
+ sfc_vdpa_info(sva,
+ "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
+ name, len, esmp->esm_base, esmp->esm_addr);
+
+ return 0;
+}
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp)
+{
+ int ret;
+
+ sfc_vdpa_log_init(sva, "name=%s", esmp->esm_mz->name);
+
+ ret = rte_vfio_container_dma_unmap(sva->vfio_container_fd,
+ (uint64_t)esmp->esm_base,
+ esmp->esm_addr, sva->mcdi_buff_size);
+ if (ret < 0)
+ sfc_vdpa_err(sva, "DMA unmap failed for MCDI : %s",
+ rte_strerror(rte_errno));
+
+ sfc_vdpa_info(sva,
+ "DMA free name=%s => virt=%p iova=%" PRIx64,
+ esmp->esm_mz->name, esmp->esm_base, esmp->esm_addr);
+
+ rte_free((void *)(esmp->esm_base));
+
+ sva->mcdi_buff_size = 0;
+ memset(esmp, 0, sizeof(*esmp));
+}
+
+static int
+sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
+ const efx_bar_region_t *mem_ebrp)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ efsys_bar_t *ebp = &sva->mem_bar;
+ struct rte_mem_resource *res =
+ &pci_dev->mem_resource[mem_ebrp->ebr_index];
+
+ SFC_BAR_LOCK_INIT(ebp, pci_dev->name);
+ ebp->esb_rid = mem_ebrp->ebr_index;
+ ebp->esb_dev = pci_dev;
+ ebp->esb_base = res->addr;
+
+ return 0;
+}
+
+static void
+sfc_vdpa_mem_bar_fini(struct sfc_vdpa_adapter *sva)
+{
+ efsys_bar_t *ebp = &sva->mem_bar;
+
+ SFC_BAR_LOCK_DESTROY(ebp);
+ memset(ebp, 0, sizeof(*ebp));
+}
+
+static int
+sfc_vdpa_nic_probe(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+ int rc;
+
+ rc = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE);
+ if (rc != 0)
+ sfc_vdpa_err(sva, "nic probe failed: %s", rte_strerror(rc));
+
+ return rc;
+}
+
+static int
+sfc_vdpa_estimate_resource_limits(struct sfc_vdpa_adapter *sva)
+{
+ efx_drv_limits_t limits;
+ int rc;
+ uint32_t evq_allocated;
+ uint32_t rxq_allocated;
+ uint32_t txq_allocated;
+ uint32_t max_queue_cnt;
+
+ memset(&limits, 0, sizeof(limits));
+
+ /* Request at least one Rx and Tx queue */
+ limits.edl_min_rxq_count = 1;
+ limits.edl_min_txq_count = 1;
+ /* Management event queue plus event queue for Tx/Rx queue */
+ limits.edl_min_evq_count =
+ 1 + RTE_MAX(limits.edl_min_rxq_count, limits.edl_min_txq_count);
+
+ limits.edl_max_rxq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_txq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_evq_count = 1 + SFC_VDPA_MAX_QUEUE_PAIRS;
+
+ SFC_VDPA_ASSERT(limits.edl_max_evq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_rxq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_txq_count >= limits.edl_min_rxq_count);
+
+ /* Configure the minimum required resources needed for the
+ * driver to operate, and the maximum desired resources that the
+ * driver is capable of using.
+ */
+ sfc_vdpa_log_init(sva, "set drv limit");
+ efx_nic_set_drv_limits(sva->nic, &limits);
+
+ sfc_vdpa_log_init(sva, "init nic");
+ rc = efx_nic_init(sva->nic);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic init failed: %s", rte_strerror(rc));
+ goto fail_nic_init;
+ }
+
+ /* Find resource dimensions assigned by firmware to this function */
+ rc = efx_nic_get_vi_pool(sva->nic, &evq_allocated, &rxq_allocated,
+ &txq_allocated);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "vi pool get failed: %s", rte_strerror(rc));
+ goto fail_get_vi_pool;
+ }
+
+ /* It still may allocate more than maximum, ensure limit */
+ evq_allocated = RTE_MIN(evq_allocated, limits.edl_max_evq_count);
+ rxq_allocated = RTE_MIN(rxq_allocated, limits.edl_max_rxq_count);
+ txq_allocated = RTE_MIN(txq_allocated, limits.edl_max_txq_count);
+
+
+ max_queue_cnt = RTE_MIN(rxq_allocated, txq_allocated);
+ /* Subtract management EVQ not used for traffic */
+ max_queue_cnt = RTE_MIN(evq_allocated - 1, max_queue_cnt);
+
+ SFC_VDPA_ASSERT(max_queue_cnt > 0);
+
+ sva->max_queue_count = max_queue_cnt;
+
+ return 0;
+
+fail_get_vi_pool:
+ efx_nic_fini(sva->nic);
+fail_nic_init:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva)
+{
+ efx_bar_region_t mem_ebr;
+ efx_nic_t *enp;
+ int rc;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "get family");
+ rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
+ if (rc != 0)
+ goto fail_family;
+ sfc_vdpa_log_init(sva,
+ "family is %u, membar is %u,"
+ "function control window offset is %#" PRIx64,
+ sva->family, mem_ebr.ebr_index, mem_ebr.ebr_offset);
+
+ sfc_vdpa_log_init(sva, "init mem bar");
+ rc = sfc_vdpa_mem_bar_init(sva, &mem_ebr);
+ if (rc != 0)
+ goto fail_mem_bar_init;
+
+ sfc_vdpa_log_init(sva, "create nic");
+ rte_spinlock_init(&sva->nic_lock);
+ rc = efx_nic_create(sva->family, (efsys_identifier_t *)sva,
+ &sva->mem_bar, mem_ebr.ebr_offset,
+ &sva->nic_lock, &enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic create failed: %s", rte_strerror(rc));
+ goto fail_nic_create;
+ }
+ sva->nic = enp;
+
+ sfc_vdpa_log_init(sva, "init mcdi");
+ rc = sfc_vdpa_mcdi_init(sva);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "mcdi init failed: %s", rte_strerror(rc));
+ goto fail_mcdi_init;
+ }
+
+ sfc_vdpa_log_init(sva, "probe nic");
+ rc = sfc_vdpa_nic_probe(sva);
+ if (rc != 0)
+ goto fail_nic_probe;
+
+ sfc_vdpa_log_init(sva, "reset nic");
+ rc = efx_nic_reset(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic reset failed: %s", rte_strerror(rc));
+ goto fail_nic_reset;
+ }
+
+ sfc_vdpa_log_init(sva, "estimate resource limits");
+ rc = sfc_vdpa_estimate_resource_limits(sva);
+ if (rc != 0)
+ goto fail_estimate_rsrc_limits;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_estimate_rsrc_limits:
+fail_nic_reset:
+ efx_nic_unprobe(enp);
+
+fail_nic_probe:
+ sfc_vdpa_mcdi_fini(sva);
+
+fail_mcdi_init:
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+fail_nic_create:
+ sfc_vdpa_mem_bar_fini(sva);
+
+fail_mem_bar_init:
+fail_family:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "unprobe nic");
+ efx_nic_unprobe(enp);
+
+ sfc_vdpa_log_init(sva, "mcdi fini");
+ sfc_vdpa_mcdi_fini(sva);
+
+ sfc_vdpa_log_init(sva, "nic fini");
+ efx_nic_fini(enp);
+
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+ sfc_vdpa_mem_bar_fini(sva);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
index 858e5ee..4e7a84f 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_log.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -21,6 +21,9 @@
/** Name prefix for the per-device log type used to report basic information */
#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+/** Device MCDI log type name prefix */
+#define SFC_VDPA_LOGTYPE_MCDI_STR SFC_VDPA_LOGTYPE_PREFIX "mcdi"
+
#define SFC_VDPA_LOG_PREFIX_MAX 32
/* Log PMD message, automatically add prefix and \n */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_mcdi.c b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
new file mode 100644
index 0000000..961d2d3
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include "sfc_efx_mcdi.h"
+
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_debug.h"
+#include "sfc_vdpa_log.h"
+
+static sfc_efx_mcdi_dma_alloc_cb sfc_vdpa_mcdi_dma_alloc;
+static int
+sfc_vdpa_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
+ efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ return sfc_vdpa_dma_alloc(sva, name, len, esmp);
+}
+
+static sfc_efx_mcdi_dma_free_cb sfc_vdpa_mcdi_dma_free;
+static void
+sfc_vdpa_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ sfc_vdpa_dma_free(sva, esmp);
+}
+
+static sfc_efx_mcdi_sched_restart_cb sfc_vdpa_mcdi_sched_restart;
+static void
+sfc_vdpa_mcdi_sched_restart(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_vdpa_mcdi_mgmt_evq_poll;
+static void
+sfc_vdpa_mcdi_mgmt_evq_poll(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static const struct sfc_efx_mcdi_ops sfc_vdpa_mcdi_ops = {
+ .dma_alloc = sfc_vdpa_mcdi_dma_alloc,
+ .dma_free = sfc_vdpa_mcdi_dma_free,
+ .sched_restart = sfc_vdpa_mcdi_sched_restart,
+ .mgmt_evq_poll = sfc_vdpa_mcdi_mgmt_evq_poll,
+
+};
+
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva)
+{
+ uint32_t logtype;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ logtype = sfc_vdpa_register_logtype(&(sva->pdev->addr),
+ SFC_VDPA_LOGTYPE_MCDI_STR,
+ RTE_LOG_NOTICE);
+
+ return sfc_efx_mcdi_init(&sva->mcdi, logtype,
+ sva->log_prefix, sva->nic,
+ &sfc_vdpa_mcdi_ops, sva);
+}
+
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva)
+{
+ sfc_vdpa_log_init(sva, "entry");
+ sfc_efx_mcdi_fini(&sva->mcdi);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
new file mode 100644
index 0000000..71696be
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -0,0 +1,129 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_malloc.h>
+#include <rte_vdpa.h>
+#include <rte_vdpa_dev.h>
+#include <rte_vhost.h>
+
+#include "sfc_vdpa_ops.h"
+#include "sfc_vdpa.h"
+
+/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
+ * In subsequent patches these ops would be implemented.
+ */
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(queue_num);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
+ uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_config(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_close(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_vring_state(int vid, int vring, int state)
+{
+ RTE_SET_USED(vid);
+ RTE_SET_USED(vring);
+ RTE_SET_USED(state);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_features(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
+ .get_queue_num = sfc_vdpa_get_queue_num,
+ .get_features = sfc_vdpa_get_features,
+ .get_protocol_features = sfc_vdpa_get_protocol_features,
+ .dev_conf = sfc_vdpa_dev_config,
+ .dev_close = sfc_vdpa_dev_close,
+ .set_vring_state = sfc_vdpa_set_vring_state,
+ .set_features = sfc_vdpa_set_features,
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *dev_handle, enum sfc_vdpa_context context)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_pci_device *pci_dev;
+
+ /* Create vDPA ops context */
+ ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
+ if (ops_data == NULL)
+ return NULL;
+
+ ops_data->vdpa_context = context;
+ ops_data->dev_handle = dev_handle;
+
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev_handle)->pdev;
+
+ /* Register vDPA Device */
+ sfc_vdpa_log_init(dev_handle, "register vDPA device");
+ ops_data->vdpa_dev =
+ rte_vdpa_register_device(&pci_dev->device, &sfc_vdpa_ops);
+ if (ops_data->vdpa_dev == NULL) {
+ sfc_vdpa_err(dev_handle, "vDPA device registration failed");
+ goto fail_register_device;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return ops_data;
+
+fail_register_device:
+ rte_free(ops_data);
+ return NULL;
+}
+
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data)
+{
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
+ rte_free(ops_data);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
new file mode 100644
index 0000000..817b302
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_OPS_H
+#define _SFC_VDPA_OPS_H
+
+#include <rte_vdpa.h>
+
+#define SFC_VDPA_MAX_QUEUE_PAIRS 1
+
+enum sfc_vdpa_context {
+ SFC_VDPA_AS_PF = 0,
+ SFC_VDPA_AS_VF
+};
+
+enum sfc_vdpa_state {
+ SFC_VDPA_STATE_UNINITIALIZED = 0,
+ SFC_VDPA_STATE_INITIALIZED,
+ SFC_VDPA_STATE_NSTATES
+};
+
+struct sfc_vdpa_ops_data {
+ void *dev_handle;
+ struct rte_vdpa_device *vdpa_dev;
+ enum sfc_vdpa_context vdpa_context;
+ enum sfc_vdpa_state state;
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *adapter, enum sfc_vdpa_context context);
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data);
+
+#endif /* _SFC_VDPA_OPS_H */
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
@ 2021-10-29 20:21 ` Mattias Rönnblom
2021-11-01 8:09 ` Andrew Rybchenko
2021-11-01 11:48 ` Xia, Chenbo
1 sibling, 1 reply; 122+ messages in thread
From: Mattias Rönnblom @ 2021-10-29 20:21 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 2021-10-29 16:46, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add HW initialization and vDPA device registration support.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Used rte_memzone_reserve_aligned for mcdi buffer allocation.
> * Freeing mcdi buff when DMA map fails.
> * Fixed one typo.
>
> doc/guides/vdpadevs/sfc.rst | 6 +
> drivers/vdpa/sfc/meson.build | 3 +
> drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
> drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 327 ++++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
> 10 files changed, 670 insertions(+), 1 deletion(-)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>
> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
> index 44e694f..d06c427 100644
> --- a/doc/guides/vdpadevs/sfc.rst
> +++ b/doc/guides/vdpadevs/sfc.rst
> @@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types available for control:
> Matches a subset of per-port log types registered during runtime.
> A full name for a particular type may be obtained by appending a
> dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
> +
> +- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
> +
> + Extra logging of the communication with the NIC's management CPU.
> + The format of the log is consumed by the netlogdecode cross-platform
> + tool. May be managed per-port, as explained above.
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> index 4255d65..dc333de 100644
> --- a/drivers/vdpa/sfc/meson.build
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -19,4 +19,7 @@ endforeach
> deps += ['common_sfc_efx', 'bus_pci']
> sources = files(
> 'sfc_vdpa.c',
> + 'sfc_vdpa_hw.c',
> + 'sfc_vdpa_mcdi.c',
> + 'sfc_vdpa_ops.c',
> )
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index d85c52b..b7eca56 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -232,6 +232,19 @@ struct sfc_vdpa_adapter *
> goto fail_vfio_setup;
> }
>
> + sfc_vdpa_log_init(sva, "hw init");
> + if (sfc_vdpa_hw_init(sva) != 0) {
> + sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
> + goto fail_hw_init;
> + }
> +
> + sfc_vdpa_log_init(sva, "dev init");
> + sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
> + if (sva->ops_data == NULL) {
> + sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
> + goto fail_dev_init;
> + }
> +
> pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> @@ -240,6 +253,12 @@ struct sfc_vdpa_adapter *
>
> return 0;
>
> +fail_dev_init:
> + sfc_vdpa_hw_fini(sva);
> +
> +fail_hw_init:
> + sfc_vdpa_vfio_teardown(sva);
> +
> fail_vfio_setup:
> fail_set_log_prefix:
> rte_free(sva);
> @@ -266,6 +285,10 @@ struct sfc_vdpa_adapter *
> TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
>
> + sfc_vdpa_device_fini(sva->ops_data);
> +
> + sfc_vdpa_hw_fini(sva);
> +
> sfc_vdpa_vfio_teardown(sva);
>
> rte_free(sva);
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> index 3b77900..046f25d 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -11,14 +11,38 @@
>
> #include <rte_bus_pci.h>
>
> +#include "sfc_efx.h"
> +#include "sfc_efx_mcdi.h"
> +#include "sfc_vdpa_debug.h"
> #include "sfc_vdpa_log.h"
> +#include "sfc_vdpa_ops.h"
> +
> +#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
>
> /* Adapter private data */
> struct sfc_vdpa_adapter {
> TAILQ_ENTRY(sfc_vdpa_adapter) next;
> + /*
> + * PMD setup and configuration is not thread safe. Since it is not
> + * performance sensitive, it is better to guarantee thread-safety
> + * and add device level lock. vDPA control operations which
> + * change its state should acquire the lock.
> + */
> + rte_spinlock_t lock;
> struct rte_pci_device *pdev;
> struct rte_pci_addr pci_addr;
>
> + efx_family_t family;
> + efx_nic_t *nic;
> + rte_spinlock_t nic_lock;
> +
> + efsys_bar_t mem_bar;
> +
> + struct sfc_efx_mcdi mcdi;
> + size_t mcdi_buff_size;
> +
> + uint32_t max_queue_count;
> +
> char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
> uint32_t logtype_main;
>
> @@ -26,6 +50,7 @@ struct sfc_vdpa_adapter {
> int vfio_dev_fd;
> int vfio_container_fd;
> int iommu_group_num;
> + struct sfc_vdpa_ops_data *ops_data;
> };
>
> uint32_t
> @@ -36,5 +61,27 @@ struct sfc_vdpa_adapter {
> struct sfc_vdpa_adapter *
> sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
>
> -#endif /* _SFC_VDPA_H */
> +int
> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
> +void
> +sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva);
>
> +int
> +sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
> +void
> +sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
> +
> +int
> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> + size_t len, efsys_mem_t *esmp);
> +
> +void
> +sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
> +
> +static inline struct sfc_vdpa_adapter *
> +sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
> +{
> + return (struct sfc_vdpa_adapter *)dev_handle;
> +}
> +
> +#endif /* _SFC_VDPA_H */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h b/drivers/vdpa/sfc/sfc_vdpa_debug.h
> new file mode 100644
> index 0000000..cfa8cc5
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_DEBUG_H_
> +#define _SFC_VDPA_DEBUG_H_
> +
> +#include <rte_debug.h>
> +
> +#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
> +/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
> + * in the driver only.
> + */
> +#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
> +#else
> +/* If the driver debug is not enabled, follow DPDK debug/non-debug */
> +#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
> +#endif
> +
> +#endif /* _SFC_VDPA_DEBUG_H_ */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> new file mode 100644
> index 0000000..7c256ff
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -0,0 +1,327 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <unistd.h>
> +
> +#include <rte_common.h>
> +#include <rte_errno.h>
> +#include <rte_vfio.h>
> +
> +#include "efx.h"
> +#include "sfc_vdpa.h"
> +#include "sfc_vdpa_ops.h"
> +
> +extern uint32_t sfc_logtype_driver;
> +
> +#ifndef PAGE_SIZE
> +#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
> +#endif
> +
> +int
> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> + size_t len, efsys_mem_t *esmp)
> +{
> + uint64_t mcdi_iova;
> + size_t mcdi_buff_size;
> + const struct rte_memzone *mz = NULL;
Redundant initialization.
> + int numa_node = sva->pdev->device.numa_node;
> + int ret;
> +
> + mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
> +
> + sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
> +
> + mz = rte_memzone_reserve_aligned(name, mcdi_buff_size,
> + numa_node,
> + RTE_MEMZONE_IOVA_CONTIG,
> + PAGE_SIZE);
> + if (mz == NULL) {
> + sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
> + name, (unsigned int)len, rte_strerror(rte_errno));
> + return -ENOMEM;
> + }
> +
> + /* IOVA address for MCDI would be re-calculated if mapping
> + * using default IOVA would fail.
> + * TODO: Earlier there was no way to get valid IOVA range.
> + * Recently a patch has been submitted to get the IOVA range
> + * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
> + * in the kernel version >= 5.4. Support to get the default
> + * IOVA address for MCDI buffer using available IOVA range
> + * would be added later. Meanwhile default IOVA for MCDI buffer
> + * is kept at high mem at 2TB. In case of overlap new available
> + * addresses would be searched and same would be used.
> + */
> + mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
> +
> + do {
> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
> + (uint64_t)mz->addr, mcdi_iova,
> + mcdi_buff_size);
> + if (ret == 0)
> + break;
> +
> + mcdi_iova = mcdi_iova >> 1;
> + if (mcdi_iova < mcdi_buff_size) {
> + sfc_vdpa_err(sva,
> + "DMA mapping failed for MCDI : %s",
> + rte_strerror(rte_errno));
> + rte_memzone_free(mz);
> + return ret;
> + }
> +
> + } while (ret < 0);
"ret < 0" will never evaluate to false here. Use "for (;;)" instead.
> +
> + esmp->esm_addr = mcdi_iova;
> + esmp->esm_base = mz->addr;
> + sva->mcdi_buff_size = mcdi_buff_size;
> +
> + sfc_vdpa_info(sva,
> + "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
> + name, len, esmp->esm_base, esmp->esm_addr);
> +
> + return 0;
> +}
> +
> +void
> +sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp)
> +{
> + int ret;
> +
> + sfc_vdpa_log_init(sva, "name=%s", esmp->esm_mz->name);
> +
> + ret = rte_vfio_container_dma_unmap(sva->vfio_container_fd,
> + (uint64_t)esmp->esm_base,
> + esmp->esm_addr, sva->mcdi_buff_size);
> + if (ret < 0)
> + sfc_vdpa_err(sva, "DMA unmap failed for MCDI : %s",
> + rte_strerror(rte_errno));
> +
> + sfc_vdpa_info(sva,
> + "DMA free name=%s => virt=%p iova=%" PRIx64,
> + esmp->esm_mz->name, esmp->esm_base, esmp->esm_addr);
> +
> + rte_free((void *)(esmp->esm_base));
> +
> + sva->mcdi_buff_size = 0;
> + memset(esmp, 0, sizeof(*esmp));
> +}
> +
> +static int
> +sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
> + const efx_bar_region_t *mem_ebrp)
> +{
> + struct rte_pci_device *pci_dev = sva->pdev;
> + efsys_bar_t *ebp = &sva->mem_bar;
> + struct rte_mem_resource *res =
> + &pci_dev->mem_resource[mem_ebrp->ebr_index];
> +
> + SFC_BAR_LOCK_INIT(ebp, pci_dev->name);
> + ebp->esb_rid = mem_ebrp->ebr_index;
> + ebp->esb_dev = pci_dev;
> + ebp->esb_base = res->addr;
> +
> + return 0;
> +}
> +
> +static void
> +sfc_vdpa_mem_bar_fini(struct sfc_vdpa_adapter *sva)
> +{
> + efsys_bar_t *ebp = &sva->mem_bar;
> +
> + SFC_BAR_LOCK_DESTROY(ebp);
> + memset(ebp, 0, sizeof(*ebp));
> +}
> +
> +static int
> +sfc_vdpa_nic_probe(struct sfc_vdpa_adapter *sva)
> +{
> + efx_nic_t *enp = sva->nic;
> + int rc;
> +
> + rc = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE);
> + if (rc != 0)
> + sfc_vdpa_err(sva, "nic probe failed: %s", rte_strerror(rc));
> +
> + return rc;
> +}
> +
> +static int
> +sfc_vdpa_estimate_resource_limits(struct sfc_vdpa_adapter *sva)
> +{
> + efx_drv_limits_t limits;
> + int rc;
> + uint32_t evq_allocated;
> + uint32_t rxq_allocated;
> + uint32_t txq_allocated;
> + uint32_t max_queue_cnt;
> +
> + memset(&limits, 0, sizeof(limits));
Avoid using typedefs for structs. This is a struct?
> +
> + /* Request at least one Rx and Tx queue */
> + limits.edl_min_rxq_count = 1;
> + limits.edl_min_txq_count = 1;
> + /* Management event queue plus event queue for Tx/Rx queue */
> + limits.edl_min_evq_count =
> + 1 + RTE_MAX(limits.edl_min_rxq_count, limits.edl_min_txq_count);
> +
> + limits.edl_max_rxq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
> + limits.edl_max_txq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
> + limits.edl_max_evq_count = 1 + SFC_VDPA_MAX_QUEUE_PAIRS;
> +
> + SFC_VDPA_ASSERT(limits.edl_max_evq_count >= limits.edl_min_rxq_count);
> + SFC_VDPA_ASSERT(limits.edl_max_rxq_count >= limits.edl_min_rxq_count);
> + SFC_VDPA_ASSERT(limits.edl_max_txq_count >= limits.edl_min_rxq_count);
> +
> + /* Configure the minimum required resources needed for the
> + * driver to operate, and the maximum desired resources that the
> + * driver is capable of using.
> + */
> + sfc_vdpa_log_init(sva, "set drv limit");
> + efx_nic_set_drv_limits(sva->nic, &limits);
> +
> + sfc_vdpa_log_init(sva, "init nic");
> + rc = efx_nic_init(sva->nic);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "nic init failed: %s", rte_strerror(rc));
> + goto fail_nic_init;
> + }
> +
> + /* Find resource dimensions assigned by firmware to this function */
> + rc = efx_nic_get_vi_pool(sva->nic, &evq_allocated, &rxq_allocated,
> + &txq_allocated);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "vi pool get failed: %s", rte_strerror(rc));
> + goto fail_get_vi_pool;
> + }
> +
> + /* It still may allocate more than maximum, ensure limit */
> + evq_allocated = RTE_MIN(evq_allocated, limits.edl_max_evq_count);
> + rxq_allocated = RTE_MIN(rxq_allocated, limits.edl_max_rxq_count);
> + txq_allocated = RTE_MIN(txq_allocated, limits.edl_max_txq_count);
> +
> +
> + max_queue_cnt = RTE_MIN(rxq_allocated, txq_allocated);
> + /* Subtract management EVQ not used for traffic */
> + max_queue_cnt = RTE_MIN(evq_allocated - 1, max_queue_cnt);
> +
> + SFC_VDPA_ASSERT(max_queue_cnt > 0);
> +
> + sva->max_queue_count = max_queue_cnt;
> +
> + return 0;
> +
> +fail_get_vi_pool:
> + efx_nic_fini(sva->nic);
> +fail_nic_init:
> + sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
> + return rc;
> +}
> +
> +int
> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva)
> +{
> + efx_bar_region_t mem_ebr;
> + efx_nic_t *enp;
> + int rc;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + sfc_vdpa_log_init(sva, "get family");
> + rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
> + if (rc != 0)
> + goto fail_family;
> + sfc_vdpa_log_init(sva,
> + "family is %u, membar is %u,"
> + "function control window offset is %#" PRIx64,
> + sva->family, mem_ebr.ebr_index, mem_ebr.ebr_offset);
> +
> + sfc_vdpa_log_init(sva, "init mem bar");
> + rc = sfc_vdpa_mem_bar_init(sva, &mem_ebr);
> + if (rc != 0)
> + goto fail_mem_bar_init;
> +
> + sfc_vdpa_log_init(sva, "create nic");
> + rte_spinlock_init(&sva->nic_lock);
> + rc = efx_nic_create(sva->family, (efsys_identifier_t *)sva,
> + &sva->mem_bar, mem_ebr.ebr_offset,
> + &sva->nic_lock, &enp);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "nic create failed: %s", rte_strerror(rc));
> + goto fail_nic_create;
> + }
> + sva->nic = enp;
> +
> + sfc_vdpa_log_init(sva, "init mcdi");
> + rc = sfc_vdpa_mcdi_init(sva);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "mcdi init failed: %s", rte_strerror(rc));
> + goto fail_mcdi_init;
> + }
> +
> + sfc_vdpa_log_init(sva, "probe nic");
> + rc = sfc_vdpa_nic_probe(sva);
> + if (rc != 0)
> + goto fail_nic_probe;
> +
> + sfc_vdpa_log_init(sva, "reset nic");
> + rc = efx_nic_reset(enp);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "nic reset failed: %s", rte_strerror(rc));
> + goto fail_nic_reset;
> + }
> +
> + sfc_vdpa_log_init(sva, "estimate resource limits");
> + rc = sfc_vdpa_estimate_resource_limits(sva);
> + if (rc != 0)
> + goto fail_estimate_rsrc_limits;
> +
> + sfc_vdpa_log_init(sva, "done");
> +
> + return 0;
> +
> +fail_estimate_rsrc_limits:
> +fail_nic_reset:
> + efx_nic_unprobe(enp);
> +
> +fail_nic_probe:
> + sfc_vdpa_mcdi_fini(sva);
> +
> +fail_mcdi_init:
> + sfc_vdpa_log_init(sva, "destroy nic");
> + sva->nic = NULL;
> + efx_nic_destroy(enp);
> +
> +fail_nic_create:
> + sfc_vdpa_mem_bar_fini(sva);
> +
> +fail_mem_bar_init:
> +fail_family:
> + sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
> + return rc;
> +}
> +
> +void
> +sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva)
> +{
> + efx_nic_t *enp = sva->nic;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + sfc_vdpa_log_init(sva, "unprobe nic");
> + efx_nic_unprobe(enp);
> +
> + sfc_vdpa_log_init(sva, "mcdi fini");
> + sfc_vdpa_mcdi_fini(sva);
> +
> + sfc_vdpa_log_init(sva, "nic fini");
> + efx_nic_fini(enp);
> +
> + sfc_vdpa_log_init(sva, "destroy nic");
> + sva->nic = NULL;
> + efx_nic_destroy(enp);
> +
> + sfc_vdpa_mem_bar_fini(sva);
> +}
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
> index 858e5ee..4e7a84f 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_log.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> @@ -21,6 +21,9 @@
> /** Name prefix for the per-device log type used to report basic information */
> #define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
>
> +/** Device MCDI log type name prefix */
> +#define SFC_VDPA_LOGTYPE_MCDI_STR SFC_VDPA_LOGTYPE_PREFIX "mcdi"
> +
> #define SFC_VDPA_LOG_PREFIX_MAX 32
>
> /* Log PMD message, automatically add prefix and \n */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_mcdi.c b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> new file mode 100644
> index 0000000..961d2d3
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> @@ -0,0 +1,74 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include "sfc_efx_mcdi.h"
> +
> +#include "sfc_vdpa.h"
> +#include "sfc_vdpa_debug.h"
> +#include "sfc_vdpa_log.h"
> +
> +static sfc_efx_mcdi_dma_alloc_cb sfc_vdpa_mcdi_dma_alloc;
> +static int
> +sfc_vdpa_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
> + efsys_mem_t *esmp)
> +{
> + struct sfc_vdpa_adapter *sva = cookie;
> +
> + return sfc_vdpa_dma_alloc(sva, name, len, esmp);
> +}
> +
> +static sfc_efx_mcdi_dma_free_cb sfc_vdpa_mcdi_dma_free;
> +static void
> +sfc_vdpa_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
> +{
> + struct sfc_vdpa_adapter *sva = cookie;
> +
> + sfc_vdpa_dma_free(sva, esmp);
> +}
> +
> +static sfc_efx_mcdi_sched_restart_cb sfc_vdpa_mcdi_sched_restart;
> +static void
> +sfc_vdpa_mcdi_sched_restart(void *cookie)
> +{
> + RTE_SET_USED(cookie);
> +}
> +
> +static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_vdpa_mcdi_mgmt_evq_poll;
> +static void
> +sfc_vdpa_mcdi_mgmt_evq_poll(void *cookie)
> +{
> + RTE_SET_USED(cookie);
> +}
> +
> +static const struct sfc_efx_mcdi_ops sfc_vdpa_mcdi_ops = {
> + .dma_alloc = sfc_vdpa_mcdi_dma_alloc,
> + .dma_free = sfc_vdpa_mcdi_dma_free,
> + .sched_restart = sfc_vdpa_mcdi_sched_restart,
> + .mgmt_evq_poll = sfc_vdpa_mcdi_mgmt_evq_poll,
> +
> +};
> +
> +int
> +sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva)
> +{
> + uint32_t logtype;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + logtype = sfc_vdpa_register_logtype(&(sva->pdev->addr),
> + SFC_VDPA_LOGTYPE_MCDI_STR,
> + RTE_LOG_NOTICE);
> +
> + return sfc_efx_mcdi_init(&sva->mcdi, logtype,
> + sva->log_prefix, sva->nic,
> + &sfc_vdpa_mcdi_ops, sva);
> +}
> +
> +void
> +sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva)
> +{
> + sfc_vdpa_log_init(sva, "entry");
> + sfc_efx_mcdi_fini(&sva->mcdi);
> +}
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> new file mode 100644
> index 0000000..71696be
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -0,0 +1,129 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <rte_malloc.h>
> +#include <rte_vdpa.h>
> +#include <rte_vdpa_dev.h>
> +#include <rte_vhost.h>
> +
> +#include "sfc_vdpa_ops.h"
> +#include "sfc_vdpa.h"
> +
> +/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
> + * In subsequent patches these ops would be implemented.
> + */
> +static int
> +sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
> +{
> + RTE_SET_USED(vdpa_dev);
> + RTE_SET_USED(queue_num);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
> +{
> + RTE_SET_USED(vdpa_dev);
> + RTE_SET_USED(features);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
> + uint64_t *features)
> +{
> + RTE_SET_USED(vdpa_dev);
> + RTE_SET_USED(features);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_dev_config(int vid)
> +{
> + RTE_SET_USED(vid);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_dev_close(int vid)
> +{
> + RTE_SET_USED(vid);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_set_vring_state(int vid, int vring, int state)
> +{
> + RTE_SET_USED(vid);
> + RTE_SET_USED(vring);
> + RTE_SET_USED(state);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_set_features(int vid)
> +{
> + RTE_SET_USED(vid);
> +
> + return -1;
> +}
> +
> +static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
> + .get_queue_num = sfc_vdpa_get_queue_num,
> + .get_features = sfc_vdpa_get_features,
> + .get_protocol_features = sfc_vdpa_get_protocol_features,
> + .dev_conf = sfc_vdpa_dev_config,
> + .dev_close = sfc_vdpa_dev_close,
> + .set_vring_state = sfc_vdpa_set_vring_state,
> + .set_features = sfc_vdpa_set_features,
> +};
> +
> +struct sfc_vdpa_ops_data *
> +sfc_vdpa_device_init(void *dev_handle, enum sfc_vdpa_context context)
> +{
> + struct sfc_vdpa_ops_data *ops_data;
> + struct rte_pci_device *pci_dev;
> +
> + /* Create vDPA ops context */
> + ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
> + if (ops_data == NULL)
> + return NULL;
> +
> + ops_data->vdpa_context = context;
> + ops_data->dev_handle = dev_handle;
> +
> + pci_dev = sfc_vdpa_adapter_by_dev_handle(dev_handle)->pdev;
> +
> + /* Register vDPA Device */
> + sfc_vdpa_log_init(dev_handle, "register vDPA device");
> + ops_data->vdpa_dev =
> + rte_vdpa_register_device(&pci_dev->device, &sfc_vdpa_ops);
> + if (ops_data->vdpa_dev == NULL) {
> + sfc_vdpa_err(dev_handle, "vDPA device registration failed");
> + goto fail_register_device;
> + }
> +
> + ops_data->state = SFC_VDPA_STATE_INITIALIZED;
> +
> + return ops_data;
> +
> +fail_register_device:
> + rte_free(ops_data);
> + return NULL;
> +}
> +
> +void
> +sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data)
> +{
> + rte_vdpa_unregister_device(ops_data->vdpa_dev);
> +
> + rte_free(ops_data);
> +}
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> new file mode 100644
> index 0000000..817b302
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> @@ -0,0 +1,36 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_OPS_H
> +#define _SFC_VDPA_OPS_H
> +
> +#include <rte_vdpa.h>
> +
> +#define SFC_VDPA_MAX_QUEUE_PAIRS 1
> +
> +enum sfc_vdpa_context {
> + SFC_VDPA_AS_PF = 0,
0 is the default.
> + SFC_VDPA_AS_VF
> +};
> +
> +enum sfc_vdpa_state {
> + SFC_VDPA_STATE_UNINITIALIZED = 0,
Same here.
> + SFC_VDPA_STATE_INITIALIZED,
> + SFC_VDPA_STATE_NSTATES
> +};
> +
> +struct sfc_vdpa_ops_data {
> + void *dev_handle;
> + struct rte_vdpa_device *vdpa_dev;
> + enum sfc_vdpa_context vdpa_context;
> + enum sfc_vdpa_state state;
> +};
> +
> +struct sfc_vdpa_ops_data *
> +sfc_vdpa_device_init(void *adapter, enum sfc_vdpa_context context);
> +void
> +sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data);
> +
> +#endif /* _SFC_VDPA_OPS_H */
>
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-10-29 20:21 ` Mattias Rönnblom
@ 2021-11-01 8:09 ` Andrew Rybchenko
0 siblings, 0 replies; 122+ messages in thread
From: Andrew Rybchenko @ 2021-11-01 8:09 UTC (permalink / raw)
To: Mattias Rönnblom, Vijay Srivastava, dev
Cc: maxime.coquelin, chenbo.xia, Vijay Kumar Srivastava
Hi Mattias,
Many thanks for review. Please, see below.
Andrew.
On 10/29/21 11:21 PM, Mattias Rönnblom wrote:
> On 2021-10-29 16:46, Vijay Srivastava wrote:
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add HW initialization and vDPA device registration support.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>> ---
>> v2:
>> * Used rte_memzone_reserve_aligned for mcdi buffer allocation.
>> * Freeing mcdi buff when DMA map fails.
>> * Fixed one typo.
>>
>> doc/guides/vdpadevs/sfc.rst | 6 +
>> drivers/vdpa/sfc/meson.build | 3 +
>> drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
>> drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
>> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
>> drivers/vdpa/sfc/sfc_vdpa_hw.c | 327
>> ++++++++++++++++++++++++++++++++++++++
>> drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
>> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
>> drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
>> drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
>> 10 files changed, 670 insertions(+), 1 deletion(-)
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
>> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>>
>> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
>> index 44e694f..d06c427 100644
>> --- a/doc/guides/vdpadevs/sfc.rst
>> +++ b/doc/guides/vdpadevs/sfc.rst
>> @@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types
>> available for control:
>> Matches a subset of per-port log types registered during runtime.
>> A full name for a particular type may be obtained by appending a
>> dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
>> +
>> +- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
>> +
>> + Extra logging of the communication with the NIC's management CPU.
>> + The format of the log is consumed by the netlogdecode cross-platform
>> + tool. May be managed per-port, as explained above.
>> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
>> index 4255d65..dc333de 100644
>> --- a/drivers/vdpa/sfc/meson.build
>> +++ b/drivers/vdpa/sfc/meson.build
>> @@ -19,4 +19,7 @@ endforeach
>> deps += ['common_sfc_efx', 'bus_pci']
>> sources = files(
>> 'sfc_vdpa.c',
>> + 'sfc_vdpa_hw.c',
>> + 'sfc_vdpa_mcdi.c',
>> + 'sfc_vdpa_ops.c',
>> )
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
>> index d85c52b..b7eca56 100644
>> --- a/drivers/vdpa/sfc/sfc_vdpa.c
>> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
>> @@ -232,6 +232,19 @@ struct sfc_vdpa_adapter *
>> goto fail_vfio_setup;
>> }
>> + sfc_vdpa_log_init(sva, "hw init");
>> + if (sfc_vdpa_hw_init(sva) != 0) {
>> + sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
>> + goto fail_hw_init;
>> + }
>> +
>> + sfc_vdpa_log_init(sva, "dev init");
>> + sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
>> + if (sva->ops_data == NULL) {
>> + sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
>> + goto fail_dev_init;
>> + }
>> +
>> pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
>> TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
>> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
>> @@ -240,6 +253,12 @@ struct sfc_vdpa_adapter *
>> return 0;
>> +fail_dev_init:
>> + sfc_vdpa_hw_fini(sva);
>> +
>> +fail_hw_init:
>> + sfc_vdpa_vfio_teardown(sva);
>> +
>> fail_vfio_setup:
>> fail_set_log_prefix:
>> rte_free(sva);
>> @@ -266,6 +285,10 @@ struct sfc_vdpa_adapter *
>> TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
>> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
>> + sfc_vdpa_device_fini(sva->ops_data);
>> +
>> + sfc_vdpa_hw_fini(sva);
>> +
>> sfc_vdpa_vfio_teardown(sva);
>> rte_free(sva);
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
>> index 3b77900..046f25d 100644
>> --- a/drivers/vdpa/sfc/sfc_vdpa.h
>> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
>> @@ -11,14 +11,38 @@
>> #include <rte_bus_pci.h>
>> +#include "sfc_efx.h"
>> +#include "sfc_efx_mcdi.h"
>> +#include "sfc_vdpa_debug.h"
>> #include "sfc_vdpa_log.h"
>> +#include "sfc_vdpa_ops.h"
>> +
>> +#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
>> /* Adapter private data */
>> struct sfc_vdpa_adapter {
>> TAILQ_ENTRY(sfc_vdpa_adapter) next;
>> + /*
>> + * PMD setup and configuration is not thread safe. Since it is not
>> + * performance sensitive, it is better to guarantee thread-safety
>> + * and add device level lock. vDPA control operations which
>> + * change its state should acquire the lock.
>> + */
>> + rte_spinlock_t lock;
>> struct rte_pci_device *pdev;
>> struct rte_pci_addr pci_addr;
>> + efx_family_t family;
>> + efx_nic_t *nic;
>> + rte_spinlock_t nic_lock;
>> +
>> + efsys_bar_t mem_bar;
>> +
>> + struct sfc_efx_mcdi mcdi;
>> + size_t mcdi_buff_size;
>> +
>> + uint32_t max_queue_count;
>> +
>> char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
>> uint32_t logtype_main;
>> @@ -26,6 +50,7 @@ struct sfc_vdpa_adapter {
>> int vfio_dev_fd;
>> int vfio_container_fd;
>> int iommu_group_num;
>> + struct sfc_vdpa_ops_data *ops_data;
>> };
>> uint32_t
>> @@ -36,5 +61,27 @@ struct sfc_vdpa_adapter {
>> struct sfc_vdpa_adapter *
>> sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
>> -#endif /* _SFC_VDPA_H */
>> +int
>> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
>> +void
>> +sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva);
>> +int
>> +sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
>> +void
>> +sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
>> +
>> +int
>> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
>> + size_t len, efsys_mem_t *esmp);
>> +
>> +void
>> +sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
>> +
>> +static inline struct sfc_vdpa_adapter *
>> +sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
>> +{
>> + return (struct sfc_vdpa_adapter *)dev_handle;
>> +}
>> +
>> +#endif /* _SFC_VDPA_H */
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h
>> b/drivers/vdpa/sfc/sfc_vdpa_debug.h
>> new file mode 100644
>> index 0000000..cfa8cc5
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
>> @@ -0,0 +1,21 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>> +#ifndef _SFC_VDPA_DEBUG_H_
>> +#define _SFC_VDPA_DEBUG_H_
>> +
>> +#include <rte_debug.h>
>> +
>> +#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
>> +/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug
>> check
>> + * in the driver only.
>> + */
>> +#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
>> +#else
>> +/* If the driver debug is not enabled, follow DPDK debug/non-debug */
>> +#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
>> +#endif
>> +
>> +#endif /* _SFC_VDPA_DEBUG_H_ */
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c
>> b/drivers/vdpa/sfc/sfc_vdpa_hw.c
>> new file mode 100644
>> index 0000000..7c256ff
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
>> @@ -0,0 +1,327 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>> +#include <unistd.h>
>> +
>> +#include <rte_common.h>
>> +#include <rte_errno.h>
>> +#include <rte_vfio.h>
>> +
>> +#include "efx.h"
>> +#include "sfc_vdpa.h"
>> +#include "sfc_vdpa_ops.h"
>> +
>> +extern uint32_t sfc_logtype_driver;
>> +
>> +#ifndef PAGE_SIZE
>> +#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
>> +#endif
>> +
>> +int
>> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
>> + size_t len, efsys_mem_t *esmp)
>> +{
>> + uint64_t mcdi_iova;
>> + size_t mcdi_buff_size;
>> + const struct rte_memzone *mz = NULL;
>
> Redundant initialization.
Is it a problem? Is it defined in DPDK coding style to avoid it?
>
>> + int numa_node = sva->pdev->device.numa_node;
>> + int ret;
>> +
>> + mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
>> +
>> + sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
>> +
>> + mz = rte_memzone_reserve_aligned(name, mcdi_buff_size,
>> + numa_node,
>> + RTE_MEMZONE_IOVA_CONTIG,
>> + PAGE_SIZE);
>> + if (mz == NULL) {
>> + sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
>> + name, (unsigned int)len, rte_strerror(rte_errno));
>> + return -ENOMEM;
>> + }
>> +
>> + /* IOVA address for MCDI would be re-calculated if mapping
>> + * using default IOVA would fail.
>> + * TODO: Earlier there was no way to get valid IOVA range.
>> + * Recently a patch has been submitted to get the IOVA range
>> + * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
>> + * in the kernel version >= 5.4. Support to get the default
>> + * IOVA address for MCDI buffer using available IOVA range
>> + * would be added later. Meanwhile default IOVA for MCDI buffer
>> + * is kept at high mem at 2TB. In case of overlap new available
>> + * addresses would be searched and same would be used.
>> + */
>> + mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
>> +
>> + do {
>> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
>> + (uint64_t)mz->addr, mcdi_iova,
>> + mcdi_buff_size);
>> + if (ret == 0)
>> + break;
>> +
>> + mcdi_iova = mcdi_iova >> 1;
>> + if (mcdi_iova < mcdi_buff_size) {
>> + sfc_vdpa_err(sva,
>> + "DMA mapping failed for MCDI : %s",
>> + rte_strerror(rte_errno));
>> + rte_memzone_free(mz);
>> + return ret;
>> + }
>> +
>> + } while (ret < 0);
>
> "ret < 0" will never evaluate to false here. Use "for (;;)" instead.
Ack.
>
>> +
>> + esmp->esm_addr = mcdi_iova;
>> + esmp->esm_base = mz->addr;
>> + sva->mcdi_buff_size = mcdi_buff_size;
>> +
>> + sfc_vdpa_info(sva,
>> + "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
>> + name, len, esmp->esm_base, esmp->esm_addr);
>> +
>> + return 0;
>> +}
>> +
>> +void
>> +sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp)
>> +{
>> + int ret;
>> +
>> + sfc_vdpa_log_init(sva, "name=%s", esmp->esm_mz->name);
>> +
>> + ret = rte_vfio_container_dma_unmap(sva->vfio_container_fd,
>> + (uint64_t)esmp->esm_base,
>> + esmp->esm_addr, sva->mcdi_buff_size);
>> + if (ret < 0)
>> + sfc_vdpa_err(sva, "DMA unmap failed for MCDI : %s",
>> + rte_strerror(rte_errno));
>> +
>> + sfc_vdpa_info(sva,
>> + "DMA free name=%s => virt=%p iova=%" PRIx64,
>> + esmp->esm_mz->name, esmp->esm_base, esmp->esm_addr);
>> +
>> + rte_free((void *)(esmp->esm_base));
>> +
>> + sva->mcdi_buff_size = 0;
>> + memset(esmp, 0, sizeof(*esmp));
>> +}
>> +
>> +static int
>> +sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
>> + const efx_bar_region_t *mem_ebrp)
>> +{
>> + struct rte_pci_device *pci_dev = sva->pdev;
>> + efsys_bar_t *ebp = &sva->mem_bar;
>> + struct rte_mem_resource *res =
>> + &pci_dev->mem_resource[mem_ebrp->ebr_index];
>> +
>> + SFC_BAR_LOCK_INIT(ebp, pci_dev->name);
>> + ebp->esb_rid = mem_ebrp->ebr_index;
>> + ebp->esb_dev = pci_dev;
>> + ebp->esb_base = res->addr;
>> +
>> + return 0;
>> +}
>> +
>> +static void
>> +sfc_vdpa_mem_bar_fini(struct sfc_vdpa_adapter *sva)
>> +{
>> + efsys_bar_t *ebp = &sva->mem_bar;
>> +
>> + SFC_BAR_LOCK_DESTROY(ebp);
>> + memset(ebp, 0, sizeof(*ebp));
>> +}
>> +
>> +static int
>> +sfc_vdpa_nic_probe(struct sfc_vdpa_adapter *sva)
>> +{
>> + efx_nic_t *enp = sva->nic;
>> + int rc;
>> +
>> + rc = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE);
>> + if (rc != 0)
>> + sfc_vdpa_err(sva, "nic probe failed: %s", rte_strerror(rc));
>> +
>> + return rc;
>> +}
>> +
>> +static int
>> +sfc_vdpa_estimate_resource_limits(struct sfc_vdpa_adapter *sva)
>> +{
>> + efx_drv_limits_t limits;
>> + int rc;
>> + uint32_t evq_allocated;
>> + uint32_t rxq_allocated;
>> + uint32_t txq_allocated;
>> + uint32_t max_queue_cnt;
>> +
>> + memset(&limits, 0, sizeof(limits));
>
> Avoid using typedefs for structs. This is a struct?
Yes, it is a struct. But it is an interface of the base
driver which is out of scope of DPDK coding style.
>
>> +
>> + /* Request at least one Rx and Tx queue */
>> + limits.edl_min_rxq_count = 1;
>> + limits.edl_min_txq_count = 1;
>> + /* Management event queue plus event queue for Tx/Rx queue */
>> + limits.edl_min_evq_count =
>> + 1 + RTE_MAX(limits.edl_min_rxq_count, limits.edl_min_txq_count);
>> +
>> + limits.edl_max_rxq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
>> + limits.edl_max_txq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
>> + limits.edl_max_evq_count = 1 + SFC_VDPA_MAX_QUEUE_PAIRS;
>> +
>> + SFC_VDPA_ASSERT(limits.edl_max_evq_count >=
>> limits.edl_min_rxq_count);
>> + SFC_VDPA_ASSERT(limits.edl_max_rxq_count >=
>> limits.edl_min_rxq_count);
>> + SFC_VDPA_ASSERT(limits.edl_max_txq_count >=
>> limits.edl_min_rxq_count);
>> +
>> + /* Configure the minimum required resources needed for the
>> + * driver to operate, and the maximum desired resources that the
>> + * driver is capable of using.
>> + */
>> + sfc_vdpa_log_init(sva, "set drv limit");
>> + efx_nic_set_drv_limits(sva->nic, &limits);
>> +
>> + sfc_vdpa_log_init(sva, "init nic");
>> + rc = efx_nic_init(sva->nic);
>> + if (rc != 0) {
>> + sfc_vdpa_err(sva, "nic init failed: %s", rte_strerror(rc));
>> + goto fail_nic_init;
>> + }
>> +
>> + /* Find resource dimensions assigned by firmware to this function */
>> + rc = efx_nic_get_vi_pool(sva->nic, &evq_allocated, &rxq_allocated,
>> + &txq_allocated);
>> + if (rc != 0) {
>> + sfc_vdpa_err(sva, "vi pool get failed: %s", rte_strerror(rc));
>> + goto fail_get_vi_pool;
>> + }
>> +
>> + /* It still may allocate more than maximum, ensure limit */
>> + evq_allocated = RTE_MIN(evq_allocated, limits.edl_max_evq_count);
>> + rxq_allocated = RTE_MIN(rxq_allocated, limits.edl_max_rxq_count);
>> + txq_allocated = RTE_MIN(txq_allocated, limits.edl_max_txq_count);
>> +
>> +
>> + max_queue_cnt = RTE_MIN(rxq_allocated, txq_allocated);
>> + /* Subtract management EVQ not used for traffic */
>> + max_queue_cnt = RTE_MIN(evq_allocated - 1, max_queue_cnt);
>> +
>> + SFC_VDPA_ASSERT(max_queue_cnt > 0);
>> +
>> + sva->max_queue_count = max_queue_cnt;
>> +
>> + return 0;
>> +
>> +fail_get_vi_pool:
>> + efx_nic_fini(sva->nic);
>> +fail_nic_init:
>> + sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
>> + return rc;
>> +}
>> +
>> +int
>> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva)
>> +{
>> + efx_bar_region_t mem_ebr;
>> + efx_nic_t *enp;
>> + int rc;
>> +
>> + sfc_vdpa_log_init(sva, "entry");
>> +
>> + sfc_vdpa_log_init(sva, "get family");
>> + rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
>> + if (rc != 0)
>> + goto fail_family;
>> + sfc_vdpa_log_init(sva,
>> + "family is %u, membar is %u,"
>> + "function control window offset is %#" PRIx64,
>> + sva->family, mem_ebr.ebr_index, mem_ebr.ebr_offset);
>> +
>> + sfc_vdpa_log_init(sva, "init mem bar");
>> + rc = sfc_vdpa_mem_bar_init(sva, &mem_ebr);
>> + if (rc != 0)
>> + goto fail_mem_bar_init;
>> +
>> + sfc_vdpa_log_init(sva, "create nic");
>> + rte_spinlock_init(&sva->nic_lock);
>> + rc = efx_nic_create(sva->family, (efsys_identifier_t *)sva,
>> + &sva->mem_bar, mem_ebr.ebr_offset,
>> + &sva->nic_lock, &enp);
>> + if (rc != 0) {
>> + sfc_vdpa_err(sva, "nic create failed: %s", rte_strerror(rc));
>> + goto fail_nic_create;
>> + }
>> + sva->nic = enp;
>> +
>> + sfc_vdpa_log_init(sva, "init mcdi");
>> + rc = sfc_vdpa_mcdi_init(sva);
>> + if (rc != 0) {
>> + sfc_vdpa_err(sva, "mcdi init failed: %s", rte_strerror(rc));
>> + goto fail_mcdi_init;
>> + }
>> +
>> + sfc_vdpa_log_init(sva, "probe nic");
>> + rc = sfc_vdpa_nic_probe(sva);
>> + if (rc != 0)
>> + goto fail_nic_probe;
>> +
>> + sfc_vdpa_log_init(sva, "reset nic");
>> + rc = efx_nic_reset(enp);
>> + if (rc != 0) {
>> + sfc_vdpa_err(sva, "nic reset failed: %s", rte_strerror(rc));
>> + goto fail_nic_reset;
>> + }
>> +
>> + sfc_vdpa_log_init(sva, "estimate resource limits");
>> + rc = sfc_vdpa_estimate_resource_limits(sva);
>> + if (rc != 0)
>> + goto fail_estimate_rsrc_limits;
>> +
>> + sfc_vdpa_log_init(sva, "done");
>> +
>> + return 0;
>> +
>> +fail_estimate_rsrc_limits:
>> +fail_nic_reset:
>> + efx_nic_unprobe(enp);
>> +
>> +fail_nic_probe:
>> + sfc_vdpa_mcdi_fini(sva);
>> +
>> +fail_mcdi_init:
>> + sfc_vdpa_log_init(sva, "destroy nic");
>> + sva->nic = NULL;
>> + efx_nic_destroy(enp);
>> +
>> +fail_nic_create:
>> + sfc_vdpa_mem_bar_fini(sva);
>> +
>> +fail_mem_bar_init:
>> +fail_family:
>> + sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
>> + return rc;
>> +}
>> +
>> +void
>> +sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva)
>> +{
>> + efx_nic_t *enp = sva->nic;
>> +
>> + sfc_vdpa_log_init(sva, "entry");
>> +
>> + sfc_vdpa_log_init(sva, "unprobe nic");
>> + efx_nic_unprobe(enp);
>> +
>> + sfc_vdpa_log_init(sva, "mcdi fini");
>> + sfc_vdpa_mcdi_fini(sva);
>> +
>> + sfc_vdpa_log_init(sva, "nic fini");
>> + efx_nic_fini(enp);
>> +
>> + sfc_vdpa_log_init(sva, "destroy nic");
>> + sva->nic = NULL;
>> + efx_nic_destroy(enp);
>> +
>> + sfc_vdpa_mem_bar_fini(sva);
>> +}
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h
>> b/drivers/vdpa/sfc/sfc_vdpa_log.h
>> index 858e5ee..4e7a84f 100644
>> --- a/drivers/vdpa/sfc/sfc_vdpa_log.h
>> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
>> @@ -21,6 +21,9 @@
>> /** Name prefix for the per-device log type used to report basic
>> information */
>> #define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
>> +/** Device MCDI log type name prefix */
>> +#define SFC_VDPA_LOGTYPE_MCDI_STR SFC_VDPA_LOGTYPE_PREFIX "mcdi"
>> +
>> #define SFC_VDPA_LOG_PREFIX_MAX 32
>> /* Log PMD message, automatically add prefix and \n */
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
>> b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
>> new file mode 100644
>> index 0000000..961d2d3
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
>> @@ -0,0 +1,74 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>> +#include "sfc_efx_mcdi.h"
>> +
>> +#include "sfc_vdpa.h"
>> +#include "sfc_vdpa_debug.h"
>> +#include "sfc_vdpa_log.h"
>> +
>> +static sfc_efx_mcdi_dma_alloc_cb sfc_vdpa_mcdi_dma_alloc;
>> +static int
>> +sfc_vdpa_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
>> + efsys_mem_t *esmp)
>> +{
>> + struct sfc_vdpa_adapter *sva = cookie;
>> +
>> + return sfc_vdpa_dma_alloc(sva, name, len, esmp);
>> +}
>> +
>> +static sfc_efx_mcdi_dma_free_cb sfc_vdpa_mcdi_dma_free;
>> +static void
>> +sfc_vdpa_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
>> +{
>> + struct sfc_vdpa_adapter *sva = cookie;
>> +
>> + sfc_vdpa_dma_free(sva, esmp);
>> +}
>> +
>> +static sfc_efx_mcdi_sched_restart_cb sfc_vdpa_mcdi_sched_restart;
>> +static void
>> +sfc_vdpa_mcdi_sched_restart(void *cookie)
>> +{
>> + RTE_SET_USED(cookie);
>> +}
>> +
>> +static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_vdpa_mcdi_mgmt_evq_poll;
>> +static void
>> +sfc_vdpa_mcdi_mgmt_evq_poll(void *cookie)
>> +{
>> + RTE_SET_USED(cookie);
>> +}
>> +
>> +static const struct sfc_efx_mcdi_ops sfc_vdpa_mcdi_ops = {
>> + .dma_alloc = sfc_vdpa_mcdi_dma_alloc,
>> + .dma_free = sfc_vdpa_mcdi_dma_free,
>> + .sched_restart = sfc_vdpa_mcdi_sched_restart,
>> + .mgmt_evq_poll = sfc_vdpa_mcdi_mgmt_evq_poll,
>> +
>> +};
>> +
>> +int
>> +sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva)
>> +{
>> + uint32_t logtype;
>> +
>> + sfc_vdpa_log_init(sva, "entry");
>> +
>> + logtype = sfc_vdpa_register_logtype(&(sva->pdev->addr),
>> + SFC_VDPA_LOGTYPE_MCDI_STR,
>> + RTE_LOG_NOTICE);
>> +
>> + return sfc_efx_mcdi_init(&sva->mcdi, logtype,
>> + sva->log_prefix, sva->nic,
>> + &sfc_vdpa_mcdi_ops, sva);
>> +}
>> +
>> +void
>> +sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva)
>> +{
>> + sfc_vdpa_log_init(sva, "entry");
>> + sfc_efx_mcdi_fini(&sva->mcdi);
>> +}
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c
>> b/drivers/vdpa/sfc/sfc_vdpa_ops.c
>> new file mode 100644
>> index 0000000..71696be
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
>> @@ -0,0 +1,129 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>> +#include <rte_malloc.h>
>> +#include <rte_vdpa.h>
>> +#include <rte_vdpa_dev.h>
>> +#include <rte_vhost.h>
>> +
>> +#include "sfc_vdpa_ops.h"
>> +#include "sfc_vdpa.h"
>> +
>> +/* Dummy functions for mandatory vDPA ops to pass vDPA device
>> registration.
>> + * In subsequent patches these ops would be implemented.
>> + */
>> +static int
>> +sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t
>> *queue_num)
>> +{
>> + RTE_SET_USED(vdpa_dev);
>> + RTE_SET_USED(queue_num);
>> +
>> + return -1;
>> +}
>> +
>> +static int
>> +sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t
>> *features)
>> +{
>> + RTE_SET_USED(vdpa_dev);
>> + RTE_SET_USED(features);
>> +
>> + return -1;
>> +}
>> +
>> +static int
>> +sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
>> + uint64_t *features)
>> +{
>> + RTE_SET_USED(vdpa_dev);
>> + RTE_SET_USED(features);
>> +
>> + return -1;
>> +}
>> +
>> +static int
>> +sfc_vdpa_dev_config(int vid)
>> +{
>> + RTE_SET_USED(vid);
>> +
>> + return -1;
>> +}
>> +
>> +static int
>> +sfc_vdpa_dev_close(int vid)
>> +{
>> + RTE_SET_USED(vid);
>> +
>> + return -1;
>> +}
>> +
>> +static int
>> +sfc_vdpa_set_vring_state(int vid, int vring, int state)
>> +{
>> + RTE_SET_USED(vid);
>> + RTE_SET_USED(vring);
>> + RTE_SET_USED(state);
>> +
>> + return -1;
>> +}
>> +
>> +static int
>> +sfc_vdpa_set_features(int vid)
>> +{
>> + RTE_SET_USED(vid);
>> +
>> + return -1;
>> +}
>> +
>> +static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
>> + .get_queue_num = sfc_vdpa_get_queue_num,
>> + .get_features = sfc_vdpa_get_features,
>> + .get_protocol_features = sfc_vdpa_get_protocol_features,
>> + .dev_conf = sfc_vdpa_dev_config,
>> + .dev_close = sfc_vdpa_dev_close,
>> + .set_vring_state = sfc_vdpa_set_vring_state,
>> + .set_features = sfc_vdpa_set_features,
>> +};
>> +
>> +struct sfc_vdpa_ops_data *
>> +sfc_vdpa_device_init(void *dev_handle, enum sfc_vdpa_context context)
>> +{
>> + struct sfc_vdpa_ops_data *ops_data;
>> + struct rte_pci_device *pci_dev;
>> +
>> + /* Create vDPA ops context */
>> + ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
>> + if (ops_data == NULL)
>> + return NULL;
>> +
>> + ops_data->vdpa_context = context;
>> + ops_data->dev_handle = dev_handle;
>> +
>> + pci_dev = sfc_vdpa_adapter_by_dev_handle(dev_handle)->pdev;
>> +
>> + /* Register vDPA Device */
>> + sfc_vdpa_log_init(dev_handle, "register vDPA device");
>> + ops_data->vdpa_dev =
>> + rte_vdpa_register_device(&pci_dev->device, &sfc_vdpa_ops);
>> + if (ops_data->vdpa_dev == NULL) {
>> + sfc_vdpa_err(dev_handle, "vDPA device registration failed");
>> + goto fail_register_device;
>> + }
>> +
>> + ops_data->state = SFC_VDPA_STATE_INITIALIZED;
>> +
>> + return ops_data;
>> +
>> +fail_register_device:
>> + rte_free(ops_data);
>> + return NULL;
>> +}
>> +
>> +void
>> +sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data)
>> +{
>> + rte_vdpa_unregister_device(ops_data->vdpa_dev);
>> +
>> + rte_free(ops_data);
>> +}
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h
>> b/drivers/vdpa/sfc/sfc_vdpa_ops.h
>> new file mode 100644
>> index 0000000..817b302
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
>> @@ -0,0 +1,36 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>> +#ifndef _SFC_VDPA_OPS_H
>> +#define _SFC_VDPA_OPS_H
>> +
>> +#include <rte_vdpa.h>
>> +
>> +#define SFC_VDPA_MAX_QUEUE_PAIRS 1
>> +
>> +enum sfc_vdpa_context {
>> + SFC_VDPA_AS_PF = 0,
>
> 0 is the default.
There are a number of coding standards which recommnd to
initalize the first member to make it easier for less
skilled reader to calculate enum values.
So, I don't think it is a problem to initalize.
>
>> + SFC_VDPA_AS_VF
>> +};
>> +
>> +enum sfc_vdpa_state {
>> + SFC_VDPA_STATE_UNINITIALIZED = 0,
>
> Same here.
>
>> + SFC_VDPA_STATE_INITIALIZED,
>> + SFC_VDPA_STATE_NSTATES
>> +};
>> +
>> +struct sfc_vdpa_ops_data {
>> + void *dev_handle;
>> + struct rte_vdpa_device *vdpa_dev;
>> + enum sfc_vdpa_context vdpa_context;
>> + enum sfc_vdpa_state state;
>> +};
>> +
>> +struct sfc_vdpa_ops_data *
>> +sfc_vdpa_device_init(void *adapter, enum sfc_vdpa_context context);
>> +void
>> +sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data);
>> +
>> +#endif /* _SFC_VDPA_OPS_H */
>>
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
2021-10-29 20:21 ` Mattias Rönnblom
@ 2021-11-01 11:48 ` Xia, Chenbo
2021-11-02 4:38 ` Vijay Kumar Srivastava
2021-11-02 7:42 ` Vijay Kumar Srivastava
1 sibling, 2 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-01 11:48 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add HW initialization and vDPA device registration support.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Used rte_memzone_reserve_aligned for mcdi buffer allocation.
> * Freeing mcdi buff when DMA map fails.
> * Fixed one typo.
>
> doc/guides/vdpadevs/sfc.rst | 6 +
> drivers/vdpa/sfc/meson.build | 3 +
> drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
> drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 327
> ++++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 36 +++++
> 10 files changed, 670 insertions(+), 1 deletion(-)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>
> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
> index 44e694f..d06c427 100644
> --- a/doc/guides/vdpadevs/sfc.rst
> +++ b/doc/guides/vdpadevs/sfc.rst
> @@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types available for
> control:
> Matches a subset of per-port log types registered during runtime.
> A full name for a particular type may be obtained by appending a
> dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
> +
> +- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
> +
> + Extra logging of the communication with the NIC's management CPU.
> + The format of the log is consumed by the netlogdecode cross-platform
> + tool. May be managed per-port, as explained above.
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> index 4255d65..dc333de 100644
> --- a/drivers/vdpa/sfc/meson.build
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -19,4 +19,7 @@ endforeach
> deps += ['common_sfc_efx', 'bus_pci']
> sources = files(
> 'sfc_vdpa.c',
> + 'sfc_vdpa_hw.c',
> + 'sfc_vdpa_mcdi.c',
> + 'sfc_vdpa_ops.c',
> )
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index d85c52b..b7eca56 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -232,6 +232,19 @@ struct sfc_vdpa_adapter *
> goto fail_vfio_setup;
> }
>
> + sfc_vdpa_log_init(sva, "hw init");
> + if (sfc_vdpa_hw_init(sva) != 0) {
> + sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
> + goto fail_hw_init;
> + }
> +
> + sfc_vdpa_log_init(sva, "dev init");
> + sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
> + if (sva->ops_data == NULL) {
> + sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
> + goto fail_dev_init;
> + }
> +
> pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> @@ -240,6 +253,12 @@ struct sfc_vdpa_adapter *
>
> return 0;
>
> +fail_dev_init:
> + sfc_vdpa_hw_fini(sva);
> +
> +fail_hw_init:
> + sfc_vdpa_vfio_teardown(sva);
> +
> fail_vfio_setup:
> fail_set_log_prefix:
> rte_free(sva);
> @@ -266,6 +285,10 @@ struct sfc_vdpa_adapter *
> TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
> pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
>
> + sfc_vdpa_device_fini(sva->ops_data);
> +
> + sfc_vdpa_hw_fini(sva);
> +
> sfc_vdpa_vfio_teardown(sva);
>
> rte_free(sva);
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> index 3b77900..046f25d 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -11,14 +11,38 @@
>
> #include <rte_bus_pci.h>
>
> +#include "sfc_efx.h"
> +#include "sfc_efx_mcdi.h"
> +#include "sfc_vdpa_debug.h"
> #include "sfc_vdpa_log.h"
> +#include "sfc_vdpa_ops.h"
> +
> +#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
>
> /* Adapter private data */
> struct sfc_vdpa_adapter {
> TAILQ_ENTRY(sfc_vdpa_adapter) next;
> + /*
> + * PMD setup and configuration is not thread safe. Since it is not
> + * performance sensitive, it is better to guarantee thread-safety
> + * and add device level lock. vDPA control operations which
> + * change its state should acquire the lock.
> + */
> + rte_spinlock_t lock;
> struct rte_pci_device *pdev;
> struct rte_pci_addr pci_addr;
>
> + efx_family_t family;
> + efx_nic_t *nic;
> + rte_spinlock_t nic_lock;
> +
> + efsys_bar_t mem_bar;
> +
> + struct sfc_efx_mcdi mcdi;
> + size_t mcdi_buff_size;
> +
> + uint32_t max_queue_count;
> +
> char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
> uint32_t logtype_main;
>
> @@ -26,6 +50,7 @@ struct sfc_vdpa_adapter {
> int vfio_dev_fd;
> int vfio_container_fd;
> int iommu_group_num;
> + struct sfc_vdpa_ops_data *ops_data;
> };
>
> uint32_t
> @@ -36,5 +61,27 @@ struct sfc_vdpa_adapter {
> struct sfc_vdpa_adapter *
> sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
>
> -#endif /* _SFC_VDPA_H */
> +int
> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
> +void
> +sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva);
>
> +int
> +sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
> +void
> +sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
> +
> +int
> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> + size_t len, efsys_mem_t *esmp);
> +
> +void
> +sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
> +
> +static inline struct sfc_vdpa_adapter *
> +sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
> +{
> + return (struct sfc_vdpa_adapter *)dev_handle;
> +}
> +
> +#endif /* _SFC_VDPA_H */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h
> b/drivers/vdpa/sfc/sfc_vdpa_debug.h
> new file mode 100644
> index 0000000..cfa8cc5
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
> @@ -0,0 +1,21 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_DEBUG_H_
> +#define _SFC_VDPA_DEBUG_H_
> +
> +#include <rte_debug.h>
> +
> +#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
> +/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
> + * in the driver only.
> + */
> +#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
> +#else
> +/* If the driver debug is not enabled, follow DPDK debug/non-debug */
> +#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
> +#endif
> +
> +#endif /* _SFC_VDPA_DEBUG_H_ */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> new file mode 100644
> index 0000000..7c256ff
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -0,0 +1,327 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <unistd.h>
> +
> +#include <rte_common.h>
> +#include <rte_errno.h>
> +#include <rte_vfio.h>
> +
> +#include "efx.h"
> +#include "sfc_vdpa.h"
> +#include "sfc_vdpa_ops.h"
> +
> +extern uint32_t sfc_logtype_driver;
> +
> +#ifndef PAGE_SIZE
> +#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
> +#endif
> +
> +int
> +sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
> + size_t len, efsys_mem_t *esmp)
> +{
> + uint64_t mcdi_iova;
> + size_t mcdi_buff_size;
> + const struct rte_memzone *mz = NULL;
> + int numa_node = sva->pdev->device.numa_node;
> + int ret;
> +
> + mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
> +
> + sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
> +
> + mz = rte_memzone_reserve_aligned(name, mcdi_buff_size,
> + numa_node,
> + RTE_MEMZONE_IOVA_CONTIG,
> + PAGE_SIZE);
> + if (mz == NULL) {
> + sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
> + name, (unsigned int)len, rte_strerror(rte_errno));
> + return -ENOMEM;
> + }
> +
> + /* IOVA address for MCDI would be re-calculated if mapping
> + * using default IOVA would fail.
> + * TODO: Earlier there was no way to get valid IOVA range.
> + * Recently a patch has been submitted to get the IOVA range
> + * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
> + * in the kernel version >= 5.4. Support to get the default
> + * IOVA address for MCDI buffer using available IOVA range
> + * would be added later. Meanwhile default IOVA for MCDI buffer
> + * is kept at high mem at 2TB. In case of overlap new available
> + * addresses would be searched and same would be used.
> + */
> + mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
> +
> + do {
> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
> + (uint64_t)mz->addr, mcdi_iova,
> + mcdi_buff_size);
> + if (ret == 0)
> + break;
> +
> + mcdi_iova = mcdi_iova >> 1;
> + if (mcdi_iova < mcdi_buff_size) {
> + sfc_vdpa_err(sva,
> + "DMA mapping failed for MCDI : %s",
> + rte_strerror(rte_errno));
> + rte_memzone_free(mz);
> + return ret;
> + }
> +
> + } while (ret < 0);
So when QEMU iova and mcdi_iova conflicts, you just let vdpa dev failed to
configure, right?
Why not use re-mapping mcdi dma region as the solution? Any side-effect?
Or you just assume conflict can hardly happen?
> +
> + esmp->esm_addr = mcdi_iova;
> + esmp->esm_base = mz->addr;
> + sva->mcdi_buff_size = mcdi_buff_size;
> +
> + sfc_vdpa_info(sva,
> + "DMA name=%s len=%zu => virt=%p iova=%" PRIx64,
I believe 0x%" PRIx64 or %#" PRIx64 will be more friendly
> + name, len, esmp->esm_base, esmp->esm_addr);
> +
> + return 0;
> +}
> +
> +void
> +sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp)
> +{
> + int ret;
> +
> + sfc_vdpa_log_init(sva, "name=%s", esmp->esm_mz->name);
> +
> + ret = rte_vfio_container_dma_unmap(sva->vfio_container_fd,
> + (uint64_t)esmp->esm_base,
> + esmp->esm_addr, sva->mcdi_buff_size);
> + if (ret < 0)
> + sfc_vdpa_err(sva, "DMA unmap failed for MCDI : %s",
> + rte_strerror(rte_errno));
> +
> + sfc_vdpa_info(sva,
> + "DMA free name=%s => virt=%p iova=%" PRIx64,
> + esmp->esm_mz->name, esmp->esm_base, esmp->esm_addr);
Ditto.
> +
> + rte_free((void *)(esmp->esm_base));
> +
> + sva->mcdi_buff_size = 0;
> + memset(esmp, 0, sizeof(*esmp));
> +}
> +
> +static int
> +sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
> + const efx_bar_region_t *mem_ebrp)
> +{
> + struct rte_pci_device *pci_dev = sva->pdev;
> + efsys_bar_t *ebp = &sva->mem_bar;
> + struct rte_mem_resource *res =
> + &pci_dev->mem_resource[mem_ebrp->ebr_index];
> +
> + SFC_BAR_LOCK_INIT(ebp, pci_dev->name);
> + ebp->esb_rid = mem_ebrp->ebr_index;
> + ebp->esb_dev = pci_dev;
> + ebp->esb_base = res->addr;
> +
> + return 0;
> +}
> +
> +static void
> +sfc_vdpa_mem_bar_fini(struct sfc_vdpa_adapter *sva)
> +{
> + efsys_bar_t *ebp = &sva->mem_bar;
> +
> + SFC_BAR_LOCK_DESTROY(ebp);
> + memset(ebp, 0, sizeof(*ebp));
> +}
> +
> +static int
> +sfc_vdpa_nic_probe(struct sfc_vdpa_adapter *sva)
> +{
> + efx_nic_t *enp = sva->nic;
> + int rc;
> +
> + rc = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE);
> + if (rc != 0)
> + sfc_vdpa_err(sva, "nic probe failed: %s", rte_strerror(rc));
> +
> + return rc;
> +}
> +
> +static int
> +sfc_vdpa_estimate_resource_limits(struct sfc_vdpa_adapter *sva)
> +{
> + efx_drv_limits_t limits;
> + int rc;
> + uint32_t evq_allocated;
> + uint32_t rxq_allocated;
> + uint32_t txq_allocated;
> + uint32_t max_queue_cnt;
> +
> + memset(&limits, 0, sizeof(limits));
> +
> + /* Request at least one Rx and Tx queue */
> + limits.edl_min_rxq_count = 1;
> + limits.edl_min_txq_count = 1;
> + /* Management event queue plus event queue for Tx/Rx queue */
> + limits.edl_min_evq_count =
> + 1 + RTE_MAX(limits.edl_min_rxq_count, limits.edl_min_txq_count);
> +
> + limits.edl_max_rxq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
> + limits.edl_max_txq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
> + limits.edl_max_evq_count = 1 + SFC_VDPA_MAX_QUEUE_PAIRS;
> +
> + SFC_VDPA_ASSERT(limits.edl_max_evq_count >= limits.edl_min_rxq_count);
> + SFC_VDPA_ASSERT(limits.edl_max_rxq_count >= limits.edl_min_rxq_count);
> + SFC_VDPA_ASSERT(limits.edl_max_txq_count >= limits.edl_min_rxq_count);
> +
> + /* Configure the minimum required resources needed for the
> + * driver to operate, and the maximum desired resources that the
> + * driver is capable of using.
> + */
> + sfc_vdpa_log_init(sva, "set drv limit");
> + efx_nic_set_drv_limits(sva->nic, &limits);
> +
> + sfc_vdpa_log_init(sva, "init nic");
> + rc = efx_nic_init(sva->nic);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "nic init failed: %s", rte_strerror(rc));
> + goto fail_nic_init;
> + }
> +
> + /* Find resource dimensions assigned by firmware to this function */
> + rc = efx_nic_get_vi_pool(sva->nic, &evq_allocated, &rxq_allocated,
> + &txq_allocated);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "vi pool get failed: %s", rte_strerror(rc));
> + goto fail_get_vi_pool;
> + }
> +
> + /* It still may allocate more than maximum, ensure limit */
> + evq_allocated = RTE_MIN(evq_allocated, limits.edl_max_evq_count);
> + rxq_allocated = RTE_MIN(rxq_allocated, limits.edl_max_rxq_count);
> + txq_allocated = RTE_MIN(txq_allocated, limits.edl_max_txq_count);
> +
> +
> + max_queue_cnt = RTE_MIN(rxq_allocated, txq_allocated);
> + /* Subtract management EVQ not used for traffic */
> + max_queue_cnt = RTE_MIN(evq_allocated - 1, max_queue_cnt);
> +
> + SFC_VDPA_ASSERT(max_queue_cnt > 0);
> +
> + sva->max_queue_count = max_queue_cnt;
> +
> + return 0;
> +
> +fail_get_vi_pool:
> + efx_nic_fini(sva->nic);
> +fail_nic_init:
> + sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
> + return rc;
> +}
> +
> +int
> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva)
> +{
> + efx_bar_region_t mem_ebr;
> + efx_nic_t *enp;
> + int rc;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + sfc_vdpa_log_init(sva, "get family");
> + rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
> + if (rc != 0)
> + goto fail_family;
> + sfc_vdpa_log_init(sva,
> + "family is %u, membar is %u,"
> + "function control window offset is %#" PRIx64,
> + sva->family, mem_ebr.ebr_index, mem_ebr.ebr_offset);
If ebr_idx is int, then %u -> %d. But if it's a bar index, its type should
be unsigned int and you should change the definition in sfc common code.
> +
> + sfc_vdpa_log_init(sva, "init mem bar");
> + rc = sfc_vdpa_mem_bar_init(sva, &mem_ebr);
> + if (rc != 0)
> + goto fail_mem_bar_init;
> +
> + sfc_vdpa_log_init(sva, "create nic");
> + rte_spinlock_init(&sva->nic_lock);
> + rc = efx_nic_create(sva->family, (efsys_identifier_t *)sva,
> + &sva->mem_bar, mem_ebr.ebr_offset,
> + &sva->nic_lock, &enp);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "nic create failed: %s", rte_strerror(rc));
> + goto fail_nic_create;
> + }
> + sva->nic = enp;
> +
> + sfc_vdpa_log_init(sva, "init mcdi");
> + rc = sfc_vdpa_mcdi_init(sva);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "mcdi init failed: %s", rte_strerror(rc));
> + goto fail_mcdi_init;
> + }
> +
> + sfc_vdpa_log_init(sva, "probe nic");
> + rc = sfc_vdpa_nic_probe(sva);
> + if (rc != 0)
> + goto fail_nic_probe;
> +
> + sfc_vdpa_log_init(sva, "reset nic");
> + rc = efx_nic_reset(enp);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "nic reset failed: %s", rte_strerror(rc));
> + goto fail_nic_reset;
> + }
> +
> + sfc_vdpa_log_init(sva, "estimate resource limits");
> + rc = sfc_vdpa_estimate_resource_limits(sva);
> + if (rc != 0)
> + goto fail_estimate_rsrc_limits;
> +
> + sfc_vdpa_log_init(sva, "done");
> +
> + return 0;
> +
> +fail_estimate_rsrc_limits:
> +fail_nic_reset:
> + efx_nic_unprobe(enp);
> +
> +fail_nic_probe:
> + sfc_vdpa_mcdi_fini(sva);
> +
> +fail_mcdi_init:
> + sfc_vdpa_log_init(sva, "destroy nic");
> + sva->nic = NULL;
> + efx_nic_destroy(enp);
> +
> +fail_nic_create:
> + sfc_vdpa_mem_bar_fini(sva);
> +
> +fail_mem_bar_init:
> +fail_family:
> + sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
> + return rc;
> +}
> +
> +void
> +sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva)
> +{
> + efx_nic_t *enp = sva->nic;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + sfc_vdpa_log_init(sva, "unprobe nic");
> + efx_nic_unprobe(enp);
> +
> + sfc_vdpa_log_init(sva, "mcdi fini");
> + sfc_vdpa_mcdi_fini(sva);
> +
> + sfc_vdpa_log_init(sva, "nic fini");
> + efx_nic_fini(enp);
> +
> + sfc_vdpa_log_init(sva, "destroy nic");
> + sva->nic = NULL;
> + efx_nic_destroy(enp);
> +
> + sfc_vdpa_mem_bar_fini(sva);
> +}
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
> index 858e5ee..4e7a84f 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_log.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> @@ -21,6 +21,9 @@
> /** Name prefix for the per-device log type used to report basic information
> */
> #define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
>
> +/** Device MCDI log type name prefix */
> +#define SFC_VDPA_LOGTYPE_MCDI_STR SFC_VDPA_LOGTYPE_PREFIX "mcdi"
> +
> #define SFC_VDPA_LOG_PREFIX_MAX 32
>
> /* Log PMD message, automatically add prefix and \n */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> new file mode 100644
> index 0000000..961d2d3
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> @@ -0,0 +1,74 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include "sfc_efx_mcdi.h"
> +
> +#include "sfc_vdpa.h"
> +#include "sfc_vdpa_debug.h"
> +#include "sfc_vdpa_log.h"
> +
> +static sfc_efx_mcdi_dma_alloc_cb sfc_vdpa_mcdi_dma_alloc;
> +static int
> +sfc_vdpa_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
> + efsys_mem_t *esmp)
> +{
> + struct sfc_vdpa_adapter *sva = cookie;
> +
> + return sfc_vdpa_dma_alloc(sva, name, len, esmp);
> +}
> +
> +static sfc_efx_mcdi_dma_free_cb sfc_vdpa_mcdi_dma_free;
> +static void
> +sfc_vdpa_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
> +{
> + struct sfc_vdpa_adapter *sva = cookie;
> +
> + sfc_vdpa_dma_free(sva, esmp);
> +}
> +
> +static sfc_efx_mcdi_sched_restart_cb sfc_vdpa_mcdi_sched_restart;
> +static void
> +sfc_vdpa_mcdi_sched_restart(void *cookie)
> +{
> + RTE_SET_USED(cookie);
> +}
> +
> +static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_vdpa_mcdi_mgmt_evq_poll;
> +static void
> +sfc_vdpa_mcdi_mgmt_evq_poll(void *cookie)
> +{
> + RTE_SET_USED(cookie);
> +}
> +
> +static const struct sfc_efx_mcdi_ops sfc_vdpa_mcdi_ops = {
> + .dma_alloc = sfc_vdpa_mcdi_dma_alloc,
> + .dma_free = sfc_vdpa_mcdi_dma_free,
> + .sched_restart = sfc_vdpa_mcdi_sched_restart,
> + .mgmt_evq_poll = sfc_vdpa_mcdi_mgmt_evq_poll,
> +
> +};
> +
> +int
> +sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva)
> +{
> + uint32_t logtype;
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + logtype = sfc_vdpa_register_logtype(&(sva->pdev->addr),
> + SFC_VDPA_LOGTYPE_MCDI_STR,
> + RTE_LOG_NOTICE);
> +
> + return sfc_efx_mcdi_init(&sva->mcdi, logtype,
> + sva->log_prefix, sva->nic,
> + &sfc_vdpa_mcdi_ops, sva);
> +}
> +
> +void
> +sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva)
> +{
> + sfc_vdpa_log_init(sva, "entry");
> + sfc_efx_mcdi_fini(&sva->mcdi);
> +}
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> new file mode 100644
> index 0000000..71696be
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -0,0 +1,129 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <rte_malloc.h>
> +#include <rte_vdpa.h>
> +#include <rte_vdpa_dev.h>
> +#include <rte_vhost.h>
> +
> +#include "sfc_vdpa_ops.h"
> +#include "sfc_vdpa.h"
> +
> +/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
> + * In subsequent patches these ops would be implemented.
> + */
> +static int
> +sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
> +{
> + RTE_SET_USED(vdpa_dev);
> + RTE_SET_USED(queue_num);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
> +{
> + RTE_SET_USED(vdpa_dev);
> + RTE_SET_USED(features);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
> + uint64_t *features)
> +{
> + RTE_SET_USED(vdpa_dev);
> + RTE_SET_USED(features);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_dev_config(int vid)
> +{
> + RTE_SET_USED(vid);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_dev_close(int vid)
> +{
> + RTE_SET_USED(vid);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_set_vring_state(int vid, int vring, int state)
> +{
> + RTE_SET_USED(vid);
> + RTE_SET_USED(vring);
> + RTE_SET_USED(state);
> +
> + return -1;
> +}
> +
> +static int
> +sfc_vdpa_set_features(int vid)
> +{
> + RTE_SET_USED(vid);
> +
> + return -1;
> +}
> +
> +static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
> + .get_queue_num = sfc_vdpa_get_queue_num,
> + .get_features = sfc_vdpa_get_features,
> + .get_protocol_features = sfc_vdpa_get_protocol_features,
> + .dev_conf = sfc_vdpa_dev_config,
> + .dev_close = sfc_vdpa_dev_close,
> + .set_vring_state = sfc_vdpa_set_vring_state,
> + .set_features = sfc_vdpa_set_features,
> +};
> +
> +struct sfc_vdpa_ops_data *
> +sfc_vdpa_device_init(void *dev_handle, enum sfc_vdpa_context context)
> +{
> + struct sfc_vdpa_ops_data *ops_data;
> + struct rte_pci_device *pci_dev;
> +
> + /* Create vDPA ops context */
> + ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
> + if (ops_data == NULL)
> + return NULL;
> +
> + ops_data->vdpa_context = context;
> + ops_data->dev_handle = dev_handle;
> +
> + pci_dev = sfc_vdpa_adapter_by_dev_handle(dev_handle)->pdev;
> +
> + /* Register vDPA Device */
> + sfc_vdpa_log_init(dev_handle, "register vDPA device");
> + ops_data->vdpa_dev =
> + rte_vdpa_register_device(&pci_dev->device, &sfc_vdpa_ops);
> + if (ops_data->vdpa_dev == NULL) {
> + sfc_vdpa_err(dev_handle, "vDPA device registration failed");
> + goto fail_register_device;
> + }
> +
> + ops_data->state = SFC_VDPA_STATE_INITIALIZED;
> +
> + return ops_data;
> +
> +fail_register_device:
> + rte_free(ops_data);
> + return NULL;
> +}
> +
> +void
> +sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data)
> +{
> + rte_vdpa_unregister_device(ops_data->vdpa_dev);
> +
> + rte_free(ops_data);
> +}
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> new file mode 100644
> index 0000000..817b302
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> @@ -0,0 +1,36 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_OPS_H
> +#define _SFC_VDPA_OPS_H
> +
> +#include <rte_vdpa.h>
> +
> +#define SFC_VDPA_MAX_QUEUE_PAIRS 1
> +
> +enum sfc_vdpa_context {
> + SFC_VDPA_AS_PF = 0,
If you don't use SFC_VDPA_AS_PF for this version of driver, why
not introduce it when you need it?
> + SFC_VDPA_AS_VF
> +};
> +
> +enum sfc_vdpa_state {
> + SFC_VDPA_STATE_UNINITIALIZED = 0,
> + SFC_VDPA_STATE_INITIALIZED,
> + SFC_VDPA_STATE_NSTATES
Similar comment: if you don't need info like this 'number of states',
you can just remove it.
Thanks,
Chenbo
> +};
> +
> +struct sfc_vdpa_ops_data {
> + void *dev_handle;
> + struct rte_vdpa_device *vdpa_dev;
> + enum sfc_vdpa_context vdpa_context;
> + enum sfc_vdpa_state state;
> +};
> +
> +struct sfc_vdpa_ops_data *
> +sfc_vdpa_device_init(void *adapter, enum sfc_vdpa_context context);
> +void
> +sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data);
> +
> +#endif /* _SFC_VDPA_OPS_H */
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-11-01 11:48 ` Xia, Chenbo
@ 2021-11-02 4:38 ` Vijay Kumar Srivastava
2021-11-02 5:16 ` Xia, Chenbo
2021-11-02 7:42 ` Vijay Kumar Srivastava
1 sibling, 1 reply; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-11-02 4:38 UTC (permalink / raw)
To: Xia, Chenbo, dev; +Cc: maxime.coquelin, andrew.rybchenko, Praveen Kumar Jain
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Monday, November 1, 2021 5:19 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
>Kumar Srivastava <vsrivast@xilinx.com>
>Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
>
>Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Friday, October 29, 2021 10:47 PM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
>> <vsrivast@xilinx.com>
>> Subject: [PATCH v3 02/10] vdpa/sfc: add support for device
>> initialization
>>
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add HW initialization and vDPA device registration support.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>> ---
[SNIP]
>> +
>> + do {
>> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
>> + (uint64_t)mz->addr,
>mcdi_iova,
>> + mcdi_buff_size);
>> + if (ret == 0)
>> + break;
>> +
>> + mcdi_iova = mcdi_iova >> 1;
>> + if (mcdi_iova < mcdi_buff_size) {
>> + sfc_vdpa_err(sva,
>> + "DMA mapping failed for MCDI : %s",
>> + rte_strerror(rte_errno));
>> + rte_memzone_free(mz);
>> + return ret;
>> + }
>> +
>> + } while (ret < 0);
>
>So when QEMU iova and mcdi_iova conflicts, you just let vdpa dev failed to
>configure, right?
>
>Why not use re-mapping mcdi dma region as the solution? Any side-effect?
>Or you just assume conflict can hardly happen?
MCDI configuration is being done at the very early point of initialization.
Conflict would be detected later when rte_vhost_get_mem_table() would be invoked in .dev_conf callback and
then MCDI re-mapping can be done in case of conflict, for this a patch is in progress which would be submitted separately.
Regards,
Vijay
[SNIP]
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-11-02 4:38 ` Vijay Kumar Srivastava
@ 2021-11-02 5:16 ` Xia, Chenbo
2021-11-02 9:50 ` Vijay Kumar Srivastava
0 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 5:16 UTC (permalink / raw)
To: Vijay Kumar Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Praveen Kumar Jain
> -----Original Message-----
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Sent: Tuesday, November 2, 2021 12:38 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Praveen Kumar
> Jain <praveenj@xilinx.com>
> Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
>
> Hi Chenbo,
>
> >-----Original Message-----
> >From: Xia, Chenbo <chenbo.xia@intel.com>
> >Sent: Monday, November 1, 2021 5:19 PM
> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
> >Kumar Srivastava <vsrivast@xilinx.com>
> >Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
> >
> >Hi Vijay,
> >
> >> -----Original Message-----
> >> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> >> Sent: Friday, October 29, 2021 10:47 PM
> >> To: dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> >> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
> >> <vsrivast@xilinx.com>
> >> Subject: [PATCH v3 02/10] vdpa/sfc: add support for device
> >> initialization
> >>
> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >>
> >> Add HW initialization and vDPA device registration support.
> >>
> >> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> >> ---
> [SNIP]
> >> +
> >> + do {
> >> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
> >> + (uint64_t)mz->addr,
> >mcdi_iova,
> >> + mcdi_buff_size);
> >> + if (ret == 0)
> >> + break;
> >> +
> >> + mcdi_iova = mcdi_iova >> 1;
> >> + if (mcdi_iova < mcdi_buff_size) {
> >> + sfc_vdpa_err(sva,
> >> + "DMA mapping failed for MCDI : %s",
> >> + rte_strerror(rte_errno));
> >> + rte_memzone_free(mz);
> >> + return ret;
> >> + }
> >> +
> >> + } while (ret < 0);
> >
> >So when QEMU iova and mcdi_iova conflicts, you just let vdpa dev failed to
> >configure, right?
> >
> >Why not use re-mapping mcdi dma region as the solution? Any side-effect?
> >Or you just assume conflict can hardly happen?
>
> MCDI configuration is being done at the very early point of initialization.
> Conflict would be detected later when rte_vhost_get_mem_table() would be
> invoked in .dev_conf callback and
> then MCDI re-mapping can be done in case of conflict,
Agree. It should be done in dev_conf callback.
> for this a patch is in
> progress which would be submitted separately.
OK for me, as the initial version, you can just let dev_conf fail if conflict
happens.
/Chenbo
>
> Regards,
> Vijay
>
> [SNIP]
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-11-02 5:16 ` Xia, Chenbo
@ 2021-11-02 9:50 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-11-02 9:50 UTC (permalink / raw)
To: Xia, Chenbo, dev; +Cc: maxime.coquelin, andrew.rybchenko, Praveen Kumar Jain
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Tuesday, November 2, 2021 10:47 AM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Praveen
>Kumar Jain <praveenj@xilinx.com>
>Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
>
>> -----Original Message-----
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Sent: Tuesday, November 2, 2021 12:38 PM
>> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Praveen
>> Kumar Jain <praveenj@xilinx.com>
>> Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device
>> initialization
>>
>> Hi Chenbo,
>>
>> >-----Original Message-----
>> >From: Xia, Chenbo <chenbo.xia@intel.com>
>> >Sent: Monday, November 1, 2021 5:19 PM
>> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
>> >Kumar Srivastava <vsrivast@xilinx.com>
>> >Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device
>> >initialization
>> >
>> >Hi Vijay,
>> >
>> >> -----Original Message-----
>> >> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> >> Sent: Friday, October 29, 2021 10:47 PM
>> >> To: dev@dpdk.org
>> >> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> >> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
>> >> <vsrivast@xilinx.com>
>> >> Subject: [PATCH v3 02/10] vdpa/sfc: add support for device
>> >> initialization
>> >>
>> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> >>
>> >> Add HW initialization and vDPA device registration support.
>> >>
>> >> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> >> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>> >> ---
>> [SNIP]
>> >> +
>> >> + do {
>> >> + ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
>> >> + (uint64_t)mz->addr,
>> >mcdi_iova,
>> >> + mcdi_buff_size);
>> >> + if (ret == 0)
>> >> + break;
>> >> +
>> >> + mcdi_iova = mcdi_iova >> 1;
>> >> + if (mcdi_iova < mcdi_buff_size) {
>> >> + sfc_vdpa_err(sva,
>> >> + "DMA mapping failed for MCDI : %s",
>> >> + rte_strerror(rte_errno));
>> >> + rte_memzone_free(mz);
>> >> + return ret;
>> >> + }
>> >> +
>> >> + } while (ret < 0);
>> >
>> >So when QEMU iova and mcdi_iova conflicts, you just let vdpa dev
>> >failed to configure, right?
>> >
>> >Why not use re-mapping mcdi dma region as the solution? Any side-effect?
>> >Or you just assume conflict can hardly happen?
>>
>> MCDI configuration is being done at the very early point of initialization.
>> Conflict would be detected later when rte_vhost_get_mem_table() would
>> be invoked in .dev_conf callback and then MCDI re-mapping can be done
>> in case of conflict,
>
>Agree. It should be done in dev_conf callback.
>
>> for this a patch is in
>> progress which would be submitted separately.
>
>OK for me, as the initial version, you can just let dev_conf fail if conflict
>happens.
Yes. In case of conflict dev_conf would fail.
Regards,
Vijay
>> [SNIP]
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-11-01 11:48 ` Xia, Chenbo
2021-11-02 4:38 ` Vijay Kumar Srivastava
@ 2021-11-02 7:42 ` Vijay Kumar Srivastava
2021-11-02 7:50 ` Xia, Chenbo
1 sibling, 1 reply; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-11-02 7:42 UTC (permalink / raw)
To: Xia, Chenbo, dev
Cc: maxime.coquelin, andrew.rybchenko, Praveen Kumar Jain,
Harpreet Singh Anand
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Monday, November 1, 2021 5:19 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
>Kumar Srivastava <vsrivast@xilinx.com>
>Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
>
>Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Friday, October 29, 2021 10:47 PM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
>> <vsrivast@xilinx.com>
>> Subject: [PATCH v3 02/10] vdpa/sfc: add support for device
>> initialization
>>
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Add HW initialization and vDPA device registration support.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>> ---
[SNIP]
>> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva) {
>> + efx_bar_region_t mem_ebr;
>> + efx_nic_t *enp;
>> + int rc;
>> +
>> + sfc_vdpa_log_init(sva, "entry");
>> +
>> + sfc_vdpa_log_init(sva, "get family");
>> + rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
>> + if (rc != 0)
>> + goto fail_family;
>> + sfc_vdpa_log_init(sva,
>> + "family is %u, membar is %u,"
>> + "function control window offset is %#" PRIx64,
>> + sva->family, mem_ebr.ebr_index,
>mem_ebr.ebr_offset);
>
>If ebr_idx is int, then %u -> %d. But if it's a bar index, its type should be
>unsigned int and you should change the definition in sfc common code.
Yes. It’s BAR index.
Thanks for the catch. I agree that usage of 'unsigned int' looks better
for BAR index, however it should result in more changes in similar
places. Is it OK if we use %d here right now to be consistent with
current type and address the review note in a follow up patches
for common/sfc_efx, net/sfc and vdpa/sfc?
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization
2021-11-02 7:42 ` Vijay Kumar Srivastava
@ 2021-11-02 7:50 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 7:50 UTC (permalink / raw)
To: Vijay Kumar Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Praveen Kumar Jain,
Harpreet Singh Anand
> -----Original Message-----
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Sent: Tuesday, November 2, 2021 3:43 PM
> To: Xia, Chenbo <chenbo.xia@intel.com>; dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Praveen Kumar
> Jain <praveenj@xilinx.com>; Harpreet Singh Anand <hanand@xilinx.com>
> Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
>
> Hi Chenbo,
>
> >-----Original Message-----
> >From: Xia, Chenbo <chenbo.xia@intel.com>
> >Sent: Monday, November 1, 2021 5:19 PM
> >To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
> >Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
> >Kumar Srivastava <vsrivast@xilinx.com>
> >Subject: RE: [PATCH v3 02/10] vdpa/sfc: add support for device initialization
> >
> >Hi Vijay,
> >
> >> -----Original Message-----
> >> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> >> Sent: Friday, October 29, 2021 10:47 PM
> >> To: dev@dpdk.org
> >> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> >> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
> >> <vsrivast@xilinx.com>
> >> Subject: [PATCH v3 02/10] vdpa/sfc: add support for device
> >> initialization
> >>
> >> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >>
> >> Add HW initialization and vDPA device registration support.
> >>
> >> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> >> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> >> ---
> [SNIP]
> >> +sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva) {
> >> + efx_bar_region_t mem_ebr;
> >> + efx_nic_t *enp;
> >> + int rc;
> >> +
> >> + sfc_vdpa_log_init(sva, "entry");
> >> +
> >> + sfc_vdpa_log_init(sva, "get family");
> >> + rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
> >> + if (rc != 0)
> >> + goto fail_family;
> >> + sfc_vdpa_log_init(sva,
> >> + "family is %u, membar is %u,"
> >> + "function control window offset is %#" PRIx64,
> >> + sva->family, mem_ebr.ebr_index,
> >mem_ebr.ebr_offset);
> >
> >If ebr_idx is int, then %u -> %d. But if it's a bar index, its type should be
> >unsigned int and you should change the definition in sfc common code.
> Yes. It’s BAR index.
> Thanks for the catch. I agree that usage of 'unsigned int' looks better
> for BAR index, however it should result in more changes in similar
> places. Is it OK if we use %d here right now to be consistent with
> current type and address the review note in a follow up patches
> for common/sfc_efx, net/sfc and vdpa/sfc?
Sure. Ok for me.
/Chenbo
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 03/10] vdpa/sfc: add support to get device and protocol features
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 01/10] " Vijay Srivastava
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 7:09 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
` (6 subsequent siblings)
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_feature and get_protocol_features.
This patch retrieves device supported features and enables
protocol features.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
doc/guides/vdpadevs/features/sfc.ini | 10 ++++
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/version.map | 10 ++++
drivers/vdpa/sfc/sfc_vdpa.c | 20 ++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 2 +
drivers/vdpa/sfc/sfc_vdpa_hw.c | 13 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 91 ++++++++++++++++++++++++++++++++----
drivers/vdpa/sfc/sfc_vdpa_ops.h | 3 ++
8 files changed, 142 insertions(+), 9 deletions(-)
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
index 71b6158..700d061 100644
--- a/doc/guides/vdpadevs/features/sfc.ini
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -4,6 +4,16 @@
; Refer to default.ini for the full list of available driver features.
;
[Features]
+csum = Y
+guest csum = Y
+host tso4 = Y
+host tso6 = Y
+version 1 = Y
+mrg rxbuf = Y
+any layout = Y
+in_order = Y
+proto host notifier = Y
+IOMMU platform = Y
Linux = Y
x86-64 = Y
Usage doc = Y
diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
index d133d61..37ec6b9 100644
--- a/drivers/common/sfc_efx/efsys.h
+++ b/drivers/common/sfc_efx/efsys.h
@@ -187,7 +187,7 @@
#define EFSYS_OPT_MAE 1
-#define EFSYS_OPT_VIRTIO 0
+#define EFSYS_OPT_VIRTIO 1
/* ID */
diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index 642a62e..ec86220 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -247,6 +247,16 @@ INTERNAL {
efx_txq_nbufs;
efx_txq_size;
+ efx_virtio_fini;
+ efx_virtio_get_doorbell_offset;
+ efx_virtio_get_features;
+ efx_virtio_init;
+ efx_virtio_qcreate;
+ efx_virtio_qdestroy;
+ efx_virtio_qstart;
+ efx_virtio_qstop;
+ efx_virtio_verify_features;
+
sfc_efx_dev_class_get;
sfc_efx_family;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index b7eca56..ccbd243 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -43,6 +43,26 @@ struct sfc_vdpa_adapter *
return found ? sva : NULL;
}
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (vdpa_dev == sva->ops_data->vdpa_dev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva->ops_data : NULL;
+}
+
static int
sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 046f25d..c10c3d3 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -60,6 +60,8 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev);
int
sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index 7c256ff..7a67bd8 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -278,10 +278,20 @@
if (rc != 0)
goto fail_estimate_rsrc_limits;
+ sfc_vdpa_log_init(sva, "init virtio");
+ rc = efx_virtio_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "virtio init failed: %s", rte_strerror(rc));
+ goto fail_virtio_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_virtio_init:
+ efx_nic_fini(enp);
+
fail_estimate_rsrc_limits:
fail_nic_reset:
efx_nic_unprobe(enp);
@@ -310,6 +320,9 @@
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_log_init(sva, "virtio fini");
+ efx_virtio_fini(enp);
+
sfc_vdpa_log_init(sva, "unprobe nic");
efx_nic_unprobe(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 71696be..5750944 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,17 +3,31 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
#include <rte_vhost.h>
+#include "efx.h"
#include "sfc_vdpa_ops.h"
#include "sfc_vdpa.h"
-/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
- * In subsequent patches these ops would be implemented.
+/* These protocol features are needed to enable notifier ctrl */
+#define SFC_VDPA_PROTOCOL_FEATURES \
+ ((1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD))
+
+/*
+ * Set of features which are enabled by default.
+ * Protocol feature bit is needed to enable notification notifier ctrl.
*/
+#define SFC_VDPA_DEFAULT_FEATURES \
+ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
+
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
@@ -24,22 +38,67 @@
}
static int
+sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ uint64_t dev_features;
+ efx_nic_t *nic;
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+
+ rc = efx_virtio_get_features(nic, EFX_VIRTIO_DEVICE_TYPE_NET,
+ &dev_features);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "could not read device feature: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ ops_data->dev_features = dev_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "device supported virtio features : 0x%" PRIx64,
+ ops_data->dev_features);
+
+ return 0;
+}
+
+static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = ops_data->drv_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = SFC_VDPA_PROTOCOL_FEATURES;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_protocol_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
@@ -91,6 +150,7 @@ struct sfc_vdpa_ops_data *
{
struct sfc_vdpa_ops_data *ops_data;
struct rte_pci_device *pci_dev;
+ int rc;
/* Create vDPA ops context */
ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
@@ -111,10 +171,25 @@ struct sfc_vdpa_ops_data *
goto fail_register_device;
}
+ /* Read supported device features */
+ sfc_vdpa_log_init(dev_handle, "get device feature");
+ rc = sfc_vdpa_get_device_features(ops_data);
+ if (rc != 0)
+ goto fail_get_dev_feature;
+
+ /* Driver features are superset of device supported feature
+ * and any additional features supported by the driver.
+ */
+ ops_data->drv_features =
+ ops_data->dev_features | SFC_VDPA_DEFAULT_FEATURES;
+
ops_data->state = SFC_VDPA_STATE_INITIALIZED;
return ops_data;
+fail_get_dev_feature:
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
fail_register_device:
rte_free(ops_data);
return NULL;
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 817b302..21cbb73 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -26,6 +26,9 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+
+ uint64_t dev_features;
+ uint64_t drv_features;
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 03/10] vdpa/sfc: add support to get device and protocol features
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
@ 2021-11-02 7:09 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 7:09 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 03/10] vdpa/sfc: add support to get device and protocol
> features
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops get_feature and get_protocol_features.
> This patch retrieves device supported features and enables
> protocol features.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> doc/guides/vdpadevs/features/sfc.ini | 10 ++++
> drivers/common/sfc_efx/efsys.h | 2 +-
> drivers/common/sfc_efx/version.map | 10 ++++
> drivers/vdpa/sfc/sfc_vdpa.c | 20 ++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 2 +
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 13 ++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 91 ++++++++++++++++++++++++++++++++---
> -
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 3 ++
> 8 files changed, 142 insertions(+), 9 deletions(-)
>
> diff --git a/doc/guides/vdpadevs/features/sfc.ini
> b/doc/guides/vdpadevs/features/sfc.ini
> index 71b6158..700d061 100644
> --- a/doc/guides/vdpadevs/features/sfc.ini
> +++ b/doc/guides/vdpadevs/features/sfc.ini
> @@ -4,6 +4,16 @@
> ; Refer to default.ini for the full list of available driver features.
> ;
> [Features]
> +csum = Y
> +guest csum = Y
> +host tso4 = Y
> +host tso6 = Y
> +version 1 = Y
> +mrg rxbuf = Y
> +any layout = Y
> +in_order = Y
> +proto host notifier = Y
> +IOMMU platform = Y
> Linux = Y
> x86-64 = Y
> Usage doc = Y
> diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
> index d133d61..37ec6b9 100644
> --- a/drivers/common/sfc_efx/efsys.h
> +++ b/drivers/common/sfc_efx/efsys.h
> @@ -187,7 +187,7 @@
>
> #define EFSYS_OPT_MAE 1
>
> -#define EFSYS_OPT_VIRTIO 0
> +#define EFSYS_OPT_VIRTIO 1
>
> /* ID */
>
> diff --git a/drivers/common/sfc_efx/version.map
> b/drivers/common/sfc_efx/version.map
> index 642a62e..ec86220 100644
> --- a/drivers/common/sfc_efx/version.map
> +++ b/drivers/common/sfc_efx/version.map
> @@ -247,6 +247,16 @@ INTERNAL {
> efx_txq_nbufs;
> efx_txq_size;
>
> + efx_virtio_fini;
> + efx_virtio_get_doorbell_offset;
> + efx_virtio_get_features;
> + efx_virtio_init;
> + efx_virtio_qcreate;
> + efx_virtio_qdestroy;
> + efx_virtio_qstart;
> + efx_virtio_qstop;
> + efx_virtio_verify_features;
> +
> sfc_efx_dev_class_get;
> sfc_efx_family;
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index b7eca56..ccbd243 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -43,6 +43,26 @@ struct sfc_vdpa_adapter *
> return found ? sva : NULL;
> }
>
> +struct sfc_vdpa_ops_data *
> +sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev)
> +{
> + bool found = false;
> + struct sfc_vdpa_adapter *sva;
> +
> + pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
> +
> + TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
> + if (vdpa_dev == sva->ops_data->vdpa_dev) {
> + found = true;
> + break;
> + }
> + }
> +
> + pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
> +
> + return found ? sva->ops_data : NULL;
> +}
> +
> static int
> sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
> {
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> index 046f25d..c10c3d3 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -60,6 +60,8 @@ struct sfc_vdpa_adapter {
>
> struct sfc_vdpa_adapter *
> sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
> +struct sfc_vdpa_ops_data *
> +sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev);
>
> int
> sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> index 7c256ff..7a67bd8 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -278,10 +278,20 @@
> if (rc != 0)
> goto fail_estimate_rsrc_limits;
>
> + sfc_vdpa_log_init(sva, "init virtio");
> + rc = efx_virtio_init(enp);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "virtio init failed: %s", rte_strerror(rc));
> + goto fail_virtio_init;
> + }
> +
> sfc_vdpa_log_init(sva, "done");
>
> return 0;
>
> +fail_virtio_init:
> + efx_nic_fini(enp);
> +
> fail_estimate_rsrc_limits:
> fail_nic_reset:
> efx_nic_unprobe(enp);
> @@ -310,6 +320,9 @@
>
> sfc_vdpa_log_init(sva, "entry");
>
> + sfc_vdpa_log_init(sva, "virtio fini");
> + efx_virtio_fini(enp);
> +
> sfc_vdpa_log_init(sva, "unprobe nic");
> efx_nic_unprobe(enp);
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index 71696be..5750944 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -3,17 +3,31 @@
> * Copyright(c) 2020-2021 Xilinx, Inc.
> */
>
> +#include <rte_errno.h>
> #include <rte_malloc.h>
> #include <rte_vdpa.h>
> #include <rte_vdpa_dev.h>
> #include <rte_vhost.h>
>
> +#include "efx.h"
> #include "sfc_vdpa_ops.h"
> #include "sfc_vdpa.h"
>
> -/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
> - * In subsequent patches these ops would be implemented.
> +/* These protocol features are needed to enable notifier ctrl */
> +#define SFC_VDPA_PROTOCOL_FEATURES \
> + ((1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
> + (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD))
> +
> +/*
> + * Set of features which are enabled by default.
> + * Protocol feature bit is needed to enable notification notifier ctrl.
> */
> +#define SFC_VDPA_DEFAULT_FEATURES \
> + (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
> +
> static int
> sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
> {
> @@ -24,22 +38,67 @@
> }
>
> static int
> +sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int rc;
> + uint64_t dev_features;
> + efx_nic_t *nic;
> +
> + nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
> +
> + rc = efx_virtio_get_features(nic, EFX_VIRTIO_DEVICE_TYPE_NET,
> + &dev_features);
> + if (rc != 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "could not read device feature: %s",
> + rte_strerror(rc));
> + return rc;
> + }
> +
> + ops_data->dev_features = dev_features;
> +
> + sfc_vdpa_info(ops_data->dev_handle,
> + "device supported virtio features : 0x%" PRIx64,
> + ops_data->dev_features);
> +
> + return 0;
> +}
> +
> +static int
> sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
> {
> - RTE_SET_USED(vdpa_dev);
> - RTE_SET_USED(features);
> + struct sfc_vdpa_ops_data *ops_data;
>
> - return -1;
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + *features = ops_data->drv_features;
> +
> + sfc_vdpa_info(ops_data->dev_handle,
> + "vDPA ops get_feature :: features : 0x%" PRIx64,
> + *features);
> +
> + return 0;
> }
>
> static int
> sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
> uint64_t *features)
> {
> - RTE_SET_USED(vdpa_dev);
> - RTE_SET_USED(features);
> + struct sfc_vdpa_ops_data *ops_data;
>
> - return -1;
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + *features = SFC_VDPA_PROTOCOL_FEATURES;
> +
> + sfc_vdpa_info(ops_data->dev_handle,
> + "vDPA ops get_protocol_feature :: features : 0x%" PRIx64,
> + *features);
> +
> + return 0;
> }
>
> static int
> @@ -91,6 +150,7 @@ struct sfc_vdpa_ops_data *
> {
> struct sfc_vdpa_ops_data *ops_data;
> struct rte_pci_device *pci_dev;
> + int rc;
>
> /* Create vDPA ops context */
> ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
> @@ -111,10 +171,25 @@ struct sfc_vdpa_ops_data *
> goto fail_register_device;
> }
>
> + /* Read supported device features */
> + sfc_vdpa_log_init(dev_handle, "get device feature");
> + rc = sfc_vdpa_get_device_features(ops_data);
> + if (rc != 0)
> + goto fail_get_dev_feature;
> +
> + /* Driver features are superset of device supported feature
> + * and any additional features supported by the driver.
> + */
> + ops_data->drv_features =
> + ops_data->dev_features | SFC_VDPA_DEFAULT_FEATURES;
> +
> ops_data->state = SFC_VDPA_STATE_INITIALIZED;
>
> return ops_data;
>
> +fail_get_dev_feature:
> + rte_vdpa_unregister_device(ops_data->vdpa_dev);
> +
> fail_register_device:
> rte_free(ops_data);
> return NULL;
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> index 817b302..21cbb73 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> @@ -26,6 +26,9 @@ struct sfc_vdpa_ops_data {
> struct rte_vdpa_device *vdpa_dev;
> enum sfc_vdpa_context vdpa_context;
> enum sfc_vdpa_state state;
> +
> + uint64_t dev_features;
> + uint64_t drv_features;
> };
>
> struct sfc_vdpa_ops_data *
> --
> 1.8.3.1
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 04/10] vdpa/sfc: get device supported max queue count
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
` (2 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 7:10 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
` (5 subsequent siblings)
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_queue_num to get the maximum number
of queues supported by the device.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 5750944..6c702e1 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -31,10 +31,20 @@
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(queue_num);
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
+ *queue_num);
+
+ return 0;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 04/10] vdpa/sfc: get device supported max queue count
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
@ 2021-11-02 7:10 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 7:10 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 04/10] vdpa/sfc: get device supported max queue count
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops get_queue_num to get the maximum number
> of queues supported by the device.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index 5750944..6c702e1 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -31,10 +31,20 @@
> static int
> sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
> {
> - RTE_SET_USED(vdpa_dev);
> - RTE_SET_USED(queue_num);
> + struct sfc_vdpa_ops_data *ops_data;
> + void *dev;
>
> - return -1;
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + dev = ops_data->dev_handle;
> + *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
> +
> + sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
> + *queue_num);
%d -> %u
With this fixed:
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
> +
> + return 0;
> }
>
> static int
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 05/10] vdpa/sfc: add support to get VFIO device fd
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
` (3 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 7:10 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
` (4 subsequent siblings)
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_vfio_device_fd to get the VFIO device fd.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 6c702e1..5253adb 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -145,6 +145,29 @@
return -1;
}
+static int
+sfc_vdpa_get_vfio_device_fd(int vid)
+{
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ int vfio_dev_fd;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ sfc_vdpa_info(dev, "vDPA ops get_vfio_device_fd :: vfio fd : %d",
+ vfio_dev_fd);
+
+ return vfio_dev_fd;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -153,6 +176,7 @@
.dev_close = sfc_vdpa_dev_close,
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
+ .get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 05/10] vdpa/sfc: add support to get VFIO device fd
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
@ 2021-11-02 7:10 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 7:10 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 05/10] vdpa/sfc: add support to get VFIO device fd
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops get_vfio_device_fd to get the VFIO device fd.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index 6c702e1..5253adb 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -145,6 +145,29 @@
> return -1;
> }
>
> +static int
> +sfc_vdpa_get_vfio_device_fd(int vid)
> +{
> + struct rte_vdpa_device *vdpa_dev;
> + struct sfc_vdpa_ops_data *ops_data;
> + int vfio_dev_fd;
> + void *dev;
> +
> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + dev = ops_data->dev_handle;
> + vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
> +
> + sfc_vdpa_info(dev, "vDPA ops get_vfio_device_fd :: vfio fd : %d",
> + vfio_dev_fd);
> +
> + return vfio_dev_fd;
> +}
> +
> static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
> .get_queue_num = sfc_vdpa_get_queue_num,
> .get_features = sfc_vdpa_get_features,
> @@ -153,6 +176,7 @@
> .dev_close = sfc_vdpa_dev_close,
> .set_vring_state = sfc_vdpa_set_vring_state,
> .set_features = sfc_vdpa_set_features,
> + .get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
> };
>
> struct sfc_vdpa_ops_data *
> --
> 1.8.3.1
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
` (4 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 7:10 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
` (3 subsequent siblings)
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops dev_conf and dev_close for DMA mapping,
interrupt and virtqueue configurations.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Removed redundant null check while calling free().
* Added error handling for rte_vhost_get_vhost_vring().
drivers/vdpa/sfc/sfc_vdpa.c | 6 +
drivers/vdpa/sfc/sfc_vdpa.h | 43 ++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 69 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 530 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 28 +++
5 files changed, 656 insertions(+), 20 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index ccbd243..b3c82e5 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -246,6 +246,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_adapter_lock_init(sva);
+
sfc_vdpa_log_init(sva, "vfio init");
if (sfc_vdpa_vfio_setup(sva) < 0) {
sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
@@ -280,6 +282,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
fail_vfio_setup:
+ sfc_vdpa_adapter_lock_fini(sva);
+
fail_set_log_prefix:
rte_free(sva);
@@ -311,6 +315,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
+ sfc_vdpa_adapter_lock_fini(sva);
+
rte_free(sva);
return 0;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index c10c3d3..1bf96e7 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -80,10 +80,53 @@ struct sfc_vdpa_ops_data *
void
sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
return (struct sfc_vdpa_adapter *)dev_handle;
}
+/*
+ * Add wrapper functions to acquire/release lock to be able to remove or
+ * change the lock in one place.
+ */
+static inline void
+sfc_vdpa_adapter_lock_init(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_init(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_is_locked(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_is_locked(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_lock(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_trylock(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_trylock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_unlock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_unlock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock_fini(__rte_unused struct sfc_vdpa_adapter *sva)
+{
+ /* Just for symmetry of the API */
+}
+
#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index 7a67bd8..b473708 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -8,6 +8,7 @@
#include <rte_common.h>
#include <rte_errno.h>
#include <rte_vfio.h>
+#include <rte_vhost.h>
#include "efx.h"
#include "sfc_vdpa.h"
@@ -109,6 +110,74 @@
memset(esmp, 0, sizeof(*esmp));
}
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *ops_data, bool do_map)
+{
+ uint32_t i, j;
+ int rc;
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ int vfio_container_fd;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_container_fd =
+ sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd;
+
+ rc = rte_vhost_get_mem_table(ops_data->vid, &vhost_mem);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "failed to get VM memory layout");
+ goto error;
+ }
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (do_map) {
+ rc = rte_vfio_container_dma_map(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA map failed : %s",
+ rte_strerror(rte_errno));
+ goto failed_vfio_dma_map;
+ }
+ } else {
+ rc = rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA unmap failed : %s",
+ rte_strerror(rte_errno));
+ goto error;
+ }
+ }
+ }
+
+ free(vhost_mem);
+
+ return 0;
+
+failed_vfio_dma_map:
+ for (j = 0; j < i; j++) {
+ mem_reg = &vhost_mem->regions[j];
+ rc = rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ }
+
+error:
+ free(vhost_mem);
+
+ return rc;
+}
+
static int
sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
const efx_bar_region_t *mem_ebrp)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 5253adb..de1c81a 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,10 +3,13 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <sys/ioctl.h>
+
#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
+#include <rte_vfio.h>
#include <rte_vhost.h>
#include "efx.h"
@@ -28,24 +31,12 @@
#define SFC_VDPA_DEFAULT_FEATURES \
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
-static int
-sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
-{
- struct sfc_vdpa_ops_data *ops_data;
- void *dev;
-
- ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
- if (ops_data == NULL)
- return -1;
-
- dev = ops_data->dev_handle;
- *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+#define SFC_VDPA_MSIX_IRQ_SET_BUF_LEN \
+ (sizeof(struct vfio_irq_set) + \
+ sizeof(int) * (SFC_VDPA_MAX_QUEUE_PAIRS * 2 + 1))
- sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
- *queue_num);
-
- return 0;
-}
+/* It will be used for target VF when calling function is not PF */
+#define SFC_VDPA_VF_NULL 0xFFFF
static int
sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
@@ -74,6 +65,441 @@
return 0;
}
+static uint64_t
+hva_to_gpa(int vid, uint64_t hva)
+{
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ uint32_t i;
+ uint64_t gpa = 0;
+
+ if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
+ goto error;
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (hva >= mem_reg->host_user_addr &&
+ hva < mem_reg->host_user_addr + mem_reg->size) {
+ gpa = (hva - mem_reg->host_user_addr) +
+ mem_reg->guest_phys_addr;
+ break;
+ }
+ }
+
+error:
+ free(vhost_mem);
+ return gpa;
+}
+
+static int
+sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int *irq_fd_ptr;
+ int vfio_dev_fd;
+ uint32_t i, num_vring;
+ struct rte_vhost_vring vring;
+ struct vfio_irq_set *irq_set;
+ struct rte_pci_device *pci_dev;
+ char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
+ void *dev;
+
+ num_vring = rte_vhost_get_vring_num(ops_data->vid);
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev;
+
+ irq_set = (struct vfio_irq_set *)irq_set_buf;
+ irq_set->argsz = sizeof(irq_set_buf);
+ irq_set->count = num_vring + 1;
+ irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
+ VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set->start = 0;
+ irq_fd_ptr = (int *)&irq_set->data;
+ irq_fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] =
+ rte_intr_fd_get(pci_dev->intr_handle);
+
+ for (i = 0; i < num_vring; i++) {
+ rc = rte_vhost_get_vhost_vring(ops_data->vid, i, &vring);
+ if (rc)
+ return -1;
+
+ irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
+ }
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error enabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_disable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int vfio_dev_fd;
+ struct vfio_irq_set *irq_set;
+ char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ irq_set = (struct vfio_irq_set *)irq_set_buf;
+ irq_set->argsz = sizeof(irq_set_buf);
+ irq_set->count = 0;
+ irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set->start = 0;
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error disabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_get_vring_info(struct sfc_vdpa_ops_data *ops_data,
+ int vq_num, struct sfc_vdpa_vring_info *vring)
+{
+ int rc;
+ uint64_t gpa;
+ struct rte_vhost_vring vq;
+
+ rc = rte_vhost_get_vhost_vring(ops_data->vid, vq_num, &vq);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vhost vring failed: %s", rte_strerror(rc));
+ return rc;
+ }
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.desc);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for descriptor ring.");
+ goto fail_vring_map;
+ }
+ vring->desc = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.avail);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for available ring.");
+ goto fail_vring_map;
+ }
+ vring->avail = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.used);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for used ring.");
+ goto fail_vring_map;
+ }
+ vring->used = gpa;
+
+ vring->size = vq.size;
+
+ rc = rte_vhost_get_vring_base(ops_data->vid, vq_num,
+ &vring->last_avail_idx,
+ &vring->last_used_idx);
+
+ return rc;
+
+fail_vring_map:
+ return -1;
+}
+
+static int
+sfc_vdpa_virtq_start(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_t *vq;
+ struct sfc_vdpa_vring_info vring;
+ efx_virtio_vq_cfg_t vq_cfg;
+ efx_virtio_vq_dyncfg_t vq_dyncfg;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ rc = sfc_vdpa_get_vring_info(ops_data, vq_num, &vring);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vring info failed: %s", rte_strerror(rc));
+ goto fail_vring_info;
+ }
+
+ vq_cfg.evvc_target_vf = SFC_VDPA_VF_NULL;
+
+ /* even virtqueue for RX and odd for TX */
+ if (vq_num % 2) {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_TXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (TXQ)", vq_num);
+ } else {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_RXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (RXQ)", vq_num);
+ }
+
+ vq_cfg.evvc_vq_num = vq_num;
+ vq_cfg.evvc_desc_tbl_addr = vring.desc;
+ vq_cfg.evvc_avail_ring_addr = vring.avail;
+ vq_cfg.evvc_used_ring_addr = vring.used;
+ vq_cfg.evvc_vq_size = vring.size;
+
+ vq_dyncfg.evvd_vq_pidx = vring.last_used_idx;
+ vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx;
+
+ /* MSI-X vector is function-relative */
+ vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num;
+ if (ops_data->vdpa_context == SFC_VDPA_AS_VF)
+ vq_cfg.evvc_pas_id = 0;
+ vq_cfg.evcc_features = ops_data->dev_features &
+ ops_data->req_features;
+
+ /* Start virtqueue */
+ rc = efx_virtio_qstart(vq, &vq_cfg, &vq_dyncfg);
+ if (rc != 0) {
+ /* destroy virtqueue */
+ sfc_vdpa_err(ops_data->dev_handle,
+ "virtqueue start failed: %s",
+ rte_strerror(rc));
+ efx_virtio_qdestroy(vq);
+ goto fail_virtio_qstart;
+ }
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "virtqueue started successfully for vq_num %d", vq_num);
+
+ ops_data->vq_cxt[vq_num].enable = B_TRUE;
+
+ return rc;
+
+fail_virtio_qstart:
+fail_vring_info:
+ return rc;
+}
+
+static int
+sfc_vdpa_virtq_stop(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_dyncfg_t vq_idx;
+ efx_virtio_vq_t *vq;
+
+ if (ops_data->vq_cxt[vq_num].enable != B_TRUE)
+ return -1;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ /* stop the vq */
+ rc = efx_virtio_qstop(vq, &vq_idx);
+ if (rc == 0) {
+ ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_cidx;
+ ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_pidx;
+ }
+ ops_data->vq_cxt[vq_num].enable = B_FALSE;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_configure(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc, i;
+ int nr_vring;
+ int max_vring_cnt;
+ efx_virtio_vq_t *vq;
+ efx_nic_t *nic;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ nic = sfc_vdpa_adapter_by_dev_handle(dev)->nic;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_INITIALIZED);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURING;
+
+ nr_vring = rte_vhost_get_vring_num(ops_data->vid);
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ /* number of vring should not be more than supported max vq count */
+ if (nr_vring > max_vring_cnt) {
+ sfc_vdpa_err(dev,
+ "nr_vring (%d) is > max vring count (%d)",
+ nr_vring, max_vring_cnt);
+ goto fail_vring_num;
+ }
+
+ rc = sfc_vdpa_dma_map(ops_data, true);
+ if (rc) {
+ sfc_vdpa_err(dev,
+ "DMA map failed: %s", rte_strerror(rc));
+ goto fail_dma_map;
+ }
+
+ for (i = 0; i < nr_vring; i++) {
+ rc = efx_virtio_qcreate(nic, &vq);
+ if ((rc != 0) || (vq == NULL)) {
+ sfc_vdpa_err(dev,
+ "virtqueue create failed: %s",
+ rte_strerror(rc));
+ goto fail_vq_create;
+ }
+
+ /* store created virtqueue context */
+ ops_data->vq_cxt[i].vq = vq;
+ }
+
+ ops_data->vq_count = i;
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return 0;
+
+fail_vq_create:
+ sfc_vdpa_dma_map(ops_data, false);
+
+fail_dma_map:
+fail_vring_num:
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return -1;
+}
+
+static void
+sfc_vdpa_close(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+
+ if (ops_data->state != SFC_VDPA_STATE_CONFIGURED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_CLOSING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ if (ops_data->vq_cxt[i].vq == NULL)
+ continue;
+
+ efx_virtio_qdestroy(ops_data->vq_cxt[i].vq);
+ }
+
+ sfc_vdpa_dma_map(ops_data, false);
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+}
+
+static void
+sfc_vdpa_stop(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+ int rc;
+
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_STOPPING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ rc = sfc_vdpa_virtq_stop(ops_data, i);
+ if (rc != 0)
+ continue;
+ }
+
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+}
+
+static int
+sfc_vdpa_start(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, j;
+ int rc;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_CONFIGURED);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->state = SFC_VDPA_STATE_STARTING;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "enable interrupts");
+ rc = sfc_vdpa_enable_vfio_intr(ops_data);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "vfio intr allocation failed: %s",
+ rte_strerror(rc));
+ goto fail_enable_vfio_intr;
+ }
+
+ rte_vhost_get_negotiated_features(ops_data->vid,
+ &ops_data->req_features);
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "negotiated feature : 0x%" PRIx64,
+ ops_data->req_features);
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "starting vq# %d", i);
+ rc = sfc_vdpa_virtq_start(ops_data, i);
+ if (rc != 0)
+ goto fail_vq_start;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_STARTED;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vq_start:
+ /* stop already started virtqueues */
+ for (j = 0; j < i; j++)
+ sfc_vdpa_virtq_stop(ops_data, j);
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+fail_enable_vfio_intr:
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
+ *queue_num);
+
+ return 0;
+}
+
static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
@@ -114,7 +540,53 @@
static int
sfc_vdpa_dev_config(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ int rc;
+ struct sfc_vdpa_ops_data *ops_data;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->vid = vid;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "configuring");
+ rc = sfc_vdpa_configure(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_config;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "starting");
+ rc = sfc_vdpa_start(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_start;
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): software relay for notify is used.",
+ vdpa_dev->device->name);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vdpa_start:
+ sfc_vdpa_close(ops_data);
+
+fail_vdpa_config:
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
return -1;
}
@@ -122,9 +594,27 @@
static int
sfc_vdpa_dev_close(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_stop(ops_data);
+ sfc_vdpa_close(ops_data);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return 0;
}
static int
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 21cbb73..8d553c5 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -18,17 +18,45 @@ enum sfc_vdpa_context {
enum sfc_vdpa_state {
SFC_VDPA_STATE_UNINITIALIZED = 0,
SFC_VDPA_STATE_INITIALIZED,
+ SFC_VDPA_STATE_CONFIGURING,
+ SFC_VDPA_STATE_CONFIGURED,
+ SFC_VDPA_STATE_CLOSING,
+ SFC_VDPA_STATE_CLOSED,
+ SFC_VDPA_STATE_STARTING,
+ SFC_VDPA_STATE_STARTED,
+ SFC_VDPA_STATE_STOPPING,
SFC_VDPA_STATE_NSTATES
};
+struct sfc_vdpa_vring_info {
+ uint64_t desc;
+ uint64_t avail;
+ uint64_t used;
+ uint64_t size;
+ uint16_t last_avail_idx;
+ uint16_t last_used_idx;
+};
+
+typedef struct sfc_vdpa_vq_context_s {
+ uint8_t enable;
+ uint32_t pidx;
+ uint32_t cidx;
+ efx_virtio_vq_t *vq;
+} sfc_vdpa_vq_context_t;
+
struct sfc_vdpa_ops_data {
void *dev_handle;
+ int vid;
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
uint64_t dev_features;
uint64_t drv_features;
+ uint64_t req_features;
+
+ uint16_t vq_count;
+ struct sfc_vdpa_vq_context_s vq_cxt[SFC_VDPA_MAX_QUEUE_PAIRS * 2];
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
@ 2021-11-02 7:10 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 7:10 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 06/10] vdpa/sfc: add support for dev conf and dev close ops
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops dev_conf and dev_close for DMA mapping,
> interrupt and virtqueue configurations.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Removed redundant null check while calling free().
> * Added error handling for rte_vhost_get_vhost_vring().
>
> drivers/vdpa/sfc/sfc_vdpa.c | 6 +
> drivers/vdpa/sfc/sfc_vdpa.h | 43 ++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 69 ++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 530 ++++++++++++++++++++++++++++++++++++++-
> -
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 28 +++
> 5 files changed, 656 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index ccbd243..b3c82e5 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -246,6 +246,8 @@ struct sfc_vdpa_ops_data *
>
> sfc_vdpa_log_init(sva, "entry");
>
> + sfc_vdpa_adapter_lock_init(sva);
> +
> sfc_vdpa_log_init(sva, "vfio init");
> if (sfc_vdpa_vfio_setup(sva) < 0) {
> sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
> @@ -280,6 +282,8 @@ struct sfc_vdpa_ops_data *
> sfc_vdpa_vfio_teardown(sva);
>
> fail_vfio_setup:
> + sfc_vdpa_adapter_lock_fini(sva);
> +
> fail_set_log_prefix:
> rte_free(sva);
>
> @@ -311,6 +315,8 @@ struct sfc_vdpa_ops_data *
>
> sfc_vdpa_vfio_teardown(sva);
>
> + sfc_vdpa_adapter_lock_fini(sva);
> +
> rte_free(sva);
>
> return 0;
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> index c10c3d3..1bf96e7 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -80,10 +80,53 @@ struct sfc_vdpa_ops_data *
> void
> sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
>
> +int
> +sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
> +
> static inline struct sfc_vdpa_adapter *
> sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
> {
> return (struct sfc_vdpa_adapter *)dev_handle;
> }
>
> +/*
> + * Add wrapper functions to acquire/release lock to be able to remove or
> + * change the lock in one place.
> + */
> +static inline void
> +sfc_vdpa_adapter_lock_init(struct sfc_vdpa_adapter *sva)
> +{
> + rte_spinlock_init(&sva->lock);
> +}
> +
> +static inline int
> +sfc_vdpa_adapter_is_locked(struct sfc_vdpa_adapter *sva)
> +{
> + return rte_spinlock_is_locked(&sva->lock);
> +}
> +
> +static inline void
> +sfc_vdpa_adapter_lock(struct sfc_vdpa_adapter *sva)
> +{
> + rte_spinlock_lock(&sva->lock);
> +}
> +
> +static inline int
> +sfc_vdpa_adapter_trylock(struct sfc_vdpa_adapter *sva)
> +{
> + return rte_spinlock_trylock(&sva->lock);
> +}
> +
> +static inline void
> +sfc_vdpa_adapter_unlock(struct sfc_vdpa_adapter *sva)
> +{
> + rte_spinlock_unlock(&sva->lock);
> +}
> +
> +static inline void
> +sfc_vdpa_adapter_lock_fini(__rte_unused struct sfc_vdpa_adapter *sva)
> +{
> + /* Just for symmetry of the API */
> +}
> +
> #endif /* _SFC_VDPA_H */
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> index 7a67bd8..b473708 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -8,6 +8,7 @@
> #include <rte_common.h>
> #include <rte_errno.h>
> #include <rte_vfio.h>
> +#include <rte_vhost.h>
>
> #include "efx.h"
> #include "sfc_vdpa.h"
> @@ -109,6 +110,74 @@
> memset(esmp, 0, sizeof(*esmp));
> }
>
> +int
> +sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *ops_data, bool do_map)
> +{
> + uint32_t i, j;
> + int rc;
> + struct rte_vhost_memory *vhost_mem = NULL;
> + struct rte_vhost_mem_region *mem_reg = NULL;
> + int vfio_container_fd;
> + void *dev;
> +
> + dev = ops_data->dev_handle;
> + vfio_container_fd =
> + sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd;
> +
> + rc = rte_vhost_get_mem_table(ops_data->vid, &vhost_mem);
> + if (rc < 0) {
> + sfc_vdpa_err(dev,
> + "failed to get VM memory layout");
> + goto error;
> + }
> +
> + for (i = 0; i < vhost_mem->nregions; i++) {
> + mem_reg = &vhost_mem->regions[i];
> +
> + if (do_map) {
> + rc = rte_vfio_container_dma_map(vfio_container_fd,
> + mem_reg->host_user_addr,
> + mem_reg->guest_phys_addr,
> + mem_reg->size);
> + if (rc < 0) {
> + sfc_vdpa_err(dev,
> + "DMA map failed : %s",
> + rte_strerror(rte_errno));
> + goto failed_vfio_dma_map;
> + }
> + } else {
> + rc = rte_vfio_container_dma_unmap(vfio_container_fd,
> + mem_reg->host_user_addr,
> + mem_reg->guest_phys_addr,
> + mem_reg->size);
> + if (rc < 0) {
> + sfc_vdpa_err(dev,
> + "DMA unmap failed : %s",
> + rte_strerror(rte_errno));
> + goto error;
> + }
> + }
> + }
> +
> + free(vhost_mem);
> +
> + return 0;
> +
> +failed_vfio_dma_map:
> + for (j = 0; j < i; j++) {
> + mem_reg = &vhost_mem->regions[j];
> + rc = rte_vfio_container_dma_unmap(vfio_container_fd,
> + mem_reg->host_user_addr,
> + mem_reg->guest_phys_addr,
> + mem_reg->size);
'rc =' not needed and will make the logic incorrect. Think of dma map failed
but unmap here all succeeded. This function will return 0, and the function
that calls it will think dma map succeed.
> + }
> +
> +error:
> + free(vhost_mem);
> +
> + return rc;
> +}
> +
> static int
> sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
> const efx_bar_region_t *mem_ebrp)
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index 5253adb..de1c81a 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -3,10 +3,13 @@
> * Copyright(c) 2020-2021 Xilinx, Inc.
> */
>
> +#include <sys/ioctl.h>
> +
> #include <rte_errno.h>
> #include <rte_malloc.h>
> #include <rte_vdpa.h>
> #include <rte_vdpa_dev.h>
> +#include <rte_vfio.h>
> #include <rte_vhost.h>
>
> #include "efx.h"
> @@ -28,24 +31,12 @@
> #define SFC_VDPA_DEFAULT_FEATURES \
> (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
>
> -static int
> -sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
> -{
> - struct sfc_vdpa_ops_data *ops_data;
> - void *dev;
> -
> - ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> - if (ops_data == NULL)
> - return -1;
> -
> - dev = ops_data->dev_handle;
> - *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
> +#define SFC_VDPA_MSIX_IRQ_SET_BUF_LEN \
> + (sizeof(struct vfio_irq_set) + \
> + sizeof(int) * (SFC_VDPA_MAX_QUEUE_PAIRS * 2 + 1))
>
> - sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
> - *queue_num);
> -
> - return 0;
> -}
> +/* It will be used for target VF when calling function is not PF */
> +#define SFC_VDPA_VF_NULL 0xFFFF
>
> static int
> sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
> @@ -74,6 +65,441 @@
> return 0;
> }
>
> +static uint64_t
> +hva_to_gpa(int vid, uint64_t hva)
> +{
> + struct rte_vhost_memory *vhost_mem = NULL;
> + struct rte_vhost_mem_region *mem_reg = NULL;
> + uint32_t i;
> + uint64_t gpa = 0;
> +
> + if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
> + goto error;
> +
> + for (i = 0; i < vhost_mem->nregions; i++) {
> + mem_reg = &vhost_mem->regions[i];
> +
> + if (hva >= mem_reg->host_user_addr &&
> + hva < mem_reg->host_user_addr + mem_reg->size) {
> + gpa = (hva - mem_reg->host_user_addr) +
> + mem_reg->guest_phys_addr;
> + break;
> + }
> + }
> +
> +error:
> + free(vhost_mem);
> + return gpa;
> +}
> +
> +static int
> +sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int rc;
> + int *irq_fd_ptr;
> + int vfio_dev_fd;
> + uint32_t i, num_vring;
> + struct rte_vhost_vring vring;
> + struct vfio_irq_set *irq_set;
> + struct rte_pci_device *pci_dev;
> + char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
> + void *dev;
> +
> + num_vring = rte_vhost_get_vring_num(ops_data->vid);
> + dev = ops_data->dev_handle;
> + vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
> + pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev;
> +
> + irq_set = (struct vfio_irq_set *)irq_set_buf;
> + irq_set->argsz = sizeof(irq_set_buf);
> + irq_set->count = num_vring + 1;
> + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
> + VFIO_IRQ_SET_ACTION_TRIGGER;
> + irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
> + irq_set->start = 0;
> + irq_fd_ptr = (int *)&irq_set->data;
> + irq_fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] =
> + rte_intr_fd_get(pci_dev->intr_handle);
> +
> + for (i = 0; i < num_vring; i++) {
> + rc = rte_vhost_get_vhost_vring(ops_data->vid, i, &vring);
> + if (rc)
> + return -1;
> +
> + irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
> + }
> +
> + rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
> + if (rc) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "error enabling MSI-X interrupts: %s",
> + strerror(errno));
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +sfc_vdpa_disable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int rc;
> + int vfio_dev_fd;
> + struct vfio_irq_set *irq_set;
> + char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
> + void *dev;
> +
> + dev = ops_data->dev_handle;
> + vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
> +
> + irq_set = (struct vfio_irq_set *)irq_set_buf;
> + irq_set->argsz = sizeof(irq_set_buf);
> + irq_set->count = 0;
> + irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
> + irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
> + irq_set->start = 0;
I think disabling only needs a struct vfio_irq_set instead of irq_set_buf,
because you don't have data when disabling. and argsz should be sizeof(struct vfio_irq_set)
> +
> + rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
> + if (rc) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "error disabling MSI-X interrupts: %s",
> + strerror(errno));
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +static int
> +sfc_vdpa_get_vring_info(struct sfc_vdpa_ops_data *ops_data,
> + int vq_num, struct sfc_vdpa_vring_info *vring)
> +{
> + int rc;
> + uint64_t gpa;
> + struct rte_vhost_vring vq;
> +
> + rc = rte_vhost_get_vhost_vring(ops_data->vid, vq_num, &vq);
> + if (rc < 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "get vhost vring failed: %s", rte_strerror(rc));
> + return rc;
> + }
> +
> + gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.desc);
> + if (gpa == 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "fail to get GPA for descriptor ring.");
> + goto fail_vring_map;
> + }
> + vring->desc = gpa;
> +
> + gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.avail);
> + if (gpa == 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "fail to get GPA for available ring.");
> + goto fail_vring_map;
> + }
> + vring->avail = gpa;
> +
> + gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.used);
> + if (gpa == 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "fail to get GPA for used ring.");
> + goto fail_vring_map;
> + }
> + vring->used = gpa;
> +
> + vring->size = vq.size;
> +
> + rc = rte_vhost_get_vring_base(ops_data->vid, vq_num,
> + &vring->last_avail_idx,
> + &vring->last_used_idx);
> +
> + return rc;
> +
> +fail_vring_map:
> + return -1;
> +}
I don't think you need 'fail_vring_map'. Just use 'return -1' to replace
goto fail_vring_map
Thanks,
Chenbo
> +
> +static int
> +sfc_vdpa_virtq_start(struct sfc_vdpa_ops_data *ops_data, int vq_num)
> +{
> + int rc;
> + efx_virtio_vq_t *vq;
> + struct sfc_vdpa_vring_info vring;
> + efx_virtio_vq_cfg_t vq_cfg;
> + efx_virtio_vq_dyncfg_t vq_dyncfg;
> +
> + vq = ops_data->vq_cxt[vq_num].vq;
> + if (vq == NULL)
> + return -1;
> +
> + rc = sfc_vdpa_get_vring_info(ops_data, vq_num, &vring);
> + if (rc < 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "get vring info failed: %s", rte_strerror(rc));
> + goto fail_vring_info;
> + }
> +
> + vq_cfg.evvc_target_vf = SFC_VDPA_VF_NULL;
> +
> + /* even virtqueue for RX and odd for TX */
> + if (vq_num % 2) {
> + vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_TXQ;
> + sfc_vdpa_info(ops_data->dev_handle,
> + "configure virtqueue # %d (TXQ)", vq_num);
> + } else {
> + vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_RXQ;
> + sfc_vdpa_info(ops_data->dev_handle,
> + "configure virtqueue # %d (RXQ)", vq_num);
> + }
> +
> + vq_cfg.evvc_vq_num = vq_num;
> + vq_cfg.evvc_desc_tbl_addr = vring.desc;
> + vq_cfg.evvc_avail_ring_addr = vring.avail;
> + vq_cfg.evvc_used_ring_addr = vring.used;
> + vq_cfg.evvc_vq_size = vring.size;
> +
> + vq_dyncfg.evvd_vq_pidx = vring.last_used_idx;
> + vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx;
> +
> + /* MSI-X vector is function-relative */
> + vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num;
> + if (ops_data->vdpa_context == SFC_VDPA_AS_VF)
> + vq_cfg.evvc_pas_id = 0;
> + vq_cfg.evcc_features = ops_data->dev_features &
> + ops_data->req_features;
> +
> + /* Start virtqueue */
> + rc = efx_virtio_qstart(vq, &vq_cfg, &vq_dyncfg);
> + if (rc != 0) {
> + /* destroy virtqueue */
> + sfc_vdpa_err(ops_data->dev_handle,
> + "virtqueue start failed: %s",
> + rte_strerror(rc));
> + efx_virtio_qdestroy(vq);
> + goto fail_virtio_qstart;
> + }
> +
> + sfc_vdpa_info(ops_data->dev_handle,
> + "virtqueue started successfully for vq_num %d", vq_num);
> +
> + ops_data->vq_cxt[vq_num].enable = B_TRUE;
> +
> + return rc;
> +
> +fail_virtio_qstart:
> +fail_vring_info:
> + return rc;
> +}
> +
> +static int
> +sfc_vdpa_virtq_stop(struct sfc_vdpa_ops_data *ops_data, int vq_num)
> +{
> + int rc;
> + efx_virtio_vq_dyncfg_t vq_idx;
> + efx_virtio_vq_t *vq;
> +
> + if (ops_data->vq_cxt[vq_num].enable != B_TRUE)
> + return -1;
> +
> + vq = ops_data->vq_cxt[vq_num].vq;
> + if (vq == NULL)
> + return -1;
> +
> + /* stop the vq */
> + rc = efx_virtio_qstop(vq, &vq_idx);
> + if (rc == 0) {
> + ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_cidx;
> + ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_pidx;
> + }
> + ops_data->vq_cxt[vq_num].enable = B_FALSE;
> +
> + return rc;
> +}
> +
> +static int
> +sfc_vdpa_configure(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int rc, i;
> + int nr_vring;
> + int max_vring_cnt;
> + efx_virtio_vq_t *vq;
> + efx_nic_t *nic;
> + void *dev;
> +
> + dev = ops_data->dev_handle;
> + nic = sfc_vdpa_adapter_by_dev_handle(dev)->nic;
> +
> + SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_INITIALIZED);
> +
> + ops_data->state = SFC_VDPA_STATE_CONFIGURING;
> +
> + nr_vring = rte_vhost_get_vring_num(ops_data->vid);
> + max_vring_cnt =
> + (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
> +
> + /* number of vring should not be more than supported max vq count */
> + if (nr_vring > max_vring_cnt) {
> + sfc_vdpa_err(dev,
> + "nr_vring (%d) is > max vring count (%d)",
> + nr_vring, max_vring_cnt);
> + goto fail_vring_num;
> + }
> +
> + rc = sfc_vdpa_dma_map(ops_data, true);
> + if (rc) {
> + sfc_vdpa_err(dev,
> + "DMA map failed: %s", rte_strerror(rc));
> + goto fail_dma_map;
> + }
> +
> + for (i = 0; i < nr_vring; i++) {
> + rc = efx_virtio_qcreate(nic, &vq);
> + if ((rc != 0) || (vq == NULL)) {
> + sfc_vdpa_err(dev,
> + "virtqueue create failed: %s",
> + rte_strerror(rc));
> + goto fail_vq_create;
> + }
> +
> + /* store created virtqueue context */
> + ops_data->vq_cxt[i].vq = vq;
> + }
> +
> + ops_data->vq_count = i;
> +
> + ops_data->state = SFC_VDPA_STATE_CONFIGURED;
> +
> + return 0;
> +
> +fail_vq_create:
> + sfc_vdpa_dma_map(ops_data, false);
> +
> +fail_dma_map:
> +fail_vring_num:
> + ops_data->state = SFC_VDPA_STATE_INITIALIZED;
> +
> + return -1;
> +}
> +
> +static void
> +sfc_vdpa_close(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int i;
> +
> + if (ops_data->state != SFC_VDPA_STATE_CONFIGURED)
> + return;
> +
> + ops_data->state = SFC_VDPA_STATE_CLOSING;
> +
> + for (i = 0; i < ops_data->vq_count; i++) {
> + if (ops_data->vq_cxt[i].vq == NULL)
> + continue;
> +
> + efx_virtio_qdestroy(ops_data->vq_cxt[i].vq);
> + }
> +
> + sfc_vdpa_dma_map(ops_data, false);
> +
> + ops_data->state = SFC_VDPA_STATE_INITIALIZED;
> +}
> +
> +static void
> +sfc_vdpa_stop(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int i;
> + int rc;
> +
> + if (ops_data->state != SFC_VDPA_STATE_STARTED)
> + return;
> +
> + ops_data->state = SFC_VDPA_STATE_STOPPING;
> +
> + for (i = 0; i < ops_data->vq_count; i++) {
> + rc = sfc_vdpa_virtq_stop(ops_data, i);
> + if (rc != 0)
> + continue;
> + }
> +
> + sfc_vdpa_disable_vfio_intr(ops_data);
> +
> + ops_data->state = SFC_VDPA_STATE_CONFIGURED;
> +}
> +
> +static int
> +sfc_vdpa_start(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int i, j;
> + int rc;
> +
> + SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_CONFIGURED);
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "entry");
> +
> + ops_data->state = SFC_VDPA_STATE_STARTING;
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "enable interrupts");
> + rc = sfc_vdpa_enable_vfio_intr(ops_data);
> + if (rc < 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "vfio intr allocation failed: %s",
> + rte_strerror(rc));
> + goto fail_enable_vfio_intr;
> + }
> +
> + rte_vhost_get_negotiated_features(ops_data->vid,
> + &ops_data->req_features);
> +
> + sfc_vdpa_info(ops_data->dev_handle,
> + "negotiated feature : 0x%" PRIx64,
> + ops_data->req_features);
> +
> + for (i = 0; i < ops_data->vq_count; i++) {
> + sfc_vdpa_log_init(ops_data->dev_handle,
> + "starting vq# %d", i);
> + rc = sfc_vdpa_virtq_start(ops_data, i);
> + if (rc != 0)
> + goto fail_vq_start;
> + }
> +
> + ops_data->state = SFC_VDPA_STATE_STARTED;
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "done");
> +
> + return 0;
> +
> +fail_vq_start:
> + /* stop already started virtqueues */
> + for (j = 0; j < i; j++)
> + sfc_vdpa_virtq_stop(ops_data, j);
> + sfc_vdpa_disable_vfio_intr(ops_data);
> +
> +fail_enable_vfio_intr:
> + ops_data->state = SFC_VDPA_STATE_CONFIGURED;
> +
> + return rc;
> +}
> +
> +static int
> +sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
> +{
> + struct sfc_vdpa_ops_data *ops_data;
> + void *dev;
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + dev = ops_data->dev_handle;
> + *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
> +
> + sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %d",
> + *queue_num);
> +
> + return 0;
> +}
> +
> static int
> sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
> {
> @@ -114,7 +540,53 @@
> static int
> sfc_vdpa_dev_config(int vid)
> {
> - RTE_SET_USED(vid);
> + struct rte_vdpa_device *vdpa_dev;
> + int rc;
> + struct sfc_vdpa_ops_data *ops_data;
> +
> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "invalid vDPA device : %p, vid : %d",
> + vdpa_dev, vid);
> + return -1;
> + }
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "entry");
> +
> + ops_data->vid = vid;
> +
> + sfc_vdpa_adapter_lock(ops_data->dev_handle);
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "configuring");
> + rc = sfc_vdpa_configure(ops_data);
> + if (rc != 0)
> + goto fail_vdpa_config;
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "starting");
> + rc = sfc_vdpa_start(ops_data);
> + if (rc != 0)
> + goto fail_vdpa_start;
> +
> + sfc_vdpa_adapter_unlock(ops_data->dev_handle);
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
> + if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
> + sfc_vdpa_info(ops_data->dev_handle,
> + "vDPA (%s): software relay for notify is used.",
> + vdpa_dev->device->name);
> +
> + sfc_vdpa_log_init(ops_data->dev_handle, "done");
> +
> + return 0;
> +
> +fail_vdpa_start:
> + sfc_vdpa_close(ops_data);
> +
> +fail_vdpa_config:
> + sfc_vdpa_adapter_unlock(ops_data->dev_handle);
>
> return -1;
> }
> @@ -122,9 +594,27 @@
> static int
> sfc_vdpa_dev_close(int vid)
> {
> - RTE_SET_USED(vid);
> + struct rte_vdpa_device *vdpa_dev;
> + struct sfc_vdpa_ops_data *ops_data;
>
> - return -1;
> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "invalid vDPA device : %p, vid : %d",
> + vdpa_dev, vid);
> + return -1;
> + }
> +
> + sfc_vdpa_adapter_lock(ops_data->dev_handle);
> +
> + sfc_vdpa_stop(ops_data);
> + sfc_vdpa_close(ops_data);
> +
> + sfc_vdpa_adapter_unlock(ops_data->dev_handle);
> +
> + return 0;
> }
>
> static int
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> index 21cbb73..8d553c5 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> @@ -18,17 +18,45 @@ enum sfc_vdpa_context {
> enum sfc_vdpa_state {
> SFC_VDPA_STATE_UNINITIALIZED = 0,
> SFC_VDPA_STATE_INITIALIZED,
> + SFC_VDPA_STATE_CONFIGURING,
> + SFC_VDPA_STATE_CONFIGURED,
> + SFC_VDPA_STATE_CLOSING,
> + SFC_VDPA_STATE_CLOSED,
> + SFC_VDPA_STATE_STARTING,
> + SFC_VDPA_STATE_STARTED,
> + SFC_VDPA_STATE_STOPPING,
> SFC_VDPA_STATE_NSTATES
> };
>
> +struct sfc_vdpa_vring_info {
> + uint64_t desc;
> + uint64_t avail;
> + uint64_t used;
> + uint64_t size;
> + uint16_t last_avail_idx;
> + uint16_t last_used_idx;
> +};
> +
> +typedef struct sfc_vdpa_vq_context_s {
> + uint8_t enable;
> + uint32_t pidx;
> + uint32_t cidx;
> + efx_virtio_vq_t *vq;
> +} sfc_vdpa_vq_context_t;
> +
> struct sfc_vdpa_ops_data {
> void *dev_handle;
> + int vid;
> struct rte_vdpa_device *vdpa_dev;
> enum sfc_vdpa_context vdpa_context;
> enum sfc_vdpa_state state;
>
> uint64_t dev_features;
> uint64_t drv_features;
> + uint64_t req_features;
> +
> + uint16_t vq_count;
> + struct sfc_vdpa_vq_context_s vq_cxt[SFC_VDPA_MAX_QUEUE_PAIRS * 2];
> };
>
> struct sfc_vdpa_ops_data *
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area info
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
` (5 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 7:35 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
` (2 subsequent siblings)
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement the vDPA ops get_notify_area to get the notify
area info of the queue.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Added error log in sfc_vdpa_get_notify_area.
drivers/vdpa/sfc/sfc_vdpa_ops.c | 168 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +
2 files changed, 164 insertions(+), 6 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index de1c81a..774d73e 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,6 +3,8 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <pthread.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <rte_errno.h>
@@ -537,6 +539,67 @@
return 0;
}
+static void *
+sfc_vdpa_notify_ctrl(void *arg)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ int vid;
+
+ ops_data = arg;
+ if (ops_data == NULL)
+ return NULL;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ vid = ops_data->vid;
+
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): Notifier could not get configured",
+ ops_data->vdpa_dev->device->name);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return NULL;
+}
+
+static int
+sfc_vdpa_setup_notify_ctrl(int vid)
+{
+ int ret;
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ ops_data->is_notify_thread_started = false;
+
+ /*
+ * Use rte_vhost_host_notifier_ctrl in a thread to avoid
+ * dead lock scenario when multiple VFs are used in single vdpa
+ * application and multiple VFs are passed to a single VM.
+ */
+ ret = pthread_create(&ops_data->notify_tid, NULL,
+ sfc_vdpa_notify_ctrl, ops_data);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to create notify_ctrl thread: %s",
+ rte_strerror(ret));
+ return -1;
+ }
+ ops_data->is_notify_thread_started = true;
+
+ return 0;
+}
+
static int
sfc_vdpa_dev_config(int vid)
{
@@ -570,18 +633,19 @@
if (rc != 0)
goto fail_vdpa_start;
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+ rc = sfc_vdpa_setup_notify_ctrl(vid);
+ if (rc != 0)
+ goto fail_vdpa_notify;
- sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
- if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
- sfc_vdpa_info(ops_data->dev_handle,
- "vDPA (%s): software relay for notify is used.",
- vdpa_dev->device->name);
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_vdpa_notify:
+ sfc_vdpa_stop(ops_data);
+
fail_vdpa_start:
sfc_vdpa_close(ops_data);
@@ -594,6 +658,7 @@
static int
sfc_vdpa_dev_close(int vid)
{
+ int ret;
struct rte_vdpa_device *vdpa_dev;
struct sfc_vdpa_ops_data *ops_data;
@@ -608,6 +673,23 @@
}
sfc_vdpa_adapter_lock(ops_data->dev_handle);
+ if (ops_data->is_notify_thread_started == true) {
+ void *status;
+ ret = pthread_cancel(ops_data->notify_tid);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to cancel notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+
+ ret = pthread_join(ops_data->notify_tid, &status);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to join terminated notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+ }
+ ops_data->is_notify_thread_started = false;
sfc_vdpa_stop(ops_data);
sfc_vdpa_close(ops_data);
@@ -658,6 +740,79 @@
return vfio_dev_fd;
}
+static int
+sfc_vdpa_get_notify_area(int vid, int qid, uint64_t *offset, uint64_t *size)
+{
+ int ret;
+ efx_nic_t *nic;
+ int vfio_dev_fd;
+ efx_rc_t rc;
+ unsigned int bar_offset;
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ struct vfio_region_info reg = { .argsz = sizeof(reg) };
+ const efx_nic_cfg_t *encp;
+ int max_vring_cnt;
+ int64_t len;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+ encp = efx_nic_cfg_get(nic);
+
+ if (qid >= max_vring_cnt) {
+ sfc_vdpa_err(dev, "invalid qid : %d", qid);
+ return -1;
+ }
+
+ if (ops_data->vq_cxt[qid].enable != B_TRUE) {
+ sfc_vdpa_err(dev, "vq is not enabled");
+ return -1;
+ }
+
+ rc = efx_virtio_get_doorbell_offset(ops_data->vq_cxt[qid].vq,
+ &bar_offset);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "failed to get doorbell offset: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ reg.index = sfc_vdpa_adapter_by_dev_handle(dev)->mem_bar.esb_rid;
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_REGION_INFO, ®);
+ if (ret != 0) {
+ sfc_vdpa_err(dev, "could not get device region info: %s",
+ strerror(errno));
+ return ret;
+ }
+
+ *offset = reg.offset + bar_offset;
+
+ len = (1U << encp->enc_vi_window_shift) / 2;
+ if (len >= sysconf(_SC_PAGESIZE)) {
+ *size = sysconf(_SC_PAGESIZE);
+ } else {
+ sfc_vdpa_err(dev, "invalid VI window size : 0x%" PRIx64, len);
+ return -1;
+ }
+
+ sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64,
+ *offset);
+
+ return 0;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -667,6 +822,7 @@
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
.get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
+ .get_notify_area = sfc_vdpa_get_notify_area,
};
struct sfc_vdpa_ops_data *
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 8d553c5..f7523ef 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -50,6 +50,8 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+ pthread_t notify_tid;
+ bool is_notify_thread_started;
uint64_t dev_features;
uint64_t drv_features;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area info
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
@ 2021-11-02 7:35 ` Xia, Chenbo
2021-11-02 9:47 ` Vijay Kumar Srivastava
0 siblings, 1 reply; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 7:35 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area info
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement the vDPA ops get_notify_area to get the notify
> area info of the queue.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Added error log in sfc_vdpa_get_notify_area.
>
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 168 ++++++++++++++++++++++++++++++++++++++-
> -
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +
> 2 files changed, 164 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index de1c81a..774d73e 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -3,6 +3,8 @@
> * Copyright(c) 2020-2021 Xilinx, Inc.
> */
>
> +#include <pthread.h>
> +#include <unistd.h>
> #include <sys/ioctl.h>
>
> #include <rte_errno.h>
> @@ -537,6 +539,67 @@
> return 0;
> }
>
> +static void *
> +sfc_vdpa_notify_ctrl(void *arg)
> +{
> + struct sfc_vdpa_ops_data *ops_data;
> + int vid;
> +
> + ops_data = arg;
> + if (ops_data == NULL)
> + return NULL;
> +
> + sfc_vdpa_adapter_lock(ops_data->dev_handle);
> +
> + vid = ops_data->vid;
> +
> + if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
> + sfc_vdpa_info(ops_data->dev_handle,
> + "vDPA (%s): Notifier could not get configured",
> + ops_data->vdpa_dev->device->name);
> +
> + sfc_vdpa_adapter_unlock(ops_data->dev_handle);
> +
> + return NULL;
> +}
> +
> +static int
> +sfc_vdpa_setup_notify_ctrl(int vid)
> +{
> + int ret;
> + struct rte_vdpa_device *vdpa_dev;
> + struct sfc_vdpa_ops_data *ops_data;
> +
> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "invalid vDPA device : %p, vid : %d",
> + vdpa_dev, vid);
> + return -1;
> + }
Why not use struct sfc_vdpa_ops_data * as the input param rather
than vid, then use ops_data->vdpa_dev to get vdpa_dev?
As ops_data is checked as non-NULL before the func, it will make
things easier.
Thanks,
Chenbo
> +
> + ops_data->is_notify_thread_started = false;
> +
> + /*
> + * Use rte_vhost_host_notifier_ctrl in a thread to avoid
> + * dead lock scenario when multiple VFs are used in single vdpa
> + * application and multiple VFs are passed to a single VM.
> + */
> + ret = pthread_create(&ops_data->notify_tid, NULL,
> + sfc_vdpa_notify_ctrl, ops_data);
> + if (ret != 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "failed to create notify_ctrl thread: %s",
> + rte_strerror(ret));
> + return -1;
> + }
> + ops_data->is_notify_thread_started = true;
> +
> + return 0;
> +}
> +
> static int
> sfc_vdpa_dev_config(int vid)
> {
> @@ -570,18 +633,19 @@
> if (rc != 0)
> goto fail_vdpa_start;
>
> - sfc_vdpa_adapter_unlock(ops_data->dev_handle);
> + rc = sfc_vdpa_setup_notify_ctrl(vid);
> + if (rc != 0)
> + goto fail_vdpa_notify;
>
> - sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
> - if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
> - sfc_vdpa_info(ops_data->dev_handle,
> - "vDPA (%s): software relay for notify is used.",
> - vdpa_dev->device->name);
> + sfc_vdpa_adapter_unlock(ops_data->dev_handle);
>
> sfc_vdpa_log_init(ops_data->dev_handle, "done");
>
> return 0;
>
> +fail_vdpa_notify:
> + sfc_vdpa_stop(ops_data);
> +
> fail_vdpa_start:
> sfc_vdpa_close(ops_data);
>
> @@ -594,6 +658,7 @@
> static int
> sfc_vdpa_dev_close(int vid)
> {
> + int ret;
> struct rte_vdpa_device *vdpa_dev;
> struct sfc_vdpa_ops_data *ops_data;
>
> @@ -608,6 +673,23 @@
> }
>
> sfc_vdpa_adapter_lock(ops_data->dev_handle);
> + if (ops_data->is_notify_thread_started == true) {
> + void *status;
> + ret = pthread_cancel(ops_data->notify_tid);
> + if (ret != 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "failed to cancel notify_ctrl thread: %s",
> + rte_strerror(ret));
> + }
> +
> + ret = pthread_join(ops_data->notify_tid, &status);
> + if (ret != 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "failed to join terminated notify_ctrl
> thread: %s",
> + rte_strerror(ret));
> + }
> + }
> + ops_data->is_notify_thread_started = false;
>
> sfc_vdpa_stop(ops_data);
> sfc_vdpa_close(ops_data);
> @@ -658,6 +740,79 @@
> return vfio_dev_fd;
> }
>
> +static int
> +sfc_vdpa_get_notify_area(int vid, int qid, uint64_t *offset, uint64_t *size)
> +{
> + int ret;
> + efx_nic_t *nic;
> + int vfio_dev_fd;
> + efx_rc_t rc;
> + unsigned int bar_offset;
> + struct rte_vdpa_device *vdpa_dev;
> + struct sfc_vdpa_ops_data *ops_data;
> + struct vfio_region_info reg = { .argsz = sizeof(reg) };
> + const efx_nic_cfg_t *encp;
> + int max_vring_cnt;
> + int64_t len;
> + void *dev;
> +
> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + dev = ops_data->dev_handle;
> +
> + vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
> + max_vring_cnt =
> + (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
> +
> + nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
> + encp = efx_nic_cfg_get(nic);
> +
> + if (qid >= max_vring_cnt) {
> + sfc_vdpa_err(dev, "invalid qid : %d", qid);
> + return -1;
> + }
> +
> + if (ops_data->vq_cxt[qid].enable != B_TRUE) {
> + sfc_vdpa_err(dev, "vq is not enabled");
> + return -1;
> + }
> +
> + rc = efx_virtio_get_doorbell_offset(ops_data->vq_cxt[qid].vq,
> + &bar_offset);
> + if (rc != 0) {
> + sfc_vdpa_err(dev, "failed to get doorbell offset: %s",
> + rte_strerror(rc));
> + return rc;
> + }
> +
> + reg.index = sfc_vdpa_adapter_by_dev_handle(dev)->mem_bar.esb_rid;
> + ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_REGION_INFO, ®);
> + if (ret != 0) {
> + sfc_vdpa_err(dev, "could not get device region info: %s",
> + strerror(errno));
> + return ret;
> + }
> +
> + *offset = reg.offset + bar_offset;
> +
> + len = (1U << encp->enc_vi_window_shift) / 2;
> + if (len >= sysconf(_SC_PAGESIZE)) {
> + *size = sysconf(_SC_PAGESIZE);
> + } else {
> + sfc_vdpa_err(dev, "invalid VI window size : 0x%" PRIx64, len);
> + return -1;
> + }
> +
> + sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64,
> + *offset);
> +
> + return 0;
> +}
> +
> static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
> .get_queue_num = sfc_vdpa_get_queue_num,
> .get_features = sfc_vdpa_get_features,
> @@ -667,6 +822,7 @@
> .set_vring_state = sfc_vdpa_set_vring_state,
> .set_features = sfc_vdpa_set_features,
> .get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
> + .get_notify_area = sfc_vdpa_get_notify_area,
> };
>
> struct sfc_vdpa_ops_data *
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> index 8d553c5..f7523ef 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
> @@ -50,6 +50,8 @@ struct sfc_vdpa_ops_data {
> struct rte_vdpa_device *vdpa_dev;
> enum sfc_vdpa_context vdpa_context;
> enum sfc_vdpa_state state;
> + pthread_t notify_tid;
> + bool is_notify_thread_started;
>
> uint64_t dev_features;
> uint64_t drv_features;
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area info
2021-11-02 7:35 ` Xia, Chenbo
@ 2021-11-02 9:47 ` Vijay Kumar Srivastava
0 siblings, 0 replies; 122+ messages in thread
From: Vijay Kumar Srivastava @ 2021-11-02 9:47 UTC (permalink / raw)
To: Xia, Chenbo, dev; +Cc: maxime.coquelin, andrew.rybchenko, Praveen Kumar Jain
Hi Chenbo,
>-----Original Message-----
>From: Xia, Chenbo <chenbo.xia@intel.com>
>Sent: Tuesday, November 2, 2021 1:05 PM
>To: Vijay Kumar Srivastava <vsrivast@xilinx.com>; dev@dpdk.org
>Cc: maxime.coquelin@redhat.com; andrew.rybchenko@oktetlabs.ru; Vijay
>Kumar Srivastava <vsrivast@xilinx.com>
>Subject: RE: [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area
>info
>
>Hi Vijay,
>
>> -----Original Message-----
>> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
>> Sent: Friday, October 29, 2021 10:47 PM
>> To: dev@dpdk.org
>> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
>> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava
>> <vsrivast@xilinx.com>
>> Subject: [PATCH v3 07/10] vdpa/sfc: add support to get queue notify
>> area info
>>
>> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>>
>> Implement the vDPA ops get_notify_area to get the notify area info of
>> the queue.
>>
>> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>> ---
[SNIP]
>> +static int
>> +sfc_vdpa_setup_notify_ctrl(int vid)
>> +{
>> + int ret;
>> + struct rte_vdpa_device *vdpa_dev;
>> + struct sfc_vdpa_ops_data *ops_data;
>> +
>> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
>> +
>> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
>> + if (ops_data == NULL) {
>> + sfc_vdpa_err(ops_data->dev_handle,
>> + "invalid vDPA device : %p, vid : %d",
>> + vdpa_dev, vid);
>> + return -1;
>> + }
>
>Why not use struct sfc_vdpa_ops_data * as the input param rather than vid,
>then use ops_data->vdpa_dev to get vdpa_dev?
>
>As ops_data is checked as non-NULL before the func, it will make things easier.
>
Yes. ops_data can be used as input param.
I will include this change.
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 08/10] vdpa/sfc: add support for MAC filter config
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
` (6 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 8:18 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add support for unicast and broadcast MAC filter configuration.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
doc/guides/vdpadevs/sfc.rst | 4 ++
drivers/vdpa/sfc/meson.build | 1 +
drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
drivers/vdpa/sfc/sfc_vdpa_filter.c | 144 +++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
7 files changed, 238 insertions(+)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index d06c427..512f23e 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -71,6 +71,10 @@ boolean parameters value.
**vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
If this parameter is not specified then ef100 device will operate as network device.
+- ``mac`` [mac address]
+
+ Configures MAC address which would be used to setup MAC filters.
+
Dynamic Logging Parameters
~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index dc333de..2ca33bc 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -22,4 +22,5 @@ sources = files(
'sfc_vdpa_hw.c',
'sfc_vdpa_mcdi.c',
'sfc_vdpa_ops.c',
+ 'sfc_vdpa_filter.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index b3c82e5..d18cd61 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -8,7 +8,9 @@
#include <sys/queue.h>
#include <rte_common.h>
+#include <rte_devargs.h>
#include <rte_errno.h>
+#include <rte_kvargs.h>
#include <rte_string_fns.h>
#include <rte_vfio.h>
#include <rte_vhost.h>
@@ -202,6 +204,31 @@ struct sfc_vdpa_ops_data *
return ret < 0 ? RTE_LOGTYPE_PMD : ret;
}
+static int
+sfc_vdpa_kvargs_parse(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ struct rte_devargs *devargs = pci_dev->device.devargs;
+ /*
+ * To get the device class a mandatory param 'class' is being
+ * used so included SFC_EFX_KVARG_DEV_CLASS in the param list.
+ */
+ const char **params = (const char *[]){
+ RTE_DEVARGS_KEY_CLASS,
+ SFC_VDPA_MAC_ADDR,
+ NULL,
+ };
+
+ if (devargs == NULL)
+ return 0;
+
+ sva->kvargs = rte_kvargs_parse(devargs->args, params);
+ if (sva->kvargs == NULL)
+ return -EINVAL;
+
+ return 0;
+}
+
static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
{ RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
{ .vendor_id = 0, /* sentinel */ },
@@ -244,6 +271,10 @@ struct sfc_vdpa_ops_data *
if (ret != 0)
goto fail_set_log_prefix;
+ ret = sfc_vdpa_kvargs_parse(sva);
+ if (ret != 0)
+ goto fail_kvargs_parse;
+
sfc_vdpa_log_init(sva, "entry");
sfc_vdpa_adapter_lock_init(sva);
@@ -284,6 +315,7 @@ struct sfc_vdpa_ops_data *
fail_vfio_setup:
sfc_vdpa_adapter_lock_fini(sva);
+fail_kvargs_parse:
fail_set_log_prefix:
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 1bf96e7..dbd099f 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -17,8 +17,29 @@
#include "sfc_vdpa_log.h"
#include "sfc_vdpa_ops.h"
+#define SFC_VDPA_MAC_ADDR "mac"
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
+/* Broadcast & Unicast MAC filters are supported */
+#define SFC_MAX_SUPPORTED_FILTERS 2
+
+/*
+ * Get function-local index of the associated VI from the
+ * virtqueue number. Queue 0 is reserved for MCDI
+ */
+#define SFC_VDPA_GET_VI_INDEX(vq_num) (((vq_num) / 2) + 1)
+
+enum sfc_vdpa_filter_type {
+ SFC_VDPA_BCAST_MAC_FILTER = 0,
+ SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_FILTER_NTYPE
+};
+
+typedef struct sfc_vdpa_filter_s {
+ int filter_cnt;
+ efx_filter_spec_t spec[SFC_MAX_SUPPORTED_FILTERS];
+} sfc_vdpa_filter_t;
+
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
@@ -32,6 +53,8 @@ struct sfc_vdpa_adapter {
struct rte_pci_device *pdev;
struct rte_pci_addr pci_addr;
+ struct rte_kvargs *kvargs;
+
efx_family_t family;
efx_nic_t *nic;
rte_spinlock_t nic_lock;
@@ -46,6 +69,8 @@ struct sfc_vdpa_adapter {
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
+ sfc_vdpa_filter_t filters;
+
int vfio_group_fd;
int vfio_dev_fd;
int vfio_container_fd;
@@ -83,6 +108,11 @@ struct sfc_vdpa_ops_data *
int
sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+int
+sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data);
+int
+sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
new file mode 100644
index 0000000..03b6a5d
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -0,0 +1,144 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_errno.h>
+#include <rte_ether.h>
+#include <rte_kvargs.h>
+
+#include "efx.h"
+#include "efx_impl.h"
+#include "sfc_vdpa.h"
+
+static inline int
+sfc_vdpa_get_eth_addr(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ struct rte_ether_addr *mac_addr = extra_args;
+
+ if (value == NULL || extra_args == NULL)
+ return -EINVAL;
+
+ /* Convert string with Ethernet address to an ether_addr */
+ rte_ether_unformat_addr(value, mac_addr);
+
+ return 0;
+}
+
+static int
+sfc_vdpa_set_mac_filter(efx_nic_t *nic, efx_filter_spec_t *spec,
+ int qid, uint8_t *eth_addr)
+{
+ int rc;
+
+ if (nic == NULL || spec == NULL)
+ return -1;
+
+ spec->efs_priority = EFX_FILTER_PRI_MANUAL;
+ spec->efs_flags = EFX_FILTER_FLAG_RX;
+ spec->efs_dmaq_id = qid;
+
+ rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
+ if (rc != 0)
+ return rc;
+
+ rc = efx_filter_insert(nic, spec);
+ if (rc != 0)
+ return rc;
+
+ return rc;
+}
+
+int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int qid;
+ efx_nic_t *nic;
+ struct rte_ether_addr bcast_eth_addr;
+ struct rte_ether_addr ucast_eth_addr;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_filter_spec_t *spec;
+
+ if (ops_data == NULL)
+ return -1;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ nic = sva->nic;
+
+ sfc_vdpa_log_init(sva, "process kvarg");
+
+ /* skip MAC filter configuration if mac address is not provided */
+ if (rte_kvargs_count(sva->kvargs, SFC_VDPA_MAC_ADDR) == 0) {
+ sfc_vdpa_warn(sva,
+ "MAC address is not provided, skipping MAC Filter Config");
+ return -1;
+ }
+
+ rc = rte_kvargs_process(sva->kvargs, SFC_VDPA_MAC_ADDR,
+ &sfc_vdpa_get_eth_addr,
+ &ucast_eth_addr);
+ if (rc < 0)
+ return -1;
+
+ /* create filters on the base queue */
+ qid = SFC_VDPA_GET_VI_INDEX(0);
+
+ sfc_vdpa_log_init(sva, "insert broadcast mac filter");
+
+ EFX_MAC_BROADCAST_ADDR_SET(bcast_eth_addr.addr_bytes);
+ spec = &sva->filters.spec[SFC_VDPA_BCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic,
+ spec, qid,
+ bcast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(ops_data->dev_handle,
+ "broadcast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "insert unicast mac filter");
+ spec = &sva->filters.spec[SFC_VDPA_UCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic,
+ spec, qid,
+ ucast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "unicast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return rc;
+}
+
+int sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, rc = 0;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_nic_t *nic;
+
+ if (ops_data == NULL)
+ return -1;
+
+ nic = sva->nic;
+
+ for (i = 0; i < sva->filters.filter_cnt; i++) {
+ rc = efx_filter_remove(nic, &(sva->filters.spec[i]));
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "remove HW filter failed for entry %d: %s",
+ i, rte_strerror(rc));
+ }
+
+ sva->filters.filter_cnt = 0;
+
+ return rc;
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index b473708..5307b03 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -354,10 +354,20 @@
goto fail_virtio_init;
}
+ sfc_vdpa_log_init(sva, "init filter");
+ rc = efx_filter_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "filter init failed: %s", rte_strerror(rc));
+ goto fail_filter_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_filter_init:
+ efx_virtio_fini(enp);
+
fail_virtio_init:
efx_nic_fini(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 774d73e..8551b65 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -426,6 +426,8 @@
sfc_vdpa_disable_vfio_intr(ops_data);
+ sfc_vdpa_filter_remove(ops_data);
+
ops_data->state = SFC_VDPA_STATE_CONFIGURED;
}
@@ -465,12 +467,27 @@
goto fail_vq_start;
}
+ ops_data->vq_count = i;
+
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "configure MAC filters");
+ rc = sfc_vdpa_filter_config(ops_data);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "MAC filter config failed: %s",
+ rte_strerror(rc));
+ goto fail_filter_cfg;
+ }
+
ops_data->state = SFC_VDPA_STATE_STARTED;
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_filter_cfg:
+ /* remove already created filters */
+ sfc_vdpa_filter_remove(ops_data);
fail_vq_start:
/* stop already started virtqueues */
for (j = 0; j < i; j++)
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 08/10] vdpa/sfc: add support for MAC filter config
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
@ 2021-11-02 8:18 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 8:18 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
Hi Vijay,
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 08/10] vdpa/sfc: add support for MAC filter config
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add support for unicast and broadcast MAC filter configuration.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> doc/guides/vdpadevs/sfc.rst | 4 ++
> drivers/vdpa/sfc/meson.build | 1 +
> drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 144
> +++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
> 7 files changed, 238 insertions(+)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
>
> diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
> index d06c427..512f23e 100644
> --- a/doc/guides/vdpadevs/sfc.rst
> +++ b/doc/guides/vdpadevs/sfc.rst
> @@ -71,6 +71,10 @@ boolean parameters value.
> **vdpa** device will work as vdpa device and will be probed by vdpa/sfc
> driver.
> If this parameter is not specified then ef100 device will operate as
> network device.
>
> +- ``mac`` [mac address]
> +
> + Configures MAC address which would be used to setup MAC filters.
> +
>
> Dynamic Logging Parameters
> ~~~~~~~~~~~~~~~~~~~~~~~~~~
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> index dc333de..2ca33bc 100644
> --- a/drivers/vdpa/sfc/meson.build
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -22,4 +22,5 @@ sources = files(
> 'sfc_vdpa_hw.c',
> 'sfc_vdpa_mcdi.c',
> 'sfc_vdpa_ops.c',
> + 'sfc_vdpa_filter.c',
> )
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> index b3c82e5..d18cd61 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -8,7 +8,9 @@
> #include <sys/queue.h>
>
> #include <rte_common.h>
> +#include <rte_devargs.h>
> #include <rte_errno.h>
> +#include <rte_kvargs.h>
> #include <rte_string_fns.h>
> #include <rte_vfio.h>
> #include <rte_vhost.h>
> @@ -202,6 +204,31 @@ struct sfc_vdpa_ops_data *
> return ret < 0 ? RTE_LOGTYPE_PMD : ret;
> }
>
> +static int
> +sfc_vdpa_kvargs_parse(struct sfc_vdpa_adapter *sva)
> +{
> + struct rte_pci_device *pci_dev = sva->pdev;
> + struct rte_devargs *devargs = pci_dev->device.devargs;
> + /*
> + * To get the device class a mandatory param 'class' is being
> + * used so included SFC_EFX_KVARG_DEV_CLASS in the param list.
> + */
> + const char **params = (const char *[]){
> + RTE_DEVARGS_KEY_CLASS,
> + SFC_VDPA_MAC_ADDR,
> + NULL,
> + };
> +
> + if (devargs == NULL)
> + return 0;
> +
> + sva->kvargs = rte_kvargs_parse(devargs->args, params);
> + if (sva->kvargs == NULL)
> + return -EINVAL;
> +
> + return 0;
> +}
> +
> static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
> { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
> { .vendor_id = 0, /* sentinel */ },
> @@ -244,6 +271,10 @@ struct sfc_vdpa_ops_data *
> if (ret != 0)
> goto fail_set_log_prefix;
>
> + ret = sfc_vdpa_kvargs_parse(sva);
> + if (ret != 0)
> + goto fail_kvargs_parse;
> +
> sfc_vdpa_log_init(sva, "entry");
>
> sfc_vdpa_adapter_lock_init(sva);
> @@ -284,6 +315,7 @@ struct sfc_vdpa_ops_data *
> fail_vfio_setup:
> sfc_vdpa_adapter_lock_fini(sva);
>
> +fail_kvargs_parse:
> fail_set_log_prefix:
> rte_free(sva);
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> index 1bf96e7..dbd099f 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -17,8 +17,29 @@
> #include "sfc_vdpa_log.h"
> #include "sfc_vdpa_ops.h"
>
> +#define SFC_VDPA_MAC_ADDR "mac"
> #define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
>
> +/* Broadcast & Unicast MAC filters are supported */
> +#define SFC_MAX_SUPPORTED_FILTERS 2
> +
> +/*
> + * Get function-local index of the associated VI from the
> + * virtqueue number. Queue 0 is reserved for MCDI
> + */
> +#define SFC_VDPA_GET_VI_INDEX(vq_num) (((vq_num) / 2) + 1)
> +
> +enum sfc_vdpa_filter_type {
> + SFC_VDPA_BCAST_MAC_FILTER = 0,
> + SFC_VDPA_UCAST_MAC_FILTER = 1,
> + SFC_VDPA_FILTER_NTYPE
> +};
> +
> +typedef struct sfc_vdpa_filter_s {
> + int filter_cnt;
> + efx_filter_spec_t spec[SFC_MAX_SUPPORTED_FILTERS];
> +} sfc_vdpa_filter_t;
> +
> /* Adapter private data */
> struct sfc_vdpa_adapter {
> TAILQ_ENTRY(sfc_vdpa_adapter) next;
> @@ -32,6 +53,8 @@ struct sfc_vdpa_adapter {
> struct rte_pci_device *pdev;
> struct rte_pci_addr pci_addr;
>
> + struct rte_kvargs *kvargs;
> +
> efx_family_t family;
> efx_nic_t *nic;
> rte_spinlock_t nic_lock;
> @@ -46,6 +69,8 @@ struct sfc_vdpa_adapter {
> char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
> uint32_t logtype_main;
>
> + sfc_vdpa_filter_t filters;
> +
> int vfio_group_fd;
> int vfio_dev_fd;
> int vfio_container_fd;
> @@ -83,6 +108,11 @@ struct sfc_vdpa_ops_data *
> int
> sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
>
> +int
> +sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data);
> +int
> +sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data);
> +
> static inline struct sfc_vdpa_adapter *
> sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
> {
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c
> b/drivers/vdpa/sfc/sfc_vdpa_filter.c
> new file mode 100644
> index 0000000..03b6a5d
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
> @@ -0,0 +1,144 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#include <rte_errno.h>
> +#include <rte_ether.h>
> +#include <rte_kvargs.h>
> +
> +#include "efx.h"
> +#include "efx_impl.h"
> +#include "sfc_vdpa.h"
> +
> +static inline int
> +sfc_vdpa_get_eth_addr(const char *key __rte_unused,
> + const char *value, void *extra_args)
> +{
> + struct rte_ether_addr *mac_addr = extra_args;
> +
> + if (value == NULL || extra_args == NULL)
> + return -EINVAL;
> +
> + /* Convert string with Ethernet address to an ether_addr */
> + rte_ether_unformat_addr(value, mac_addr);
> +
> + return 0;
> +}
> +
> +static int
> +sfc_vdpa_set_mac_filter(efx_nic_t *nic, efx_filter_spec_t *spec,
> + int qid, uint8_t *eth_addr)
> +{
> + int rc;
> +
> + if (nic == NULL || spec == NULL)
> + return -1;
> +
> + spec->efs_priority = EFX_FILTER_PRI_MANUAL;
> + spec->efs_flags = EFX_FILTER_FLAG_RX;
> + spec->efs_dmaq_id = qid;
> +
> + rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
> + eth_addr);
> + if (rc != 0)
> + return rc;
> +
> + rc = efx_filter_insert(nic, spec);
> + if (rc != 0)
> + return rc;
> +
> + return rc;
> +}
> +
> +int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int rc;
> + int qid;
> + efx_nic_t *nic;
> + struct rte_ether_addr bcast_eth_addr;
> + struct rte_ether_addr ucast_eth_addr;
> + struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
> + efx_filter_spec_t *spec;
> +
> + if (ops_data == NULL)
> + return -1;
You check this after you use the pointer to reference adapter.
One option is to remove the check as I don't think it will be NULL.
> +
> + sfc_vdpa_log_init(sva, "entry");
> +
> + nic = sva->nic;
> +
> + sfc_vdpa_log_init(sva, "process kvarg");
> +
> + /* skip MAC filter configuration if mac address is not provided */
> + if (rte_kvargs_count(sva->kvargs, SFC_VDPA_MAC_ADDR) == 0) {
> + sfc_vdpa_warn(sva,
> + "MAC address is not provided, skipping MAC Filter
> Config");
> + return -1;
> + }
> +
> + rc = rte_kvargs_process(sva->kvargs, SFC_VDPA_MAC_ADDR,
> + &sfc_vdpa_get_eth_addr,
> + &ucast_eth_addr);
> + if (rc < 0)
> + return -1;
> +
> + /* create filters on the base queue */
> + qid = SFC_VDPA_GET_VI_INDEX(0);
> +
> + sfc_vdpa_log_init(sva, "insert broadcast mac filter");
> +
> + EFX_MAC_BROADCAST_ADDR_SET(bcast_eth_addr.addr_bytes);
> + spec = &sva->filters.spec[SFC_VDPA_BCAST_MAC_FILTER];
> +
> + rc = sfc_vdpa_set_mac_filter(nic,
> + spec, qid,
> + bcast_eth_addr.addr_bytes);
Can improve to use two lines as it won't exceed 80
> + if (rc != 0)
> + sfc_vdpa_err(ops_data->dev_handle,
> + "broadcast MAC filter insertion failed: %s",
> + rte_strerror(rc));
> + else
> + sva->filters.filter_cnt++;
> +
> + sfc_vdpa_log_init(sva, "insert unicast mac filter");
> + spec = &sva->filters.spec[SFC_VDPA_UCAST_MAC_FILTER];
> +
> + rc = sfc_vdpa_set_mac_filter(nic,
> + spec, qid,
> + ucast_eth_addr.addr_bytes);
Ditto.
> + if (rc != 0)
> + sfc_vdpa_err(sva,
> + "unicast MAC filter insertion failed: %s",
> + rte_strerror(rc));
> + else
> + sva->filters.filter_cnt++;
> +
> + sfc_vdpa_log_init(sva, "done");
> +
> + return rc;
> +}
> +
> +int sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data)
> +{
> + int i, rc = 0;
> + struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
> + efx_nic_t *nic;
> +
> + if (ops_data == NULL)
> + return -1;
You check this after you use the pointer to reference adapter.
One option is to remove the check as I don't think it will be NULL.
Thanks,
Chenbo
> +
> + nic = sva->nic;
> +
> + for (i = 0; i < sva->filters.filter_cnt; i++) {
> + rc = efx_filter_remove(nic, &(sva->filters.spec[i]));
> + if (rc != 0)
> + sfc_vdpa_err(sva,
> + "remove HW filter failed for entry %d: %s",
> + i, rte_strerror(rc));
> + }
> +
> + sva->filters.filter_cnt = 0;
> +
> + return rc;
> +}
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> index b473708..5307b03 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
> @@ -354,10 +354,20 @@
> goto fail_virtio_init;
> }
>
> + sfc_vdpa_log_init(sva, "init filter");
> + rc = efx_filter_init(enp);
> + if (rc != 0) {
> + sfc_vdpa_err(sva, "filter init failed: %s", rte_strerror(rc));
> + goto fail_filter_init;
> + }
> +
> sfc_vdpa_log_init(sva, "done");
>
> return 0;
>
> +fail_filter_init:
> + efx_virtio_fini(enp);
> +
> fail_virtio_init:
> efx_nic_fini(enp);
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index 774d73e..8551b65 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -426,6 +426,8 @@
>
> sfc_vdpa_disable_vfio_intr(ops_data);
>
> + sfc_vdpa_filter_remove(ops_data);
> +
> ops_data->state = SFC_VDPA_STATE_CONFIGURED;
> }
>
> @@ -465,12 +467,27 @@
> goto fail_vq_start;
> }
>
> + ops_data->vq_count = i;
> +
> + sfc_vdpa_log_init(ops_data->dev_handle,
> + "configure MAC filters");
> + rc = sfc_vdpa_filter_config(ops_data);
> + if (rc != 0) {
> + sfc_vdpa_err(ops_data->dev_handle,
> + "MAC filter config failed: %s",
> + rte_strerror(rc));
> + goto fail_filter_cfg;
> + }
> +
> ops_data->state = SFC_VDPA_STATE_STARTED;
>
> sfc_vdpa_log_init(ops_data->dev_handle, "done");
>
> return 0;
>
> +fail_filter_cfg:
> + /* remove already created filters */
> + sfc_vdpa_filter_remove(ops_data);
> fail_vq_start:
> /* stop already started virtqueues */
> for (j = 0; j < i; j++)
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 09/10] vdpa/sfc: add support to set vring state
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
` (7 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 8:18 ` Xia, Chenbo
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implements vDPA ops set_vring_state to configure vring state.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 54 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 8551b65..3430643 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -719,11 +719,57 @@
static int
sfc_vdpa_set_vring_state(int vid, int vring, int state)
{
- RTE_SET_USED(vid);
- RTE_SET_USED(vring);
- RTE_SET_USED(state);
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_vdpa_device *vdpa_dev;
+ efx_rc_t rc;
+ int vring_max;
+ void *dev;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ sfc_vdpa_info(dev,
+ "vDPA ops set_vring_state: vid: %d, vring: %d, state:%d",
+ vid, vring, state);
+
+ vring_max = (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ if (vring < 0 || vring > vring_max) {
+ sfc_vdpa_err(dev, "received invalid vring id : %d to set state",
+ vring);
+ return -1;
+ }
+
+ /*
+ * Skip if device is not yet started. virtqueues state can be
+ * changed once it is created and other configurations are done.
+ */
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return 0;
+
+ if (ops_data->vq_cxt[vring].enable == state)
+ return 0;
+
+ if (state == 0) {
+ rc = sfc_vdpa_virtq_stop(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue stop failed: %s",
+ rte_strerror(rc));
+ }
+ } else {
+ rc = sfc_vdpa_virtq_start(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue start failed: %s",
+ rte_strerror(rc));
+ }
+ }
+
+ return rc;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 09/10] vdpa/sfc: add support to set vring state
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
@ 2021-11-02 8:18 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 8:18 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 09/10] vdpa/sfc: add support to set vring state
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implements vDPA ops set_vring_state to configure vring state.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 54 ++++++++++++++++++++++++++++++++++++++--
> -
> 1 file changed, 50 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> index 8551b65..3430643 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
> @@ -719,11 +719,57 @@
> static int
> sfc_vdpa_set_vring_state(int vid, int vring, int state)
> {
> - RTE_SET_USED(vid);
> - RTE_SET_USED(vring);
> - RTE_SET_USED(state);
> + struct sfc_vdpa_ops_data *ops_data;
> + struct rte_vdpa_device *vdpa_dev;
> + efx_rc_t rc;
> + int vring_max;
> + void *dev;
>
> - return -1;
> + vdpa_dev = rte_vhost_get_vdpa_device(vid);
> +
> + ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
> + if (ops_data == NULL)
> + return -1;
> +
> + dev = ops_data->dev_handle;
> +
> + sfc_vdpa_info(dev,
> + "vDPA ops set_vring_state: vid: %d, vring: %d, state:%d",
> + vid, vring, state);
> +
> + vring_max = (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
> +
> + if (vring < 0 || vring > vring_max) {
> + sfc_vdpa_err(dev, "received invalid vring id : %d to set state",
> + vring);
> + return -1;
> + }
> +
> + /*
> + * Skip if device is not yet started. virtqueues state can be
> + * changed once it is created and other configurations are done.
> + */
> + if (ops_data->state != SFC_VDPA_STATE_STARTED)
> + return 0;
> +
> + if (ops_data->vq_cxt[vring].enable == state)
> + return 0;
> +
> + if (state == 0) {
> + rc = sfc_vdpa_virtq_stop(ops_data, vring);
> + if (rc != 0) {
> + sfc_vdpa_err(dev, "virtqueue stop failed: %s",
> + rte_strerror(rc));
> + }
> + } else {
> + rc = sfc_vdpa_virtq_start(ops_data, vring);
> + if (rc != 0) {
> + sfc_vdpa_err(dev, "virtqueue start failed: %s",
> + rte_strerror(rc));
> + }
> + }
> +
> + return rc;
> }
>
> static int
> --
> 1.8.3.1
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v3 10/10] vdpa/sfc: set a multicast filter during vDPA init
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
` (8 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
@ 2021-10-29 14:46 ` Vijay Srivastava
2021-11-02 8:18 ` Xia, Chenbo
9 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-10-29 14:46 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Insert unknown multicast filter to allow IPv6 neighbor discovery
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
drivers/vdpa/sfc/sfc_vdpa.h | 3 ++-
drivers/vdpa/sfc/sfc_vdpa_filter.c | 19 +++++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index dbd099f..bedc76c 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -21,7 +21,7 @@
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Broadcast & Unicast MAC filters are supported */
-#define SFC_MAX_SUPPORTED_FILTERS 2
+#define SFC_MAX_SUPPORTED_FILTERS 3
/*
* Get function-local index of the associated VI from the
@@ -32,6 +32,7 @@
enum sfc_vdpa_filter_type {
SFC_VDPA_BCAST_MAC_FILTER = 0,
SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_MCAST_DST_FILTER = 2,
SFC_VDPA_FILTER_NTYPE
};
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
index 03b6a5d..74204d3 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_filter.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -39,8 +39,12 @@
spec->efs_flags = EFX_FILTER_FLAG_RX;
spec->efs_dmaq_id = qid;
- rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
- eth_addr);
+ if (eth_addr == NULL)
+ rc = efx_filter_spec_set_mc_def(spec);
+ else
+ rc = efx_filter_spec_set_eth_local(spec,
+ EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
if (rc != 0)
return rc;
@@ -114,6 +118,17 @@ int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
else
sva->filters.filter_cnt++;
+ sfc_vdpa_log_init(sva, "insert unknown mcast filter");
+ spec = &sva->filters.spec[SFC_VDPA_MCAST_DST_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic, spec, qid, NULL);
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "mcast filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
sfc_vdpa_log_init(sva, "done");
return rc;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v3 10/10] vdpa/sfc: set a multicast filter during vDPA init
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
@ 2021-11-02 8:18 ` Xia, Chenbo
0 siblings, 0 replies; 122+ messages in thread
From: Xia, Chenbo @ 2021-11-02 8:18 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, andrew.rybchenko, Vijay Kumar Srivastava
> -----Original Message-----
> From: Vijay Srivastava <vijay.srivastava@xilinx.com>
> Sent: Friday, October 29, 2021 10:47 PM
> To: dev@dpdk.org
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> andrew.rybchenko@oktetlabs.ru; Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Subject: [PATCH v3 10/10] vdpa/sfc: set a multicast filter during vDPA init
>
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Insert unknown multicast filter to allow IPv6 neighbor discovery
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> drivers/vdpa/sfc/sfc_vdpa.h | 3 ++-
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 19 +++++++++++++++++--
> 2 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
> index dbd099f..bedc76c 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa.h
> +++ b/drivers/vdpa/sfc/sfc_vdpa.h
> @@ -21,7 +21,7 @@
> #define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
>
> /* Broadcast & Unicast MAC filters are supported */
> -#define SFC_MAX_SUPPORTED_FILTERS 2
> +#define SFC_MAX_SUPPORTED_FILTERS 3
>
> /*
> * Get function-local index of the associated VI from the
> @@ -32,6 +32,7 @@
> enum sfc_vdpa_filter_type {
> SFC_VDPA_BCAST_MAC_FILTER = 0,
> SFC_VDPA_UCAST_MAC_FILTER = 1,
> + SFC_VDPA_MCAST_DST_FILTER = 2,
> SFC_VDPA_FILTER_NTYPE
> };
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c
> b/drivers/vdpa/sfc/sfc_vdpa_filter.c
> index 03b6a5d..74204d3 100644
> --- a/drivers/vdpa/sfc/sfc_vdpa_filter.c
> +++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
> @@ -39,8 +39,12 @@
> spec->efs_flags = EFX_FILTER_FLAG_RX;
> spec->efs_dmaq_id = qid;
>
> - rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
> - eth_addr);
> + if (eth_addr == NULL)
> + rc = efx_filter_spec_set_mc_def(spec);
> + else
> + rc = efx_filter_spec_set_eth_local(spec,
> + EFX_FILTER_SPEC_VID_UNSPEC,
> + eth_addr);
> if (rc != 0)
> return rc;
>
> @@ -114,6 +118,17 @@ int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data
> *ops_data)
> else
> sva->filters.filter_cnt++;
>
> + sfc_vdpa_log_init(sva, "insert unknown mcast filter");
> + spec = &sva->filters.spec[SFC_VDPA_MCAST_DST_FILTER];
> +
> + rc = sfc_vdpa_set_mac_filter(nic, spec, qid, NULL);
> + if (rc != 0)
> + sfc_vdpa_err(sva,
> + "mcast filter insertion failed: %s",
> + rte_strerror(rc));
Can improve to use two lines.
With this fixed:
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
> + else
> + sva->filters.filter_cnt++;
> +
> sfc_vdpa_log_init(sva, "done");
>
> return rc;
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-07-06 16:44 [dpdk-dev] [PATCH 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (14 preceding siblings ...)
2021-10-29 14:46 ` [dpdk-dev] [PATCH v3 " Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
` (10 more replies)
15 siblings, 11 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Srivastava
This patch series introduces vDPA driver for Xilinx devices.
The Xilinx vDPA (vhost data path acceleration) provides
support for the Xilinx SN1022 SmartNICs.
Vijay Kumar Srivastava (10):
vdpa/sfc: introduce Xilinx vDPA driver
vdpa/sfc: add support for device initialization
vdpa/sfc: add support to get device and protocol features
vdpa/sfc: get device supported max queue count
vdpa/sfc: add support to get VFIO device fd
vdpa/sfc: add support for dev conf and dev close ops
vdpa/sfc: add support to get queue notify area info
vdpa/sfc: add support for MAC filter config
vdpa/sfc: add support to set vring state
vdpa/sfc: set a multicast filter during vDPA init
MAINTAINERS | 6 +
doc/guides/rel_notes/release_21_11.rst | 5 +
doc/guides/vdpadevs/features/sfc.ini | 19 +
doc/guides/vdpadevs/index.rst | 1 +
doc/guides/vdpadevs/sfc.rst | 107 ++++
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/version.map | 10 +
drivers/vdpa/meson.build | 1 +
drivers/vdpa/sfc/meson.build | 26 +
drivers/vdpa/sfc/sfc_vdpa.c | 363 +++++++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 162 ++++++
drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
drivers/vdpa/sfc/sfc_vdpa_filter.c | 150 ++++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 418 +++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 59 +++
drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 930 +++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.h | 67 +++
drivers/vdpa/sfc/version.map | 3 +
19 files changed, 2423 insertions(+), 1 deletion(-)
create mode 100644 doc/guides/vdpadevs/features/sfc.ini
create mode 100644 doc/guides/vdpadevs/sfc.rst
create mode 100644 drivers/vdpa/sfc/meson.build
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
create mode 100644 drivers/vdpa/sfc/version.map
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-04 9:28 ` Maxime Coquelin
` (4 more replies)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
` (9 subsequent siblings)
10 siblings, 5 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add new vDPA PMD to support vDPA operations of Xilinx devices.
This patch implements probe and remove functions.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Updated logging macros to remove redundant code.
v3:
* Replaced depreciated whitelist with allowlist.
* Text corrections in the sfc.rst and commit msg.
* Added sfc in the toctree of doc/guides/vdpadevs/index.rst.
* Removed extra compiler flags.
v4:
* Removed redundant NULL checks.
* Removed unused pci_addr from adapter structure.
* Updated format specifiers in log messages.
MAINTAINERS | 6 +
doc/guides/rel_notes/release_21_11.rst | 5 +
doc/guides/vdpadevs/features/sfc.ini | 9 ++
doc/guides/vdpadevs/index.rst | 1 +
doc/guides/vdpadevs/sfc.rst | 97 ++++++++++++
drivers/vdpa/meson.build | 1 +
drivers/vdpa/sfc/meson.build | 22 +++
drivers/vdpa/sfc/sfc_vdpa.c | 282 +++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 39 +++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 56 +++++++
drivers/vdpa/sfc/version.map | 3 +
11 files changed, 521 insertions(+)
create mode 100644 doc/guides/vdpadevs/features/sfc.ini
create mode 100644 doc/guides/vdpadevs/sfc.rst
create mode 100644 drivers/vdpa/sfc/meson.build
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
create mode 100644 drivers/vdpa/sfc/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index be2c9b6..5d12c49 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1236,6 +1236,12 @@ F: drivers/vdpa/mlx5/
F: doc/guides/vdpadevs/mlx5.rst
F: doc/guides/vdpadevs/features/mlx5.ini
+Xilinx sfc vDPA
+M: Vijay Kumar Srivastava <vsrivast@xilinx.com>
+F: drivers/vdpa/sfc/
+F: doc/guides/vdpadevs/sfc.rst
+F: doc/guides/vdpadevs/features/sfc.ini
+
Eventdev Drivers
----------------
diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index c68f122..0859b9b 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -324,6 +324,11 @@ New Features
with the capability for the application to configure the hash key, the
RETA and the hash types. Virtio hash reporting is yet to be added.
+* **Added new vDPA PMD based on Xilinx devices.**
+
+ Added a new Xilinx vDPA (``sfc_vdpa``) PMD.
+ See the :doc:`../vdpadevs/sfc` guide for more details on this driver.
+
Removed Items
-------------
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
new file mode 100644
index 0000000..71b6158
--- /dev/null
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'sfc' vDPA driver.
+;
+; Refer to default.ini for the full list of available driver features.
+;
+[Features]
+Linux = Y
+x86-64 = Y
+Usage doc = Y
diff --git a/doc/guides/vdpadevs/index.rst b/doc/guides/vdpadevs/index.rst
index 1a13efe..cc2f858 100644
--- a/doc/guides/vdpadevs/index.rst
+++ b/doc/guides/vdpadevs/index.rst
@@ -14,3 +14,4 @@ which can be used from an application through vhost API.
features_overview
ifc
mlx5
+ sfc
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
new file mode 100644
index 0000000..44e694f
--- /dev/null
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -0,0 +1,97 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright(c) 2021 Xilinx Corporation.
+
+Xilinx vDPA driver
+==================
+
+The Xilinx vDPA (vhost data path acceleration) driver (**librte_pmd_sfc_vdpa**)
+provides support for the Xilinx SN1022 SmartNICs family of 10/25/40/50/100 Gbps
+adapters that have support for latest Linux and FreeBSD operating systems.
+
+More information can be found at Xilinx website https://www.xilinx.com.
+
+
+Xilinx vDPA implementation
+--------------------------
+
+ef100 device can be configured in the net device or vDPA mode.
+Adding "class=vdpa" parameter helps to specify that this
+device is to be used in vDPA mode. If this parameter is not specified, device
+will be probed by net/sfc driver and will used as a net device.
+
+This PMD uses libefx (common/sfc_efx) code to access the device firmware.
+
+
+Supported NICs
+--------------
+
+- Xilinx SN1022 SmartNICs
+
+
+Features
+--------
+
+Features of the Xilinx vDPA driver are:
+
+- Compatibility with virtio 0.95 and 1.0
+
+
+Non-supported Features
+----------------------
+
+- Control Queue
+- Multi queue
+- Live Migration
+
+
+Prerequisites
+-------------
+
+Requires firmware version: v1.0.7.0 or higher
+
+Visit `Xilinx Support Downloads <https://www.xilinx.com/support.html>`_
+to get Xilinx Utilities with the latest firmware.
+Follow instructions from Alveo SN1000 SmartNICs User Guide to
+update firmware and configure the adapter.
+
+
+Per-Device Parameters
+~~~~~~~~~~~~~~~~~~~~~
+
+The following per-device parameters can be passed via EAL PCI device
+allowlist option like "-a 02:00.0,arg1=value1,...".
+
+Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify
+boolean parameters value.
+
+- ``class`` [net|vdpa] (default **net**)
+
+ Choose the mode of operation of ef100 device.
+ **net** device will work as network device and will be probed by net/sfc driver.
+ **vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
+ If this parameter is not specified then ef100 device will operate as network device.
+
+
+Dynamic Logging Parameters
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+One may leverage EAL option "--log-level" to change default levels
+for the log types supported by the driver. The option is used with
+an argument typically consisting of two parts separated by a colon.
+
+Level value is the last part which takes a symbolic name (or integer).
+Log type is the former part which may shell match syntax.
+Depending on the choice of the expression, the given log level may
+be used either for some specific log type or for a subset of types.
+
+SFC vDPA PMD provides the following log types available for control:
+
+- ``pmd.vdpa.sfc.driver`` (default level is **notice**)
+
+ Affects driver-wide messages unrelated to any particular devices.
+
+- ``pmd.vdpa.sfc.main`` (default level is **notice**)
+
+ Matches a subset of per-port log types registered during runtime.
+ A full name for a particular type may be obtained by appending a
+ dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
index f765fe3..77412c7 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -8,6 +8,7 @@ endif
drivers = [
'ifc',
'mlx5',
+ 'sfc',
]
std_deps = ['bus_pci', 'kvargs']
std_deps += ['vhost']
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
new file mode 100644
index 0000000..4255d65
--- /dev/null
+++ b/drivers/vdpa/sfc/meson.build
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Copyright(c) 2020-2021 Xilinx, Inc.
+
+if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+ build = false
+ reason = 'only supported on x86_64 and aarch64'
+endif
+
+fmt_name = 'sfc_vdpa'
+extra_flags = []
+
+foreach flag: extra_flags
+ if cc.has_argument(flag)
+ cflags += flag
+ endif
+endforeach
+
+deps += ['common_sfc_efx', 'bus_pci']
+sources = files(
+ 'sfc_vdpa.c',
+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
new file mode 100644
index 0000000..f087944
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -0,0 +1,282 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_string_fns.h>
+#include <rte_vfio.h>
+#include <rte_vhost.h>
+
+#include "efx.h"
+#include "sfc_efx.h"
+#include "sfc_vdpa.h"
+
+TAILQ_HEAD(sfc_vdpa_adapter_list_head, sfc_vdpa_adapter);
+static struct sfc_vdpa_adapter_list_head sfc_vdpa_adapter_list =
+ TAILQ_HEAD_INITIALIZER(sfc_vdpa_adapter_list);
+
+static pthread_mutex_t sfc_vdpa_adapter_list_lock = PTHREAD_MUTEX_INITIALIZER;
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (pdev == sva->pdev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva : NULL;
+}
+
+static int
+sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *dev = sva->pdev;
+ char dev_name[RTE_DEV_NAME_MAX_LEN] = {0};
+ int rc;
+
+ rte_pci_device_name(&dev->addr, dev_name, RTE_DEV_NAME_MAX_LEN);
+
+ sva->vfio_container_fd = rte_vfio_container_create();
+ if (sva->vfio_container_fd < 0) {
+ sfc_vdpa_err(sva, "failed to create VFIO container");
+ goto fail_container_create;
+ }
+
+ rc = rte_vfio_get_group_num(rte_pci_get_sysfs_path(), dev_name,
+ &sva->iommu_group_num);
+ if (rc <= 0) {
+ sfc_vdpa_err(sva, "failed to get IOMMU group for %s : %s",
+ dev_name, rte_strerror(-rc));
+ goto fail_get_group_num;
+ }
+
+ sva->vfio_group_fd =
+ rte_vfio_container_group_bind(sva->vfio_container_fd,
+ sva->iommu_group_num);
+ if (sva->vfio_group_fd < 0) {
+ sfc_vdpa_err(sva,
+ "failed to bind IOMMU group %d to container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ goto fail_group_bind;
+ }
+
+ if (rte_pci_map_device(dev) != 0) {
+ sfc_vdpa_err(sva, "failed to map PCI device %s : %s",
+ dev_name, rte_strerror(rte_errno));
+ goto fail_pci_map_device;
+ }
+
+ sva->vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle);
+
+ return 0;
+
+fail_pci_map_device:
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+fail_group_bind:
+fail_get_group_num:
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva, "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+
+fail_container_create:
+ return -1;
+}
+
+static void
+sfc_vdpa_vfio_teardown(struct sfc_vdpa_adapter *sva)
+{
+ rte_pci_unmap_device(sva->pdev);
+
+ if (rte_vfio_container_group_unbind(sva->vfio_container_fd,
+ sva->iommu_group_num) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to unbind IOMMU group %d from container %d",
+ sva->iommu_group_num, sva->vfio_container_fd);
+ }
+
+ if (rte_vfio_container_destroy(sva->vfio_container_fd) != 0) {
+ sfc_vdpa_err(sva,
+ "failed to destroy container %d",
+ sva->vfio_container_fd);
+ }
+}
+
+static int
+sfc_vdpa_set_log_prefix(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ int ret;
+
+ ret = snprintf(sva->log_prefix, sizeof(sva->log_prefix),
+ "PMD: sfc_vdpa " PCI_PRI_FMT " : ",
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+
+ if (ret < 0 || ret >= (int)sizeof(sva->log_prefix)) {
+ SFC_VDPA_GENERIC_LOG(ERR,
+ "reserved log prefix is too short for " PCI_PRI_FMT,
+ pci_dev->addr.domain, pci_dev->addr.bus,
+ pci_dev->addr.devid, pci_dev->addr.function);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str, uint32_t ll_default)
+{
+ size_t lt_prefix_str_size = strlen(lt_prefix_str);
+ size_t lt_str_size_max;
+ char *lt_str = NULL;
+ int ret;
+
+ if (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {
+ ++lt_prefix_str_size; /* Reserve space for prefix separator */
+ lt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;
+ } else {
+ return RTE_LOGTYPE_PMD;
+ }
+
+ lt_str = rte_zmalloc("logtype_str", lt_str_size_max, 0);
+ if (lt_str == NULL)
+ return RTE_LOGTYPE_PMD;
+
+ strncpy(lt_str, lt_prefix_str, lt_prefix_str_size);
+ lt_str[lt_prefix_str_size - 1] = '.';
+ rte_pci_device_name(pci_addr, lt_str + lt_prefix_str_size,
+ lt_str_size_max - lt_prefix_str_size);
+ lt_str[lt_str_size_max - 1] = '\0';
+
+ ret = rte_log_register_type_and_pick_level(lt_str, ll_default);
+ rte_free(lt_str);
+
+ return ret < 0 ? RTE_LOGTYPE_PMD : ret;
+}
+
+static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
+ { RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
+ { .vendor_id = 0, /* sentinel */ },
+};
+
+static int
+sfc_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+ uint32_t logtype_main;
+ int ret = 0;
+
+ if (sfc_efx_dev_class_get(pci_dev->device.devargs) !=
+ SFC_EFX_DEV_CLASS_VDPA) {
+ SFC_VDPA_GENERIC_LOG(INFO,
+ "Incompatible device class: skip probing, should be probed by other sfc driver.");
+ return 1;
+ }
+
+ /*
+ * It will not be probed in the secondary process. As device class
+ * is vdpa so return 0 to avoid probe by other sfc driver
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ logtype_main = sfc_vdpa_register_logtype(&pci_dev->addr,
+ SFC_VDPA_LOGTYPE_MAIN_STR,
+ RTE_LOG_NOTICE);
+
+ sva = rte_zmalloc("sfc_vdpa", sizeof(struct sfc_vdpa_adapter), 0);
+ if (sva == NULL)
+ goto fail_zmalloc;
+
+ sva->pdev = pci_dev;
+ sva->logtype_main = logtype_main;
+
+ ret = sfc_vdpa_set_log_prefix(sva);
+ if (ret != 0)
+ goto fail_set_log_prefix;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "vfio init");
+ if (sfc_vdpa_vfio_setup(sva) < 0) {
+ sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
+ goto fail_vfio_setup;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_vfio_setup:
+fail_set_log_prefix:
+ rte_free(sva);
+
+fail_zmalloc:
+ return -1;
+}
+
+static int
+sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev)
+{
+ struct sfc_vdpa_adapter *sva = NULL;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -1;
+
+ sva = sfc_vdpa_get_adapter_by_dev(pci_dev);
+ if (sva == NULL) {
+ sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name);
+ return -1;
+ }
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+ TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ sfc_vdpa_vfio_teardown(sva);
+
+ rte_free(sva);
+
+ return 0;
+}
+
+static struct rte_pci_driver rte_sfc_vdpa = {
+ .id_table = pci_id_sfc_vdpa_efx_map,
+ .drv_flags = 0,
+ .probe = sfc_vdpa_pci_probe,
+ .remove = sfc_vdpa_pci_remove,
+};
+
+RTE_PMD_REGISTER_PCI(net_sfc_vdpa, rte_sfc_vdpa);
+RTE_PMD_REGISTER_PCI_TABLE(net_sfc_vdpa, pci_id_sfc_vdpa_efx_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_sfc_vdpa, "* vfio-pci");
+RTE_LOG_REGISTER_SUFFIX(sfc_vdpa_logtype_driver, driver, NOTICE);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
new file mode 100644
index 0000000..2ae9ec3
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_H
+#define _SFC_VDPA_H
+
+#include <stdint.h>
+#include <sys/queue.h>
+
+#include <rte_bus_pci.h>
+
+#include "sfc_vdpa_log.h"
+
+/* Adapter private data */
+struct sfc_vdpa_adapter {
+ TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ struct rte_pci_device *pdev;
+
+ char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
+ uint32_t logtype_main;
+
+ int vfio_group_fd;
+ int vfio_dev_fd;
+ int vfio_container_fd;
+ int iommu_group_num;
+};
+
+uint32_t
+sfc_vdpa_register_logtype(const struct rte_pci_addr *pci_addr,
+ const char *lt_prefix_str,
+ uint32_t ll_default);
+
+struct sfc_vdpa_adapter *
+sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+
+#endif /* _SFC_VDPA_H */
+
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
new file mode 100644
index 0000000..858e5ee
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_LOG_H_
+#define _SFC_VDPA_LOG_H_
+
+/** Generic driver log type */
+extern int sfc_vdpa_logtype_driver;
+
+/** Common log type name prefix */
+#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
+
+/** Log PMD generic message, add a prefix and a line break */
+#define SFC_VDPA_GENERIC_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver, \
+ RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+/** Name prefix for the per-device log type used to report basic information */
+#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+
+#define SFC_VDPA_LOG_PREFIX_MAX 32
+
+/* Log PMD message, automatically add prefix and \n */
+#define SFC_VDPA_LOG(sva, level, ...) \
+ do { \
+ const struct sfc_vdpa_adapter *_sva = (sva); \
+ \
+ rte_log(RTE_LOG_ ## level, _sva->logtype_main, \
+ RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ _sva->log_prefix, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+ } while (0)
+
+#define sfc_vdpa_err(sva, ...) \
+ SFC_VDPA_LOG(sva, ERR, __VA_ARGS__)
+
+#define sfc_vdpa_warn(sva, ...) \
+ SFC_VDPA_LOG(sva, WARNING, __VA_ARGS__)
+
+#define sfc_vdpa_notice(sva, ...) \
+ SFC_VDPA_LOG(sva, NOTICE, __VA_ARGS__)
+
+#define sfc_vdpa_info(sva, ...) \
+ SFC_VDPA_LOG(sva, INFO, __VA_ARGS__)
+
+#define sfc_vdpa_log_init(sva, ...) \
+ SFC_VDPA_LOG(sva, INFO, \
+ RTE_FMT("%s(): " \
+ RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
+
+#endif /* _SFC_VDPA_LOG_H_ */
diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
new file mode 100644
index 0000000..4a76d1d
--- /dev/null
+++ b/drivers/vdpa/sfc/version.map
@@ -0,0 +1,3 @@
+DPDK_21 {
+ local: *;
+};
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
@ 2021-11-04 9:28 ` Maxime Coquelin
2021-11-05 9:01 ` Ferruh Yigit
` (3 subsequent siblings)
4 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-04 9:28 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/21 14:57, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add new vDPA PMD to support vDPA operations of Xilinx devices.
> This patch implements probe and remove functions.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Updated logging macros to remove redundant code.
>
> v3:
> * Replaced depreciated whitelist with allowlist.
> * Text corrections in the sfc.rst and commit msg.
> * Added sfc in the toctree of doc/guides/vdpadevs/index.rst.
> * Removed extra compiler flags.
>
> v4:
> * Removed redundant NULL checks.
> * Removed unused pci_addr from adapter structure.
> * Updated format specifiers in log messages.
>
> MAINTAINERS | 6 +
> doc/guides/rel_notes/release_21_11.rst | 5 +
> doc/guides/vdpadevs/features/sfc.ini | 9 ++
> doc/guides/vdpadevs/index.rst | 1 +
> doc/guides/vdpadevs/sfc.rst | 97 ++++++++++++
> drivers/vdpa/meson.build | 1 +
> drivers/vdpa/sfc/meson.build | 22 +++
> drivers/vdpa/sfc/sfc_vdpa.c | 282 +++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 39 +++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 56 +++++++
> drivers/vdpa/sfc/version.map | 3 +
> 11 files changed, 521 insertions(+)
> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
> create mode 100644 doc/guides/vdpadevs/sfc.rst
> create mode 100644 drivers/vdpa/sfc/meson.build
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
> create mode 100644 drivers/vdpa/sfc/version.map
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
2021-11-04 9:28 ` Maxime Coquelin
@ 2021-11-05 9:01 ` Ferruh Yigit
2021-11-05 9:03 ` Maxime Coquelin
2021-11-05 9:13 ` Ferruh Yigit
` (2 subsequent siblings)
4 siblings, 1 reply; 122+ messages in thread
From: Ferruh Yigit @ 2021-11-05 9:01 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
> diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
> new file mode 100644
> index 0000000..4a76d1d
> --- /dev/null
> +++ b/drivers/vdpa/sfc/version.map
> @@ -0,0 +1,3 @@
> +DPDK_21 {
> + local: *;
> +};
It is DPDK_22 now
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-05 9:01 ` Ferruh Yigit
@ 2021-11-05 9:03 ` Maxime Coquelin
2021-11-05 9:09 ` Ferruh Yigit
0 siblings, 1 reply; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-05 9:03 UTC (permalink / raw)
To: Ferruh Yigit, Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/5/21 10:01, Ferruh Yigit wrote:
> On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
>> diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
>> new file mode 100644
>> index 0000000..4a76d1d
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/version.map
>> @@ -0,0 +1,3 @@
>> +DPDK_21 {
>> + local: *;
>> +};
>
> It is DPDK_22 now
>
Good catch, I missed it.
Should I fixup in my branch or you take care of it?
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-05 9:03 ` Maxime Coquelin
@ 2021-11-05 9:09 ` Ferruh Yigit
0 siblings, 0 replies; 122+ messages in thread
From: Ferruh Yigit @ 2021-11-05 9:09 UTC (permalink / raw)
To: Maxime Coquelin, Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/5/2021 9:03 AM, Maxime Coquelin wrote:
>
>
> On 11/5/21 10:01, Ferruh Yigit wrote:
>> On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
>>> diff --git a/drivers/vdpa/sfc/version.map b/drivers/vdpa/sfc/version.map
>>> new file mode 100644
>>> index 0000000..4a76d1d
>>> --- /dev/null
>>> +++ b/drivers/vdpa/sfc/version.map
>>> @@ -0,0 +1,3 @@
>>> +DPDK_21 {
>>> + local: *;
>>> +};
>>
>> It is DPDK_22 now
>>
>
> Good catch, I missed it.
> Should I fixup in my branch or you take care of it?
>
If it is just this, or similar a few small issues, I can fix in next-net.
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
2021-11-04 9:28 ` Maxime Coquelin
2021-11-05 9:01 ` Ferruh Yigit
@ 2021-11-05 9:13 ` Ferruh Yigit
2021-11-05 9:28 ` Andrew Rybchenko
2021-11-05 9:42 ` Ferruh Yigit
2021-11-05 10:07 ` Ferruh Yigit
4 siblings, 1 reply; 122+ messages in thread
From: Ferruh Yigit @ 2021-11-05 9:13 UTC (permalink / raw)
To: Vijay Srivastava, dev, Hemant Agrawal
Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
> new file mode 100644
> index 0000000..f087944
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> @@ -0,0 +1,282 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
Only sfc has that blank line between SPDX tag and Copyright,
is it intentional?
+Hemant, not sure if we enforce any specific syntax?
If there is no specific reason, I think better to have common syntax,
that helps to scripts etc..
It may be noise to update existing code, but we can fix it in
new code.
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-05 9:13 ` Ferruh Yigit
@ 2021-11-05 9:28 ` Andrew Rybchenko
2021-11-05 9:40 ` Ferruh Yigit
0 siblings, 1 reply; 122+ messages in thread
From: Andrew Rybchenko @ 2021-11-05 9:28 UTC (permalink / raw)
To: Ferruh Yigit, Vijay Srivastava, dev, Hemant Agrawal
Cc: maxime.coquelin, chenbo.xia, Vijay Kumar Srivastava
On 11/5/21 12:13 PM, Ferruh Yigit wrote:
> On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
>> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
>> new file mode 100644
>> index 0000000..f087944
>> --- /dev/null
>> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
>> @@ -0,0 +1,282 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + *
>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>> + */
>> +
>
> Only sfc has that blank line between SPDX tag and Copyright,
> is it intentional?
As far as I remember it is not intentional. Just coincident
and may be definitely fixed in vdpa/sfc.
>
> +Hemant, not sure if we enforce any specific syntax?
>
>
> If there is no specific reason, I think better to have common syntax,
> that helps to scripts etc..
> It may be noise to update existing code, but we can fix it in
> new code.
+1
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-05 9:28 ` Andrew Rybchenko
@ 2021-11-05 9:40 ` Ferruh Yigit
2021-11-08 9:34 ` Hemant Agrawal
0 siblings, 1 reply; 122+ messages in thread
From: Ferruh Yigit @ 2021-11-05 9:40 UTC (permalink / raw)
To: Andrew Rybchenko, Vijay Srivastava, dev, Hemant Agrawal
Cc: maxime.coquelin, chenbo.xia, Vijay Kumar Srivastava
On 11/5/2021 9:28 AM, Andrew Rybchenko wrote:
> On 11/5/21 12:13 PM, Ferruh Yigit wrote:
>> On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
>>> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
>>> new file mode 100644
>>> index 0000000..f087944
>>> --- /dev/null
>>> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
>>> @@ -0,0 +1,282 @@
>>> +/* SPDX-License-Identifier: BSD-3-Clause
>>> + *
>>> + * Copyright(c) 2020-2021 Xilinx, Inc.
>>> + */
>>> +
>>
>> Only sfc has that blank line between SPDX tag and Copyright,
>> is it intentional?
>
> As far as I remember it is not intentional. Just coincident
> and may be definitely fixed in vdpa/sfc.
>
>>
>> +Hemant, not sure if we enforce any specific syntax?
>>
>>
>> If there is no specific reason, I think better to have common syntax,
>> that helps to scripts etc..
>> It may be noise to update existing code, but we can fix it in
>> new code.
>
> +1
>
If there is not objection, I will remove that empty lines in this set,
while merging next-net.
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-05 9:40 ` Ferruh Yigit
@ 2021-11-08 9:34 ` Hemant Agrawal
0 siblings, 0 replies; 122+ messages in thread
From: Hemant Agrawal @ 2021-11-08 9:34 UTC (permalink / raw)
To: Ferruh Yigit, Andrew Rybchenko, Vijay Srivastava, dev
Cc: maxime.coquelin, chenbo.xia, Vijay Kumar Srivastava
> On 11/5/2021 9:28 AM, Andrew Rybchenko wrote:
> > On 11/5/21 12:13 PM, Ferruh Yigit wrote:
> >> On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
> >>> diff --git a/drivers/vdpa/sfc/sfc_vdpa.c
> >>> b/drivers/vdpa/sfc/sfc_vdpa.c new file mode 100644 index
> >>> 0000000..f087944
> >>> --- /dev/null
> >>> +++ b/drivers/vdpa/sfc/sfc_vdpa.c
> >>> @@ -0,0 +1,282 @@
> >>> +/* SPDX-License-Identifier: BSD-3-Clause
> >>> + *
> >>> + * Copyright(c) 2020-2021 Xilinx, Inc.
> >>> + */
> >>> +
> >>
> >> Only sfc has that blank line between SPDX tag and Copyright, is it
> >> intentional?
> >
> > As far as I remember it is not intentional. Just coincident and may be
> > definitely fixed in vdpa/sfc.
> >
> >>
> >> +Hemant, not sure if we enforce any specific syntax?
> >>
> >>
> >> If there is no specific reason, I think better to have common syntax,
> >> that helps to scripts etc..
> >> It may be noise to update existing code, but we can fix it in new
> >> code.
> >
> > +1
> >
>
> If there is not objection, I will remove that empty lines in this set, while
> merging next-net.
[Hemant] I saw it late.
There is no restrictions to have blank lines between copyright and SPDX. But it looks clean without that.
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
` (2 preceding siblings ...)
2021-11-05 9:13 ` Ferruh Yigit
@ 2021-11-05 9:42 ` Ferruh Yigit
2021-11-05 10:07 ` Ferruh Yigit
4 siblings, 0 replies; 122+ messages in thread
From: Ferruh Yigit @ 2021-11-05 9:42 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> new file mode 100644
> index 0000000..4255d65
> --- /dev/null
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -0,0 +1,22 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +#
> +# Copyright(c) 2020-2021 Xilinx, Inc.
> +
> +if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
This line is too long, I will break second part after 'and' to
next line in next-net.
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 01/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
` (3 preceding siblings ...)
2021-11-05 9:42 ` Ferruh Yigit
@ 2021-11-05 10:07 ` Ferruh Yigit
4 siblings, 0 replies; 122+ messages in thread
From: Ferruh Yigit @ 2021-11-05 10:07 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/2021 1:57 PM, Vijay Srivastava wrote:
> diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
> new file mode 100644
> index 0000000..4255d65
> --- /dev/null
> +++ b/drivers/vdpa/sfc/meson.build
> @@ -0,0 +1,22 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +#
> +# Copyright(c) 2020-2021 Xilinx, Inc.
> +
> +if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
> + build = false
> + reason = 'only supported on x86_64 and aarch64'
> +endif
> +
> +fmt_name = 'sfc_vdpa'
> +extra_flags = []
> +
> +foreach flag: extra_flags
> + if cc.has_argument(flag)
> + cflags += flag
> + endif
> +endforeach
> +
> +deps += ['common_sfc_efx', 'bus_pci']
> +sources = files(
> + 'sfc_vdpa.c',
> +)
'./devtools/check-meson.py' is failing [1], I guess it is because
of whitespace space vs tab, will fix in next-net.
[1]
$ ./devtools/check-meson.py
Error parsing drivers/vdpa/sfc/meson.build:5, got some tabulation
Error parsing drivers/vdpa/sfc/meson.build:6, got some tabulation
Error parsing drivers/vdpa/sfc/meson.build:13, got some tabulation
Error parsing drivers/vdpa/sfc/meson.build:14, got some tabulation
Error parsing drivers/vdpa/sfc/meson.build:15, got some tabulation
Error parsing drivers/vdpa/sfc/meson.build:20, got some tabulation
Error: Incorrect indent at drivers/vdpa/sfc/meson.build:21
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v4 02/10] vdpa/sfc: add support for device initialization
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-04 9:54 ` Maxime Coquelin
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
` (8 subsequent siblings)
10 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add HW initialization and vDPA device registration support.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Used rte_memzone_reserve_aligned for mcdi buffer allocation.
* Freeing mcdi buff when DMA map fails.
* Fixed one typo.
v4:
* Removed unused enum fields.
* Updated format specifiers in log messages.
* Changed do/while loop used during mcdi buffer mapping into for() loop.
doc/guides/vdpadevs/sfc.rst | 6 +
drivers/vdpa/sfc/meson.build | 3 +
drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 326 ++++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_ops.h | 34 ++++
10 files changed, 667 insertions(+), 1 deletion(-)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index 44e694f..d06c427 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -95,3 +95,9 @@ SFC vDPA PMD provides the following log types available for control:
Matches a subset of per-port log types registered during runtime.
A full name for a particular type may be obtained by appending a
dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.
+
+- ``pmd.vdpa.sfc.mcdi`` (default level is **notice**)
+
+ Extra logging of the communication with the NIC's management CPU.
+ The format of the log is consumed by the netlogdecode cross-platform
+ tool. May be managed per-port, as explained above.
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index 4255d65..dc333de 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -19,4 +19,7 @@ endforeach
deps += ['common_sfc_efx', 'bus_pci']
sources = files(
'sfc_vdpa.c',
+ 'sfc_vdpa_hw.c',
+ 'sfc_vdpa_mcdi.c',
+ 'sfc_vdpa_ops.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index f087944..da75ba6 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -228,6 +228,19 @@ struct sfc_vdpa_adapter *
goto fail_vfio_setup;
}
+ sfc_vdpa_log_init(sva, "hw init");
+ if (sfc_vdpa_hw_init(sva) != 0) {
+ sfc_vdpa_err(sva, "failed to init HW %s", pci_dev->name);
+ goto fail_hw_init;
+ }
+
+ sfc_vdpa_log_init(sva, "dev init");
+ sva->ops_data = sfc_vdpa_device_init(sva, SFC_VDPA_AS_VF);
+ if (sva->ops_data == NULL) {
+ sfc_vdpa_err(sva, "failed vDPA dev init %s", pci_dev->name);
+ goto fail_dev_init;
+ }
+
pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
TAILQ_INSERT_TAIL(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
@@ -236,6 +249,12 @@ struct sfc_vdpa_adapter *
return 0;
+fail_dev_init:
+ sfc_vdpa_hw_fini(sva);
+
+fail_hw_init:
+ sfc_vdpa_vfio_teardown(sva);
+
fail_vfio_setup:
fail_set_log_prefix:
rte_free(sva);
@@ -262,6 +281,10 @@ struct sfc_vdpa_adapter *
TAILQ_REMOVE(&sfc_vdpa_adapter_list, sva, next);
pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+ sfc_vdpa_device_fini(sva->ops_data);
+
+ sfc_vdpa_hw_fini(sva);
+
sfc_vdpa_vfio_teardown(sva);
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 2ae9ec3..bd3c437 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -11,13 +11,37 @@
#include <rte_bus_pci.h>
+#include "sfc_efx.h"
+#include "sfc_efx_mcdi.h"
+#include "sfc_vdpa_debug.h"
#include "sfc_vdpa_log.h"
+#include "sfc_vdpa_ops.h"
+
+#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
+ /*
+ * PMD setup and configuration is not thread safe. Since it is not
+ * performance sensitive, it is better to guarantee thread-safety
+ * and add device level lock. vDPA control operations which
+ * change its state should acquire the lock.
+ */
+ rte_spinlock_t lock;
struct rte_pci_device *pdev;
+ efx_family_t family;
+ efx_nic_t *nic;
+ rte_spinlock_t nic_lock;
+
+ efsys_bar_t mem_bar;
+
+ struct sfc_efx_mcdi mcdi;
+ size_t mcdi_buff_size;
+
+ uint32_t max_queue_count;
+
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
@@ -25,6 +49,7 @@ struct sfc_vdpa_adapter {
int vfio_dev_fd;
int vfio_container_fd;
int iommu_group_num;
+ struct sfc_vdpa_ops_data *ops_data;
};
uint32_t
@@ -35,5 +60,27 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
-#endif /* _SFC_VDPA_H */
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva);
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva);
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva);
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp);
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+
+static inline struct sfc_vdpa_adapter *
+sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
+{
+ return (struct sfc_vdpa_adapter *)dev_handle;
+}
+
+#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_debug.h b/drivers/vdpa/sfc/sfc_vdpa_debug.h
new file mode 100644
index 0000000..cfa8cc5
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_debug.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_DEBUG_H_
+#define _SFC_VDPA_DEBUG_H_
+
+#include <rte_debug.h>
+
+#ifdef RTE_LIBRTE_SFC_VDPA_DEBUG
+/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
+ * in the driver only.
+ */
+#define SFC_VDPA_ASSERT(exp) RTE_VERIFY(exp)
+#else
+/* If the driver debug is not enabled, follow DPDK debug/non-debug */
+#define SFC_VDPA_ASSERT(exp) RTE_ASSERT(exp)
+#endif
+
+#endif /* _SFC_VDPA_DEBUG_H_ */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
new file mode 100644
index 0000000..dfb6d4f
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -0,0 +1,326 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <unistd.h>
+
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_vfio.h>
+
+#include "efx.h"
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_ops.h"
+
+extern uint32_t sfc_logtype_driver;
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
+#endif
+
+int
+sfc_vdpa_dma_alloc(struct sfc_vdpa_adapter *sva, const char *name,
+ size_t len, efsys_mem_t *esmp)
+{
+ uint64_t mcdi_iova;
+ size_t mcdi_buff_size;
+ const struct rte_memzone *mz = NULL;
+ int numa_node = sva->pdev->device.numa_node;
+ int ret;
+
+ mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
+
+ sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
+
+ mz = rte_memzone_reserve_aligned(name, mcdi_buff_size,
+ numa_node,
+ RTE_MEMZONE_IOVA_CONTIG,
+ PAGE_SIZE);
+ if (mz == NULL) {
+ sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
+ name, (unsigned int)len, rte_strerror(rte_errno));
+ return -ENOMEM;
+ }
+
+ /* IOVA address for MCDI would be re-calculated if mapping
+ * using default IOVA would fail.
+ * TODO: Earlier there was no way to get valid IOVA range.
+ * Recently a patch has been submitted to get the IOVA range
+ * using ioctl. VFIO_IOMMU_GET_INFO. This patch is available
+ * in the kernel version >= 5.4. Support to get the default
+ * IOVA address for MCDI buffer using available IOVA range
+ * would be added later. Meanwhile default IOVA for MCDI buffer
+ * is kept at high mem at 2TB. In case of overlap new available
+ * addresses would be searched and same would be used.
+ */
+ mcdi_iova = SFC_VDPA_DEFAULT_MCDI_IOVA;
+
+ for (;;) {
+ ret = rte_vfio_container_dma_map(sva->vfio_container_fd,
+ (uint64_t)mz->addr, mcdi_iova,
+ mcdi_buff_size);
+ if (ret == 0)
+ break;
+
+ mcdi_iova = mcdi_iova >> 1;
+ if (mcdi_iova < mcdi_buff_size) {
+ sfc_vdpa_err(sva,
+ "DMA mapping failed for MCDI : %s",
+ rte_strerror(rte_errno));
+ rte_memzone_free(mz);
+ return ret;
+ }
+ }
+
+ esmp->esm_addr = mcdi_iova;
+ esmp->esm_base = mz->addr;
+ sva->mcdi_buff_size = mcdi_buff_size;
+
+ sfc_vdpa_info(sva,
+ "DMA name=%s len=%zu => virt=%p iova=0x%" PRIx64,
+ name, len, esmp->esm_base, esmp->esm_addr);
+
+ return 0;
+}
+
+void
+sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp)
+{
+ int ret;
+
+ sfc_vdpa_log_init(sva, "name=%s", esmp->esm_mz->name);
+
+ ret = rte_vfio_container_dma_unmap(sva->vfio_container_fd,
+ (uint64_t)esmp->esm_base,
+ esmp->esm_addr, sva->mcdi_buff_size);
+ if (ret < 0)
+ sfc_vdpa_err(sva, "DMA unmap failed for MCDI : %s",
+ rte_strerror(rte_errno));
+
+ sfc_vdpa_info(sva,
+ "DMA free name=%s => virt=%p iova=0x%" PRIx64,
+ esmp->esm_mz->name, esmp->esm_base, esmp->esm_addr);
+
+ rte_free((void *)(esmp->esm_base));
+
+ sva->mcdi_buff_size = 0;
+ memset(esmp, 0, sizeof(*esmp));
+}
+
+static int
+sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
+ const efx_bar_region_t *mem_ebrp)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ efsys_bar_t *ebp = &sva->mem_bar;
+ struct rte_mem_resource *res =
+ &pci_dev->mem_resource[mem_ebrp->ebr_index];
+
+ SFC_BAR_LOCK_INIT(ebp, pci_dev->name);
+ ebp->esb_rid = mem_ebrp->ebr_index;
+ ebp->esb_dev = pci_dev;
+ ebp->esb_base = res->addr;
+
+ return 0;
+}
+
+static void
+sfc_vdpa_mem_bar_fini(struct sfc_vdpa_adapter *sva)
+{
+ efsys_bar_t *ebp = &sva->mem_bar;
+
+ SFC_BAR_LOCK_DESTROY(ebp);
+ memset(ebp, 0, sizeof(*ebp));
+}
+
+static int
+sfc_vdpa_nic_probe(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+ int rc;
+
+ rc = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE);
+ if (rc != 0)
+ sfc_vdpa_err(sva, "nic probe failed: %s", rte_strerror(rc));
+
+ return rc;
+}
+
+static int
+sfc_vdpa_estimate_resource_limits(struct sfc_vdpa_adapter *sva)
+{
+ efx_drv_limits_t limits;
+ int rc;
+ uint32_t evq_allocated;
+ uint32_t rxq_allocated;
+ uint32_t txq_allocated;
+ uint32_t max_queue_cnt;
+
+ memset(&limits, 0, sizeof(limits));
+
+ /* Request at least one Rx and Tx queue */
+ limits.edl_min_rxq_count = 1;
+ limits.edl_min_txq_count = 1;
+ /* Management event queue plus event queue for Tx/Rx queue */
+ limits.edl_min_evq_count =
+ 1 + RTE_MAX(limits.edl_min_rxq_count, limits.edl_min_txq_count);
+
+ limits.edl_max_rxq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_txq_count = SFC_VDPA_MAX_QUEUE_PAIRS;
+ limits.edl_max_evq_count = 1 + SFC_VDPA_MAX_QUEUE_PAIRS;
+
+ SFC_VDPA_ASSERT(limits.edl_max_evq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_rxq_count >= limits.edl_min_rxq_count);
+ SFC_VDPA_ASSERT(limits.edl_max_txq_count >= limits.edl_min_rxq_count);
+
+ /* Configure the minimum required resources needed for the
+ * driver to operate, and the maximum desired resources that the
+ * driver is capable of using.
+ */
+ sfc_vdpa_log_init(sva, "set drv limit");
+ efx_nic_set_drv_limits(sva->nic, &limits);
+
+ sfc_vdpa_log_init(sva, "init nic");
+ rc = efx_nic_init(sva->nic);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic init failed: %s", rte_strerror(rc));
+ goto fail_nic_init;
+ }
+
+ /* Find resource dimensions assigned by firmware to this function */
+ rc = efx_nic_get_vi_pool(sva->nic, &evq_allocated, &rxq_allocated,
+ &txq_allocated);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "vi pool get failed: %s", rte_strerror(rc));
+ goto fail_get_vi_pool;
+ }
+
+ /* It still may allocate more than maximum, ensure limit */
+ evq_allocated = RTE_MIN(evq_allocated, limits.edl_max_evq_count);
+ rxq_allocated = RTE_MIN(rxq_allocated, limits.edl_max_rxq_count);
+ txq_allocated = RTE_MIN(txq_allocated, limits.edl_max_txq_count);
+
+
+ max_queue_cnt = RTE_MIN(rxq_allocated, txq_allocated);
+ /* Subtract management EVQ not used for traffic */
+ max_queue_cnt = RTE_MIN(evq_allocated - 1, max_queue_cnt);
+
+ SFC_VDPA_ASSERT(max_queue_cnt > 0);
+
+ sva->max_queue_count = max_queue_cnt;
+
+ return 0;
+
+fail_get_vi_pool:
+ efx_nic_fini(sva->nic);
+fail_nic_init:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+int
+sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva)
+{
+ efx_bar_region_t mem_ebr;
+ efx_nic_t *enp;
+ int rc;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "get family");
+ rc = sfc_efx_family(sva->pdev, &mem_ebr, &sva->family);
+ if (rc != 0)
+ goto fail_family;
+ sfc_vdpa_log_init(sva,
+ "family is %u, membar is %d,"
+ "function control window offset is %#" PRIx64,
+ sva->family, mem_ebr.ebr_index, mem_ebr.ebr_offset);
+
+ sfc_vdpa_log_init(sva, "init mem bar");
+ rc = sfc_vdpa_mem_bar_init(sva, &mem_ebr);
+ if (rc != 0)
+ goto fail_mem_bar_init;
+
+ sfc_vdpa_log_init(sva, "create nic");
+ rte_spinlock_init(&sva->nic_lock);
+ rc = efx_nic_create(sva->family, (efsys_identifier_t *)sva,
+ &sva->mem_bar, mem_ebr.ebr_offset,
+ &sva->nic_lock, &enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic create failed: %s", rte_strerror(rc));
+ goto fail_nic_create;
+ }
+ sva->nic = enp;
+
+ sfc_vdpa_log_init(sva, "init mcdi");
+ rc = sfc_vdpa_mcdi_init(sva);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "mcdi init failed: %s", rte_strerror(rc));
+ goto fail_mcdi_init;
+ }
+
+ sfc_vdpa_log_init(sva, "probe nic");
+ rc = sfc_vdpa_nic_probe(sva);
+ if (rc != 0)
+ goto fail_nic_probe;
+
+ sfc_vdpa_log_init(sva, "reset nic");
+ rc = efx_nic_reset(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "nic reset failed: %s", rte_strerror(rc));
+ goto fail_nic_reset;
+ }
+
+ sfc_vdpa_log_init(sva, "estimate resource limits");
+ rc = sfc_vdpa_estimate_resource_limits(sva);
+ if (rc != 0)
+ goto fail_estimate_rsrc_limits;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return 0;
+
+fail_estimate_rsrc_limits:
+fail_nic_reset:
+ efx_nic_unprobe(enp);
+
+fail_nic_probe:
+ sfc_vdpa_mcdi_fini(sva);
+
+fail_mcdi_init:
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+fail_nic_create:
+ sfc_vdpa_mem_bar_fini(sva);
+
+fail_mem_bar_init:
+fail_family:
+ sfc_vdpa_log_init(sva, "failed: %s", rte_strerror(rc));
+ return rc;
+}
+
+void
+sfc_vdpa_hw_fini(struct sfc_vdpa_adapter *sva)
+{
+ efx_nic_t *enp = sva->nic;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ sfc_vdpa_log_init(sva, "unprobe nic");
+ efx_nic_unprobe(enp);
+
+ sfc_vdpa_log_init(sva, "mcdi fini");
+ sfc_vdpa_mcdi_fini(sva);
+
+ sfc_vdpa_log_init(sva, "nic fini");
+ efx_nic_fini(enp);
+
+ sfc_vdpa_log_init(sva, "destroy nic");
+ sva->nic = NULL;
+ efx_nic_destroy(enp);
+
+ sfc_vdpa_mem_bar_fini(sva);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h b/drivers/vdpa/sfc/sfc_vdpa_log.h
index 858e5ee..4e7a84f 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_log.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
@@ -21,6 +21,9 @@
/** Name prefix for the per-device log type used to report basic information */
#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
+/** Device MCDI log type name prefix */
+#define SFC_VDPA_LOGTYPE_MCDI_STR SFC_VDPA_LOGTYPE_PREFIX "mcdi"
+
#define SFC_VDPA_LOG_PREFIX_MAX 32
/* Log PMD message, automatically add prefix and \n */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_mcdi.c b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
new file mode 100644
index 0000000..961d2d3
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_mcdi.c
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include "sfc_efx_mcdi.h"
+
+#include "sfc_vdpa.h"
+#include "sfc_vdpa_debug.h"
+#include "sfc_vdpa_log.h"
+
+static sfc_efx_mcdi_dma_alloc_cb sfc_vdpa_mcdi_dma_alloc;
+static int
+sfc_vdpa_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
+ efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ return sfc_vdpa_dma_alloc(sva, name, len, esmp);
+}
+
+static sfc_efx_mcdi_dma_free_cb sfc_vdpa_mcdi_dma_free;
+static void
+sfc_vdpa_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
+{
+ struct sfc_vdpa_adapter *sva = cookie;
+
+ sfc_vdpa_dma_free(sva, esmp);
+}
+
+static sfc_efx_mcdi_sched_restart_cb sfc_vdpa_mcdi_sched_restart;
+static void
+sfc_vdpa_mcdi_sched_restart(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_vdpa_mcdi_mgmt_evq_poll;
+static void
+sfc_vdpa_mcdi_mgmt_evq_poll(void *cookie)
+{
+ RTE_SET_USED(cookie);
+}
+
+static const struct sfc_efx_mcdi_ops sfc_vdpa_mcdi_ops = {
+ .dma_alloc = sfc_vdpa_mcdi_dma_alloc,
+ .dma_free = sfc_vdpa_mcdi_dma_free,
+ .sched_restart = sfc_vdpa_mcdi_sched_restart,
+ .mgmt_evq_poll = sfc_vdpa_mcdi_mgmt_evq_poll,
+
+};
+
+int
+sfc_vdpa_mcdi_init(struct sfc_vdpa_adapter *sva)
+{
+ uint32_t logtype;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ logtype = sfc_vdpa_register_logtype(&(sva->pdev->addr),
+ SFC_VDPA_LOGTYPE_MCDI_STR,
+ RTE_LOG_NOTICE);
+
+ return sfc_efx_mcdi_init(&sva->mcdi, logtype,
+ sva->log_prefix, sva->nic,
+ &sfc_vdpa_mcdi_ops, sva);
+}
+
+void
+sfc_vdpa_mcdi_fini(struct sfc_vdpa_adapter *sva)
+{
+ sfc_vdpa_log_init(sva, "entry");
+ sfc_efx_mcdi_fini(&sva->mcdi);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
new file mode 100644
index 0000000..71696be
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -0,0 +1,129 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_malloc.h>
+#include <rte_vdpa.h>
+#include <rte_vdpa_dev.h>
+#include <rte_vhost.h>
+
+#include "sfc_vdpa_ops.h"
+#include "sfc_vdpa.h"
+
+/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
+ * In subsequent patches these ops would be implemented.
+ */
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(queue_num);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
+ uint64_t *features)
+{
+ RTE_SET_USED(vdpa_dev);
+ RTE_SET_USED(features);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_config(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_dev_close(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_vring_state(int vid, int vring, int state)
+{
+ RTE_SET_USED(vid);
+ RTE_SET_USED(vring);
+ RTE_SET_USED(state);
+
+ return -1;
+}
+
+static int
+sfc_vdpa_set_features(int vid)
+{
+ RTE_SET_USED(vid);
+
+ return -1;
+}
+
+static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
+ .get_queue_num = sfc_vdpa_get_queue_num,
+ .get_features = sfc_vdpa_get_features,
+ .get_protocol_features = sfc_vdpa_get_protocol_features,
+ .dev_conf = sfc_vdpa_dev_config,
+ .dev_close = sfc_vdpa_dev_close,
+ .set_vring_state = sfc_vdpa_set_vring_state,
+ .set_features = sfc_vdpa_set_features,
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *dev_handle, enum sfc_vdpa_context context)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_pci_device *pci_dev;
+
+ /* Create vDPA ops context */
+ ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
+ if (ops_data == NULL)
+ return NULL;
+
+ ops_data->vdpa_context = context;
+ ops_data->dev_handle = dev_handle;
+
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev_handle)->pdev;
+
+ /* Register vDPA Device */
+ sfc_vdpa_log_init(dev_handle, "register vDPA device");
+ ops_data->vdpa_dev =
+ rte_vdpa_register_device(&pci_dev->device, &sfc_vdpa_ops);
+ if (ops_data->vdpa_dev == NULL) {
+ sfc_vdpa_err(dev_handle, "vDPA device registration failed");
+ goto fail_register_device;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return ops_data;
+
+fail_register_device:
+ rte_free(ops_data);
+ return NULL;
+}
+
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data)
+{
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
+ rte_free(ops_data);
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
new file mode 100644
index 0000000..baa4293
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#ifndef _SFC_VDPA_OPS_H
+#define _SFC_VDPA_OPS_H
+
+#include <rte_vdpa.h>
+
+#define SFC_VDPA_MAX_QUEUE_PAIRS 1
+
+enum sfc_vdpa_context {
+ SFC_VDPA_AS_VF
+};
+
+enum sfc_vdpa_state {
+ SFC_VDPA_STATE_UNINITIALIZED = 0,
+ SFC_VDPA_STATE_INITIALIZED,
+};
+
+struct sfc_vdpa_ops_data {
+ void *dev_handle;
+ struct rte_vdpa_device *vdpa_dev;
+ enum sfc_vdpa_context vdpa_context;
+ enum sfc_vdpa_state state;
+};
+
+struct sfc_vdpa_ops_data *
+sfc_vdpa_device_init(void *adapter, enum sfc_vdpa_context context);
+void
+sfc_vdpa_device_fini(struct sfc_vdpa_ops_data *ops_data);
+
+#endif /* _SFC_VDPA_OPS_H */
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 02/10] vdpa/sfc: add support for device initialization
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
@ 2021-11-04 9:54 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-04 9:54 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/21 14:57, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add HW initialization and vDPA device registration support.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Used rte_memzone_reserve_aligned for mcdi buffer allocation.
> * Freeing mcdi buff when DMA map fails.
> * Fixed one typo.
>
> v4:
> * Removed unused enum fields.
> * Updated format specifiers in log messages.
> * Changed do/while loop used during mcdi buffer mapping into for() loop.
>
> doc/guides/vdpadevs/sfc.rst | 6 +
> drivers/vdpa/sfc/meson.build | 3 +
> drivers/vdpa/sfc/sfc_vdpa.c | 23 +++
> drivers/vdpa/sfc/sfc_vdpa.h | 49 +++++-
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 326 ++++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 3 +
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 129 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 34 ++++
> 10 files changed, 667 insertions(+), 1 deletion(-)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
>
Note that rte_vdpa_dev.h was renamed to vdpa_driver.h yesterday, so if
you have to post a new revision you'll have to do the change, otherwise
I'll do it while applying.
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v4 03/10] vdpa/sfc: add support to get device and protocol features
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 01/10] " Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 02/10] vdpa/sfc: add support for device initialization Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
` (7 subsequent siblings)
10 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_feature and get_protocol_features.
This patch retrieves device supported features and enables
protocol features.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
doc/guides/vdpadevs/features/sfc.ini | 10 ++++
drivers/common/sfc_efx/efsys.h | 2 +-
drivers/common/sfc_efx/version.map | 10 ++++
drivers/vdpa/sfc/sfc_vdpa.c | 20 ++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 2 +
drivers/vdpa/sfc/sfc_vdpa_hw.c | 13 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 91 ++++++++++++++++++++++++++++++++----
drivers/vdpa/sfc/sfc_vdpa_ops.h | 3 ++
8 files changed, 142 insertions(+), 9 deletions(-)
diff --git a/doc/guides/vdpadevs/features/sfc.ini b/doc/guides/vdpadevs/features/sfc.ini
index 71b6158..700d061 100644
--- a/doc/guides/vdpadevs/features/sfc.ini
+++ b/doc/guides/vdpadevs/features/sfc.ini
@@ -4,6 +4,16 @@
; Refer to default.ini for the full list of available driver features.
;
[Features]
+csum = Y
+guest csum = Y
+host tso4 = Y
+host tso6 = Y
+version 1 = Y
+mrg rxbuf = Y
+any layout = Y
+in_order = Y
+proto host notifier = Y
+IOMMU platform = Y
Linux = Y
x86-64 = Y
Usage doc = Y
diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
index d133d61..37ec6b9 100644
--- a/drivers/common/sfc_efx/efsys.h
+++ b/drivers/common/sfc_efx/efsys.h
@@ -187,7 +187,7 @@
#define EFSYS_OPT_MAE 1
-#define EFSYS_OPT_VIRTIO 0
+#define EFSYS_OPT_VIRTIO 1
/* ID */
diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index 642a62e..ec86220 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -247,6 +247,16 @@ INTERNAL {
efx_txq_nbufs;
efx_txq_size;
+ efx_virtio_fini;
+ efx_virtio_get_doorbell_offset;
+ efx_virtio_get_features;
+ efx_virtio_init;
+ efx_virtio_qcreate;
+ efx_virtio_qdestroy;
+ efx_virtio_qstart;
+ efx_virtio_qstop;
+ efx_virtio_verify_features;
+
sfc_efx_dev_class_get;
sfc_efx_family;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index da75ba6..7b9ebcc 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -43,6 +43,26 @@ struct sfc_vdpa_adapter *
return found ? sva : NULL;
}
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev)
+{
+ bool found = false;
+ struct sfc_vdpa_adapter *sva;
+
+ pthread_mutex_lock(&sfc_vdpa_adapter_list_lock);
+
+ TAILQ_FOREACH(sva, &sfc_vdpa_adapter_list, next) {
+ if (vdpa_dev == sva->ops_data->vdpa_dev) {
+ found = true;
+ break;
+ }
+ }
+
+ pthread_mutex_unlock(&sfc_vdpa_adapter_list_lock);
+
+ return found ? sva->ops_data : NULL;
+}
+
static int
sfc_vdpa_vfio_setup(struct sfc_vdpa_adapter *sva)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index bd3c437..dd3ca80 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -59,6 +59,8 @@ struct sfc_vdpa_adapter {
struct sfc_vdpa_adapter *
sfc_vdpa_get_adapter_by_dev(struct rte_pci_device *pdev);
+struct sfc_vdpa_ops_data *
+sfc_vdpa_get_data_by_dev(struct rte_vdpa_device *vdpa_dev);
int
sfc_vdpa_hw_init(struct sfc_vdpa_adapter *sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index dfb6d4f..dca7034 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -277,10 +277,20 @@
if (rc != 0)
goto fail_estimate_rsrc_limits;
+ sfc_vdpa_log_init(sva, "init virtio");
+ rc = efx_virtio_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "virtio init failed: %s", rte_strerror(rc));
+ goto fail_virtio_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_virtio_init:
+ efx_nic_fini(enp);
+
fail_estimate_rsrc_limits:
fail_nic_reset:
efx_nic_unprobe(enp);
@@ -309,6 +319,9 @@
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_log_init(sva, "virtio fini");
+ efx_virtio_fini(enp);
+
sfc_vdpa_log_init(sva, "unprobe nic");
efx_nic_unprobe(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 71696be..5750944 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,17 +3,31 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
#include <rte_vhost.h>
+#include "efx.h"
#include "sfc_vdpa_ops.h"
#include "sfc_vdpa.h"
-/* Dummy functions for mandatory vDPA ops to pass vDPA device registration.
- * In subsequent patches these ops would be implemented.
+/* These protocol features are needed to enable notifier ctrl */
+#define SFC_VDPA_PROTOCOL_FEATURES \
+ ((1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
+ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD))
+
+/*
+ * Set of features which are enabled by default.
+ * Protocol feature bit is needed to enable notification notifier ctrl.
*/
+#define SFC_VDPA_DEFAULT_FEATURES \
+ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
+
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
@@ -24,22 +38,67 @@
}
static int
+sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ uint64_t dev_features;
+ efx_nic_t *nic;
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+
+ rc = efx_virtio_get_features(nic, EFX_VIRTIO_DEVICE_TYPE_NET,
+ &dev_features);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "could not read device feature: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ ops_data->dev_features = dev_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "device supported virtio features : 0x%" PRIx64,
+ ops_data->dev_features);
+
+ return 0;
+}
+
+static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = ops_data->drv_features;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
sfc_vdpa_get_protocol_features(struct rte_vdpa_device *vdpa_dev,
uint64_t *features)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(features);
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ *features = SFC_VDPA_PROTOCOL_FEATURES;
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA ops get_protocol_feature :: features : 0x%" PRIx64,
+ *features);
+
+ return 0;
}
static int
@@ -91,6 +150,7 @@ struct sfc_vdpa_ops_data *
{
struct sfc_vdpa_ops_data *ops_data;
struct rte_pci_device *pci_dev;
+ int rc;
/* Create vDPA ops context */
ops_data = rte_zmalloc("vdpa", sizeof(struct sfc_vdpa_ops_data), 0);
@@ -111,10 +171,25 @@ struct sfc_vdpa_ops_data *
goto fail_register_device;
}
+ /* Read supported device features */
+ sfc_vdpa_log_init(dev_handle, "get device feature");
+ rc = sfc_vdpa_get_device_features(ops_data);
+ if (rc != 0)
+ goto fail_get_dev_feature;
+
+ /* Driver features are superset of device supported feature
+ * and any additional features supported by the driver.
+ */
+ ops_data->drv_features =
+ ops_data->dev_features | SFC_VDPA_DEFAULT_FEATURES;
+
ops_data->state = SFC_VDPA_STATE_INITIALIZED;
return ops_data;
+fail_get_dev_feature:
+ rte_vdpa_unregister_device(ops_data->vdpa_dev);
+
fail_register_device:
rte_free(ops_data);
return NULL;
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index baa4293..7b77df0 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -24,6 +24,9 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+
+ uint64_t dev_features;
+ uint64_t drv_features;
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v4 04/10] vdpa/sfc: get device supported max queue count
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (2 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 03/10] vdpa/sfc: add support to get device and protocol features Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
` (6 subsequent siblings)
10 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_queue_num to get the maximum number
of queues supported by the device.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
v4:
* Updated format specifier in log message.
drivers/vdpa/sfc/sfc_vdpa_ops.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 5750944..9a95211 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -31,10 +31,20 @@
static int
sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
{
- RTE_SET_USED(vdpa_dev);
- RTE_SET_USED(queue_num);
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
- return -1;
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %u",
+ *queue_num);
+
+ return 0;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v4 05/10] vdpa/sfc: add support to get VFIO device fd
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (3 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 04/10] vdpa/sfc: get device supported max queue count Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
` (5 subsequent siblings)
10 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops get_vfio_device_fd to get the VFIO device fd.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 9a95211..b5815df 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -145,6 +145,29 @@
return -1;
}
+static int
+sfc_vdpa_get_vfio_device_fd(int vid)
+{
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ int vfio_dev_fd;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ sfc_vdpa_info(dev, "vDPA ops get_vfio_device_fd :: vfio fd : %d",
+ vfio_dev_fd);
+
+ return vfio_dev_fd;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -153,6 +176,7 @@
.dev_close = sfc_vdpa_dev_close,
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
+ .get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v4 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (4 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 05/10] vdpa/sfc: add support to get VFIO device fd Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-04 10:15 ` Maxime Coquelin
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
` (4 subsequent siblings)
10 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement vDPA ops dev_conf and dev_close for DMA mapping,
interrupt and virtqueue configurations.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Removed redundant null check while calling free().
* Added error handling for rte_vhost_get_vhost_vring().
v4:
* Removed rc for rte_vfio_container_dma_unmap from label failed_vfio_dma_map.
* Updated VFIO_DEVICE_SET_IRQS parameter fields for intr disable.
* Removed goto label fail_vring_map.
drivers/vdpa/sfc/sfc_vdpa.c | 6 +
drivers/vdpa/sfc/sfc_vdpa.h | 43 ++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 69 ++++++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 525 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 28 +++
5 files changed, 651 insertions(+), 20 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index 7b9ebcc..f548c1e 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -242,6 +242,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_log_init(sva, "entry");
+ sfc_vdpa_adapter_lock_init(sva);
+
sfc_vdpa_log_init(sva, "vfio init");
if (sfc_vdpa_vfio_setup(sva) < 0) {
sfc_vdpa_err(sva, "failed to setup device %s", pci_dev->name);
@@ -276,6 +278,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
fail_vfio_setup:
+ sfc_vdpa_adapter_lock_fini(sva);
+
fail_set_log_prefix:
rte_free(sva);
@@ -307,6 +311,8 @@ struct sfc_vdpa_ops_data *
sfc_vdpa_vfio_teardown(sva);
+ sfc_vdpa_adapter_lock_fini(sva);
+
rte_free(sva);
return 0;
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index dd3ca80..38fd5de 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -79,10 +79,53 @@ struct sfc_vdpa_ops_data *
void
sfc_vdpa_dma_free(struct sfc_vdpa_adapter *sva, efsys_mem_t *esmp);
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
return (struct sfc_vdpa_adapter *)dev_handle;
}
+/*
+ * Add wrapper functions to acquire/release lock to be able to remove or
+ * change the lock in one place.
+ */
+static inline void
+sfc_vdpa_adapter_lock_init(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_init(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_is_locked(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_is_locked(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_lock(&sva->lock);
+}
+
+static inline int
+sfc_vdpa_adapter_trylock(struct sfc_vdpa_adapter *sva)
+{
+ return rte_spinlock_trylock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_unlock(struct sfc_vdpa_adapter *sva)
+{
+ rte_spinlock_unlock(&sva->lock);
+}
+
+static inline void
+sfc_vdpa_adapter_lock_fini(__rte_unused struct sfc_vdpa_adapter *sva)
+{
+ /* Just for symmetry of the API */
+}
+
#endif /* _SFC_VDPA_H */
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index dca7034..d3459ee 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -8,6 +8,7 @@
#include <rte_common.h>
#include <rte_errno.h>
#include <rte_vfio.h>
+#include <rte_vhost.h>
#include "efx.h"
#include "sfc_vdpa.h"
@@ -108,6 +109,74 @@
memset(esmp, 0, sizeof(*esmp));
}
+int
+sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *ops_data, bool do_map)
+{
+ uint32_t i, j;
+ int rc;
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ int vfio_container_fd;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_container_fd =
+ sfc_vdpa_adapter_by_dev_handle(dev)->vfio_container_fd;
+
+ rc = rte_vhost_get_mem_table(ops_data->vid, &vhost_mem);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "failed to get VM memory layout");
+ goto error;
+ }
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (do_map) {
+ rc = rte_vfio_container_dma_map(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA map failed : %s",
+ rte_strerror(rte_errno));
+ goto failed_vfio_dma_map;
+ }
+ } else {
+ rc = rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ if (rc < 0) {
+ sfc_vdpa_err(dev,
+ "DMA unmap failed : %s",
+ rte_strerror(rte_errno));
+ goto error;
+ }
+ }
+ }
+
+ free(vhost_mem);
+
+ return 0;
+
+failed_vfio_dma_map:
+ for (j = 0; j < i; j++) {
+ mem_reg = &vhost_mem->regions[j];
+ rte_vfio_container_dma_unmap(vfio_container_fd,
+ mem_reg->host_user_addr,
+ mem_reg->guest_phys_addr,
+ mem_reg->size);
+ }
+
+error:
+ free(vhost_mem);
+
+ return rc;
+}
+
static int
sfc_vdpa_mem_bar_init(struct sfc_vdpa_adapter *sva,
const efx_bar_region_t *mem_ebrp)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index b5815df..f0be652 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,10 +3,13 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <sys/ioctl.h>
+
#include <rte_errno.h>
#include <rte_malloc.h>
#include <rte_vdpa.h>
#include <rte_vdpa_dev.h>
+#include <rte_vfio.h>
#include <rte_vhost.h>
#include "efx.h"
@@ -28,24 +31,12 @@
#define SFC_VDPA_DEFAULT_FEATURES \
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
-static int
-sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
-{
- struct sfc_vdpa_ops_data *ops_data;
- void *dev;
-
- ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
- if (ops_data == NULL)
- return -1;
-
- dev = ops_data->dev_handle;
- *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+#define SFC_VDPA_MSIX_IRQ_SET_BUF_LEN \
+ (sizeof(struct vfio_irq_set) + \
+ sizeof(int) * (SFC_VDPA_MAX_QUEUE_PAIRS * 2 + 1))
- sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %u",
- *queue_num);
-
- return 0;
-}
+/* It will be used for target VF when calling function is not PF */
+#define SFC_VDPA_VF_NULL 0xFFFF
static int
sfc_vdpa_get_device_features(struct sfc_vdpa_ops_data *ops_data)
@@ -74,6 +65,436 @@
return 0;
}
+static uint64_t
+hva_to_gpa(int vid, uint64_t hva)
+{
+ struct rte_vhost_memory *vhost_mem = NULL;
+ struct rte_vhost_mem_region *mem_reg = NULL;
+ uint32_t i;
+ uint64_t gpa = 0;
+
+ if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
+ goto error;
+
+ for (i = 0; i < vhost_mem->nregions; i++) {
+ mem_reg = &vhost_mem->regions[i];
+
+ if (hva >= mem_reg->host_user_addr &&
+ hva < mem_reg->host_user_addr + mem_reg->size) {
+ gpa = (hva - mem_reg->host_user_addr) +
+ mem_reg->guest_phys_addr;
+ break;
+ }
+ }
+
+error:
+ free(vhost_mem);
+ return gpa;
+}
+
+static int
+sfc_vdpa_enable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int *irq_fd_ptr;
+ int vfio_dev_fd;
+ uint32_t i, num_vring;
+ struct rte_vhost_vring vring;
+ struct vfio_irq_set *irq_set;
+ struct rte_pci_device *pci_dev;
+ char irq_set_buf[SFC_VDPA_MSIX_IRQ_SET_BUF_LEN];
+ void *dev;
+
+ num_vring = rte_vhost_get_vring_num(ops_data->vid);
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ pci_dev = sfc_vdpa_adapter_by_dev_handle(dev)->pdev;
+
+ irq_set = (struct vfio_irq_set *)irq_set_buf;
+ irq_set->argsz = sizeof(irq_set_buf);
+ irq_set->count = num_vring + 1;
+ irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
+ VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set->start = 0;
+ irq_fd_ptr = (int *)&irq_set->data;
+ irq_fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] =
+ rte_intr_fd_get(pci_dev->intr_handle);
+
+ for (i = 0; i < num_vring; i++) {
+ rc = rte_vhost_get_vhost_vring(ops_data->vid, i, &vring);
+ if (rc)
+ return -1;
+
+ irq_fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
+ }
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error enabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_disable_vfio_intr(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int vfio_dev_fd;
+ struct vfio_irq_set irq_set;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+
+ irq_set.argsz = sizeof(irq_set);
+ irq_set.count = 0;
+ irq_set.flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
+ irq_set.index = VFIO_PCI_MSIX_IRQ_INDEX;
+ irq_set.start = 0;
+
+ rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, &irq_set);
+ if (rc) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "error disabling MSI-X interrupts: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
+
+static int
+sfc_vdpa_get_vring_info(struct sfc_vdpa_ops_data *ops_data,
+ int vq_num, struct sfc_vdpa_vring_info *vring)
+{
+ int rc;
+ uint64_t gpa;
+ struct rte_vhost_vring vq;
+
+ rc = rte_vhost_get_vhost_vring(ops_data->vid, vq_num, &vq);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vhost vring failed: %s", rte_strerror(rc));
+ return rc;
+ }
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.desc);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for descriptor ring.");
+ return -1;
+ }
+ vring->desc = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.avail);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for available ring.");
+ return -1;
+ }
+ vring->avail = gpa;
+
+ gpa = hva_to_gpa(ops_data->vid, (uint64_t)(uintptr_t)vq.used);
+ if (gpa == 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "fail to get GPA for used ring.");
+ return -1;
+ }
+ vring->used = gpa;
+
+ vring->size = vq.size;
+
+ rc = rte_vhost_get_vring_base(ops_data->vid, vq_num,
+ &vring->last_avail_idx,
+ &vring->last_used_idx);
+
+ return rc;
+}
+
+static int
+sfc_vdpa_virtq_start(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_t *vq;
+ struct sfc_vdpa_vring_info vring;
+ efx_virtio_vq_cfg_t vq_cfg;
+ efx_virtio_vq_dyncfg_t vq_dyncfg;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ rc = sfc_vdpa_get_vring_info(ops_data, vq_num, &vring);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "get vring info failed: %s", rte_strerror(rc));
+ goto fail_vring_info;
+ }
+
+ vq_cfg.evvc_target_vf = SFC_VDPA_VF_NULL;
+
+ /* even virtqueue for RX and odd for TX */
+ if (vq_num % 2) {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_TXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (TXQ)", vq_num);
+ } else {
+ vq_cfg.evvc_type = EFX_VIRTIO_VQ_TYPE_NET_RXQ;
+ sfc_vdpa_info(ops_data->dev_handle,
+ "configure virtqueue # %d (RXQ)", vq_num);
+ }
+
+ vq_cfg.evvc_vq_num = vq_num;
+ vq_cfg.evvc_desc_tbl_addr = vring.desc;
+ vq_cfg.evvc_avail_ring_addr = vring.avail;
+ vq_cfg.evvc_used_ring_addr = vring.used;
+ vq_cfg.evvc_vq_size = vring.size;
+
+ vq_dyncfg.evvd_vq_pidx = vring.last_used_idx;
+ vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx;
+
+ /* MSI-X vector is function-relative */
+ vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num;
+ if (ops_data->vdpa_context == SFC_VDPA_AS_VF)
+ vq_cfg.evvc_pas_id = 0;
+ vq_cfg.evcc_features = ops_data->dev_features &
+ ops_data->req_features;
+
+ /* Start virtqueue */
+ rc = efx_virtio_qstart(vq, &vq_cfg, &vq_dyncfg);
+ if (rc != 0) {
+ /* destroy virtqueue */
+ sfc_vdpa_err(ops_data->dev_handle,
+ "virtqueue start failed: %s",
+ rte_strerror(rc));
+ efx_virtio_qdestroy(vq);
+ goto fail_virtio_qstart;
+ }
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "virtqueue started successfully for vq_num %d", vq_num);
+
+ ops_data->vq_cxt[vq_num].enable = B_TRUE;
+
+ return rc;
+
+fail_virtio_qstart:
+fail_vring_info:
+ return rc;
+}
+
+static int
+sfc_vdpa_virtq_stop(struct sfc_vdpa_ops_data *ops_data, int vq_num)
+{
+ int rc;
+ efx_virtio_vq_dyncfg_t vq_idx;
+ efx_virtio_vq_t *vq;
+
+ if (ops_data->vq_cxt[vq_num].enable != B_TRUE)
+ return -1;
+
+ vq = ops_data->vq_cxt[vq_num].vq;
+ if (vq == NULL)
+ return -1;
+
+ /* stop the vq */
+ rc = efx_virtio_qstop(vq, &vq_idx);
+ if (rc == 0) {
+ ops_data->vq_cxt[vq_num].cidx = vq_idx.evvd_vq_cidx;
+ ops_data->vq_cxt[vq_num].pidx = vq_idx.evvd_vq_pidx;
+ }
+ ops_data->vq_cxt[vq_num].enable = B_FALSE;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_configure(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc, i;
+ int nr_vring;
+ int max_vring_cnt;
+ efx_virtio_vq_t *vq;
+ efx_nic_t *nic;
+ void *dev;
+
+ dev = ops_data->dev_handle;
+ nic = sfc_vdpa_adapter_by_dev_handle(dev)->nic;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_INITIALIZED);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURING;
+
+ nr_vring = rte_vhost_get_vring_num(ops_data->vid);
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ /* number of vring should not be more than supported max vq count */
+ if (nr_vring > max_vring_cnt) {
+ sfc_vdpa_err(dev,
+ "nr_vring (%d) is > max vring count (%d)",
+ nr_vring, max_vring_cnt);
+ goto fail_vring_num;
+ }
+
+ rc = sfc_vdpa_dma_map(ops_data, true);
+ if (rc) {
+ sfc_vdpa_err(dev,
+ "DMA map failed: %s", rte_strerror(rc));
+ goto fail_dma_map;
+ }
+
+ for (i = 0; i < nr_vring; i++) {
+ rc = efx_virtio_qcreate(nic, &vq);
+ if ((rc != 0) || (vq == NULL)) {
+ sfc_vdpa_err(dev,
+ "virtqueue create failed: %s",
+ rte_strerror(rc));
+ goto fail_vq_create;
+ }
+
+ /* store created virtqueue context */
+ ops_data->vq_cxt[i].vq = vq;
+ }
+
+ ops_data->vq_count = i;
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return 0;
+
+fail_vq_create:
+ sfc_vdpa_dma_map(ops_data, false);
+
+fail_dma_map:
+fail_vring_num:
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+
+ return -1;
+}
+
+static void
+sfc_vdpa_close(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+
+ if (ops_data->state != SFC_VDPA_STATE_CONFIGURED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_CLOSING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ if (ops_data->vq_cxt[i].vq == NULL)
+ continue;
+
+ efx_virtio_qdestroy(ops_data->vq_cxt[i].vq);
+ }
+
+ sfc_vdpa_dma_map(ops_data, false);
+
+ ops_data->state = SFC_VDPA_STATE_INITIALIZED;
+}
+
+static void
+sfc_vdpa_stop(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i;
+ int rc;
+
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return;
+
+ ops_data->state = SFC_VDPA_STATE_STOPPING;
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ rc = sfc_vdpa_virtq_stop(ops_data, i);
+ if (rc != 0)
+ continue;
+ }
+
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+}
+
+static int
+sfc_vdpa_start(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, j;
+ int rc;
+
+ SFC_EFX_ASSERT(ops_data->state == SFC_VDPA_STATE_CONFIGURED);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->state = SFC_VDPA_STATE_STARTING;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "enable interrupts");
+ rc = sfc_vdpa_enable_vfio_intr(ops_data);
+ if (rc < 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "vfio intr allocation failed: %s",
+ rte_strerror(rc));
+ goto fail_enable_vfio_intr;
+ }
+
+ rte_vhost_get_negotiated_features(ops_data->vid,
+ &ops_data->req_features);
+
+ sfc_vdpa_info(ops_data->dev_handle,
+ "negotiated feature : 0x%" PRIx64,
+ ops_data->req_features);
+
+ for (i = 0; i < ops_data->vq_count; i++) {
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "starting vq# %d", i);
+ rc = sfc_vdpa_virtq_start(ops_data, i);
+ if (rc != 0)
+ goto fail_vq_start;
+ }
+
+ ops_data->state = SFC_VDPA_STATE_STARTED;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vq_start:
+ /* stop already started virtqueues */
+ for (j = 0; j < i; j++)
+ sfc_vdpa_virtq_stop(ops_data, j);
+ sfc_vdpa_disable_vfio_intr(ops_data);
+
+fail_enable_vfio_intr:
+ ops_data->state = SFC_VDPA_STATE_CONFIGURED;
+
+ return rc;
+}
+
+static int
+sfc_vdpa_get_queue_num(struct rte_vdpa_device *vdpa_dev, uint32_t *queue_num)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ void *dev;
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+ *queue_num = sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count;
+
+ sfc_vdpa_info(dev, "vDPA ops get_queue_num :: supported queue num : %u",
+ *queue_num);
+
+ return 0;
+}
+
static int
sfc_vdpa_get_features(struct rte_vdpa_device *vdpa_dev, uint64_t *features)
{
@@ -114,7 +535,53 @@
static int
sfc_vdpa_dev_config(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ int rc;
+ struct sfc_vdpa_ops_data *ops_data;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "entry");
+
+ ops_data->vid = vid;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "configuring");
+ rc = sfc_vdpa_configure(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_config;
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "starting");
+ rc = sfc_vdpa_start(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_start;
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): software relay for notify is used.",
+ vdpa_dev->device->name);
+
+ sfc_vdpa_log_init(ops_data->dev_handle, "done");
+
+ return 0;
+
+fail_vdpa_start:
+ sfc_vdpa_close(ops_data);
+
+fail_vdpa_config:
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
return -1;
}
@@ -122,9 +589,27 @@
static int
sfc_vdpa_dev_close(int vid)
{
- RTE_SET_USED(vid);
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "invalid vDPA device : %p, vid : %d",
+ vdpa_dev, vid);
+ return -1;
+ }
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ sfc_vdpa_stop(ops_data);
+ sfc_vdpa_close(ops_data);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return 0;
}
static int
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index 7b77df0..d20d219 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -17,16 +17,44 @@ enum sfc_vdpa_context {
enum sfc_vdpa_state {
SFC_VDPA_STATE_UNINITIALIZED = 0,
SFC_VDPA_STATE_INITIALIZED,
+ SFC_VDPA_STATE_CONFIGURING,
+ SFC_VDPA_STATE_CONFIGURED,
+ SFC_VDPA_STATE_CLOSING,
+ SFC_VDPA_STATE_CLOSED,
+ SFC_VDPA_STATE_STARTING,
+ SFC_VDPA_STATE_STARTED,
+ SFC_VDPA_STATE_STOPPING,
};
+struct sfc_vdpa_vring_info {
+ uint64_t desc;
+ uint64_t avail;
+ uint64_t used;
+ uint64_t size;
+ uint16_t last_avail_idx;
+ uint16_t last_used_idx;
+};
+
+typedef struct sfc_vdpa_vq_context_s {
+ uint8_t enable;
+ uint32_t pidx;
+ uint32_t cidx;
+ efx_virtio_vq_t *vq;
+} sfc_vdpa_vq_context_t;
+
struct sfc_vdpa_ops_data {
void *dev_handle;
+ int vid;
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
uint64_t dev_features;
uint64_t drv_features;
+ uint64_t req_features;
+
+ uint16_t vq_count;
+ struct sfc_vdpa_vq_context_s vq_cxt[SFC_VDPA_MAX_QUEUE_PAIRS * 2];
};
struct sfc_vdpa_ops_data *
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 06/10] vdpa/sfc: add support for dev conf and dev close ops
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
@ 2021-11-04 10:15 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-04 10:15 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/21 14:57, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement vDPA ops dev_conf and dev_close for DMA mapping,
> interrupt and virtqueue configurations.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Removed redundant null check while calling free().
> * Added error handling for rte_vhost_get_vhost_vring().
>
> v4:
> * Removed rc for rte_vfio_container_dma_unmap from label failed_vfio_dma_map.
> * Updated VFIO_DEVICE_SET_IRQS parameter fields for intr disable.
> * Removed goto label fail_vring_map.
>
> drivers/vdpa/sfc/sfc_vdpa.c | 6 +
> drivers/vdpa/sfc/sfc_vdpa.h | 43 ++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 69 ++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 525 ++++++++++++++++++++++++++++++++++++++--
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 28 +++
> 5 files changed, 651 insertions(+), 20 deletions(-)
>
...
> +static uint64_t
> +hva_to_gpa(int vid, uint64_t hva)
> +{
> + struct rte_vhost_memory *vhost_mem = NULL;
> + struct rte_vhost_mem_region *mem_reg = NULL;
> + uint32_t i;
> + uint64_t gpa = 0;
> +
> + if (rte_vhost_get_mem_table(vid, &vhost_mem) < 0)
> + goto error;
> +
> + for (i = 0; i < vhost_mem->nregions; i++) {
> + mem_reg = &vhost_mem->regions[i];
> +
> + if (hva >= mem_reg->host_user_addr &&
> + hva < mem_reg->host_user_addr + mem_reg->size) {
> + gpa = (hva - mem_reg->host_user_addr) +
> + mem_reg->guest_phys_addr;
> + break;
> + }
> + }
> +
> +error:
> + free(vhost_mem);
> + return gpa;
> +}
It would be done later, but all the vDPA drivers have (almost) the same
function, so it would make sense to add a Vhost API that would make use
of Vhost's hva_to_gpa.
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v4 07/10] vdpa/sfc: add support to get queue notify area info
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (5 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 06/10] vdpa/sfc: add support for dev conf and dev close ops Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-04 10:50 ` Maxime Coquelin
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
` (3 subsequent siblings)
10 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implement the vDPA ops get_notify_area to get the notify
area info of the queue.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v2:
* Added error log in sfc_vdpa_get_notify_area.
v4:
* Updated parameter for sfc_vdpa_setup_notify_ctrl
drivers/vdpa/sfc/sfc_vdpa_ops.c | 156 ++++++++++++++++++++++++++++++++++++++--
drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +
2 files changed, 152 insertions(+), 6 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index f0be652..1725597 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -3,6 +3,8 @@
* Copyright(c) 2020-2021 Xilinx, Inc.
*/
+#include <pthread.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <rte_errno.h>
@@ -532,6 +534,55 @@
return 0;
}
+static void *
+sfc_vdpa_notify_ctrl(void *arg)
+{
+ struct sfc_vdpa_ops_data *ops_data;
+ int vid;
+
+ ops_data = arg;
+ if (ops_data == NULL)
+ return NULL;
+
+ sfc_vdpa_adapter_lock(ops_data->dev_handle);
+
+ vid = ops_data->vid;
+
+ if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+ sfc_vdpa_info(ops_data->dev_handle,
+ "vDPA (%s): Notifier could not get configured",
+ ops_data->vdpa_dev->device->name);
+
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+
+ return NULL;
+}
+
+static int
+sfc_vdpa_setup_notify_ctrl(struct sfc_vdpa_ops_data *ops_data)
+{
+ int ret;
+
+ ops_data->is_notify_thread_started = false;
+
+ /*
+ * Use rte_vhost_host_notifier_ctrl in a thread to avoid
+ * dead lock scenario when multiple VFs are used in single vdpa
+ * application and multiple VFs are passed to a single VM.
+ */
+ ret = pthread_create(&ops_data->notify_tid, NULL,
+ sfc_vdpa_notify_ctrl, ops_data);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to create notify_ctrl thread: %s",
+ rte_strerror(ret));
+ return -1;
+ }
+ ops_data->is_notify_thread_started = true;
+
+ return 0;
+}
+
static int
sfc_vdpa_dev_config(int vid)
{
@@ -565,18 +616,19 @@
if (rc != 0)
goto fail_vdpa_start;
- sfc_vdpa_adapter_unlock(ops_data->dev_handle);
+ rc = sfc_vdpa_setup_notify_ctrl(ops_data);
+ if (rc != 0)
+ goto fail_vdpa_notify;
- sfc_vdpa_log_init(ops_data->dev_handle, "vhost notifier ctrl");
- if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
- sfc_vdpa_info(ops_data->dev_handle,
- "vDPA (%s): software relay for notify is used.",
- vdpa_dev->device->name);
+ sfc_vdpa_adapter_unlock(ops_data->dev_handle);
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_vdpa_notify:
+ sfc_vdpa_stop(ops_data);
+
fail_vdpa_start:
sfc_vdpa_close(ops_data);
@@ -589,6 +641,7 @@
static int
sfc_vdpa_dev_close(int vid)
{
+ int ret;
struct rte_vdpa_device *vdpa_dev;
struct sfc_vdpa_ops_data *ops_data;
@@ -603,6 +656,23 @@
}
sfc_vdpa_adapter_lock(ops_data->dev_handle);
+ if (ops_data->is_notify_thread_started == true) {
+ void *status;
+ ret = pthread_cancel(ops_data->notify_tid);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to cancel notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+
+ ret = pthread_join(ops_data->notify_tid, &status);
+ if (ret != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "failed to join terminated notify_ctrl thread: %s",
+ rte_strerror(ret));
+ }
+ }
+ ops_data->is_notify_thread_started = false;
sfc_vdpa_stop(ops_data);
sfc_vdpa_close(ops_data);
@@ -653,6 +723,79 @@
return vfio_dev_fd;
}
+static int
+sfc_vdpa_get_notify_area(int vid, int qid, uint64_t *offset, uint64_t *size)
+{
+ int ret;
+ efx_nic_t *nic;
+ int vfio_dev_fd;
+ efx_rc_t rc;
+ unsigned int bar_offset;
+ struct rte_vdpa_device *vdpa_dev;
+ struct sfc_vdpa_ops_data *ops_data;
+ struct vfio_region_info reg = { .argsz = sizeof(reg) };
+ const efx_nic_cfg_t *encp;
+ int max_vring_cnt;
+ int64_t len;
+ void *dev;
+
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ vfio_dev_fd = sfc_vdpa_adapter_by_dev_handle(dev)->vfio_dev_fd;
+ max_vring_cnt =
+ (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ nic = sfc_vdpa_adapter_by_dev_handle(ops_data->dev_handle)->nic;
+ encp = efx_nic_cfg_get(nic);
+
+ if (qid >= max_vring_cnt) {
+ sfc_vdpa_err(dev, "invalid qid : %d", qid);
+ return -1;
+ }
+
+ if (ops_data->vq_cxt[qid].enable != B_TRUE) {
+ sfc_vdpa_err(dev, "vq is not enabled");
+ return -1;
+ }
+
+ rc = efx_virtio_get_doorbell_offset(ops_data->vq_cxt[qid].vq,
+ &bar_offset);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "failed to get doorbell offset: %s",
+ rte_strerror(rc));
+ return rc;
+ }
+
+ reg.index = sfc_vdpa_adapter_by_dev_handle(dev)->mem_bar.esb_rid;
+ ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_REGION_INFO, ®);
+ if (ret != 0) {
+ sfc_vdpa_err(dev, "could not get device region info: %s",
+ strerror(errno));
+ return ret;
+ }
+
+ *offset = reg.offset + bar_offset;
+
+ len = (1U << encp->enc_vi_window_shift) / 2;
+ if (len >= sysconf(_SC_PAGESIZE)) {
+ *size = sysconf(_SC_PAGESIZE);
+ } else {
+ sfc_vdpa_err(dev, "invalid VI window size : 0x%" PRIx64, len);
+ return -1;
+ }
+
+ sfc_vdpa_info(dev, "vDPA ops get_notify_area :: offset : 0x%" PRIx64,
+ *offset);
+
+ return 0;
+}
+
static struct rte_vdpa_dev_ops sfc_vdpa_ops = {
.get_queue_num = sfc_vdpa_get_queue_num,
.get_features = sfc_vdpa_get_features,
@@ -662,6 +805,7 @@
.set_vring_state = sfc_vdpa_set_vring_state,
.set_features = sfc_vdpa_set_features,
.get_vfio_device_fd = sfc_vdpa_get_vfio_device_fd,
+ .get_notify_area = sfc_vdpa_get_notify_area,
};
struct sfc_vdpa_ops_data *
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.h b/drivers/vdpa/sfc/sfc_vdpa_ops.h
index d20d219..9b94aca 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.h
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.h
@@ -48,6 +48,8 @@ struct sfc_vdpa_ops_data {
struct rte_vdpa_device *vdpa_dev;
enum sfc_vdpa_context vdpa_context;
enum sfc_vdpa_state state;
+ pthread_t notify_tid;
+ bool is_notify_thread_started;
uint64_t dev_features;
uint64_t drv_features;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 07/10] vdpa/sfc: add support to get queue notify area info
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
@ 2021-11-04 10:50 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-04 10:50 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/21 14:57, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Implement the vDPA ops get_notify_area to get the notify
> area info of the queue.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v2:
> * Added error log in sfc_vdpa_get_notify_area.
>
> v4:
> * Updated parameter for sfc_vdpa_setup_notify_ctrl
>
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 156 ++++++++++++++++++++++++++++++++++++++--
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 2 +
> 2 files changed, 152 insertions(+), 6 deletions(-)
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v4 08/10] vdpa/sfc: add support for MAC filter config
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (6 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 07/10] vdpa/sfc: add support to get queue notify area info Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-04 10:58 ` Maxime Coquelin
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
` (2 subsequent siblings)
10 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Add support for unicast and broadcast MAC filter configuration.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
v4:
* Removed redundant NULL check.
* Improved line usage by rearranging function params.
doc/guides/vdpadevs/sfc.rst | 4 ++
drivers/vdpa/sfc/meson.build | 1 +
drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
drivers/vdpa/sfc/sfc_vdpa_filter.c | 136 +++++++++++++++++++++++++++++++++++++
drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
7 files changed, 230 insertions(+)
create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
diff --git a/doc/guides/vdpadevs/sfc.rst b/doc/guides/vdpadevs/sfc.rst
index d06c427..512f23e 100644
--- a/doc/guides/vdpadevs/sfc.rst
+++ b/doc/guides/vdpadevs/sfc.rst
@@ -71,6 +71,10 @@ boolean parameters value.
**vdpa** device will work as vdpa device and will be probed by vdpa/sfc driver.
If this parameter is not specified then ef100 device will operate as network device.
+- ``mac`` [mac address]
+
+ Configures MAC address which would be used to setup MAC filters.
+
Dynamic Logging Parameters
~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index dc333de..2ca33bc 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -22,4 +22,5 @@ sources = files(
'sfc_vdpa_hw.c',
'sfc_vdpa_mcdi.c',
'sfc_vdpa_ops.c',
+ 'sfc_vdpa_filter.c',
)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c
index f548c1e..78b280e 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.c
+++ b/drivers/vdpa/sfc/sfc_vdpa.c
@@ -8,7 +8,9 @@
#include <sys/queue.h>
#include <rte_common.h>
+#include <rte_devargs.h>
#include <rte_errno.h>
+#include <rte_kvargs.h>
#include <rte_string_fns.h>
#include <rte_vfio.h>
#include <rte_vhost.h>
@@ -198,6 +200,31 @@ struct sfc_vdpa_ops_data *
return ret < 0 ? RTE_LOGTYPE_PMD : ret;
}
+static int
+sfc_vdpa_kvargs_parse(struct sfc_vdpa_adapter *sva)
+{
+ struct rte_pci_device *pci_dev = sva->pdev;
+ struct rte_devargs *devargs = pci_dev->device.devargs;
+ /*
+ * To get the device class a mandatory param 'class' is being
+ * used so included SFC_EFX_KVARG_DEV_CLASS in the param list.
+ */
+ const char **params = (const char *[]){
+ RTE_DEVARGS_KEY_CLASS,
+ SFC_VDPA_MAC_ADDR,
+ NULL,
+ };
+
+ if (devargs == NULL)
+ return 0;
+
+ sva->kvargs = rte_kvargs_parse(devargs->args, params);
+ if (sva->kvargs == NULL)
+ return -EINVAL;
+
+ return 0;
+}
+
static struct rte_pci_id pci_id_sfc_vdpa_efx_map[] = {
{ RTE_PCI_DEVICE(EFX_PCI_VENID_XILINX, EFX_PCI_DEVID_RIVERHEAD_VF) },
{ .vendor_id = 0, /* sentinel */ },
@@ -240,6 +267,10 @@ struct sfc_vdpa_ops_data *
if (ret != 0)
goto fail_set_log_prefix;
+ ret = sfc_vdpa_kvargs_parse(sva);
+ if (ret != 0)
+ goto fail_kvargs_parse;
+
sfc_vdpa_log_init(sva, "entry");
sfc_vdpa_adapter_lock_init(sva);
@@ -280,6 +311,7 @@ struct sfc_vdpa_ops_data *
fail_vfio_setup:
sfc_vdpa_adapter_lock_fini(sva);
+fail_kvargs_parse:
fail_set_log_prefix:
rte_free(sva);
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 38fd5de..81fc39d 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -17,8 +17,29 @@
#include "sfc_vdpa_log.h"
#include "sfc_vdpa_ops.h"
+#define SFC_VDPA_MAC_ADDR "mac"
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
+/* Broadcast & Unicast MAC filters are supported */
+#define SFC_MAX_SUPPORTED_FILTERS 2
+
+/*
+ * Get function-local index of the associated VI from the
+ * virtqueue number. Queue 0 is reserved for MCDI
+ */
+#define SFC_VDPA_GET_VI_INDEX(vq_num) (((vq_num) / 2) + 1)
+
+enum sfc_vdpa_filter_type {
+ SFC_VDPA_BCAST_MAC_FILTER = 0,
+ SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_FILTER_NTYPE
+};
+
+typedef struct sfc_vdpa_filter_s {
+ int filter_cnt;
+ efx_filter_spec_t spec[SFC_MAX_SUPPORTED_FILTERS];
+} sfc_vdpa_filter_t;
+
/* Adapter private data */
struct sfc_vdpa_adapter {
TAILQ_ENTRY(sfc_vdpa_adapter) next;
@@ -31,6 +52,8 @@ struct sfc_vdpa_adapter {
rte_spinlock_t lock;
struct rte_pci_device *pdev;
+ struct rte_kvargs *kvargs;
+
efx_family_t family;
efx_nic_t *nic;
rte_spinlock_t nic_lock;
@@ -45,6 +68,8 @@ struct sfc_vdpa_adapter {
char log_prefix[SFC_VDPA_LOG_PREFIX_MAX];
uint32_t logtype_main;
+ sfc_vdpa_filter_t filters;
+
int vfio_group_fd;
int vfio_dev_fd;
int vfio_container_fd;
@@ -82,6 +107,11 @@ struct sfc_vdpa_ops_data *
int
sfc_vdpa_dma_map(struct sfc_vdpa_ops_data *vdpa_data, bool do_map);
+int
+sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data);
+int
+sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data);
+
static inline struct sfc_vdpa_adapter *
sfc_vdpa_adapter_by_dev_handle(void *dev_handle)
{
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
new file mode 100644
index 0000000..9687278
--- /dev/null
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -0,0 +1,136 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2020-2021 Xilinx, Inc.
+ */
+
+#include <rte_errno.h>
+#include <rte_ether.h>
+#include <rte_kvargs.h>
+
+#include "efx.h"
+#include "efx_impl.h"
+#include "sfc_vdpa.h"
+
+static inline int
+sfc_vdpa_get_eth_addr(const char *key __rte_unused,
+ const char *value, void *extra_args)
+{
+ struct rte_ether_addr *mac_addr = extra_args;
+
+ if (value == NULL || extra_args == NULL)
+ return -EINVAL;
+
+ /* Convert string with Ethernet address to an ether_addr */
+ rte_ether_unformat_addr(value, mac_addr);
+
+ return 0;
+}
+
+static int
+sfc_vdpa_set_mac_filter(efx_nic_t *nic, efx_filter_spec_t *spec,
+ int qid, uint8_t *eth_addr)
+{
+ int rc;
+
+ if (nic == NULL || spec == NULL)
+ return -1;
+
+ spec->efs_priority = EFX_FILTER_PRI_MANUAL;
+ spec->efs_flags = EFX_FILTER_FLAG_RX;
+ spec->efs_dmaq_id = qid;
+
+ rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
+ if (rc != 0)
+ return rc;
+
+ rc = efx_filter_insert(nic, spec);
+ if (rc != 0)
+ return rc;
+
+ return rc;
+}
+
+int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
+{
+ int rc;
+ int qid;
+ efx_nic_t *nic;
+ struct rte_ether_addr bcast_eth_addr;
+ struct rte_ether_addr ucast_eth_addr;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_filter_spec_t *spec;
+
+ sfc_vdpa_log_init(sva, "entry");
+
+ nic = sva->nic;
+
+ sfc_vdpa_log_init(sva, "process kvarg");
+
+ /* skip MAC filter configuration if mac address is not provided */
+ if (rte_kvargs_count(sva->kvargs, SFC_VDPA_MAC_ADDR) == 0) {
+ sfc_vdpa_warn(sva,
+ "MAC address is not provided, skipping MAC Filter Config");
+ return -1;
+ }
+
+ rc = rte_kvargs_process(sva->kvargs, SFC_VDPA_MAC_ADDR,
+ &sfc_vdpa_get_eth_addr,
+ &ucast_eth_addr);
+ if (rc < 0)
+ return -1;
+
+ /* create filters on the base queue */
+ qid = SFC_VDPA_GET_VI_INDEX(0);
+
+ sfc_vdpa_log_init(sva, "insert broadcast mac filter");
+
+ EFX_MAC_BROADCAST_ADDR_SET(bcast_eth_addr.addr_bytes);
+ spec = &sva->filters.spec[SFC_VDPA_BCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic, spec, qid,
+ bcast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(ops_data->dev_handle,
+ "broadcast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "insert unicast mac filter");
+ spec = &sva->filters.spec[SFC_VDPA_UCAST_MAC_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic, spec, qid,
+ ucast_eth_addr.addr_bytes);
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "unicast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "done");
+
+ return rc;
+}
+
+int sfc_vdpa_filter_remove(struct sfc_vdpa_ops_data *ops_data)
+{
+ int i, rc = 0;
+ struct sfc_vdpa_adapter *sva = ops_data->dev_handle;
+ efx_nic_t *nic;
+
+ nic = sva->nic;
+
+ for (i = 0; i < sva->filters.filter_cnt; i++) {
+ rc = efx_filter_remove(nic, &(sva->filters.spec[i]));
+ if (rc != 0)
+ sfc_vdpa_err(sva,
+ "remove HW filter failed for entry %d: %s",
+ i, rte_strerror(rc));
+ }
+
+ sva->filters.filter_cnt = 0;
+
+ return rc;
+}
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index d3459ee..463498c 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -353,10 +353,20 @@
goto fail_virtio_init;
}
+ sfc_vdpa_log_init(sva, "init filter");
+ rc = efx_filter_init(enp);
+ if (rc != 0) {
+ sfc_vdpa_err(sva, "filter init failed: %s", rte_strerror(rc));
+ goto fail_filter_init;
+ }
+
sfc_vdpa_log_init(sva, "done");
return 0;
+fail_filter_init:
+ efx_virtio_fini(enp);
+
fail_virtio_init:
efx_nic_fini(enp);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 1725597..9d4ed34 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -421,6 +421,8 @@
sfc_vdpa_disable_vfio_intr(ops_data);
+ sfc_vdpa_filter_remove(ops_data);
+
ops_data->state = SFC_VDPA_STATE_CONFIGURED;
}
@@ -460,12 +462,27 @@
goto fail_vq_start;
}
+ ops_data->vq_count = i;
+
+ sfc_vdpa_log_init(ops_data->dev_handle,
+ "configure MAC filters");
+ rc = sfc_vdpa_filter_config(ops_data);
+ if (rc != 0) {
+ sfc_vdpa_err(ops_data->dev_handle,
+ "MAC filter config failed: %s",
+ rte_strerror(rc));
+ goto fail_filter_cfg;
+ }
+
ops_data->state = SFC_VDPA_STATE_STARTED;
sfc_vdpa_log_init(ops_data->dev_handle, "done");
return 0;
+fail_filter_cfg:
+ /* remove already created filters */
+ sfc_vdpa_filter_remove(ops_data);
fail_vq_start:
/* stop already started virtqueues */
for (j = 0; j < i; j++)
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 08/10] vdpa/sfc: add support for MAC filter config
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
@ 2021-11-04 10:58 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-04 10:58 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/21 14:57, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Add support for unicast and broadcast MAC filter configuration.
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
> v4:
> * Removed redundant NULL check.
> * Improved line usage by rearranging function params.
>
> doc/guides/vdpadevs/sfc.rst | 4 ++
> drivers/vdpa/sfc/meson.build | 1 +
> drivers/vdpa/sfc/sfc_vdpa.c | 32 +++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 30 ++++++++
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 136 +++++++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 10 +++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 17 +++++
> 7 files changed, 230 insertions(+)
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* [dpdk-dev] [PATCH v4 09/10] vdpa/sfc: add support to set vring state
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (7 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 08/10] vdpa/sfc: add support for MAC filter config Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
2021-11-04 13:07 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Maxime Coquelin
10 siblings, 0 replies; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Implements vDPA ops set_vring_state to configure vring state.
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
drivers/vdpa/sfc/sfc_vdpa_ops.c | 54 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index 9d4ed34..c5c97b8 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -702,11 +702,57 @@
static int
sfc_vdpa_set_vring_state(int vid, int vring, int state)
{
- RTE_SET_USED(vid);
- RTE_SET_USED(vring);
- RTE_SET_USED(state);
+ struct sfc_vdpa_ops_data *ops_data;
+ struct rte_vdpa_device *vdpa_dev;
+ efx_rc_t rc;
+ int vring_max;
+ void *dev;
- return -1;
+ vdpa_dev = rte_vhost_get_vdpa_device(vid);
+
+ ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev);
+ if (ops_data == NULL)
+ return -1;
+
+ dev = ops_data->dev_handle;
+
+ sfc_vdpa_info(dev,
+ "vDPA ops set_vring_state: vid: %d, vring: %d, state:%d",
+ vid, vring, state);
+
+ vring_max = (sfc_vdpa_adapter_by_dev_handle(dev)->max_queue_count * 2);
+
+ if (vring < 0 || vring > vring_max) {
+ sfc_vdpa_err(dev, "received invalid vring id : %d to set state",
+ vring);
+ return -1;
+ }
+
+ /*
+ * Skip if device is not yet started. virtqueues state can be
+ * changed once it is created and other configurations are done.
+ */
+ if (ops_data->state != SFC_VDPA_STATE_STARTED)
+ return 0;
+
+ if (ops_data->vq_cxt[vring].enable == state)
+ return 0;
+
+ if (state == 0) {
+ rc = sfc_vdpa_virtq_stop(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue stop failed: %s",
+ rte_strerror(rc));
+ }
+ } else {
+ rc = sfc_vdpa_virtq_start(ops_data, vring);
+ if (rc != 0) {
+ sfc_vdpa_err(dev, "virtqueue start failed: %s",
+ rte_strerror(rc));
+ }
+ }
+
+ return rc;
}
static int
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* [dpdk-dev] [PATCH v4 10/10] vdpa/sfc: set a multicast filter during vDPA init
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (8 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 09/10] vdpa/sfc: add support to set vring state Vijay Srivastava
@ 2021-11-03 13:57 ` Vijay Srivastava
2021-11-04 11:12 ` Maxime Coquelin
2021-11-04 13:07 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Maxime Coquelin
10 siblings, 1 reply; 122+ messages in thread
From: Vijay Srivastava @ 2021-11-03 13:57 UTC (permalink / raw)
To: dev; +Cc: maxime.coquelin, chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Insert unknown multicast filter to allow IPv6 neighbor discovery
Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
v4:
* Improved line usage by rearranging function params.
drivers/vdpa/sfc/sfc_vdpa.h | 3 ++-
drivers/vdpa/sfc/sfc_vdpa_filter.c | 20 +++++++++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa.h b/drivers/vdpa/sfc/sfc_vdpa.h
index 81fc39d..080f2d6 100644
--- a/drivers/vdpa/sfc/sfc_vdpa.h
+++ b/drivers/vdpa/sfc/sfc_vdpa.h
@@ -21,7 +21,7 @@
#define SFC_VDPA_DEFAULT_MCDI_IOVA 0x200000000000
/* Broadcast & Unicast MAC filters are supported */
-#define SFC_MAX_SUPPORTED_FILTERS 2
+#define SFC_MAX_SUPPORTED_FILTERS 3
/*
* Get function-local index of the associated VI from the
@@ -32,6 +32,7 @@
enum sfc_vdpa_filter_type {
SFC_VDPA_BCAST_MAC_FILTER = 0,
SFC_VDPA_UCAST_MAC_FILTER = 1,
+ SFC_VDPA_MCAST_DST_FILTER = 2,
SFC_VDPA_FILTER_NTYPE
};
diff --git a/drivers/vdpa/sfc/sfc_vdpa_filter.c b/drivers/vdpa/sfc/sfc_vdpa_filter.c
index 9687278..4c133aa 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_filter.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_filter.c
@@ -39,8 +39,12 @@
spec->efs_flags = EFX_FILTER_FLAG_RX;
spec->efs_dmaq_id = qid;
- rc = efx_filter_spec_set_eth_local(spec, EFX_FILTER_SPEC_VID_UNSPEC,
- eth_addr);
+ if (eth_addr == NULL)
+ rc = efx_filter_spec_set_mc_def(spec);
+ else
+ rc = efx_filter_spec_set_eth_local(spec,
+ EFX_FILTER_SPEC_VID_UNSPEC,
+ eth_addr);
if (rc != 0)
return rc;
@@ -103,8 +107,18 @@ int sfc_vdpa_filter_config(struct sfc_vdpa_ops_data *ops_data)
rc = sfc_vdpa_set_mac_filter(nic, spec, qid,
ucast_eth_addr.addr_bytes);
if (rc != 0)
+ sfc_vdpa_err(sva, "unicast MAC filter insertion failed: %s",
+ rte_strerror(rc));
+ else
+ sva->filters.filter_cnt++;
+
+ sfc_vdpa_log_init(sva, "insert unknown mcast filter");
+ spec = &sva->filters.spec[SFC_VDPA_MCAST_DST_FILTER];
+
+ rc = sfc_vdpa_set_mac_filter(nic, spec, qid, NULL);
+ if (rc != 0)
sfc_vdpa_err(sva,
- "unicast MAC filter insertion failed: %s",
+ "mcast filter insertion failed: %s",
rte_strerror(rc));
else
sva->filters.filter_cnt++;
--
1.8.3.1
^ permalink raw reply [flat|nested] 122+ messages in thread* Re: [dpdk-dev] [PATCH v4 10/10] vdpa/sfc: set a multicast filter during vDPA init
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
@ 2021-11-04 11:12 ` Maxime Coquelin
0 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-04 11:12 UTC (permalink / raw)
To: Vijay Srivastava, dev
Cc: chenbo.xia, andrew.rybchenko, Vijay Kumar Srivastava
On 11/3/21 14:57, Vijay Srivastava wrote:
> From: Vijay Kumar Srivastava <vsrivast@xilinx.com>
>
> Insert unknown multicast filter to allow IPv6 neighbor discovery
>
> Signed-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
> ---
> v4:
> * Improved line usage by rearranging function params.
>
> drivers/vdpa/sfc/sfc_vdpa.h | 3 ++-
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 20 +++++++++++++++++---
> 2 files changed, 19 insertions(+), 4 deletions(-)
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread
* Re: [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 00/10] vdpa/sfc: introduce Xilinx vDPA driver Vijay Srivastava
` (9 preceding siblings ...)
2021-11-03 13:57 ` [dpdk-dev] [PATCH v4 10/10] vdpa/sfc: set a multicast filter during vDPA init Vijay Srivastava
@ 2021-11-04 13:07 ` Maxime Coquelin
10 siblings, 0 replies; 122+ messages in thread
From: Maxime Coquelin @ 2021-11-04 13:07 UTC (permalink / raw)
To: Vijay Srivastava, dev; +Cc: chenbo.xia, andrew.rybchenko, Vijay Srivastava
On 11/3/21 14:57, Vijay Srivastava wrote:
> This patch series introduces vDPA driver for Xilinx devices.
> The Xilinx vDPA (vhost data path acceleration) provides
> support for the Xilinx SN1022 SmartNICs.
>
> Vijay Kumar Srivastava (10):
> vdpa/sfc: introduce Xilinx vDPA driver
> vdpa/sfc: add support for device initialization
> vdpa/sfc: add support to get device and protocol features
> vdpa/sfc: get device supported max queue count
> vdpa/sfc: add support to get VFIO device fd
> vdpa/sfc: add support for dev conf and dev close ops
> vdpa/sfc: add support to get queue notify area info
> vdpa/sfc: add support for MAC filter config
> vdpa/sfc: add support to set vring state
> vdpa/sfc: set a multicast filter during vDPA init
>
> MAINTAINERS | 6 +
> doc/guides/rel_notes/release_21_11.rst | 5 +
> doc/guides/vdpadevs/features/sfc.ini | 19 +
> doc/guides/vdpadevs/index.rst | 1 +
> doc/guides/vdpadevs/sfc.rst | 107 ++++
> drivers/common/sfc_efx/efsys.h | 2 +-
> drivers/common/sfc_efx/version.map | 10 +
> drivers/vdpa/meson.build | 1 +
> drivers/vdpa/sfc/meson.build | 26 +
> drivers/vdpa/sfc/sfc_vdpa.c | 363 +++++++++++++
> drivers/vdpa/sfc/sfc_vdpa.h | 162 ++++++
> drivers/vdpa/sfc/sfc_vdpa_debug.h | 21 +
> drivers/vdpa/sfc/sfc_vdpa_filter.c | 150 ++++++
> drivers/vdpa/sfc/sfc_vdpa_hw.c | 418 +++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_log.h | 59 +++
> drivers/vdpa/sfc/sfc_vdpa_mcdi.c | 74 +++
> drivers/vdpa/sfc/sfc_vdpa_ops.c | 930 +++++++++++++++++++++++++++++++++
> drivers/vdpa/sfc/sfc_vdpa_ops.h | 67 +++
> drivers/vdpa/sfc/version.map | 3 +
> 19 files changed, 2423 insertions(+), 1 deletion(-)
> create mode 100644 doc/guides/vdpadevs/features/sfc.ini
> create mode 100644 doc/guides/vdpadevs/sfc.rst
> create mode 100644 drivers/vdpa/sfc/meson.build
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_debug.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_filter.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_hw.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_log.h
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_mcdi.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.c
> create mode 100644 drivers/vdpa/sfc/sfc_vdpa_ops.h
> create mode 100644 drivers/vdpa/sfc/version.map
>
Applied to dpdk-next-virtio/main, with fixing the vdpa driver header
inclusion.
Thanks,
Maxime
^ permalink raw reply [flat|nested] 122+ messages in thread