From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>,
Heinz Graalfs <graalfs@linux.vnet.ibm.com>,
virtualization@lists.linux-foundation.org
Subject: [PATCH 05/16] virtio: defer config changed notifications
Date: Sun, 5 Oct 2014 19:07:05 +0300 [thread overview]
Message-ID: <1412525038-15871-6-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1412525038-15871-1-git-send-email-mst@redhat.com>
Defer config changed notifications that arrive during
probe/scan/freeze/restore.
This will allow drivers to set DRIVER_OK earlier, without worrying about
racing with config change interrupts.
This change will also benefit old hypervisors (before 2009)
that send interrupts without checking DRIVER_OK: previously,
the callback could race with driver-specific initialization.
This will also help simplify drivers.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/linux/virtio.h | 6 ++++++
drivers/virtio/virtio.c | 55 +++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 8df7ba8..5636b11 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -79,6 +79,9 @@ bool virtqueue_is_broken(struct virtqueue *vq);
* virtio_device - representation of a device using virtio
* @index: unique position on the virtio bus
* @failed: saved value for CONFIG_S_FAILED bit (for restore)
+ * @config_enabled: configuration change reporting enabled
+ * @config_changed: configuration change reported while disabled
+ * @config_lock: protects configuration change reporting
* @dev: underlying device.
* @id: the device type identification (used to match it with a driver).
* @config: the configuration ops for this device.
@@ -90,6 +93,9 @@ bool virtqueue_is_broken(struct virtqueue *vq);
struct virtio_device {
int index;
bool failed;
+ bool config_enabled;
+ bool config_changed;
+ spinlock_t config_lock;
struct device dev;
struct virtio_device_id id;
const struct virtio_config_ops *config;
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 657f817..578e02d 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -117,6 +117,40 @@ void virtio_check_driver_offered_feature(const struct virtio_device *vdev,
}
EXPORT_SYMBOL_GPL(virtio_check_driver_offered_feature);
+static void __virtio_config_changed(struct virtio_device *dev)
+{
+ struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
+
+ if (!dev->config_enabled)
+ dev->config_changed = true;
+ else if (drv && drv->config_changed)
+ drv->config_changed(dev);
+}
+
+void virtio_config_changed(struct virtio_device *dev)
+{
+ spin_lock_irq(&dev->config_lock);
+ __virtio_config_changed(dev);
+ spin_unlock_irq(&dev->config_lock);
+}
+EXPORT_SYMBOL_GPL(virtio_config_changed);
+
+static void virtio_config_disable(struct virtio_device *dev)
+{
+ spin_lock_irq(&dev->config_lock);
+ dev->config_enabled = false;
+ spin_unlock_irq(&dev->config_lock);
+}
+
+static void virtio_config_enable(struct virtio_device *dev)
+{
+ spin_lock_irq(&dev->config_lock);
+ dev->config_enabled = true;
+ __virtio_config_changed(dev);
+ dev->config_changed = false;
+ spin_unlock_irq(&dev->config_lock);
+}
+
static int virtio_dev_probe(struct device *_d)
{
int err, i;
@@ -153,6 +187,8 @@ static int virtio_dev_probe(struct device *_d)
add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
if (drv->scan)
drv->scan(dev);
+
+ virtio_config_enable(dev);
}
return err;
@@ -163,6 +199,8 @@ static int virtio_dev_remove(struct device *_d)
struct virtio_device *dev = dev_to_virtio(_d);
struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
+ virtio_config_disable(dev);
+
drv->remove(dev);
/* Driver should have reset device. */
@@ -211,6 +249,10 @@ int register_virtio_device(struct virtio_device *dev)
dev->index = err;
dev_set_name(&dev->dev, "virtio%u", dev->index);
+ spin_lock_init(&dev->config_lock);
+ dev->config_enabled = false;
+ dev->config_changed = false;
+
/* We always start by resetting the device, in case a previous
* driver messed it up. This also tests that code path a little. */
dev->config->reset(dev);
@@ -239,20 +281,13 @@ void unregister_virtio_device(struct virtio_device *dev)
}
EXPORT_SYMBOL_GPL(unregister_virtio_device);
-void virtio_config_changed(struct virtio_device *dev)
-{
- struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
-
- if (drv && drv->config_changed)
- drv->config_changed(dev);
-}
-EXPORT_SYMBOL_GPL(virtio_config_changed);
-
#ifdef CONFIG_PM_SLEEP
int virtio_device_freeze(struct virtio_device *dev)
{
struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
+ virtio_config_disable(dev);
+
dev->failed = dev->config->get_status(dev) & VIRTIO_CONFIG_S_FAILED;
if (drv && drv->freeze)
@@ -296,6 +331,8 @@ int virtio_device_restore(struct virtio_device *dev)
add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
}
+ virtio_config_enable(dev);
+
return 0;
}
EXPORT_SYMBOL_GPL(virtio_device_restore);
--
MST
next prev parent reply other threads:[~2014-10-05 16:07 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-05 16:06 [PATCH 00/16] virtio: fix spec compliance issues Michael S. Tsirkin
2014-10-05 16:06 ` [PATCH 01/16] virtio_pci: fix virtio spec compliance on restore Michael S. Tsirkin
2014-10-05 16:06 ` [PATCH 02/16] virtio: unify config_changed handling Michael S. Tsirkin
2014-10-06 9:20 ` Cornelia Huck
2014-10-05 16:06 ` [PATCH 03/16] virtio: refactor to use drv_to_virtio Michael S. Tsirkin
2014-10-06 10:34 ` Cornelia Huck
2014-10-05 16:07 ` [PATCH 04/16] virtio-pci: move freeze/restore to virtio core Michael S. Tsirkin
2014-10-06 10:54 ` Cornelia Huck
2014-10-05 16:07 ` Michael S. Tsirkin [this message]
2014-10-06 11:33 ` [PATCH 05/16] virtio: defer config changed notifications Cornelia Huck
2014-10-06 12:00 ` Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 06/16] virtio_blk: drop config_enable Michael S. Tsirkin
2014-10-06 11:42 ` Cornelia Huck
2014-10-06 12:09 ` Michael S. Tsirkin
2014-10-06 12:20 ` Cornelia Huck
2014-10-06 12:31 ` Michael S. Tsirkin
2014-10-06 12:55 ` Cornelia Huck
2014-10-05 16:07 ` [PATCH 07/16] virtio-blk: drop config_mutex Michael S. Tsirkin
2014-10-06 11:48 ` Cornelia Huck
2014-10-05 16:07 ` [PATCH 08/16] virtio_net: drop config_enable Michael S. Tsirkin
2014-10-06 11:50 ` Cornelia Huck
2014-10-06 12:10 ` Michael S. Tsirkin
2014-10-06 19:02 ` David Miller
2014-10-07 6:49 ` Michael S. Tsirkin
2014-10-07 15:36 ` David Miller
2014-10-07 15:42 ` Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 09/16] virtio-net: drop config_mutex Michael S. Tsirkin
2014-10-06 11:46 ` Sergei Shtylyov
2014-10-06 11:56 ` Michael S. Tsirkin
2014-10-06 12:07 ` Sergei Shtylyov
2014-10-06 12:22 ` Michael S. Tsirkin
2014-10-06 12:31 ` Sergei Shtylyov
2014-10-06 11:56 ` Cornelia Huck
2014-10-06 12:01 ` Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 10/16] virtio: add API to enable VQs early Michael S. Tsirkin
2014-10-06 14:08 ` Cornelia Huck
2014-10-06 14:51 ` Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 11/16] virtio_net: minor cleanup Michael S. Tsirkin
2014-10-06 12:06 ` Cornelia Huck
2014-10-05 16:07 ` [PATCH 12/16] virtio_net: enable VQs early Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 13/16] virtio_blk: " Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 14/16] virtio_console: " Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 15/16] 9p/trans_virtio: " Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 16/16] virtio_net: fix use after free on allocation failure Michael S. Tsirkin
2014-10-06 14:17 ` Cornelia Huck
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=1412525038-15871-6-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=graalfs@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--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).