From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,
jfreimann@redhat.com, nicknickolaev@gmail.com,
i.maximets@samsung.com, bruce.richardson@intel.com,
alejandro.lucero@netronome.com
Cc: dgilbert@redhat.com, stable@dpdk.org,
Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v3 08/19] vhost: pass socket fd to message handling callbacks
Date: Thu, 4 Oct 2018 10:13:52 +0200 [thread overview]
Message-ID: <20181004081403.8039-9-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181004081403.8039-1-maxime.coquelin@redhat.com>
This is not used for now, but will be needed for the
special handling of VHOST_USER_SET_MEM_TABLE message
once postcopy will be supported.
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/vhost_user.c | 71 +++++++++++++++++++++++------------
1 file changed, 47 insertions(+), 24 deletions(-)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index ad69a267e..c5c4c41b9 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -138,14 +138,16 @@ vhost_backend_cleanup(struct virtio_net *dev)
*/
static int
vhost_user_set_owner(struct virtio_net **pdev __rte_unused,
- struct VhostUserMsg *msg __rte_unused)
+ struct VhostUserMsg *msg __rte_unused,
+ int main_fd __rte_unused)
{
return VH_RESULT_OK;
}
static int
vhost_user_reset_owner(struct virtio_net **pdev,
- struct VhostUserMsg *msg __rte_unused)
+ struct VhostUserMsg *msg __rte_unused,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
vhost_destroy_device_notify(dev);
@@ -159,7 +161,8 @@ vhost_user_reset_owner(struct virtio_net **pdev,
* The features that we support are requested.
*/
static int
-vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint64_t features = 0;
@@ -176,7 +179,8 @@ vhost_user_get_features(struct virtio_net **pdev, struct VhostUserMsg *msg)
* The queue number that we support are requested.
*/
static int
-vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint32_t queue_num = 0;
@@ -193,7 +197,8 @@ vhost_user_get_queue_num(struct virtio_net **pdev, struct VhostUserMsg *msg)
* We receive the negotiated features supported by us and the virtio device.
*/
static int
-vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint64_t features = msg->payload.u64;
@@ -275,7 +280,8 @@ vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg)
*/
static int
vhost_user_set_vring_num(struct virtio_net **pdev,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
@@ -637,7 +643,8 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index)
* This function then converts these to our address space.
*/
static int
-vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_virtqueue *vq;
@@ -674,7 +681,8 @@ vhost_user_set_vring_addr(struct virtio_net **pdev, struct VhostUserMsg *msg)
*/
static int
vhost_user_set_vring_base(struct virtio_net **pdev,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
dev->virtqueue[msg->payload.state.index]->last_used_idx =
@@ -807,7 +815,8 @@ vhost_memory_changed(struct VhostUserMemory *new,
}
static int
-vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct VhostUserMemory memory = msg->payload.memory;
@@ -1022,7 +1031,8 @@ virtio_is_ready(struct virtio_net *dev)
}
static int
-vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_vring_file file;
@@ -1046,7 +1056,8 @@ vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg)
}
static int vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
if (!(msg->payload.u64 & VHOST_USER_VRING_NOFD_MASK))
close(msg->fds[0]);
@@ -1056,7 +1067,8 @@ static int vhost_user_set_vring_err(struct virtio_net **pdev __rte_unused,
}
static int
-vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_vring_file file;
@@ -1115,7 +1127,8 @@ free_zmbufs(struct vhost_virtqueue *vq)
*/
static int
vhost_user_get_vring_base(struct virtio_net **pdev,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index];
@@ -1171,7 +1184,8 @@ vhost_user_get_vring_base(struct virtio_net **pdev,
*/
static int
vhost_user_set_vring_enable(struct virtio_net **pdev,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
int enable = (int)msg->payload.state.num;
@@ -1199,7 +1213,8 @@ vhost_user_set_vring_enable(struct virtio_net **pdev,
static int
vhost_user_get_protocol_features(struct virtio_net **pdev,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint64_t features, protocol_features;
@@ -1224,7 +1239,8 @@ vhost_user_get_protocol_features(struct virtio_net **pdev,
static int
vhost_user_set_protocol_features(struct virtio_net **pdev,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint64_t protocol_features = msg->payload.u64;
@@ -1241,7 +1257,8 @@ vhost_user_set_protocol_features(struct virtio_net **pdev,
}
static int
-vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
int fd = msg->fds[0];
@@ -1307,7 +1324,8 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg)
}
static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused,
- struct VhostUserMsg *msg)
+ struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
close(msg->fds[0]);
RTE_LOG(INFO, VHOST_CONFIG, "not implemented.\n");
@@ -1324,7 +1342,8 @@ static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused,
* a flag 'broadcast_rarp' to let rte_vhost_dequeue_burst() inject it.
*/
static int
-vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
uint8_t *mac = (uint8_t *)&msg->payload.u64;
@@ -1354,7 +1373,8 @@ vhost_user_send_rarp(struct virtio_net **pdev, struct VhostUserMsg *msg)
}
static int
-vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
if (msg->payload.u64 < VIRTIO_MIN_MTU ||
@@ -1371,7 +1391,8 @@ vhost_user_net_set_mtu(struct virtio_net **pdev, struct VhostUserMsg *msg)
}
static int
-vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
int fd = msg->fds[0];
@@ -1438,7 +1459,8 @@ is_vring_iotlb_invalidate(struct vhost_virtqueue *vq,
}
static int
-vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg)
+vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ int main_fd __rte_unused)
{
struct virtio_net *dev = *pdev;
struct vhost_iotlb_msg *imsg = &msg->payload.iotlb;
@@ -1483,7 +1505,8 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg)
}
typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
- struct VhostUserMsg *msg);
+ struct VhostUserMsg *msg,
+ int main_fd);
static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
[VHOST_USER_NONE] = NULL,
[VHOST_USER_GET_FEATURES] = vhost_user_get_features,
@@ -1761,7 +1784,7 @@ vhost_user_msg_handler(int vid, int fd)
if (request > VHOST_USER_NONE && request < VHOST_USER_MAX) {
if (!vhost_message_handlers[request])
goto skip_to_post_handle;
- ret = vhost_message_handlers[request](&dev, &msg);
+ ret = vhost_message_handlers[request](&dev, &msg, fd);
switch (ret) {
case VH_RESULT_ERR:
--
2.17.1
next prev parent reply other threads:[~2018-10-04 8:15 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 8:13 [dpdk-dev] [PATCH v3 00/19] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 01/19] vhost: fix messages error checks Maxime Coquelin
2018-10-04 14:48 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 02/19] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-04 14:48 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 03/19] vhost: clarify reply-ack in case a reply was already sent Maxime Coquelin
2018-10-04 14:50 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 04/19] vhost: fix payload size of reply Maxime Coquelin
2018-10-04 14:49 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 05/19] vhost: fix error handling when mem table gets updated Maxime Coquelin
2018-10-04 14:59 ` Ilya Maximets
2018-10-04 15:06 ` Maxime Coquelin
2018-10-04 15:11 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 06/19] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-04 14:59 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 07/19] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-10-05 9:56 ` Ilya Maximets
2018-10-08 12:56 ` Maxime Coquelin
2018-10-04 8:13 ` Maxime Coquelin [this message]
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 09/19] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 10/19] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-05 11:55 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 11/19] vhost: introduce postcopy's advise message Maxime Coquelin
2018-10-05 11:58 ` Ilya Maximets
2018-10-05 13:36 ` Maxime Coquelin
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 12/19] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-05 12:02 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 13/19] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-05 12:34 ` Ilya Maximets
2018-10-08 13:03 ` Maxime Coquelin
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 14/19] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-05 12:37 ` Ilya Maximets
2018-10-04 8:13 ` [dpdk-dev] [PATCH v3 15/19] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-04 8:14 ` [dpdk-dev] [PATCH v3 16/19] vhost: add support to postcopy's end request Maxime Coquelin
2018-10-04 8:14 ` [dpdk-dev] [PATCH v3 17/19] vhost: enable postcopy protocol feature Maxime Coquelin
2018-10-04 8:14 ` [dpdk-dev] [PATCH v3 18/19] vhost: add flag to enable postcopy live-migration Maxime Coquelin
2018-10-05 14:24 ` Ilya Maximets
2018-10-08 16:25 ` Ilya Maximets
2018-10-08 16:54 ` Maxime Coquelin
2018-10-04 8:14 ` [dpdk-dev] [PATCH v3 19/19] net/vhost: add parameter to enable postcopy support Maxime Coquelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181004081403.8039-9-maxime.coquelin@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=alejandro.lucero@netronome.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=dgilbert@redhat.com \
--cc=i.maximets@samsung.com \
--cc=jfreimann@redhat.com \
--cc=nicknickolaev@gmail.com \
--cc=stable@dpdk.org \
--cc=tiwei.bie@intel.com \
--cc=zhihong.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).