From: Tiwei Bie <tiwei.bie@intel.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: dev@dpdk.org, zhihong.wang@intel.com, jfreimann@redhat.com,
nicknickolaev@gmail.com, i.maximets@samsung.com,
bruce.richardson@intel.com, alejandro.lucero@netronome.com,
dgilbert@redhat.com, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH v5 07/19] vhost: add number of fds to vhost-user messages and use it
Date: Wed, 10 Oct 2018 18:06:27 +0800 [thread overview]
Message-ID: <20181010100627.GA2956@debian> (raw)
In-Reply-To: <20181009205426.21219-8-maxime.coquelin@redhat.com>
On Tue, Oct 09, 2018 at 10:54:14PM +0200, Maxime Coquelin wrote:
> As soons as some anciliarry datai (fds) are received, it is copied
typo: soons anciliarry datai
> without checking its length.
>
> This patch adds adds the number of fds received to the message,
s/adds adds/adds/
> 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 | 25 ++++++++++++++++++++-----
> lib/librte_vhost/vhost_user.c | 2 +-
> lib/librte_vhost/vhost_user.h | 4 +++-
> 3 files changed, 24 insertions(+), 7 deletions(-)
>
> diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
> index d63031747..7cad5593e 100644
> --- a/lib/librte_vhost/socket.c
> +++ b/lib/librte_vhost/socket.c
> @@ -94,18 +94,24 @@ 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 *tmp_fds;
> int ret;
>
> + *fd_num = 0;
> +
> memset(&msgh, 0, sizeof(msgh));
> iov.iov_base = buf;
> iov.iov_len = buflen;
> @@ -131,13 +137,22 @@ 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");
I think it's preferred to keep the code aligned
with tab size set to 8. Above code looks like
this when tab size is 8:
¦ ¦ ¦ ¦ RTE_LOG(ERR, VHOST_CONFIG,
¦ ¦ ¦ ¦ ¦ ¦ "Received msg contains more fds than supported\n");
Something like this is better:
¦ ¦ ¦ ¦ RTE_LOG(ERR, VHOST_CONFIG,
¦ ¦ ¦ ¦ ¦ "Received msg contains more fds than supported\n");
There are some other similar cases in this series,
please also fix them. It should be quite easy to
find them by setting the tab size to 8. Thanks!
> + tmp_fds = (int *)CMSG_DATA(cmsg);
> + while (got_fds--)
> + close(tmp_fds[got_fds]);
> + 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 83d3e6321..c1c5f35ff 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -1509,7 +1509,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 62654f736..9a91d496b 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)
> @@ -155,7 +156,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-10 10:07 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 20:54 [dpdk-stable] [PATCH v5 00/19] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 01/19] vhost: fix messages results handling Maxime Coquelin
2018-10-10 7:25 ` Maxime Coquelin
2018-10-11 9:32 ` Ilya Maximets
2018-10-11 9:36 ` Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 02/19] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 03/19] vhost: clarify reply-ack in case a reply was already sent Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 04/19] vhost: fix payload size of reply Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 05/19] vhost: fix error handling when mem table gets updated Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 06/19] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 07/19] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-10-10 10:06 ` Tiwei Bie [this message]
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 08/19] vhost: pass socket fd to message handling callbacks Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 09/19] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-10 10:09 ` Tiwei Bie
2018-10-10 10:26 ` Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 10/19] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 11/19] vhost: introduce postcopy's advise message Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 12/19] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 13/19] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 14/19] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 15/19] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-10 10:13 ` Tiwei Bie
2018-10-10 10:25 ` Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 16/19] vhost: add support to postcopy's end request Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 17/19] vhost: restrict postcopy live-migration enablement Maxime Coquelin
2018-10-10 10:17 ` Tiwei Bie
2018-10-10 10:23 ` Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 18/19] net/vhost: add parameter to enable postcopy support Maxime Coquelin
2018-10-09 20:54 ` [dpdk-stable] [PATCH v5 19/19] vhost: enable postcopy protocol feature 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=20181010100627.GA2956@debian \
--to=tiwei.bie@intel.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=maxime.coquelin@redhat.com \
--cc=nicknickolaev@gmail.com \
--cc=stable@dpdk.org \
--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).