diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2014-03-13 11:23:38 +1030 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-05 13:38:19 +0200 |
| commit | fa8c40b770e8746d1f2e9737068e54098fc9e8dd (patch) | |
| tree | cbd5c0323bfa647fdd42470228d459571b15509d | |
| parent | fa48decc1df0ec789d7bb2ea737f823f649a3cc3 (diff) | |
virtio_balloon: don't softlockup on huge balloon changes.
commit 1f74ef0f2d7d692fcd615621e0e734c3e7771413 upstream.
When adding or removing 100G from a balloon:
BUG: soft lockup - CPU#0 stuck for 22s! [vballoon:367]
We have a wait_event_interruptible(), but the condition is always true
(more ballooning to do) so we don't ever sleep. We also have a
wait_event() for the host to ack, but that is also always true as QEMU
is synchronous for balloon operations.
Reported-by: Gopesh Kumar Chaudhary <gopchaud@in.ibm.com>
Cc: stable@kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/virtio/virtio_balloon.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 1f572c00a1be..cfda0a6c07a7 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -312,6 +312,12 @@ static int balloon(void *_vballoon) else if (diff < 0) leak_balloon(vb, -diff); update_balloon_size(vb); + + /* + * For large balloon changes, we could spend a lot of time + * and always have work to do. Be nice if preempt disabled. + */ + cond_resched(); } return 0; } |