From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Subject: [PATCH v2 19/24] vdpa: make sure set_features in invoked for legacy
Date: Mon, 3 Aug 2020 17:00:07 -0400 [thread overview]
Message-ID: <20200803205814.540410-20-mst@redhat.com> (raw)
In-Reply-To: <20200803205814.540410-1-mst@redhat.com>
Some legacy guests just assume features are 0 after reset.
We detect that config space is accessed before features are
set and set features to 0 automatically.
Note: some legacy guests might not even access config space, if this is
reported in the field we might need to catch a kick to handle these.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vdpa/vdpa.c | 1 +
include/linux/vdpa.h | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index de211ef3738c..7105265e4793 100644
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -96,6 +96,7 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent,
vdev->dev.release = vdpa_release_dev;
vdev->index = err;
vdev->config = config;
+ vdev->features_valid = false;
err = dev_set_name(&vdev->dev, "vdpa%u", vdev->index);
if (err)
diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
index 239db794357c..29b8296f1414 100644
--- a/include/linux/vdpa.h
+++ b/include/linux/vdpa.h
@@ -33,12 +33,14 @@ struct vdpa_notification_area {
* @dma_dev: the actual device that is performing DMA
* @config: the configuration ops for this device.
* @index: device index
+ * @features_valid: were features initialized? for legacy guests
*/
struct vdpa_device {
struct device dev;
struct device *dma_dev;
const struct vdpa_config_ops *config;
unsigned int index;
+ bool features_valid;
};
/**
@@ -266,4 +268,36 @@ static inline struct device *vdpa_get_dma_dev(struct vdpa_device *vdev)
{
return vdev->dma_dev;
}
+
+static inline void vdpa_reset(struct vdpa_device *vdev)
+{
+ const struct vdpa_config_ops *ops = vdev->config;
+
+ vdev->features_valid = false;
+ ops->set_status(vdev, 0);
+}
+
+static inline int vdpa_set_features(struct vdpa_device *vdev, u64 features)
+{
+ const struct vdpa_config_ops *ops = vdev->config;
+
+ vdev->features_valid = true;
+ return ops->set_features(vdev, features);
+}
+
+
+static inline void vdpa_get_config(struct vdpa_device *vdev, unsigned offset,
+ void *buf, unsigned int len)
+{
+ const struct vdpa_config_ops *ops = vdev->config;
+
+ /*
+ * Config accesses aren't supposed to trigger before features are set.
+ * If it does happen we assume a legacy guest.
+ */
+ if (!vdev->features_valid)
+ vdpa_set_features(vdev, 0);
+ ops->get_config(vdev, offset, buf, len);
+}
+
#endif /* _LINUX_VDPA_H */
--
MST
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2020-08-03 21:00 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 20:58 [PATCH v2 00/24] virtio: config space endian-ness cleanup Michael S. Tsirkin
2020-08-03 20:58 ` [PATCH v2 01/24] virtio_balloon: fix sparse warning Michael S. Tsirkin
2020-08-03 21:25 ` David Hildenbrand
2020-08-04 14:16 ` Cornelia Huck
2020-08-03 20:58 ` [PATCH v2 02/24] virtio_ring: sparse warning fixup Michael S. Tsirkin
2020-08-04 14:18 ` Cornelia Huck
2020-08-03 20:58 ` [PATCH v2 03/24] virtio: allow __virtioXX, __leXX in config space Michael S. Tsirkin
2020-08-04 14:23 ` Cornelia Huck
2020-08-04 14:28 ` Michael S. Tsirkin
2020-08-05 6:28 ` Jason Wang
2020-08-05 11:45 ` Michael S. Tsirkin
2020-08-06 3:37 ` Jason Wang
2020-08-06 5:58 ` Michael S. Tsirkin
2020-08-07 3:26 ` Jason Wang
2020-08-03 20:58 ` [PATCH v2 04/24] virtio_9p: correct tags for config space fields Michael S. Tsirkin
2020-08-04 14:25 ` Cornelia Huck
2020-08-03 20:58 ` [PATCH v2 05/24] virtio_balloon: " Michael S. Tsirkin
2020-08-03 21:26 ` David Hildenbrand
2020-08-04 14:26 ` Cornelia Huck
2020-08-03 20:58 ` [PATCH v2 06/24] virtio_blk: " Michael S. Tsirkin
2020-08-04 14:29 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 07/24] virtio_console: " Michael S. Tsirkin
2020-08-04 14:31 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 08/24] virtio_crypto: " Michael S. Tsirkin
2020-08-04 14:32 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 09/24] virtio_fs: " Michael S. Tsirkin
2020-08-04 13:36 ` Vivek Goyal
2020-08-04 14:33 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 10/24] virtio_gpu: " Michael S. Tsirkin
2020-08-04 14:34 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 11/24] virtio_input: " Michael S. Tsirkin
2020-08-04 6:01 ` Gerd Hoffmann
2020-08-04 14:35 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 12/24] virtio_iommu: " Michael S. Tsirkin
2020-08-04 8:00 ` Jean-Philippe Brucker
2020-08-04 14:36 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 13/24] virtio_mem: " Michael S. Tsirkin
2020-08-03 21:23 ` David Hildenbrand
2020-08-04 14:37 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 14/24] virtio_net: " Michael S. Tsirkin
2020-08-04 14:44 ` Cornelia Huck
2020-08-05 13:26 ` Michael S. Tsirkin
2020-08-03 20:59 ` [PATCH v2 15/24] virtio_pmem: " Michael S. Tsirkin
2020-08-04 14:46 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 16/24] virtio_scsi: " Michael S. Tsirkin
2020-08-04 14:48 ` Cornelia Huck
2020-08-03 20:59 ` [PATCH v2 17/24] virtio_config: disallow native type fields Michael S. Tsirkin
2020-08-04 14:50 ` Cornelia Huck
2020-08-05 13:29 ` Michael S. Tsirkin
2020-08-03 21:00 ` [PATCH v2 18/24] mlxbf-tmfifo: sparse tags for config access Michael S. Tsirkin
2020-08-04 14:56 ` Cornelia Huck
2020-08-05 13:29 ` Michael S. Tsirkin
2020-08-03 21:00 ` Michael S. Tsirkin [this message]
2020-08-05 6:14 ` [PATCH v2 19/24] vdpa: make sure set_features in invoked for legacy Jason Wang
2020-08-05 11:40 ` Michael S. Tsirkin
2020-08-06 3:23 ` Jason Wang
2020-08-06 5:53 ` Michael S. Tsirkin
2020-08-06 7:27 ` Jason Wang
2020-08-06 10:00 ` Michael S. Tsirkin
2020-08-07 3:00 ` Jason Wang
2020-08-03 21:00 ` [PATCH v2 20/24] vhost/vdpa: switch to new helpers Michael S. Tsirkin
2020-08-03 21:00 ` [PATCH v2 21/24] virtio_vdpa: legacy features handling Michael S. Tsirkin
2020-08-03 21:00 ` [PATCH v2 22/24] vdpa_sim: fix endian-ness of config space Michael S. Tsirkin
2020-08-05 6:21 ` Jason Wang
2020-08-05 11:44 ` Michael S. Tsirkin
2020-08-05 12:06 ` Michael S. Tsirkin
2020-08-06 3:23 ` Jason Wang
2020-08-03 21:00 ` [PATCH v2 23/24] virtio_config: cread/write cleanup Michael S. Tsirkin
2020-08-03 21:00 ` [PATCH v2 24/24] virtio_config: rewrite using _Generic Michael S. Tsirkin
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=20200803205814.540410-20-mst@redhat.com \
--to=mst@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.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).