net/ifc: detect if VDPA mode is specified

If user wants the VF to be used in VDPA (vhost data path acceleration)
mode, then the user can add a "vdpa=1" parameter for the device.

So if driver does not find this option, it should quit and let the bus
continue the probe.

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Xiao Wang 2018-12-18 16:02:03 +08:00 committed by Ferruh Yigit
parent 7b47ea59f2
commit 40ef35f4a5
2 changed files with 48 additions and 0 deletions

View File

@ -10,6 +10,7 @@ LIB = librte_pmd_ifc.a
LDLIBS += -lpthread
LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci
LDLIBS += -lrte_kvargs
CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS)

View File

@ -17,6 +17,8 @@
#include <rte_vfio.h>
#include <rte_spinlock.h>
#include <rte_log.h>
#include <rte_kvargs.h>
#include <rte_devargs.h>
#include "base/ifcvf.h"
@ -28,6 +30,13 @@
#define PAGE_SIZE 4096
#endif
#define IFCVF_VDPA_MODE "vdpa"
static const char * const ifcvf_valid_arguments[] = {
IFCVF_VDPA_MODE,
NULL
};
static int ifcvf_vdpa_logtype;
struct ifcvf_internal {
@ -735,6 +744,21 @@ static struct rte_vdpa_dev_ops ifcvf_ops = {
.get_notify_area = ifcvf_get_notify_area,
};
static inline int
open_int(const char *key __rte_unused, const char *value, void *extra_args)
{
uint16_t *n = extra_args;
if (value == NULL || extra_args == NULL)
return -EINVAL;
*n = (uint16_t)strtoul(value, NULL, 0);
if (*n == USHRT_MAX && errno == ERANGE)
return -1;
return 0;
}
static int
ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
@ -742,10 +766,31 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
uint64_t features;
struct ifcvf_internal *internal = NULL;
struct internal_list *list = NULL;
int vdpa_mode = 0;
struct rte_kvargs *kvlist = NULL;
int ret = 0;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
kvlist = rte_kvargs_parse(pci_dev->device.devargs->args,
ifcvf_valid_arguments);
if (kvlist == NULL)
return 1;
/* probe only when vdpa mode is specified */
if (rte_kvargs_count(kvlist, IFCVF_VDPA_MODE) == 0) {
rte_kvargs_free(kvlist);
return 1;
}
ret = rte_kvargs_process(kvlist, IFCVF_VDPA_MODE, &open_int,
&vdpa_mode);
if (ret < 0 || vdpa_mode == 0) {
rte_kvargs_free(kvlist);
return 1;
}
list = rte_zmalloc("ifcvf", sizeof(*list), 0);
if (list == NULL)
goto error;
@ -795,9 +840,11 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
rte_atomic32_set(&internal->started, 1);
update_datapath(internal);
rte_kvargs_free(kvlist);
return 0;
error:
rte_kvargs_free(kvlist);
rte_free(list);
rte_free(internal);
return -1;