From: Stefan Hajnoczi <stefanha@gmail.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: qemu-devel@nongnu.org, Johannes Berg <johannes.berg@intel.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] libvhost-user: handle NOFD flag in call/kick/err better
Date: Wed, 18 Sep 2019 10:39:32 +0100 [thread overview]
Message-ID: <20190918093932.GC26027@stefanha-x1.localdomain> (raw)
In-Reply-To: <20190917122559.15555-1-johannes@sipsolutions.net>
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
On Tue, Sep 17, 2019 at 02:25:59PM +0200, Johannes Berg wrote:
> diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c
> index f1677da21201..17b7833d1f6b 100644
> --- a/contrib/libvhost-user/libvhost-user.c
> +++ b/contrib/libvhost-user/libvhost-user.c
> @@ -920,6 +920,7 @@ static bool
> vu_check_queue_msg_file(VuDev *dev, VhostUserMsg *vmsg)
> {
> int index = vmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK;
> + bool nofd = vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK;
>
> if (index >= dev->max_queues) {
> vmsg_close_fds(vmsg);
> @@ -927,8 +928,12 @@ vu_check_queue_msg_file(VuDev *dev, VhostUserMsg *vmsg)
> return false;
> }
>
> - if (vmsg->payload.u64 & VHOST_USER_VRING_NOFD_MASK ||
> - vmsg->fd_num != 1) {
> + if (nofd) {
> + vmsg_close_fds(vmsg);
> + return true;
> + }
With the following change to vmsg_close_fds():
for (i = 0; i < vmsg->fd_num; i++) {
close(vmsg->fds[i]);
}
+ for (i = 0; i < sizeof(vmsg->fd_num) / sizeof(vmsg->fd_num[0]); i++) {
+ vmsg->fds[i] = -1;
+ }
+ vmsg->fd_num = 0;
...the message handler functions below can use vmsg->fds[0] (-1) without
worrying about NOFD. This makes the code simpler.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-09-18 9:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 12:25 [Qemu-devel] [PATCH] libvhost-user: handle NOFD flag in call/kick/err better Johannes Berg
2019-09-17 17:13 ` no-reply
2019-09-17 17:14 ` no-reply
2019-09-18 9:39 ` Stefan Hajnoczi [this message]
2019-09-18 9:49 ` Johannes Berg
2019-09-20 8:58 ` Stefan Hajnoczi
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=20190918093932.GC26027@stefanha-x1.localdomain \
--to=stefanha@gmail.com \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).