Both, net/mlx5 PMD and vdpa/mlx5 drivers can probe the same Mellanox
devices.
Skip net/mlx5 PMD probing while the device is in vDPA mode selected by
the device devargs provided by the user: vdpa=1.
Skip vdpa/mlx5 PMD probing while the device is not in vDPA mode selected by
the device devargs provided by the user: vdpa=1.
Signed-off-by: Matan Azrad <matan@mellanox.com>
---
drivers/common/mlx5/Makefile | 2 +-
drivers/common/mlx5/meson.build | 2 +-
drivers/common/mlx5/mlx5_common.c | 36 +++++++++++++++++++++++++
drivers/common/mlx5/mlx5_common.h | 3 +++
drivers/common/mlx5/rte_common_mlx5_version.map | 1 +
drivers/net/mlx5/mlx5.c | 7 ++++-
drivers/vdpa/mlx5/mlx5_vdpa.c | 7 ++++-
7 files changed, 54 insertions(+), 4 deletions(-)
@@ -42,7 +42,7 @@ else
LDLIBS += -libverbs -lmlx5
endif
-LDLIBS += -lrte_eal -lrte_pci
+LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs
# A few warnings cannot be avoided in external headers.
CFLAGS += -Wno-error=cast-qual -DNDEBUG -UPEDANTIC
@@ -37,7 +37,7 @@ endforeach
if build
allow_experimental_apis = true
- deps += ['hash', 'pci', 'net', 'eal']
+ deps += ['hash', 'pci', 'net', 'eal', 'kvargs']
ext_deps += libs
sources = files(
'mlx5_devx_cmds.c',
@@ -71,6 +71,42 @@
return 0;
}
+static int
+mlx5_vdpa_check_handler(__rte_unused const char *key, const char *value,
+ __rte_unused void *opaque)
+{
+ if (strcmp(value, "1"))
+ return -1;
+ return 0;
+}
+
+int
+mlx5_vdpa_mode_selected(struct rte_devargs *devargs)
+{
+ struct rte_kvargs *kvlist;
+ const char *key = "vdpa";
+ int ret = 0;
+
+ if (devargs == NULL)
+ return 0;
+
+ kvlist = rte_kvargs_parse(devargs->args, NULL);
+ if (kvlist == NULL)
+ return 0;
+
+ if (!rte_kvargs_count(kvlist, key))
+ goto exit;
+
+ /* Vdpa mode selected when there's a key-value pair: vdpa=1. */
+ if (rte_kvargs_process(kvlist, key, mlx5_vdpa_check_handler, NULL) < 0)
+ goto exit;
+ ret = 1;
+
+exit:
+ rte_kvargs_free(kvlist);
+ return ret;
+}
+
#ifdef RTE_IBVERBS_LINK_DLOPEN
/**
@@ -11,6 +11,8 @@
#include <rte_pci.h>
#include <rte_atomic.h>
#include <rte_log.h>
+#include <rte_kvargs.h>
+#include <rte_devargs.h>
#include "mlx5_prm.h"
@@ -149,5 +151,6 @@ enum mlx5_cqe_status {
}
int mlx5_dev_to_pci_addr(const char *dev_path, struct rte_pci_addr *pci_addr);
+int mlx5_vdpa_mode_selected(struct rte_devargs *devargs);
#endif /* RTE_PMD_MLX5_COMMON_H_ */
@@ -24,4 +24,5 @@ DPDK_20.02 {
mlx5_devx_get_out_command_status;
mlx5_dev_to_pci_addr;
+ mlx5_vdpa_mode_selected;
};
@@ -2956,7 +2956,12 @@ struct mlx5_flow_id_pool *
struct mlx5_dev_config dev_config;
int ret;
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ if (mlx5_vdpa_mode_selected(pci_dev->device.devargs)) {
+ DRV_LOG(DEBUG, "Skip probing - should be probed by the vdpa"
+ " driver.");
+ return 1;
+ }
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
mlx5_pmd_socket_init();
ret = mlx5_init_once();
if (ret) {
@@ -243,7 +243,7 @@
*/
static int
mlx5_vdpa_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
- struct rte_pci_device *pci_dev __rte_unused)
+ struct rte_pci_device *pci_dev)
{
struct ibv_device **ibv_list;
struct ibv_device *ibv_match = NULL;
@@ -252,6 +252,11 @@
struct mlx5_hca_attr attr;
int ret;
+ if (!mlx5_vdpa_mode_selected(pci_dev->device.devargs)) {
+ DRV_LOG(DEBUG, "Skip mlx5 vdpa probing - no \"vdpa=1\" in"
+ " devargs.");
+ return 1;
+ }
errno = 0;
ibv_list = mlx5_glue->get_device_list(&ret);
if (!ibv_list) {