From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 757254F9C for ; Fri, 30 Mar 2018 12:01:02 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Mar 2018 03:01:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,381,1517904000"; d="scan'208";a="43494323" Received: from unknown (HELO dpdk99.sh.intel.com) ([10.67.110.156]) by orsmga001.jf.intel.com with ESMTP; 30 Mar 2018 03:01:00 -0700 From: Zhihong Wang To: dev@dpdk.org Cc: jianfeng.tan@intel.com, tiwei.bie@intel.com, maxime.coquelin@redhat.com, yliu@fridaylinux.org, cunming.liang@intel.com, xiao.w.wang@intel.com, dan.daly@intel.com, Zhihong Wang Message-Id: <20180310100148.12030-4-zhihong.wang@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180310100148.12030-1-zhihong.wang@intel.com> References: <1517614137-62926-1-git-send-email-zhihong.wang@intel.com> <20180310100148.12030-1-zhihong.wang@intel.com> Subject: [dpdk-dev] [PATCH v4 3/5] vhost: add apis for datapath configuration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Fri, 30 Mar 2018 10:01:03 -0000 X-Original-Date: Sat, 10 Mar 2018 18:01:46 +0800 X-List-Received-Date: Fri, 30 Mar 2018 10:01:03 -0000 This patch adds APIs for datapath configuration. The did of the vhost-user socket can be set to identify the backend device, in this case each vhost-user socket can have only 1 connection. The did is set to -1 by default when the software datapath is used. Signed-off-by: Zhihong Wang --- Changes in v4: 1. Remove the "engine" concept in the lib. lib/librte_vhost/rte_vhost.h | 35 +++++++++++++++++++++++++++++++++ lib/librte_vhost/rte_vhost_version.map | 3 +++ lib/librte_vhost/socket.c | 36 ++++++++++++++++++++++++++++++++++ lib/librte_vhost/vhost.c | 25 +++++++++++++++++++++++ lib/librte_vhost/vhost.h | 9 +++++++++ 5 files changed, 108 insertions(+) diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h index 671ea5053..d50f4c67d 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h @@ -200,6 +200,30 @@ int rte_vhost_driver_register(const char *path, uint64_t flags); int rte_vhost_driver_unregister(const char *path); /** + * Set the device id, enforce single connection per socket + * + * @param path + * The vhost-user socket file path + * @param did + * Device id + * @return + * 0 on success, -1 on failure + */ +int __rte_experimental +rte_vhost_driver_set_vdpa_did(const char *path, int did); + +/** + * Get the device id + * + * @param path + * The vhost-user socket file path + * @return + * Device id, -1 on failure + */ +int __rte_experimental +rte_vhost_driver_get_vdpa_did(const char *path); + +/** * Set the feature bits the vhost-user driver supports. * * @param path @@ -464,6 +488,17 @@ int rte_vhost_vring_call(int vid, uint16_t vring_idx); */ uint32_t rte_vhost_rx_queue_count(int vid, uint16_t qid); +/** + * Get vdpa device id for vhost device. + * + * @param vid + * vhost device ID + * @return + * device id + */ +int __rte_experimental +rte_vhost_get_vdpa_did(int vid); + #ifdef __cplusplus } #endif diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map index 7bcffb490..6e2d5364a 100644 --- a/lib/librte_vhost/rte_vhost_version.map +++ b/lib/librte_vhost/rte_vhost_version.map @@ -64,4 +64,7 @@ EXPERIMENTAL { rte_vdpa_register_device; rte_vdpa_unregister_device; rte_vdpa_find_device_id; + rte_vhost_driver_set_vdpa_did; + rte_vhost_driver_get_vdpa_did; + rte_vhost_get_vdpa_did; } DPDK_18.02; diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index cfc31e179..3d58da94e 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -52,6 +52,13 @@ struct vhost_user_socket { uint64_t supported_features; uint64_t features; + /* + * Device id to identify a specific backend device. + * It's set to -1 for the default software implementation. + * If valid, one socket can have 1 connection only. + */ + int did; + struct vhost_device_ops const *notify_ops; }; @@ -545,6 +552,35 @@ find_vhost_user_socket(const char *path) } int +rte_vhost_driver_set_vdpa_did(const char *path, int did) +{ + struct vhost_user_socket *vsocket; + + pthread_mutex_lock(&vhost_user.mutex); + vsocket = find_vhost_user_socket(path); + if (vsocket) + vsocket->did = did; + pthread_mutex_unlock(&vhost_user.mutex); + + return vsocket ? 0 : -1; +} + +int +rte_vhost_driver_get_vdpa_did(const char *path) +{ + struct vhost_user_socket *vsocket; + int did = -1; + + pthread_mutex_lock(&vhost_user.mutex); + vsocket = find_vhost_user_socket(path); + if (vsocket) + did = vsocket->did; + pthread_mutex_unlock(&vhost_user.mutex); + + return did; +} + +int rte_vhost_driver_disable_features(const char *path, uint64_t features) { struct vhost_user_socket *vsocket; diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index f6f12a03b..1740cc1ab 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -283,6 +283,7 @@ vhost_new_device(void) dev->vid = i; dev->flags = VIRTIO_DEV_BUILTIN_VIRTIO_NET; dev->slave_req_fd = -1; + dev->did = -1; return i; } @@ -311,6 +312,20 @@ vhost_destroy_device(int vid) } void +vhost_set_vdpa_did(int vid, int did) +{ + struct virtio_net *dev = get_device(vid); + + if (did < 0) + return; + + if (dev == NULL) + return; + + dev->did = did; +} + +void vhost_set_ifname(int vid, const char *if_name, unsigned int if_len) { struct virtio_net *dev; @@ -614,3 +629,13 @@ rte_vhost_rx_queue_count(int vid, uint16_t qid) return *((volatile uint16_t *)&vq->avail->idx) - vq->last_avail_idx; } + +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 2e28e4026..2970c1eab 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -19,6 +19,7 @@ #include #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 @@ -239,6 +240,12 @@ struct virtio_net { struct guest_page *guest_pages; int slave_req_fd; + + /* + * Device id to identify a specific backend device. + * It's set to -1 for the default software implementation. + */ + int did; } __rte_cache_aligned; @@ -365,6 +372,8 @@ void free_vq(struct vhost_virtqueue *vq); int alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx); +void vhost_set_vdpa_did(int vid, int did); + void vhost_set_ifname(int, const char *if_name, unsigned int if_len); void vhost_enable_dequeue_zero_copy(int vid); void vhost_set_builtin_virtio_net(int vid, bool enable); -- 2.13.6