linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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
Subject: [PATCH 07/16] virtio-blk: drop config_mutex
Date: Sun, 5 Oct 2014 19:07:10 +0300	[thread overview]
Message-ID: <1412525038-15871-8-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/block/virtio_blk.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index c8cf6a1..13c384b 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -41,9 +41,6 @@ struct virtio_blk
 	/* Process context for config space updates */
 	struct work_struct config_work;
 
-	/* Lock for config space updates */
-	struct mutex config_lock;
-
 	/* What host tells us, plus 2 for header & tailer. */
 	unsigned int sg_elems;
 
@@ -344,8 +341,6 @@ static void virtblk_config_changed_work(struct work_struct *work)
 	char *envp[] = { "RESIZE=1", NULL };
 	u64 capacity, size;
 
-	mutex_lock(&vblk->config_lock);
-
 	/* Host must always specify the capacity. */
 	virtio_cread(vdev, struct virtio_blk_config, capacity, &capacity);
 
@@ -369,8 +364,6 @@ static void virtblk_config_changed_work(struct work_struct *work)
 	set_capacity(vblk->disk, capacity);
 	revalidate_disk(vblk->disk);
 	kobject_uevent_env(&disk_to_dev(vblk->disk)->kobj, KOBJ_CHANGE, envp);
-
-	mutex_unlock(&vblk->config_lock);
 }
 
 static void virtblk_config_changed(struct virtio_device *vdev)
@@ -601,7 +594,6 @@ static int virtblk_probe(struct virtio_device *vdev)
 
 	vblk->vdev = vdev;
 	vblk->sg_elems = sg_elems;
-	mutex_init(&vblk->config_lock);
 
 	INIT_WORK(&vblk->config_work, virtblk_config_changed_work);
 
-- 
MST


  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 ` Michael S. Tsirkin [this message]
2014-10-06 11:48   ` [PATCH 07/16] virtio-blk: drop config_mutex 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-8-git-send-email-mst@redhat.com \
    --to=mst@redhat.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).