From: Vivek Goyal <vgoyal@redhat.com> To: Anton Kuchin <antonkuchin@yandex-team.ru> Cc: virtio-fs@redhat.com, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com> Subject: Re: [Virtio-fs] [PATCH] vhost-user-fs: fix features handling Date: Fri, 9 Apr 2021 11:56:57 -0400 [thread overview] Message-ID: <20210409155657.GE1111800@redhat.com> (raw) In-Reply-To: <20210408195534.647895-1-antonkuchin@yandex-team.ru> On Thu, Apr 08, 2021 at 10:55:34PM +0300, Anton Kuchin wrote: > Make virtio-fs take into account server capabilities. > > Just returning requested features assumes they all of then are implemented > by server and results in setting unsupported configuration if some of them > are absent. > > Signed-off-by: Anton Kuchin <antonkuchin@yandex-team.ru> [CC stefan and qemu-devel.] Can you give more details of what problem exactly you are facing. Or this fix is about avoiding a future problem where device can refuse to support a feature qemu is requesting for. IIUC, this patch is preparing a list of features vhost-user-fs device can support. Then it calls vhost_get_features() which makes sure that all these features are support by real vhost-user device (hdev->features). If not, then corresponding feature is reset and remaining features are returned to caller. This feature negotion bit is called in so many places that I am kind of lost that who should be doing what. Will leave it to Stefan who understands it much better. > --- > hw/virtio/vhost-user-fs.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c > index ac4fc34b36..6cf983ba0e 100644 > --- a/hw/virtio/vhost-user-fs.c > +++ b/hw/virtio/vhost-user-fs.c > @@ -24,6 +24,14 @@ > #include "monitor/monitor.h" > #include "sysemu/sysemu.h" > > +static const int user_feature_bits[] = { > + VIRTIO_F_VERSION_1, > + VIRTIO_RING_F_INDIRECT_DESC, > + VIRTIO_RING_F_EVENT_IDX, > + VIRTIO_F_NOTIFY_ON_EMPTY, > + VHOST_INVALID_FEATURE_BIT > +}; > + > static void vuf_get_config(VirtIODevice *vdev, uint8_t *config) > { > VHostUserFS *fs = VHOST_USER_FS(vdev); > @@ -129,11 +137,12 @@ static void vuf_set_status(VirtIODevice *vdev, uint8_t status) > } > > static uint64_t vuf_get_features(VirtIODevice *vdev, > - uint64_t requested_features, > - Error **errp) > + uint64_t features, Will it make sense to keep the name requested_features. This kind of makes it clear that caller is requesting these features. I feel there should be few lines of comments also to make it clear what this function is actually doing. Vivek > + Error **errp) > { > - /* No feature bits used yet */ > - return requested_features; > + VHostUserFS *fs = VHOST_USER_FS(vdev); > + > + return vhost_get_features(&fs->vhost_dev, user_feature_bits, features); > } > > static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq) > -- > 2.25.1 > > > _______________________________________________ > Virtio-fs mailing list > Virtio-fs@redhat.com > https://listman.redhat.com/mailman/listinfo/virtio-fs
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: Anton Kuchin <antonkuchin@yandex-team.ru> Cc: virtio-fs@redhat.com, qemu-devel@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com> Subject: Re: [Virtio-fs] [PATCH] vhost-user-fs: fix features handling Date: Fri, 9 Apr 2021 11:56:57 -0400 [thread overview] Message-ID: <20210409155657.GE1111800@redhat.com> (raw) In-Reply-To: <20210408195534.647895-1-antonkuchin@yandex-team.ru> On Thu, Apr 08, 2021 at 10:55:34PM +0300, Anton Kuchin wrote: > Make virtio-fs take into account server capabilities. > > Just returning requested features assumes they all of then are implemented > by server and results in setting unsupported configuration if some of them > are absent. > > Signed-off-by: Anton Kuchin <antonkuchin@yandex-team.ru> [CC stefan and qemu-devel.] Can you give more details of what problem exactly you are facing. Or this fix is about avoiding a future problem where device can refuse to support a feature qemu is requesting for. IIUC, this patch is preparing a list of features vhost-user-fs device can support. Then it calls vhost_get_features() which makes sure that all these features are support by real vhost-user device (hdev->features). If not, then corresponding feature is reset and remaining features are returned to caller. This feature negotion bit is called in so many places that I am kind of lost that who should be doing what. Will leave it to Stefan who understands it much better. > --- > hw/virtio/vhost-user-fs.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c > index ac4fc34b36..6cf983ba0e 100644 > --- a/hw/virtio/vhost-user-fs.c > +++ b/hw/virtio/vhost-user-fs.c > @@ -24,6 +24,14 @@ > #include "monitor/monitor.h" > #include "sysemu/sysemu.h" > > +static const int user_feature_bits[] = { > + VIRTIO_F_VERSION_1, > + VIRTIO_RING_F_INDIRECT_DESC, > + VIRTIO_RING_F_EVENT_IDX, > + VIRTIO_F_NOTIFY_ON_EMPTY, > + VHOST_INVALID_FEATURE_BIT > +}; > + > static void vuf_get_config(VirtIODevice *vdev, uint8_t *config) > { > VHostUserFS *fs = VHOST_USER_FS(vdev); > @@ -129,11 +137,12 @@ static void vuf_set_status(VirtIODevice *vdev, uint8_t status) > } > > static uint64_t vuf_get_features(VirtIODevice *vdev, > - uint64_t requested_features, > - Error **errp) > + uint64_t features, Will it make sense to keep the name requested_features. This kind of makes it clear that caller is requesting these features. I feel there should be few lines of comments also to make it clear what this function is actually doing. Vivek > + Error **errp) > { > - /* No feature bits used yet */ > - return requested_features; > + VHostUserFS *fs = VHOST_USER_FS(vdev); > + > + return vhost_get_features(&fs->vhost_dev, user_feature_bits, features); > } > > static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq) > -- > 2.25.1 > > > _______________________________________________ > Virtio-fs mailing list > Virtio-fs@redhat.com > https://listman.redhat.com/mailman/listinfo/virtio-fs
next prev parent reply other threads:[~2021-04-09 15:59 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-08 19:55 [PATCH] vhost-user-fs: fix features handling Anton Kuchin 2021-04-08 19:55 ` [Virtio-fs] " Anton Kuchin 2021-04-09 15:56 ` Vivek Goyal [this message] 2021-04-09 15:56 ` Vivek Goyal 2021-04-11 6:21 ` Anton Kuchin 2021-04-11 6:21 ` Anton Kuchin 2021-04-12 18:43 ` Vivek Goyal 2021-04-12 18:43 ` Vivek Goyal 2021-04-13 8:53 ` Stefan Hajnoczi 2021-04-13 8:47 ` Stefan Hajnoczi 2021-04-13 8:47 ` [Virtio-fs] " Stefan Hajnoczi 2021-04-13 11:36 ` Dr. David Alan Gilbert 2021-04-13 11:36 ` [Virtio-fs] " Dr. David Alan Gilbert 2021-04-13 13:35 ` Vivek Goyal 2021-04-14 7:00 ` 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=20210409155657.GE1111800@redhat.com \ --to=vgoyal@redhat.com \ --cc=antonkuchin@yandex-team.ru \ --cc=mst@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=stefanha@redhat.com \ --cc=virtio-fs@redhat.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.