public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.14 32/37] xen: let alloc_xenballooned_pages() fail if not enough memory free
Date: Fri, 26 Jul 2019 09:43:27 -0400	[thread overview]
Message-ID: <20190726134332.12626-32-sashal@kernel.org> (raw)
In-Reply-To: <20190726134332.12626-1-sashal@kernel.org>

From: Juergen Gross <jgross@suse.com>

[ Upstream commit a1078e821b605813b63bf6bca414a85f804d5c66 ]

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: Sasha Levin <sashal@kernel.org>
---
 drivers/xen/balloon.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index f77e499afddd..7d521babc020 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -590,8 +590,15 @@ static void balloon_process(struct work_struct *work)
 				state = reserve_additional_memory();
 		}
 
-		if (credit < 0)
-			state = decrease_reservation(-credit, GFP_BALLOON);
+		if (credit < 0) {
+			long n_pages;
+
+			n_pages = min(-credit, si_mem_available());
+			state = decrease_reservation(n_pages, GFP_BALLOON);
+			if (state == BP_DONE && n_pages != -credit &&
+			    n_pages < totalreserve_pages)
+				state = BP_EAGAIN;
+		}
 
 		state = update_schedule(state);
 
@@ -630,6 +637,9 @@ static int add_ballooned_pages(int nr_pages)
 		}
 	}
 
+	if (si_mem_available() < nr_pages)
+		return -ENOMEM;
+
 	st = decrease_reservation(nr_pages, GFP_USER);
 	if (st != BP_DONE)
 		return -ENOMEM;
@@ -759,7 +769,7 @@ static int __init balloon_init(void)
 	balloon_stats.schedule_delay = 1;
 	balloon_stats.max_schedule_delay = 32;
 	balloon_stats.retry_count = 1;
-	balloon_stats.max_retry_count = RETRY_UNLIMITED;
+	balloon_stats.max_retry_count = 4;
 
 #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
 	set_online_page_callback(&xen_online_page);
-- 
2.20.1


  parent reply	other threads:[~2019-07-26 13:44 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-26 13:42 [PATCH AUTOSEL 4.14 01/37] ARM: riscpc: fix DMA Sasha Levin
2019-07-26 13:42 ` [PATCH AUTOSEL 4.14 02/37] ARM: dts: rockchip: Make rk3288-veyron-minnie run at hs200 Sasha Levin
2019-07-26 13:42 ` [PATCH AUTOSEL 4.14 03/37] ARM: dts: rockchip: Make rk3288-veyron-mickey's emmc work again Sasha Levin
2019-07-26 13:42 ` [PATCH AUTOSEL 4.14 04/37] ARM: dts: rockchip: Mark that the rk3288 timer might stop in suspend Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 05/37] ftrace: Enable trampoline when rec count returns back to one Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 06/37] kernel/module.c: Only return -EEXIST for modules that have finished loading Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 07/37] MIPS: lantiq: Fix bitfield masking Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 08/37] dmaengine: rcar-dmac: Reject zero-length slave DMA requests Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 09/37] clk: tegra210: fix PLLU and PLLU_OUT1 Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 10/37] fs/adfs: super: fix use-after-free bug Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 11/37] btrfs: fix minimum number of chunk errors for DUP Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 12/37] cifs: Fix a race condition with cifs_echo_request Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 13/37] ceph: fix improper use of smp_mb__before_atomic() Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 14/37] ceph: return -ERANGE if virtual xattr value didn't fit in buffer Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 15/37] ACPI: blacklist: fix clang warning for unused DMI table Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 16/37] scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 17/37] x86: kvm: avoid constant-conversion warning Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 18/37] ACPI: fix false-positive -Wuninitialized warning Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 19/37] ISDN: hfcsusb: checking idx of ep configuration Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 20/37] be2net: Signal that the device cannot transmit during reconfiguration Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 21/37] x86/apic: Silence -Wtype-limits compiler warnings Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 22/37] x86: math-emu: Hide clang warnings for 16-bit overflow Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 23/37] mm/cma.c: fail if fixed declaration can't be honored Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 24/37] coda: add error handling for fget Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 25/37] coda: fix build using bare-metal toolchain Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 26/37] uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 27/37] drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 28/37] drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 29/37] ipc/mqueue.c: only perform resource calculation if user valid Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 30/37] floppy: fix div-by-zero in setup_format_params Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 31/37] floppy: fix out-of-bounds read in copy_buffer Sasha Levin
2019-07-26 13:43 ` Sasha Levin [this message]
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 33/37] xen/pv: Fix a boot up hang revealed by int3 self test Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 34/37] x86/kvm: Don't call kvm_spurious_fault() from .fixup Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 35/37] x86/paravirt: Fix callee-saved function ELF sizes Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 36/37] x86, boot: Remove multiple copy of static function sanitize_boot_params() Sasha Levin
2019-07-26 13:43 ` [PATCH AUTOSEL 4.14 37/37] drm/nouveau: fix memory leak in nouveau_conn_reset() Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190726134332.12626-32-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=jgross@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox