Skip to content

Commit dfd74a1

Browse files
rosslagerwallDavid Vrabel
authored andcommitted
xen/balloon: Fix crash when ballooning on x86 32 bit PAE
Commit 55b3da9 (xen/balloon: find non-conflicting regions to place hotplugged memory) caused a regression in 4.4. When ballooning on an x86 32 bit PAE system with close to 64 GiB of memory, the address returned by allocate_resource may be above 64 GiB. When using CONFIG_SPARSEMEM, this setup is limited to using physical addresses < 64 GiB. When adding memory at this address, it runs off the end of the mem_section array and causes a crash. Instead, fail the ballooning request. Signed-off-by: Ross Lagerwall <[email protected]> Cc: <[email protected]> # 4.4+ Signed-off-by: David Vrabel <[email protected]>
1 parent 60901df commit dfd74a1

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

drivers/xen/balloon.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ static DECLARE_WAIT_QUEUE_HEAD(balloon_wq);
151151
static void balloon_process(struct work_struct *work);
152152
static DECLARE_DELAYED_WORK(balloon_worker, balloon_process);
153153

154+
static void release_memory_resource(struct resource *resource);
155+
154156
/* When ballooning out (allocating memory to return to Xen) we don't really
155157
want the kernel to try too hard since that can trigger the oom killer. */
156158
#define GFP_BALLOON \
@@ -267,6 +269,20 @@ static struct resource *additional_memory_resource(phys_addr_t size)
267269
return NULL;
268270
}
269271

272+
#ifdef CONFIG_SPARSEMEM
273+
{
274+
unsigned long limit = 1UL << (MAX_PHYSMEM_BITS - PAGE_SHIFT);
275+
unsigned long pfn = res->start >> PAGE_SHIFT;
276+
277+
if (pfn > limit) {
278+
pr_err("New System RAM resource outside addressable RAM (%lu > %lu)\n",
279+
pfn, limit);
280+
release_memory_resource(res);
281+
return NULL;
282+
}
283+
}
284+
#endif
285+
270286
return res;
271287
}
272288

0 commit comments

Comments
 (0)