* [dpdk-dev] [PATCH RFC 1/2] vhost: make capabilities configurable
2017-12-23 3:36 [dpdk-dev] [PATCH RFC 0/2] vhost: support selective datapath Zhihong Wang
@ 2017-12-23 3:36 ` Zhihong Wang
2018-01-30 14:59 ` Maxime Coquelin
2017-12-23 3:36 ` [dpdk-dev] [PATCH RFC 2/2] vhost: support selective datapath Zhihong Wang
1 sibling, 1 reply; 5+ messages in thread
From: Zhihong Wang @ 2017-12-23 3:36 UTC (permalink / raw)
To: dev
Cc: jianfeng.tan, tiwei.bie, maxime.coquelin, yliu, cunming.liang,
xiao.w.wang, dan.daly, Zhihong Wang
This patch makes vhost device capabilities configurable to adopt various
engines. Such capabilities include supported features, protocol features,
queue number. APIs are introduced to let app configure these capabilities.
Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
---
lib/librte_vhost/rte_vhost.h | 50 ++++++++++++++++++++++++++++
lib/librte_vhost/socket.c | 77 +++++++++++++++++++++++++++++++++++++++++++
lib/librte_vhost/vhost_user.c | 48 ++++++++++++++++++++-------
3 files changed, 164 insertions(+), 11 deletions(-)
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index f653644..17b4c6d 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -209,6 +209,56 @@ int rte_vhost_driver_unregister(const char *path);
int rte_vhost_driver_set_features(const char *path, uint64_t features);
/**
+ * Get the protocol feature bits before feature negotiation.
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @param protocol_features
+ * A pointer to store the queried protocol feature bits
+ * @return
+ * 0 on success, -1 on failure
+ */
+int rte_vhost_driver_get_protocol_features(const char *path,
+ uint64_t *protocol_features);
+
+/**
+ * Set the protocol feature bits the vhost-user driver supports.
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @param protocol_features
+ * Supported protocol features
+ * @return
+ * 0 on success, -1 on failure
+ */
+int rte_vhost_driver_set_protocol_features(const char *path,
+ uint64_t protocol_features);
+
+/**
+ * Get the queue number before feature negotiation.
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @param queue_num
+ * A pointer to store the queried queue number
+ * @return
+ * 0 on success, -1 on failure
+ */
+int rte_vhost_driver_get_queue_num(const char *path, uint16_t *queue_num);
+
+/**
+ * Set the queue number the vhost-user driver supports.
+ *
+ * @param path
+ * The vhost-user socket file path
+ * @param queue_num
+ * Supported queue number
+ * @return
+ * 0 on success, -1 on failure
+ */
+int rte_vhost_driver_set_queue_num(const char *path, uint16_t queue_num);
+
+/**
* Enable vhost-user driver features.
*
* Note that
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 422da00..742f772 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -78,7 +78,10 @@ struct vhost_user_socket {
* features negotiation.
*/
uint64_t supported_features;
+ uint64_t supported_protocol_features;
uint64_t features;
+ uint64_t protocol_features;
+ uint16_t queue_num;
struct vhost_device_ops const *notify_ops;
};
@@ -613,6 +616,75 @@ rte_vhost_driver_get_features(const char *path, uint64_t *features)
}
}
+int rte_vhost_driver_set_protocol_features(const char *path,
+ uint64_t protocol_features)
+{
+ struct vhost_user_socket *vsocket;
+
+ pthread_mutex_lock(&vhost_user.mutex);
+ vsocket = find_vhost_user_socket(path);
+ if (vsocket) {
+ vsocket->supported_protocol_features = protocol_features;
+ vsocket->protocol_features = protocol_features;
+ }
+ pthread_mutex_unlock(&vhost_user.mutex);
+
+ return vsocket ? 0 : -1;
+}
+
+int
+rte_vhost_driver_get_protocol_features(const char *path,
+ uint64_t *protocol_features)
+{
+ struct vhost_user_socket *vsocket;
+
+ pthread_mutex_lock(&vhost_user.mutex);
+ vsocket = find_vhost_user_socket(path);
+ if (vsocket)
+ *protocol_features = vsocket->protocol_features;
+ pthread_mutex_unlock(&vhost_user.mutex);
+
+ if (!vsocket) {
+ RTE_LOG(ERR, VHOST_CONFIG,
+ "socket file %s is not registered yet.\n", path);
+ return -1;
+ } else {
+ return 0;
+ }
+}
+
+int rte_vhost_driver_set_queue_num(const char *path, uint16_t queue_num)
+{
+ struct vhost_user_socket *vsocket;
+
+ pthread_mutex_lock(&vhost_user.mutex);
+ vsocket = find_vhost_user_socket(path);
+ if (vsocket)
+ vsocket->queue_num = queue_num;
+ pthread_mutex_unlock(&vhost_user.mutex);
+
+ return vsocket ? 0 : -1;
+}
+
+int rte_vhost_driver_get_queue_num(const char *path, uint16_t *queue_num)
+{
+ struct vhost_user_socket *vsocket;
+
+ pthread_mutex_lock(&vhost_user.mutex);
+ vsocket = find_vhost_user_socket(path);
+ if (vsocket)
+ *queue_num = vsocket->queue_num;
+ pthread_mutex_unlock(&vhost_user.mutex);
+
+ if (!vsocket) {
+ RTE_LOG(ERR, VHOST_CONFIG,
+ "socket file %s is not registered yet.\n", path);
+ return -1;
+ } else {
+ return 0;
+ }
+}
+
/*
* Register a new vhost-user socket; here we could act as server
* (the default case), or client (when RTE_VHOST_USER_CLIENT) flag
@@ -675,6 +747,11 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
vsocket->features &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM);
}
+ vsocket->supported_protocol_features = VHOST_USER_PROTOCOL_FEATURES;
+ vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
+
+ vsocket->queue_num = VHOST_MAX_QUEUE_PAIRS;
+
if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
vsocket->reconnect = !(flags & RTE_VHOST_USER_NO_RECONNECT);
if (vsocket->reconnect && reconn_tid == 0) {
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index f4c7ce4..0a4d128 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -156,6 +156,18 @@ vhost_user_reset_owner(struct virtio_net *dev)
}
/*
+ * The max queue num.
+ */
+static uint16_t
+vhost_user_get_queue_num(struct virtio_net *dev)
+{
+ uint16_t queue_num = 0;
+
+ rte_vhost_driver_get_queue_num(dev->ifname, &queue_num);
+ return queue_num;
+}
+
+/*
* The features that we support are requested.
*/
static uint64_t
@@ -860,13 +872,17 @@ vhost_user_set_vring_enable(struct virtio_net *dev,
return 0;
}
-static void
-vhost_user_get_protocol_features(struct virtio_net *dev,
- struct VhostUserMsg *msg)
+/*
+ * The protocol features that we support are requested.
+ */
+
+static uint64_t
+vhost_user_get_protocol_features(struct virtio_net *dev)
{
- uint64_t features, protocol_features = VHOST_USER_PROTOCOL_FEATURES;
+ uint64_t features, protocol_features;
rte_vhost_driver_get_features(dev->ifname, &features);
+ rte_vhost_driver_get_protocol_features(dev->ifname, &protocol_features);
/*
* REPLY_ACK protocol feature is only mandatory for now
@@ -877,18 +893,27 @@ vhost_user_get_protocol_features(struct virtio_net *dev,
if (!(features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)))
protocol_features &= ~(1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK);
- msg->payload.u64 = protocol_features;
- msg->size = sizeof(msg->payload.u64);
+ return protocol_features;
}
-static void
+static int
vhost_user_set_protocol_features(struct virtio_net *dev,
uint64_t protocol_features)
{
- if (protocol_features & ~VHOST_USER_PROTOCOL_FEATURES)
- return;
+ uint64_t vhost_protocol_features = 0;
+
+ rte_vhost_driver_get_protocol_features(dev->ifname,
+ &vhost_protocol_features);
+ if (protocol_features & ~vhost_protocol_features) {
+ RTE_LOG(ERR, VHOST_CONFIG,
+ "(%d) received invalid negotiated protocol_features.\n",
+ dev->vid);
+ return -1;
+ }
dev->protocol_features = protocol_features;
+
+ return 0;
}
static int
@@ -1252,7 +1277,8 @@ vhost_user_msg_handler(int vid, int fd)
break;
case VHOST_USER_GET_PROTOCOL_FEATURES:
- vhost_user_get_protocol_features(dev, &msg);
+ msg.payload.u64 = vhost_user_get_protocol_features(dev);
+ msg.size = sizeof(msg.payload.u64);
send_vhost_reply(fd, &msg);
break;
case VHOST_USER_SET_PROTOCOL_FEATURES:
@@ -1312,7 +1338,7 @@ vhost_user_msg_handler(int vid, int fd)
break;
case VHOST_USER_GET_QUEUE_NUM:
- msg.payload.u64 = VHOST_MAX_QUEUE_PAIRS;
+ msg.payload.u64 = vhost_user_get_queue_num(dev);
msg.size = sizeof(msg.payload.u64);
send_vhost_reply(fd, &msg);
break;
--
2.7.5
^ permalink raw reply [flat|nested] 5+ messages in thread* [dpdk-dev] [PATCH RFC 2/2] vhost: support selective datapath
2017-12-23 3:36 [dpdk-dev] [PATCH RFC 0/2] vhost: support selective datapath Zhihong Wang
2017-12-23 3:36 ` [dpdk-dev] [PATCH RFC 1/2] vhost: make capabilities configurable Zhihong Wang
@ 2017-12-23 3:36 ` Zhihong Wang
1 sibling, 0 replies; 5+ messages in thread
From: Zhihong Wang @ 2017-12-23 3:36 UTC (permalink / raw)
To: dev
Cc: jianfeng.tan, tiwei.bie, maxime.coquelin, yliu, cunming.liang,
xiao.w.wang, dan.daly, Zhihong Wang
This patch introduces support for selective datapath in DPDK vhost-user lib
to enable acceleration. The default selection is the existing software
implementation, while more options are available when more engines are
present.
Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
---
lib/librte_vhost/Makefile | 4 +-
lib/librte_vhost/rte_vdpa.h | 126 ++++++++++++++++++++++++++++++++++++++++++
lib/librte_vhost/rte_vhost.h | 48 ++++++++++++++++
lib/librte_vhost/vdpa.c | 122 ++++++++++++++++++++++++++++++++++++++++
lib/librte_vhost/vhost.c | 53 ++++++++++++++++++
lib/librte_vhost/vhost.h | 7 +++
lib/librte_vhost/vhost_user.c | 48 ++++++++++++++--
7 files changed, 402 insertions(+), 6 deletions(-)
create mode 100644 lib/librte_vhost/rte_vdpa.h
create mode 100644 lib/librte_vhost/vdpa.c
diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile
index be18279..47930ba 100644
--- a/lib/librte_vhost/Makefile
+++ b/lib/librte_vhost/Makefile
@@ -49,9 +49,9 @@ LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev
# all source are stored in SRCS-y
SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c iotlb.c socket.c vhost.c \
- vhost_user.c virtio_net.c
+ vhost_user.c virtio_net.c vdpa.c
# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h
+SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h rte_vdpa.h
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h
new file mode 100644
index 0000000..4f9eebd
--- /dev/null
+++ b/lib/librte_vhost/rte_vdpa.h
@@ -0,0 +1,126 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_VDPA_H_
+#define _RTE_VDPA_H_
+
+#include <rte_memory.h>
+#include <rte_pci.h>
+#include "rte_vhost.h"
+
+/**
+ * @file
+ *
+ * Device specific vhost lib
+ */
+
+#define MAX_VDPA_ENGINE_NUM 128
+#define MAX_VDPA_NAME_LEN 128
+
+
+struct rte_vdpa_eng_id {
+ union {
+ uint8_t __dummy[64];
+
+ struct {
+ struct rte_pci_addr pci_addr;
+ };
+ };
+};
+
+struct rte_vdpa_eng_attr {
+ char name[MAX_VDPA_NAME_LEN];
+ struct rte_vdpa_eng_id *id;
+};
+
+/* register/remove engine and return the engine id */
+typedef int (*vdpa_eng_init_t)(int eid, struct rte_vdpa_eng_id *id);
+typedef int (*vdpa_eng_uninit_t)(int eid);
+
+/* driver configure/close the port based on connection */
+typedef int (*vdpa_dev_conf_t)(int vid);
+typedef int (*vdpa_dev_close_t)(int vid);
+
+/* enable/disable this vring */
+typedef int (*vdpa_vring_state_set_t)(int vid, int vring, int state);
+
+/* set features when changed */
+typedef int (*vdpa_feature_set_t)(int vid);
+
+/* destination operations when migration done, e.g. send rarp */
+typedef int (*vdpa_migration_done_t)(int vid);
+
+/* device ops */
+struct rte_vdpa_dev_ops {
+ vdpa_dev_conf_t dev_conf;
+ vdpa_dev_close_t dev_close;
+ vdpa_vring_state_set_t vring_state_set;
+ vdpa_feature_set_t feature_set;
+ vdpa_migration_done_t migration_done;
+};
+
+/* engine ops */
+struct rte_vdpa_eng_ops {
+ vdpa_eng_init_t eng_init;
+ vdpa_eng_uninit_t eng_uninit;
+};
+
+struct rte_vdpa_eng_driver {
+ const char *name;
+ struct rte_vdpa_eng_ops eng_ops;
+ struct rte_vdpa_dev_ops dev_ops;
+} __rte_cache_aligned;
+
+struct rte_vdpa_engine {
+ struct rte_vdpa_eng_attr eng_attr;
+ struct rte_vdpa_eng_driver *eng_drv;
+} __rte_cache_aligned;
+
+extern struct rte_vdpa_engine *vdpa_engines[];
+extern uint32_t vdpa_engine_num;
+
+/* engine management */
+int rte_vdpa_register_engine(const char *name, struct rte_vdpa_eng_id *id);
+int rte_vdpa_unregister_engine(int eid);
+
+/* driver register api */
+void rte_vdpa_register_driver(struct rte_vdpa_eng_driver *drv);
+
+#define RTE_VDPA_REGISTER_DRIVER(nm, drv) \
+RTE_INIT(vdpainitfn_ ##nm); \
+static void vdpainitfn_ ##nm(void) \
+{ \
+ rte_vdpa_register_driver(&drv); \
+} \
+
+#endif /* _RTE_VDPA_H_ */
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index 17b4c6d..cbb2105 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -498,6 +498,54 @@ int rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx,
*/
uint32_t rte_vhost_rx_queue_count(int vid, uint16_t qid);
+/**
+ * Set vdpa engine id for vhost device.
+ *
+ * @param vid
+ * vhost device ID
+ * @param eid
+ * engine id
+ * @return
+ * engine id
+ */
+int rte_vhost_set_vdpa_eid(int vid, int eid);
+
+/**
+ * Set vdpa device id for vhost device.
+ *
+ * @param vid
+ * vhost device ID
+ * @param did
+ * device id
+ * @return
+ * device id
+ */
+int rte_vhost_set_vdpa_did(int vid, int did);
+
+/**
+ * Get vdpa engine id for vhost device.
+ *
+ * @param vid
+ * vhost device ID
+ * @param eid
+ * engine id
+ * @return
+ * engine id
+ */
+int rte_vhost_get_vdpa_eid(int vid);
+
+/**
+ * Get vdpa device id for vhost device.
+ *
+ * @param vid
+ * vhost device ID
+ * @param did
+ * device id
+ * @return
+ * device id
+ */
+int rte_vhost_get_vdpa_did(int vid);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c
new file mode 100644
index 0000000..f2aa308
--- /dev/null
+++ b/lib/librte_vhost/vdpa.c
@@ -0,0 +1,122 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @file
+ *
+ * Device specific vhost lib
+ */
+
+#include <rte_malloc.h>
+#include "rte_vdpa.h"
+#include "vhost.h"
+
+static struct rte_vdpa_eng_driver *vdpa_drivers[MAX_VDPA_ENGINE_NUM];
+static uint32_t vdpa_driver_num;
+
+struct rte_vdpa_engine *vdpa_engines[MAX_VDPA_ENGINE_NUM];
+uint32_t vdpa_engine_num;
+
+int vid2eid[MAX_VHOST_DEVICE];
+int vid2did[MAX_VHOST_DEVICE];
+
+void rte_vdpa_register_driver(struct rte_vdpa_eng_driver *driver)
+{
+ if (vdpa_driver_num >= MAX_VDPA_ENGINE_NUM)
+ return;
+
+ vdpa_drivers[vdpa_driver_num] = driver;
+ vdpa_driver_num++;
+}
+
+int rte_vdpa_register_engine(const char *name, struct rte_vdpa_eng_id *id)
+{
+ static int engine_idx;
+
+ struct rte_vdpa_engine *eng;
+ struct rte_vdpa_eng_driver *cur;
+ char engine_name[MAX_VDPA_NAME_LEN];
+ int i;
+
+ for (i = 0; i < MAX_VDPA_ENGINE_NUM; ++i) {
+ eng = vdpa_engines[i];
+ if (eng && 0 == strncmp(eng->eng_attr.name, name,
+ MAX_VDPA_NAME_LEN)
+ && eng->eng_attr.id == id) {
+ return i;
+ }
+ }
+
+ sprintf(engine_name, "vdpa-%s-%d", name, engine_idx++);
+ eng = rte_zmalloc(engine_name, sizeof(struct rte_vdpa_engine),
+ RTE_CACHE_LINE_SIZE);
+ if (!eng)
+ return -1;
+
+ for (i = 0; i < MAX_VDPA_ENGINE_NUM; ++i) {
+ cur = vdpa_drivers[i];
+ if (cur && 0 == strncmp(name, cur->name,
+ MAX_VDPA_NAME_LEN)) {
+ eng->eng_drv = cur;
+ strcpy(eng->eng_attr.name, name);
+ eng->eng_attr.id = id;
+ for (i = 0; i < MAX_VDPA_ENGINE_NUM; ++i) {
+ if (vdpa_engines[i])
+ continue;
+ vdpa_engines[i] = eng;
+ if (eng->eng_drv->eng_ops.eng_init)
+ eng->eng_drv->eng_ops.eng_init(i, id);
+ vdpa_engine_num++;
+ return i;
+ }
+ }
+ }
+
+ return -1;
+}
+
+int rte_vdpa_unregister_engine(int eid)
+{
+ if (eid < 0 || eid >= MAX_VDPA_ENGINE_NUM || vdpa_engines[eid]
+ == NULL)
+ return -1;
+
+ if (vdpa_engines[eid]->eng_drv->eng_ops.eng_uninit)
+ vdpa_engines[eid]->eng_drv->eng_ops.eng_uninit(eid);
+
+ rte_free(vdpa_engines[eid]);
+ vdpa_engines[eid] = NULL;
+ vdpa_engine_num--;
+
+ return eid;
+}
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 4f8b73a..709b0f9 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -314,6 +314,8 @@ vhost_new_device(void)
vhost_devices[i] = dev;
dev->vid = i;
dev->slave_req_fd = -1;
+ dev->eid = -1;
+ dev->did = -1;
return i;
}
@@ -326,11 +328,16 @@ void
vhost_destroy_device(int vid)
{
struct virtio_net *dev = get_device(vid);
+ int eid = dev->eid;
if (dev == NULL)
return;
if (dev->flags & VIRTIO_DEV_RUNNING) {
+ if (eid >= 0 && vdpa_engines[eid] &&
+ vdpa_engines[eid]->eng_drv &&
+ vdpa_engines[eid]->eng_drv->dev_ops.dev_close)
+ vdpa_engines[eid]->eng_drv->dev_ops.dev_close(dev->vid);
dev->flags &= ~VIRTIO_DEV_RUNNING;
dev->notify_ops->destroy_device(vid);
}
@@ -610,3 +617,49 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid)
return *((volatile uint16_t *)&vq->avail->idx) - vq->last_avail_idx;
}
+
+int
+rte_vhost_set_vdpa_eid(int vid, int eid)
+{
+ struct virtio_net *dev = get_device(vid);
+
+ if (dev == NULL)
+ return -1;
+
+ dev->eid = eid;
+
+ return eid;
+}
+
+int
+rte_vhost_set_vdpa_did(int vid, int did)
+{
+ struct virtio_net *dev = get_device(vid);
+
+ if (dev == NULL)
+ return -1;
+
+ dev->did = did;
+
+ return did;
+}
+
+int rte_vhost_get_vdpa_eid(int vid)
+{
+ struct virtio_net *dev = get_device(vid);
+
+ if (dev == NULL)
+ return -1;
+
+ return dev->eid;
+}
+
+int rte_vhost_get_vdpa_did(int vid)
+{
+ struct virtio_net *dev = get_device(vid);
+
+ if (dev == NULL)
+ return -1;
+
+ return dev->did;
+}
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 1cc81c1..f261c1a 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -48,6 +48,7 @@
#include <rte_rwlock.h>
#include "rte_vhost.h"
+#include "rte_vdpa.h"
/* Used to indicate that the device is running on a data core */
#define VIRTIO_DEV_RUNNING 1
@@ -253,6 +254,12 @@ struct virtio_net {
struct guest_page *guest_pages;
int slave_req_fd;
+
+ /* engine and device id to identify a certain port on a specific
+ * backend, both are set to -1 for sw.
+ */
+ int eid;
+ int did;
} __rte_cache_aligned;
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 0a4d128..51e6443 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -145,7 +145,13 @@ vhost_user_set_owner(void)
static int
vhost_user_reset_owner(struct virtio_net *dev)
{
+ int eid = dev->eid;
+
if (dev->flags & VIRTIO_DEV_RUNNING) {
+ if (eid >= 0 && vdpa_engines[eid] &&
+ vdpa_engines[eid]->eng_drv &&
+ vdpa_engines[eid]->eng_drv->dev_ops.dev_close)
+ vdpa_engines[eid]->eng_drv->dev_ops.dev_close(dev->vid);
dev->flags &= ~VIRTIO_DEV_RUNNING;
dev->notify_ops->destroy_device(dev->vid);
}
@@ -186,6 +192,7 @@ static int
vhost_user_set_features(struct virtio_net *dev, uint64_t features)
{
uint64_t vhost_features = 0;
+ int eid = dev->eid;
rte_vhost_driver_get_features(dev->ifname, &vhost_features);
if (features & ~vhost_features) {
@@ -200,6 +207,11 @@ vhost_user_set_features(struct virtio_net *dev, uint64_t features)
dev->notify_ops->features_changed(dev->vid, features);
}
+ if (eid >= 0 && vdpa_engines[eid] &&
+ vdpa_engines[eid]->eng_drv &&
+ vdpa_engines[eid]->eng_drv->dev_ops.feature_set)
+ vdpa_engines[eid]->eng_drv->dev_ops.feature_set(dev->vid);
+
dev->features = features;
if (dev->features &
((1 << VIRTIO_NET_F_MRG_RXBUF) | (1ULL << VIRTIO_F_VERSION_1))) {
@@ -813,9 +825,14 @@ vhost_user_get_vring_base(struct virtio_net *dev,
VhostUserMsg *msg)
{
struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
+ int eid = dev->eid;
/* We have to stop the queue (virtio) if it is running. */
if (dev->flags & VIRTIO_DEV_RUNNING) {
+ if (eid >= 0 && vdpa_engines[eid] &&
+ vdpa_engines[eid]->eng_drv &&
+ vdpa_engines[eid]->eng_drv->dev_ops.dev_close)
+ vdpa_engines[eid]->eng_drv->dev_ops.dev_close(dev->vid);
dev->flags &= ~VIRTIO_DEV_RUNNING;
dev->notify_ops->destroy_device(dev->vid);
}
@@ -858,16 +875,24 @@ vhost_user_set_vring_enable(struct virtio_net *dev,
VhostUserMsg *msg)
{
int enable = (int)msg->payload.state.num;
+ int index = (int)msg->payload.state.index;
+ int eid = dev->eid;
RTE_LOG(INFO, VHOST_CONFIG,
"set queue enable: %d to qp idx: %d\n",
- enable, msg->payload.state.index);
+ enable, index);
+
+ if (eid >= 0 && vdpa_engines[eid] &&
+ vdpa_engines[eid]->eng_drv &&
+ vdpa_engines[eid]->eng_drv->dev_ops.vring_state_set)
+ vdpa_engines[eid]->eng_drv->dev_ops.vring_state_set(dev->vid,
+ index, enable);
if (dev->notify_ops->vring_state_changed)
dev->notify_ops->vring_state_changed(dev->vid,
- msg->payload.state.index, enable);
+ index, enable);
- dev->virtqueue[msg->payload.state.index]->enabled = enable;
+ dev->virtqueue[index]->enabled = enable;
return 0;
}
@@ -978,6 +1003,7 @@ static int
vhost_user_send_rarp(struct virtio_net *dev, struct VhostUserMsg *msg)
{
uint8_t *mac = (uint8_t *)&msg->payload.u64;
+ int eid = dev->eid;
RTE_LOG(DEBUG, VHOST_CONFIG,
":: mac: %02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -993,6 +1019,10 @@ vhost_user_send_rarp(struct virtio_net *dev, struct VhostUserMsg *msg)
*/
rte_smp_wmb();
rte_atomic16_set(&dev->broadcast_rarp, 1);
+ if (eid >= 0 && vdpa_engines[eid] &&
+ vdpa_engines[eid]->eng_drv &&
+ vdpa_engines[eid]->eng_drv->dev_ops.migration_done)
+ vdpa_engines[eid]->eng_drv->dev_ops.migration_done(dev->vid);
return 0;
}
@@ -1383,8 +1413,18 @@ vhost_user_msg_handler(int vid, int fd)
"dequeue zero copy is enabled\n");
}
- if (dev->notify_ops->new_device(dev->vid) == 0)
+ if (dev->notify_ops->new_device(vid) == 0)
dev->flags |= VIRTIO_DEV_RUNNING;
+
+ struct rte_vdpa_engine *eng;
+ int eid = dev->eid;
+
+ if (eid >= 0) {
+ eng = vdpa_engines[eid];
+ if (eng && eng->eng_drv &&
+ eng->eng_drv->dev_ops.dev_conf)
+ eng->eng_drv->dev_ops.dev_conf(vid);
+ }
}
}
--
2.7.5
^ permalink raw reply [flat|nested] 5+ messages in thread