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-stable] [PATCH v2 05/17] vhost: add number of fds to vhost-user messages and use it
Date: Tue, 2 Oct 2018 11:36:39 +0200 [thread overview]
Message-ID: <20181002093651.24795-6-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20181002093651.24795-1-maxime.coquelin@redhat.com>
As soons as some anciliarry datai (fds) are received, it is copied
without checking its length.
This patch adds adds the number of fds received to the message,
which is set in read_vhost_message().
This is preliminary work to support sending fds to Qemu.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_vhost/socket.c | 21 ++++++++++++++++-----
lib/librte_vhost/vhost_user.c | 2 +-
lib/librte_vhost/vhost_user.h | 4 +++-
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index d63031747..c04d3d305 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -94,18 +94,23 @@ static struct vhost_user vhost_user = {
.mutex = PTHREAD_MUTEX_INITIALIZER,
};
-/* return bytes# of read on success or negative val on failure. */
+/*
+ * return bytes# of read on success or negative val on failure. Update fdnum
+ * with number of fds read.
+ */
int
-read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)
+read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
+ int *fd_num)
{
struct iovec iov;
struct msghdr msgh;
- size_t fdsize = fd_num * sizeof(int);
- char control[CMSG_SPACE(fdsize)];
+ char control[CMSG_SPACE(max_fds * sizeof(int))];
struct cmsghdr *cmsg;
int got_fds = 0;
int ret;
+ *fd_num = 0;
+
memset(&msgh, 0, sizeof(msgh));
iov.iov_base = buf;
iov.iov_len = buflen;
@@ -131,13 +136,19 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)
if ((cmsg->cmsg_level == SOL_SOCKET) &&
(cmsg->cmsg_type == SCM_RIGHTS)) {
got_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
+ if (got_fds > max_fds) {
+ RTE_LOG(ERR, VHOST_CONFIG,
+ "Received msg contains more fds than supported\n");
+ return -1;
+ }
+ *fd_num = got_fds;
memcpy(fds, CMSG_DATA(cmsg), got_fds * sizeof(int));
break;
}
}
/* Clear out unused file descriptors */
- while (got_fds < fd_num)
+ while (got_fds < max_fds)
fds[got_fds++] = -1;
return ret;
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index c669d3c0a..608d2f3e4 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1514,7 +1514,7 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)
int ret;
ret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE,
- msg->fds, VHOST_MEMORY_MAX_NREGIONS);
+ msg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num);
if (ret <= 0)
return ret;
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 42166adf2..dd0262f8f 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -132,6 +132,7 @@ typedef struct VhostUserMsg {
VhostUserVringArea area;
} payload;
int fds[VHOST_MEMORY_MAX_NREGIONS];
+ int fd_num;
} __attribute((packed)) VhostUserMsg;
#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
@@ -146,7 +147,8 @@ int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm);
int vhost_user_host_notifier_ctrl(int vid, bool enable);
/* socket.c */
-int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num);
+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);
#endif
--
2.17.1
next prev parent reply other threads:[~2018-10-02 9:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 9:36 [dpdk-stable] [PATCH v2 00/17] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 01/17] vhost: fix messages error checks Maxime Coquelin
2018-10-02 14:15 ` Ilya Maximets
2018-10-03 7:50 ` Maxime Coquelin
2018-10-03 7:57 ` Ilya Maximets
2018-10-03 8:02 ` Maxime Coquelin
2018-10-03 8:32 ` Ilya Maximets
2018-10-03 9:07 ` Ilya Maximets
2018-10-03 14:39 ` Maxime Coquelin
2018-10-04 5:42 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 02/17] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-03 13:26 ` Ilya Maximets
2018-10-03 14:49 ` Maxime Coquelin
2018-10-04 5:49 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 03/17] vhost: fix error handling when mem table gets updated Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 04/17] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-02 9:36 ` Maxime Coquelin [this message]
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 06/17] vhost: pass socket fd to message handling callbacks Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 07/17] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 08/17] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 09/17] vhost: introduce postcopy's advise message Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 10/17] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-02 14:11 ` Ilya Maximets
2018-10-03 7:46 ` Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 11/17] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 12/17] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 13/17] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 14/17] vhost: add support to postcopy's end request Maxime Coquelin
2018-10-02 14:18 ` Ilya Maximets
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 15/17] vhost: enable postcopy protocol feature Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 16/17] vhost: add flag to enable postcopy live-migration Maxime Coquelin
2018-10-02 9:36 ` [dpdk-stable] [PATCH v2 17/17] 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=20181002093651.24795-6-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).