Skip to content

Commit 6ef36ab

Browse files
jgross1gregkh
authored andcommitted
xen: let alloc_xenballooned_pages() fail if not enough memory free
commit a1078e8 upstream. Instead of trying to allocate pages with GFP_USER in add_ballooned_pages() check the available free memory via si_mem_available(). GFP_USER is far less limiting memory exhaustion than the test via si_mem_available(). This will avoid dom0 running out of memory due to excessive foreign page mappings especially on ARM and on x86 in PVH mode, as those don't have a pre-ballooned area which can be used for foreign mappings. As the normal ballooning suffers from the same problem don't balloon down more than si_mem_available() pages in one iteration. At the same time limit the default maximum number of retries. This is part of XSA-300. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d39c2e9 commit 6ef36ab

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

Diff for: drivers/xen/balloon.c

+13-3
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,15 @@ static void balloon_process(struct work_struct *work)
538538
state = reserve_additional_memory();
539539
}
540540

541-
if (credit < 0)
542-
state = decrease_reservation(-credit, GFP_BALLOON);
541+
if (credit < 0) {
542+
long n_pages;
543+
544+
n_pages = min(-credit, si_mem_available());
545+
state = decrease_reservation(n_pages, GFP_BALLOON);
546+
if (state == BP_DONE && n_pages != -credit &&
547+
n_pages < totalreserve_pages)
548+
state = BP_EAGAIN;
549+
}
543550

544551
state = update_schedule(state);
545552

@@ -578,6 +585,9 @@ static int add_ballooned_pages(int nr_pages)
578585
}
579586
}
580587

588+
if (si_mem_available() < nr_pages)
589+
return -ENOMEM;
590+
581591
st = decrease_reservation(nr_pages, GFP_USER);
582592
if (st != BP_DONE)
583593
return -ENOMEM;
@@ -710,7 +720,7 @@ static int __init balloon_init(void)
710720
balloon_stats.schedule_delay = 1;
711721
balloon_stats.max_schedule_delay = 32;
712722
balloon_stats.retry_count = 1;
713-
balloon_stats.max_retry_count = RETRY_UNLIMITED;
723+
balloon_stats.max_retry_count = 4;
714724

715725
#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
716726
set_online_page_callback(&xen_online_page);

0 commit comments

Comments
 (0)