From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <xiao.w.wang@intel.com>
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
by dpdk.org (Postfix) with ESMTP id 08C781B965
for <dev@dpdk.org>; Fri, 14 Dec 2018 22:26:41 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga001.jf.intel.com ([10.7.209.18])
by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
14 Dec 2018 13:26:41 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.56,354,1539673200"; d="scan'208";a="118922667"
Received: from dpdk-xiao-1.sh.intel.com ([10.67.111.145])
by orsmga001.jf.intel.com with ESMTP; 14 Dec 2018 13:26:40 -0800
From: Xiao Wang <xiao.w.wang@intel.com>
To: tiwei.bie@intel.com,
maxime.coquelin@redhat.com
Cc: alejandro.lucero@netronome.com, dev@dpdk.org, zhihong.wang@intel.com,
xiaolong.ye@intel.com, Xiao Wang <xiao.w.wang@intel.com>
Date: Sat, 15 Dec 2018 05:16:08 +0800
Message-Id: <20181214211612.167681-7-xiao.w.wang@intel.com>
X-Mailer: git-send-email 2.15.1
In-Reply-To: <20181214211612.167681-1-xiao.w.wang@intel.com>
References: <20181213100910.13087-2-xiao.w.wang@intel.com>
<20181214211612.167681-1-xiao.w.wang@intel.com>
Subject: [dpdk-dev] [PATCH v4 06/10] net/ifc: detect if VDPA mode is
specified
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Dec 2018 21:26:42 -0000
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 doesn't not find this option, it should quit and let the
bus continue the probe.
Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
---
drivers/net/ifc/Makefile | 1 +
drivers/net/ifc/ifcvf_vdpa.c | 47 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifc/Makefile
index 39b36ae5d..7755a87eb 100644
--- a/drivers/net/ifc/Makefile
+++ b/drivers/net/ifc/Makefile
@@ -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)
diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
index 6fcd50b73..c0e50354a 100644
--- a/drivers/net/ifc/ifcvf_vdpa.c
+++ b/drivers/net/ifc/ifcvf_vdpa.c
@@ -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;
--
2.15.1