Skip to content

Commit

Permalink
xen: release lock occasionally during ballooning
Browse files Browse the repository at this point in the history
When dom0 is being ballooned balloon_process() will hold the balloon
mutex until it is finished. This will block e.g. creation of new
domains as the device backends for the new domain need some
autoballooned pages for the ring buffers.

Avoid this by releasing the balloon mutex from time to time during
ballooning. Adjust the comment above balloon_process() regarding
multiple instances of balloon_process().

Instead of open coding it, just use cond_resched().

Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
  • Loading branch information
jgross1 authored and David Vrabel committed Jul 20, 2015
1 parent 30b03d0 commit 929423f
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions drivers/xen/balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp)
}

/*
* We avoid multiple worker processes conflicting via the balloon mutex.
* As this is a work item it is guaranteed to run as a single instance only.
* We may of course race updates of the target counts (which are protected
* by the balloon lock), or with changes to the Xen hard limit, but we will
* recover from these in time.
Expand All @@ -482,9 +482,10 @@ static void balloon_process(struct work_struct *work)
enum bp_state state = BP_DONE;
long credit;

mutex_lock(&balloon_mutex);

do {
mutex_lock(&balloon_mutex);

credit = current_credit();

if (credit > 0) {
Expand All @@ -499,17 +500,15 @@ static void balloon_process(struct work_struct *work)

state = update_schedule(state);

#ifndef CONFIG_PREEMPT
if (need_resched())
schedule();
#endif
mutex_unlock(&balloon_mutex);

cond_resched();

} while (credit && state == BP_DONE);

/* Schedule more work if there is some still to be done. */
if (state == BP_EAGAIN)
schedule_delayed_work(&balloon_worker, balloon_stats.schedule_delay * HZ);

mutex_unlock(&balloon_mutex);
}

/* Resets the Xen limit, sets new target, and kicks off processing. */
Expand Down

0 comments on commit 929423f

Please sign in to comment.