linux-next: manual merge of the vhost tree with the virtio tree
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/virtio/virtio_balloon.c between commit df81b29c7b81
("virtio_balloon: transitional interface") from the virtio tree and
commit 263f23c089f2 ("virtio_balloon: transitional interface") from the
vhost tree.
I fixed it up (by using the version of the files from the virtio tree)
and can carry the fix as necessary. Please clean up this mess ...
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp0hWYK27G_l.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the vhost tree with the virtio tree
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/virtio/virtio_balloon.c between commit df81b29c7b81 (virtio_balloon: transitional interface) from the virtio tree and commit 263f23c089f2 (virtio_balloon: transitional interface) from the vhost tree. I fixed it up (by using the version of the files from the virtio tree) and can carry the fix as necessary. Please clean up this mess ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp0hWYK27G_l.pgp Description: OpenPGP digital signature
linux-next: manual merge of the vhost tree with the virtio tree
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/virtio/virtio_balloon.c between commit 7f8998200dcb
("virtio_balloon: annotate possible sleep waiting for event") from the
virtio tree and commit 2426d3b03d07 ("virtio-balloon: do not call
blocking ops when !TASK_RUNNING") from the vhost tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/virtio/virtio_balloon.c
index 06001ca71ea3,5a6ad6dbdec4..
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@@ -341,19 -343,17 +343,25 @@@ static int balloon(void *_vballoon
try_to_freeze();
+ /*
+ * Reading the config on the ccw backend involves an
+ * allocation, so we may actually sleep and have an
+ * extra iteration. It's extremely unlikely, and this
+ * isn't a fast path in any sense.
+ */
+ sched_annotate_sleep();
+
- wait_event_interruptible(vb->config_change,
-(diff = towards_target(vb)) != 0
-|| vb->need_stats_update
-|| kthread_should_stop()
-|| freezing(current));
+ add_wait_queue(>config_change, );
+ for (;;) {
+ if ((diff = towards_target(vb)) != 0 ||
+ vb->need_stats_update ||
+ kthread_should_stop() ||
+ freezing(current))
+ break;
+ wait_woken(, TASK_INTERRUPTIBLE,
MAX_SCHEDULE_TIMEOUT);
+ }
+ remove_wait_queue(>config_change, );
+
if (vb->need_stats_update)
stats_handle_request(vb);
if (diff > 0)
pgpdDrFr1BDDj.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the vhost tree with the virtio tree
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/virtio/virtio_balloon.c between commit 7f8998200dcb
(virtio_balloon: annotate possible sleep waiting for event) from the
virtio tree and commit 2426d3b03d07 (virtio-balloon: do not call
blocking ops when !TASK_RUNNING) from the vhost tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/virtio/virtio_balloon.c
index 06001ca71ea3,5a6ad6dbdec4..
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@@ -341,19 -343,17 +343,25 @@@ static int balloon(void *_vballoon
try_to_freeze();
+ /*
+ * Reading the config on the ccw backend involves an
+ * allocation, so we may actually sleep and have an
+ * extra iteration. It's extremely unlikely, and this
+ * isn't a fast path in any sense.
+ */
+ sched_annotate_sleep();
+
- wait_event_interruptible(vb-config_change,
-(diff = towards_target(vb)) != 0
-|| vb-need_stats_update
-|| kthread_should_stop()
-|| freezing(current));
+ add_wait_queue(vb-config_change, wait);
+ for (;;) {
+ if ((diff = towards_target(vb)) != 0 ||
+ vb-need_stats_update ||
+ kthread_should_stop() ||
+ freezing(current))
+ break;
+ wait_woken(wait, TASK_INTERRUPTIBLE,
MAX_SCHEDULE_TIMEOUT);
+ }
+ remove_wait_queue(vb-config_change, wait);
+
if (vb-need_stats_update)
stats_handle_request(vb);
if (diff 0)
pgpdDrFr1BDDj.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the vhost tree with the virtio tree
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/vhost/Makefile between commit 4d8dc8b44748 ("vringh: host-side
implementation of virtio rings") from the virtio tree and commit
0b87bfefde9a ("vhost-blk: Add vhost-blk support v6") from the vhost tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/vhost/Makefile
index 1d37f5e,1a8a4a5..000
--- a/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@@ -2,5 -2,5 +2,7 @@@ obj-$(CONFIG_VHOST_NET) += vhost_net.
vhost_net-y := vhost.o net.o
obj-$(CONFIG_TCM_VHOST) += tcm_vhost.o
+
+obj-$(CONFIG_VHOST_RING) += vringh.o
+ obj-$(CONFIG_VHOST_BLK) += vhost_blk.o
+ vhost_blk-y := blk.o
pgpZTV6iLd2BA.pgp
Description: PGP signature
linux-next: manual merge of the vhost tree with the virtio tree
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/vhost/Makefile between commit 4d8dc8b44748 (vringh: host-side implementation of virtio rings) from the virtio tree and commit 0b87bfefde9a (vhost-blk: Add vhost-blk support v6) from the vhost tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/vhost/Makefile index 1d37f5e,1a8a4a5..000 --- a/drivers/vhost/Makefile +++ b/drivers/vhost/Makefile @@@ -2,5 -2,5 +2,7 @@@ obj-$(CONFIG_VHOST_NET) += vhost_net. vhost_net-y := vhost.o net.o obj-$(CONFIG_TCM_VHOST) += tcm_vhost.o + +obj-$(CONFIG_VHOST_RING) += vringh.o + obj-$(CONFIG_VHOST_BLK) += vhost_blk.o + vhost_blk-y := blk.o pgpZTV6iLd2BA.pgp Description: PGP signature
