From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id CD6A3A04BA;
Fri, 2 Oct 2020 17:36:15 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 519871D957;
Fri, 2 Oct 2020 17:36:13 +0200 (CEST)
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
by dpdk.org (Postfix) with ESMTP id F070F1D6F6;
Fri, 2 Oct 2020 17:36:09 +0200 (CEST)
IronPort-SDR: e6oejV2bY4Qrp0R4wr1RJzyldrhFQ8zt4rUSakF2oUHSG+YDEOnTMt/RBI43zV1i2oIT7cVZ5B
15fw2JRE+9CA==
X-IronPort-AV: E=McAfee;i="6000,8403,9762"; a="247754196"
X-IronPort-AV: E=Sophos;i="5.77,328,1596524400"; d="scan'208";a="247754196"
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
02 Oct 2020 08:36:08 -0700
IronPort-SDR: LnG7y4RMiSZGxsvTbQIozJ4uzOIm55GgSt3+zZsrmgLUOKTtOpDagVsk/avWxqZmp417GUCXUk
xtWQP8LI7l5w==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.77,328,1596524400"; d="scan'208";a="515193801"
Received: from silpixa00398673.ir.intel.com (HELO
silpixa00398673.ger.corp.intel.com) ([10.237.223.136])
by fmsmga006.fm.intel.com with ESMTP; 02 Oct 2020 08:36:06 -0700
From: Fan Zhang <roy.fan.zhang@intel.com>
To: dev@dpdk.org
Cc: chenbo.xia@intel.com, maxime.coquelin@redhat.com, changpeng.liu@intel.com,
ferruh.yigit@intel.com, stable@dpdk.org,
Fan Zhang <roy.fan.zhang@intel.com>
Date: Fri, 2 Oct 2020 16:36:00 +0100
Message-Id: <20201002153601.84097-2-roy.fan.zhang@intel.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201002153601.84097-1-roy.fan.zhang@intel.com>
References: <20201002083615.45470-1-roy.fan.zhang@intel.com>
<20201002153601.84097-1-roy.fan.zhang@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [dpdk-dev v2 1/2] vhost: add backend type in driver start
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>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
This patch adds an internal driver start function with a newly
added backend type identifier as parameter. With this way
different built-in driver types (net, crypto) can be identified.
Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
lib/librte_vhost/socket.c | 39 ++++++++++++++++++++++++++++-------
lib/librte_vhost/vhost_user.h | 8 +++++++
2 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 0169d3648..a53e536ac 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -38,7 +38,7 @@ struct vhost_user_socket {
bool is_server;
bool reconnect;
bool iommu_support;
- bool use_builtin_virtio_net;
+ enum virtio_backend_type backend_type;
bool extbuf;
bool linearbuf;
bool async_copy;
@@ -224,7 +224,9 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket)
size = strnlen(vsocket->path, PATH_MAX);
vhost_set_ifname(vid, vsocket->path, size);
- vhost_set_builtin_virtio_net(vid, vsocket->use_builtin_virtio_net);
+ vhost_set_builtin_virtio_net(vid,
+ vsocket->backend_type == VIRTIO_DEV_BUILTIN_NET ?
+ true : false);
vhost_attach_vdpa_device(vid, vsocket->vdpa_dev);
@@ -632,7 +634,7 @@ rte_vhost_driver_disable_features(const char *path, uint64_t features)
pthread_mutex_lock(&vhost_user.mutex);
vsocket = find_vhost_user_socket(path);
- /* Note that use_builtin_virtio_net is not affected by this function
+ /* Note that backend type is not affected by this function
* since callers may want to selectively disable features of the
* built-in vhost net device backend.
*/
@@ -681,7 +683,8 @@ rte_vhost_driver_set_features(const char *path, uint64_t features)
/* Anyone setting feature bits is implementing their own vhost
* device backend.
*/
- vsocket->use_builtin_virtio_net = false;
+ if (vsocket->backend_type == VIRTIO_DEV_BUILTIN_NET)
+ vsocket->backend_type = VIRTIO_DEV_UNKNOWN;
}
pthread_mutex_unlock(&vhost_user.mutex);
@@ -899,7 +902,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
* rte_vhost_driver_set_features(), which will overwrite following
* two values.
*/
- vsocket->use_builtin_virtio_net = true;
+ vsocket->backend_type = VIRTIO_DEV_BUILTIN_NET;
vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
@@ -1117,10 +1120,17 @@ vhost_driver_callback_get(const char *path)
}
int
-rte_vhost_driver_start(const char *path)
+vhost_driver_start(const char *path, enum virtio_backend_type backend_type)
{
struct vhost_user_socket *vsocket;
static pthread_t fdset_tid;
+ int ret;
+
+ if (backend_type <= VIRTIO_DEV_UNKNOWN ||
+ backend_type > VIRTIO_DEV_BUILTIN_CRYPTO) {
+ VHOST_LOG_CONFIG(ERR, "Wrong backend type\n");
+ return -1;
+ }
pthread_mutex_lock(&vhost_user.mutex);
vsocket = find_vhost_user_socket(path);
@@ -1153,7 +1163,20 @@ rte_vhost_driver_start(const char *path)
}
if (vsocket->is_server)
- return vhost_user_start_server(vsocket);
+ ret = vhost_user_start_server(vsocket);
else
- return vhost_user_start_client(vsocket);
+ ret = vhost_user_start_client(vsocket);
+
+ if (ret < 0)
+ return ret;
+
+ vsocket->backend_type = backend_type;
+
+ return 0;
+}
+
+int
+rte_vhost_driver_start(const char *path)
+{
+ return vhost_driver_start(path, VIRTIO_DEV_BUILTIN_NET);
}
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 16fe03f88..9f526e676 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -158,6 +158,12 @@ typedef struct VhostUserMsg {
/* The version of the protocol we support */
#define VHOST_USER_VERSION 0x1
+/* virtio backend types */
+enum virtio_backend_type {
+ VIRTIO_DEV_UNKNOWN = 0, /* Likely external */
+ VIRTIO_DEV_BUILTIN_NET, /* Virtio-net device */
+ VIRTIO_DEV_BUILTIN_CRYPTO, /* Virtio-crypto device */
+};
/* vhost_user.c */
int vhost_user_msg_handler(int vid, int fd);
@@ -167,5 +173,7 @@ int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm);
int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
int *fd_num);
int send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num);
+int vhost_driver_start(const char *path,
+ enum virtio_backend_type backend_type);
#endif
--
2.20.1