From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>,
Nicholas Tsirakis <niko.tsirakis@gmail.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Sasha Levin <sashal@kernel.org>,
xen-devel@lists.xenproject.org
Subject: [PATCH AUTOSEL 4.14 18/19] xen/balloon: fix ballooned page accounting without hotplug enabled
Date: Fri, 20 Dec 2019 09:37:39 -0500 [thread overview]
Message-ID: <20191220143741.10220-18-sashal@kernel.org> (raw)
In-Reply-To: <20191220143741.10220-1-sashal@kernel.org>
From: Juergen Gross <jgross@suse.com>
[ Upstream commit c673ec61ade89bf2f417960f986bc25671762efb ]
When CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not defined
reserve_additional_memory() will set balloon_stats.target_pages to a
wrong value in case there are still some ballooned pages allocated via
alloc_xenballooned_pages().
This will result in balloon_process() no longer be triggered when
ballooned pages are freed in batches.
Reported-by: Nicholas Tsirakis <niko.tsirakis@gmail.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/xen/balloon.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 71a6deeb4e714..3f9260af701f0 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -401,7 +401,8 @@ static struct notifier_block xen_memory_nb = {
#else
static enum bp_state reserve_additional_memory(void)
{
- balloon_stats.target_pages = balloon_stats.current_pages;
+ balloon_stats.target_pages = balloon_stats.current_pages +
+ balloon_stats.target_unpopulated;
return BP_ECANCELED;
}
#endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */
--
2.20.1
next prev parent reply other threads:[~2019-12-20 14:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-20 14:37 [PATCH AUTOSEL 4.14 01/19] nvme_fc: add module to ops template to allow module references Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 02/19] iio: adc: max9611: Fix too short conversion time delay Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 03/19] PM / devfreq: Don't fail devfreq_dev_release if not in list Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 04/19] RDMA/cma: add missed unregister_pernet_subsys in init failure Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 05/19] rxe: correctly calculate iCRC for unaligned payloads Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 06/19] scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 07/19] scsi: qla2xxx: Don't call qlt_async_event twice Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 08/19] scsi: iscsi: qla4xxx: fix double free in probe Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 09/19] scsi: libsas: stop discovering if oob mode is disconnected Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 10/19] drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 11/19] usb: gadget: fix wrong endpoint desc Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 12/19] net: make socket read/write_iter() honor IOCB_NOWAIT Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 13/19] md: raid1: check rdev before reference in raid1_sync_request func Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 14/19] s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 15/19] s390/cpum_sf: Avoid SBD overflow condition in irq handler Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 16/19] IB/mlx4: Follow mirror sequence of device add during device removal Sasha Levin
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 17/19] xen-blkback: prevent premature module unload Sasha Levin
2019-12-20 14:37 ` Sasha Levin [this message]
2019-12-20 14:37 ` [PATCH AUTOSEL 4.14 19/19] PM / hibernate: memory_bm_find_bit(): Tighten node optimisation 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=20191220143741.10220-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=niko.tsirakis@gmail.com \
--cc=stable@vger.kernel.org \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).