From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: [PATCH 08/16] virtio_net: drop config_enable
Date: Sun, 5 Oct 2014 19:07:13 +0300 [thread overview]
Message-ID: <1412525038-15871-9-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1412525038-15871-1-git-send-email-mst@redhat.com>
Now that virtio core ensures config changes don't arrive during probing,
drop config_enable flag in virtio net.
On removal, flush is now sufficient to guarantee that no change work is
queued.
This help simplify the driver, and will allow setting DRIVER_OK earlier
without losing config change notifications.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/net/virtio_net.c | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 59caa06..fa17afa 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -123,9 +123,6 @@ struct virtnet_info {
/* Host can handle any s/g split between our header and packet data */
bool any_header_sg;
- /* enable config space updates */
- bool config_enable;
-
/* Active statistics */
struct virtnet_stats __percpu *stats;
@@ -1408,9 +1405,6 @@ static void virtnet_config_changed_work(struct work_struct *work)
u16 v;
mutex_lock(&vi->config_lock);
- if (!vi->config_enable)
- goto done;
-
if (virtio_cread_feature(vi->vdev, VIRTIO_NET_F_STATUS,
struct virtio_net_config, status, &v) < 0)
goto done;
@@ -1758,7 +1752,6 @@ static int virtnet_probe(struct virtio_device *vdev)
}
mutex_init(&vi->config_lock);
- vi->config_enable = true;
INIT_WORK(&vi->config_work, virtnet_config_changed_work);
/* If we can receive ANY GSO packets, we must allocate large ones. */
@@ -1876,16 +1869,12 @@ static void virtnet_remove(struct virtio_device *vdev)
unregister_hotcpu_notifier(&vi->nb);
/* Prevent config work handler from accessing the device. */
- mutex_lock(&vi->config_lock);
- vi->config_enable = false;
- mutex_unlock(&vi->config_lock);
+ flush_work(&vi->config_work);
unregister_netdev(vi->dev);
remove_vq_common(vi);
- flush_work(&vi->config_work);
-
free_percpu(vi->stats);
free_netdev(vi->dev);
}
@@ -1899,9 +1888,7 @@ static int virtnet_freeze(struct virtio_device *vdev)
unregister_hotcpu_notifier(&vi->nb);
/* Prevent config work handler from accessing the device */
- mutex_lock(&vi->config_lock);
- vi->config_enable = false;
- mutex_unlock(&vi->config_lock);
+ flush_work(&vi->config_work);
netif_device_detach(vi->dev);
cancel_delayed_work_sync(&vi->refill);
@@ -1916,8 +1903,6 @@ static int virtnet_freeze(struct virtio_device *vdev)
remove_vq_common(vi);
- flush_work(&vi->config_work);
-
return 0;
}
@@ -1941,10 +1926,6 @@ static int virtnet_restore(struct virtio_device *vdev)
netif_device_attach(vi->dev);
- mutex_lock(&vi->config_lock);
- vi->config_enable = true;
- mutex_unlock(&vi->config_lock);
-
rtnl_lock();
virtnet_set_queues(vi, vi->curr_queue_pairs);
rtnl_unlock();
--
MST
next prev parent reply other threads:[~2014-10-05 16:03 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 ` [PATCH 05/16] virtio: defer config changed notifications Michael S. Tsirkin
2014-10-06 11:33 ` 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 ` Michael S. Tsirkin [this message]
2014-10-06 11:50 ` [PATCH 08/16] virtio_net: drop config_enable 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-9-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@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).