From: "Michael S. Tsirkin" <mst@redhat.com> To: Tiwei Bie <tiwei.bie@intel.com> Cc: jasowang@redhat.com, alex.williamson@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org, cunming.liang@intel.com, dan.daly@intel.com, jianfeng.tan@intel.com, zhihong.wang@intel.com, xiao.w.wang@intel.com Subject: Re: [Qemu-devel] [PATCH v3 3/6] vhost-user: support receiving file descriptors in slave_read Date: Thu, 24 May 2018 00:25:23 +0300 [thread overview] Message-ID: <20180524002447-mutt-send-email-mst@kernel.org> (raw) In-Reply-To: <20180412151232.17506-4-tiwei.bie@intel.com> On Thu, Apr 12, 2018 at 11:12:29PM +0800, Tiwei Bie wrote: > Signed-off-by: Tiwei Bie <tiwei.bie@intel.com> Thinking about it, I think we should add a protocol feature for this. This way remote can find out whether it's safe to send this data to us. > --- > hw/virtio/vhost-user.c | 41 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 40 insertions(+), 1 deletion(-) > > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > index 91edd95453..9cea2c8c51 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -854,14 +854,44 @@ static void slave_read(void *opaque) > VhostUserHeader hdr = { 0, }; > VhostUserPayload payload = { 0, }; > int size, ret = 0; > + struct iovec iov; > + struct msghdr msgh; > + int fd = -1; > + char control[CMSG_SPACE(sizeof(fd))]; > + struct cmsghdr *cmsg; > + size_t fdsize; > + > + memset(&msgh, 0, sizeof(msgh)); > + msgh.msg_iov = &iov; > + msgh.msg_iovlen = 1; > + msgh.msg_control = control; > + msgh.msg_controllen = sizeof(control); > > /* Read header */ > - size = read(u->slave_fd, &hdr, VHOST_USER_HDR_SIZE); > + iov.iov_base = &hdr; > + iov.iov_len = VHOST_USER_HDR_SIZE; > + > + size = recvmsg(u->slave_fd, &msgh, 0); > if (size != VHOST_USER_HDR_SIZE) { > error_report("Failed to read from slave."); > goto err; > } > > + if (msgh.msg_flags & MSG_CTRUNC) { > + error_report("Truncated message."); > + goto err; > + } > + > + for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; > + cmsg = CMSG_NXTHDR(&msgh, cmsg)) { > + if (cmsg->cmsg_level == SOL_SOCKET && > + cmsg->cmsg_type == SCM_RIGHTS) { > + fdsize = cmsg->cmsg_len - CMSG_LEN(0); > + memcpy(&fd, CMSG_DATA(cmsg), fdsize); > + break; > + } > + } > + > if (hdr.size > VHOST_USER_PAYLOAD_SIZE) { > error_report("Failed to read msg header." > " Size %d exceeds the maximum %zu.", hdr.size, > @@ -885,9 +915,15 @@ static void slave_read(void *opaque) > break; > default: > error_report("Received unexpected msg type."); > + if (fd != -1) { > + close(fd); > + } > ret = -EINVAL; > } > > + /* Message handlers need to make sure that fd will be consumed. */ > + fd = -1; > + > /* > * REPLY_ACK feature handling. Other reply types has to be managed > * directly in their request handlers. > @@ -920,6 +956,9 @@ err: > qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL); > close(u->slave_fd); > u->slave_fd = -1; > + if (fd != -1) { > + close(fd); > + } > return; > } > > -- > 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: Tiwei Bie <tiwei.bie@intel.com> Cc: jasowang@redhat.com, alex.williamson@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org, cunming.liang@intel.com, dan.daly@intel.com, jianfeng.tan@intel.com, zhihong.wang@intel.com, xiao.w.wang@intel.com Subject: [virtio-dev] Re: [PATCH v3 3/6] vhost-user: support receiving file descriptors in slave_read Date: Thu, 24 May 2018 00:25:23 +0300 [thread overview] Message-ID: <20180524002447-mutt-send-email-mst@kernel.org> (raw) In-Reply-To: <20180412151232.17506-4-tiwei.bie@intel.com> On Thu, Apr 12, 2018 at 11:12:29PM +0800, Tiwei Bie wrote: > Signed-off-by: Tiwei Bie <tiwei.bie@intel.com> Thinking about it, I think we should add a protocol feature for this. This way remote can find out whether it's safe to send this data to us. > --- > hw/virtio/vhost-user.c | 41 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 40 insertions(+), 1 deletion(-) > > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > index 91edd95453..9cea2c8c51 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -854,14 +854,44 @@ static void slave_read(void *opaque) > VhostUserHeader hdr = { 0, }; > VhostUserPayload payload = { 0, }; > int size, ret = 0; > + struct iovec iov; > + struct msghdr msgh; > + int fd = -1; > + char control[CMSG_SPACE(sizeof(fd))]; > + struct cmsghdr *cmsg; > + size_t fdsize; > + > + memset(&msgh, 0, sizeof(msgh)); > + msgh.msg_iov = &iov; > + msgh.msg_iovlen = 1; > + msgh.msg_control = control; > + msgh.msg_controllen = sizeof(control); > > /* Read header */ > - size = read(u->slave_fd, &hdr, VHOST_USER_HDR_SIZE); > + iov.iov_base = &hdr; > + iov.iov_len = VHOST_USER_HDR_SIZE; > + > + size = recvmsg(u->slave_fd, &msgh, 0); > if (size != VHOST_USER_HDR_SIZE) { > error_report("Failed to read from slave."); > goto err; > } > > + if (msgh.msg_flags & MSG_CTRUNC) { > + error_report("Truncated message."); > + goto err; > + } > + > + for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; > + cmsg = CMSG_NXTHDR(&msgh, cmsg)) { > + if (cmsg->cmsg_level == SOL_SOCKET && > + cmsg->cmsg_type == SCM_RIGHTS) { > + fdsize = cmsg->cmsg_len - CMSG_LEN(0); > + memcpy(&fd, CMSG_DATA(cmsg), fdsize); > + break; > + } > + } > + > if (hdr.size > VHOST_USER_PAYLOAD_SIZE) { > error_report("Failed to read msg header." > " Size %d exceeds the maximum %zu.", hdr.size, > @@ -885,9 +915,15 @@ static void slave_read(void *opaque) > break; > default: > error_report("Received unexpected msg type."); > + if (fd != -1) { > + close(fd); > + } > ret = -EINVAL; > } > > + /* Message handlers need to make sure that fd will be consumed. */ > + fd = -1; > + > /* > * REPLY_ACK feature handling. Other reply types has to be managed > * directly in their request handlers. > @@ -920,6 +956,9 @@ err: > qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL); > close(u->slave_fd); > u->slave_fd = -1; > + if (fd != -1) { > + close(fd); > + } > return; > } > > -- > 2.11.0 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
next prev parent reply other threads:[~2018-05-23 21:25 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-12 15:12 [Qemu-devel] [PATCH v3 0/6] Extend vhost-user to support registering external host notifiers Tiwei Bie 2018-04-12 15:12 ` [virtio-dev] " Tiwei Bie 2018-04-12 15:12 ` [Qemu-devel] [PATCH v3 1/6] vhost-user: add Net prefix to internal state structure Tiwei Bie 2018-04-12 15:12 ` [virtio-dev] " Tiwei Bie 2018-04-12 15:12 ` [Qemu-devel] [PATCH v3 2/6] vhost-user: introduce shared vhost-user state Tiwei Bie 2018-04-12 15:12 ` [virtio-dev] " Tiwei Bie 2018-05-23 13:44 ` [Qemu-devel] " Michael S. Tsirkin 2018-05-23 13:44 ` [virtio-dev] " Michael S. Tsirkin 2018-05-23 15:36 ` [Qemu-devel] " Michael S. Tsirkin 2018-05-23 15:36 ` [virtio-dev] " Michael S. Tsirkin 2018-05-23 15:43 ` [Qemu-devel] " Michael S. Tsirkin 2018-05-23 15:43 ` [virtio-dev] " Michael S. Tsirkin 2018-05-23 23:21 ` [Qemu-devel] " Tiwei Bie 2018-05-23 23:21 ` [virtio-dev] " Tiwei Bie 2018-05-24 2:24 ` [Qemu-devel] " Tiwei Bie 2018-05-24 2:24 ` [virtio-dev] " Tiwei Bie 2018-05-24 7:03 ` [Qemu-devel] " Tiwei Bie 2018-05-24 7:03 ` [virtio-dev] " Tiwei Bie 2018-05-24 10:59 ` [Qemu-devel] " Tiwei Bie 2018-05-24 10:59 ` [virtio-dev] " Tiwei Bie 2018-05-24 13:55 ` [Qemu-devel] " Michael S. Tsirkin 2018-05-24 13:55 ` [virtio-dev] " Michael S. Tsirkin 2018-05-24 14:54 ` [Qemu-devel] " Tiwei Bie 2018-05-24 14:54 ` Tiwei Bie 2018-05-24 14:30 ` [Qemu-devel] " Michael S. Tsirkin 2018-05-24 14:30 ` [virtio-dev] " Michael S. Tsirkin 2018-05-24 15:22 ` [Qemu-devel] " Tiwei Bie 2018-05-24 15:22 ` [virtio-dev] " Tiwei Bie 2018-05-24 13:50 ` [Qemu-devel] " Michael S. Tsirkin 2018-05-24 13:50 ` [virtio-dev] " Michael S. Tsirkin 2018-04-12 15:12 ` [Qemu-devel] [PATCH v3 3/6] vhost-user: support receiving file descriptors in slave_read Tiwei Bie 2018-04-12 15:12 ` [virtio-dev] " Tiwei Bie 2018-05-23 21:25 ` Michael S. Tsirkin [this message] 2018-05-23 21:25 ` [virtio-dev] " Michael S. Tsirkin 2018-05-23 23:12 ` [Qemu-devel] " Tiwei Bie 2018-05-23 23:12 ` Tiwei Bie 2018-05-24 13:48 ` [Qemu-devel] " Michael S. Tsirkin 2018-05-24 13:48 ` Michael S. Tsirkin 2018-05-24 14:56 ` [Qemu-devel] " Tiwei Bie 2018-05-24 14:56 ` Tiwei Bie 2018-04-12 15:12 ` [Qemu-devel] [PATCH v3 4/6] virtio: support setting memory region based host notifier Tiwei Bie 2018-04-12 15:12 ` [virtio-dev] " Tiwei Bie 2018-04-12 15:12 ` [Qemu-devel] [PATCH v3 5/6] vhost: allow backends to filter memory sections Tiwei Bie 2018-04-12 15:12 ` [virtio-dev] " Tiwei Bie 2018-04-12 15:12 ` [Qemu-devel] [PATCH v3 6/6] vhost-user: support registering external host notifiers Tiwei Bie 2018-04-12 15:12 ` [virtio-dev] " Tiwei Bie 2018-04-18 16:34 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-18 16:34 ` [virtio-dev] " Michael S. Tsirkin 2018-04-19 11:14 ` [Qemu-devel] " Tiwei Bie 2018-04-19 11:14 ` [virtio-dev] " Tiwei Bie 2018-04-19 12:43 ` [Qemu-devel] " Liang, Cunming 2018-04-19 12:43 ` [virtio-dev] " Liang, Cunming 2018-04-19 13:02 ` [Qemu-devel] " Paolo Bonzini 2018-04-19 13:02 ` Paolo Bonzini 2018-04-19 15:19 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 15:19 ` Michael S. Tsirkin 2018-04-19 15:51 ` [Qemu-devel] " Paolo Bonzini 2018-04-19 15:51 ` Paolo Bonzini 2018-04-19 15:59 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 15:59 ` Michael S. Tsirkin 2018-04-19 16:07 ` [Qemu-devel] " Paolo Bonzini 2018-04-19 16:07 ` Paolo Bonzini 2018-04-19 16:48 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 16:48 ` Michael S. Tsirkin 2018-04-19 16:24 ` [Qemu-devel] " Liang, Cunming 2018-04-19 16:24 ` Liang, Cunming 2018-04-19 16:55 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 16:55 ` Michael S. Tsirkin 2018-04-20 3:01 ` [Qemu-devel] " Liang, Cunming 2018-04-20 3:01 ` Liang, Cunming 2018-04-19 15:42 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 15:42 ` [virtio-dev] " Michael S. Tsirkin 2018-04-19 15:52 ` [Qemu-devel] " Paolo Bonzini 2018-04-19 15:52 ` [virtio-dev] " Paolo Bonzini 2018-04-19 16:34 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 16:34 ` [virtio-dev] " Michael S. Tsirkin 2018-04-19 16:52 ` [Qemu-devel] " Liang, Cunming 2018-04-19 16:52 ` [virtio-dev] " Liang, Cunming 2018-04-19 16:59 ` [Qemu-devel] " Paolo Bonzini 2018-04-19 16:59 ` Paolo Bonzini 2018-04-19 17:27 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 17:27 ` Michael S. Tsirkin 2018-04-19 17:35 ` [Qemu-devel] " Paolo Bonzini 2018-04-19 17:35 ` Paolo Bonzini 2018-04-19 17:39 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 17:39 ` Michael S. Tsirkin 2018-04-19 17:00 ` [Qemu-devel] " Michael S. Tsirkin 2018-04-19 17:00 ` [virtio-dev] " Michael S. Tsirkin 2018-04-19 23:05 ` [Qemu-devel] " Liang, Cunming 2018-04-19 23:05 ` [virtio-dev] " Liang, Cunming 2018-04-19 16:27 ` [Qemu-devel] " Liang, Cunming 2018-04-19 16:27 ` [virtio-dev] " Liang, Cunming 2018-05-02 10:32 ` [Qemu-devel] " Tiwei Bie 2018-05-02 10:32 ` [virtio-dev] " Tiwei Bie 2018-05-16 1:41 ` [Qemu-devel] [PATCH v3 0/6] Extend vhost-user to " Michael S. Tsirkin 2018-05-16 1:41 ` [virtio-dev] " Michael S. Tsirkin 2018-05-16 1:56 ` [Qemu-devel] " Tiwei Bie 2018-05-16 1:56 ` [virtio-dev] " Tiwei Bie
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=20180524002447-mutt-send-email-mst@kernel.org \ --to=mst@redhat.com \ --cc=alex.williamson@redhat.com \ --cc=cunming.liang@intel.com \ --cc=dan.daly@intel.com \ --cc=jasowang@redhat.com \ --cc=jianfeng.tan@intel.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=stefanha@redhat.com \ --cc=tiwei.bie@intel.com \ --cc=virtio-dev@lists.oasis-open.org \ --cc=xiao.w.wang@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.