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 09/16] virtio-net: drop config_mutex
Date: Sun, 5 Oct 2014 19:07:16 +0300 [thread overview]
Message-ID: <1412525038-15871-10-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1412525038-15871-1-git-send-email-mst@redhat.com>
config_mutex served two purposes: prevent multiple concurrent config
change handlers, and synchronize access to config_enable flag.
Since commit dbf2576e37da0fcc7aacbfbb9fd5d3de7888a3c1
workqueue: make all workqueues non-reentrant
all workqueues are non-reentrant, and config_enable
is now gone.
Get rid of the unnecessary lock.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/net/virtio_net.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index fa17afa..d80fef4 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -132,9 +132,6 @@ struct virtnet_info {
/* Work struct for config space updates */
struct work_struct config_work;
- /* Lock for config space updates */
- struct mutex config_lock;
-
/* Does the affinity hint is set for virtqueues? */
bool affinity_hint_set;
@@ -1404,7 +1401,6 @@ static void virtnet_config_changed_work(struct work_struct *work)
container_of(work, struct virtnet_info, config_work);
u16 v;
- mutex_lock(&vi->config_lock);
if (virtio_cread_feature(vi->vdev, VIRTIO_NET_F_STATUS,
struct virtio_net_config, status, &v) < 0)
goto done;
@@ -1430,7 +1426,7 @@ static void virtnet_config_changed_work(struct work_struct *work)
netif_tx_stop_all_queues(vi->dev);
}
done:
- mutex_unlock(&vi->config_lock);
+ return;
}
static void virtnet_config_changed(struct virtio_device *vdev)
@@ -1751,7 +1747,6 @@ static int virtnet_probe(struct virtio_device *vdev)
u64_stats_init(&virtnet_stats->rx_syncp);
}
- mutex_init(&vi->config_lock);
INIT_WORK(&vi->config_work, virtnet_config_changed_work);
/* If we can receive ANY GSO packets, we must allocate large ones. */
--
MST
next prev parent reply other threads:[~2014-10-05 16:06 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 ` [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 ` Michael S. Tsirkin [this message]
2014-10-06 11:46 ` [PATCH 09/16] virtio-net: drop config_mutex 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-10-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).