diff options
| author | Richard Weinberger <richard@nod.at> | 2015-10-25 22:26:09 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-11-06 22:49:12 +0100 |
| commit | 70c8205f40a385383b0c81f59550cf27273bf912 (patch) | |
| tree | 3186e2e340000c4cb2b237460d6cb68b52e59003 /arch | |
| parent | 1b2411c283e8e178b1c57d07f7fe082442a0927b (diff) | |
| download | linux-70c8205f40a385383b0c81f59550cf27273bf912.tar.bz2 | |
um: Report host OOM more nicely
If UML runs on the host side out of memory, report this
condition more nicely.
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/kernel/tlb.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index 2077248e8a72..3777b82759bd 100644 --- a/arch/um/kernel/tlb.c +++ b/arch/um/kernel/tlb.c @@ -50,6 +50,13 @@ struct host_vm_change { .index = 0, \ .force = force }) +static void report_enomem(void) +{ + printk(KERN_ERR "UML ran out of memory on the host side! " + "This can happen due to a memory limitation or " + "vm.max_map_count has been reached.\n"); +} + static int do_ops(struct host_vm_change *hvc, int end, int finished) { @@ -81,6 +88,9 @@ static int do_ops(struct host_vm_change *hvc, int end, } } + if (ret == -ENOMEM) + report_enomem(); + return ret; } @@ -433,8 +443,12 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long address) else if (pte_newprot(*pte)) err = protect(mm_id, address, PAGE_SIZE, prot, 1, &flush); - if (err) + if (err) { + if (err == -ENOMEM) + report_enomem(); + goto kill; + } *pte = pte_mkuptodate(*pte); |