2019-05-23 12:14:39 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2011-11-03 12:20:04 +04:00
|
|
|
/*
|
|
|
|
* Virtio balloon implementation, inspired by Dor Laor and Marcelo
|
2008-02-05 07:50:12 +03:00
|
|
|
* Tosatti's implementations.
|
|
|
|
*
|
|
|
|
* Copyright 2008 Rusty Russell IBM Corporation
|
|
|
|
*/
|
2011-11-03 12:20:04 +04:00
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
#include <linux/virtio.h>
|
|
|
|
#include <linux/virtio_balloon.h>
|
|
|
|
#include <linux/swap.h>
|
2016-01-25 19:38:05 +03:00
|
|
|
#include <linux/workqueue.h>
|
2008-02-06 12:40:22 +03:00
|
|
|
#include <linux/delay.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2011-07-04 00:20:30 +04:00
|
|
|
#include <linux/module.h>
|
2012-12-12 04:02:45 +04:00
|
|
|
#include <linux/balloon_compaction.h>
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
#include <linux/oom.h>
|
2015-03-10 04:25:08 +03:00
|
|
|
#include <linux/wait.h>
|
2016-03-18 00:19:08 +03:00
|
|
|
#include <linux/mm.h>
|
2016-07-27 01:23:09 +03:00
|
|
|
#include <linux/mount.h>
|
2017-02-05 18:03:58 +03:00
|
|
|
#include <linux/magic.h>
|
2019-03-25 19:38:25 +03:00
|
|
|
#include <linux/pseudo_fs.h>
|
2020-04-07 06:05:05 +03:00
|
|
|
#include <linux/page_reporting.h>
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2012-04-12 17:38:00 +04:00
|
|
|
/*
|
|
|
|
* Balloon device works in 4K page units. So each page is pointed to by
|
|
|
|
* multiple balloon pages. All memory counters in this driver are in balloon
|
|
|
|
* page units.
|
|
|
|
*/
|
2012-12-12 04:02:45 +04:00
|
|
|
#define VIRTIO_BALLOON_PAGES_PER_PAGE (unsigned)(PAGE_SIZE >> VIRTIO_BALLOON_PFN_SHIFT)
|
|
|
|
#define VIRTIO_BALLOON_ARRAY_PFNS_MAX 256
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
/* Maximum number of (4k) pages to deflate on OOM notifications. */
|
|
|
|
#define VIRTIO_BALLOON_OOM_NR_PAGES 256
|
|
|
|
#define VIRTIO_BALLOON_OOM_NOTIFY_PRIORITY 80
|
2014-11-10 02:06:29 +03:00
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
#define VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG (__GFP_NORETRY | __GFP_NOWARN | \
|
|
|
|
__GFP_NOMEMALLOC)
|
|
|
|
/* The order of free page blocks to report to host */
|
2019-11-19 13:21:47 +03:00
|
|
|
#define VIRTIO_BALLOON_HINT_BLOCK_ORDER (MAX_ORDER - 1)
|
2018-08-27 04:32:17 +03:00
|
|
|
/* The size of a free page block in bytes */
|
2019-11-19 13:21:47 +03:00
|
|
|
#define VIRTIO_BALLOON_HINT_BLOCK_BYTES \
|
|
|
|
(1 << (VIRTIO_BALLOON_HINT_BLOCK_ORDER + PAGE_SHIFT))
|
2019-11-19 13:25:24 +03:00
|
|
|
#define VIRTIO_BALLOON_HINT_BLOCK_PAGES (1 << VIRTIO_BALLOON_HINT_BLOCK_ORDER)
|
2018-08-27 04:32:17 +03:00
|
|
|
|
2016-07-27 01:23:09 +03:00
|
|
|
#ifdef CONFIG_BALLOON_COMPACTION
|
|
|
|
static struct vfsmount *balloon_mnt;
|
|
|
|
#endif
|
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
enum virtio_balloon_vq {
|
|
|
|
VIRTIO_BALLOON_VQ_INFLATE,
|
|
|
|
VIRTIO_BALLOON_VQ_DEFLATE,
|
|
|
|
VIRTIO_BALLOON_VQ_STATS,
|
|
|
|
VIRTIO_BALLOON_VQ_FREE_PAGE,
|
2020-04-07 06:05:05 +03:00
|
|
|
VIRTIO_BALLOON_VQ_REPORTING,
|
2018-08-27 04:32:17 +03:00
|
|
|
VIRTIO_BALLOON_VQ_MAX
|
|
|
|
};
|
|
|
|
|
2019-01-07 10:01:04 +03:00
|
|
|
enum virtio_balloon_config_read {
|
|
|
|
VIRTIO_BALLOON_CONFIG_READ_CMD_ID = 0,
|
|
|
|
};
|
|
|
|
|
2015-01-15 14:33:31 +03:00
|
|
|
struct virtio_balloon {
|
2008-02-05 07:50:12 +03:00
|
|
|
struct virtio_device *vdev;
|
2018-08-27 04:32:17 +03:00
|
|
|
struct virtqueue *inflate_vq, *deflate_vq, *stats_vq, *free_page_vq;
|
|
|
|
|
|
|
|
/* Balloon's own wq for cpu-intensive work items */
|
|
|
|
struct workqueue_struct *balloon_wq;
|
|
|
|
/* The free page reporting work item submitted to the balloon wq */
|
|
|
|
struct work_struct report_free_page_work;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2016-01-25 19:38:05 +03:00
|
|
|
/* The balloon servicing is delegated to a freezable workqueue. */
|
2016-01-25 19:38:06 +03:00
|
|
|
struct work_struct update_balloon_stats_work;
|
|
|
|
struct work_struct update_balloon_size_work;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2016-01-25 19:38:05 +03:00
|
|
|
/* Prevent updating balloon when it is being canceled. */
|
|
|
|
spinlock_t stop_update_lock;
|
|
|
|
bool stop_update;
|
2019-01-07 10:01:04 +03:00
|
|
|
/* Bitmap to indicate if reading the related config fields are needed */
|
|
|
|
unsigned long config_read_bitmap;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
/* The list of allocated free pages, waiting to be given back to mm */
|
|
|
|
struct list_head free_page_list;
|
|
|
|
spinlock_t free_page_list_lock;
|
|
|
|
/* The number of free page blocks on the above list */
|
|
|
|
unsigned long num_free_page_blocks;
|
2019-01-07 10:01:04 +03:00
|
|
|
/*
|
|
|
|
* The cmd id received from host.
|
|
|
|
* Read it via virtio_balloon_cmd_id_received to get the latest value
|
|
|
|
* sent from host.
|
|
|
|
*/
|
|
|
|
u32 cmd_id_received_cache;
|
2018-08-27 04:32:17 +03:00
|
|
|
/* The cmd id that is actively in use */
|
|
|
|
__virtio32 cmd_id_active;
|
|
|
|
/* Buffer to store the stop sign */
|
|
|
|
__virtio32 cmd_id_stop;
|
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
/* Waiting for host to ack the pages we released. */
|
2012-07-02 11:33:08 +04:00
|
|
|
wait_queue_head_t acked;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2012-04-12 17:38:00 +04:00
|
|
|
/* Number of balloon pages we've told the Host we're not using. */
|
2008-02-05 07:50:12 +03:00
|
|
|
unsigned int num_pages;
|
2012-04-12 17:38:00 +04:00
|
|
|
/*
|
2012-12-12 04:02:45 +04:00
|
|
|
* The pages we've told the Host we're not using are enqueued
|
|
|
|
* at vb_dev_info->pages list.
|
2012-04-12 17:38:00 +04:00
|
|
|
* Each page on this list adds VIRTIO_BALLOON_PAGES_PER_PAGE
|
|
|
|
* to num_pages above.
|
|
|
|
*/
|
2014-10-10 02:29:29 +04:00
|
|
|
struct balloon_dev_info vb_dev_info;
|
2012-12-12 04:02:45 +04:00
|
|
|
|
|
|
|
/* Synchronize access/update to this struct virtio_balloon elements */
|
|
|
|
struct mutex balloon_lock;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
|
|
|
/* The array of pfns we tell the Host about. */
|
|
|
|
unsigned int num_pfns;
|
2016-05-17 13:31:18 +03:00
|
|
|
__virtio32 pfns[VIRTIO_BALLOON_ARRAY_PFNS_MAX];
|
2009-11-30 19:14:15 +03:00
|
|
|
|
|
|
|
/* Memory statistics */
|
|
|
|
struct virtio_balloon_stat stats[VIRTIO_BALLOON_S_NR];
|
2014-11-10 02:06:29 +03:00
|
|
|
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
/* Shrinker to return free pages - VIRTIO_BALLOON_F_FREE_PAGE_HINT */
|
2018-08-16 10:50:58 +03:00
|
|
|
struct shrinker shrinker;
|
2020-04-07 06:05:05 +03:00
|
|
|
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
/* OOM notifier to deflate on OOM - VIRTIO_BALLOON_F_DEFLATE_ON_OOM */
|
|
|
|
struct notifier_block oom_nb;
|
|
|
|
|
2020-04-07 06:05:05 +03:00
|
|
|
/* Free page reporting device */
|
|
|
|
struct virtqueue *reporting_vq;
|
|
|
|
struct page_reporting_dev_info pr_dev_info;
|
2008-02-05 07:50:12 +03:00
|
|
|
};
|
|
|
|
|
2020-09-11 23:35:07 +03:00
|
|
|
static const struct virtio_device_id id_table[] = {
|
2008-02-05 07:50:12 +03:00
|
|
|
{ VIRTIO_ID_BALLOON, VIRTIO_DEV_ANY_ID },
|
|
|
|
{ 0 },
|
|
|
|
};
|
|
|
|
|
2008-11-14 00:48:33 +03:00
|
|
|
static u32 page_to_balloon_pfn(struct page *page)
|
|
|
|
{
|
|
|
|
unsigned long pfn = page_to_pfn(page);
|
|
|
|
|
|
|
|
BUILD_BUG_ON(PAGE_SHIFT < VIRTIO_BALLOON_PFN_SHIFT);
|
|
|
|
/* Convert pfn from Linux page size to balloon page size. */
|
2012-04-12 17:38:00 +04:00
|
|
|
return pfn * VIRTIO_BALLOON_PAGES_PER_PAGE;
|
|
|
|
}
|
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
static void balloon_ack(struct virtqueue *vq)
|
|
|
|
{
|
2012-07-02 11:33:08 +04:00
|
|
|
struct virtio_balloon *vb = vq->vdev->priv;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2012-07-02 11:33:08 +04:00
|
|
|
wake_up(&vb->acked);
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq)
|
|
|
|
{
|
|
|
|
struct scatterlist sg;
|
2012-07-02 11:33:08 +04:00
|
|
|
unsigned int len;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
|
|
|
sg_init_one(&sg, vb->pfns, sizeof(vb->pfns[0]) * vb->num_pfns);
|
|
|
|
|
|
|
|
/* We should always be able to add one buffer to an empty queue. */
|
2014-03-13 04:53:40 +04:00
|
|
|
virtqueue_add_outbuf(vq, &sg, 1, vb, GFP_KERNEL);
|
2010-04-12 17:18:28 +04:00
|
|
|
virtqueue_kick(vq);
|
2008-02-05 07:50:12 +03:00
|
|
|
|
|
|
|
/* When host has read buffer, this completes via balloon_ack */
|
2012-07-02 11:33:08 +04:00
|
|
|
wait_event(vb->acked, virtqueue_get_buf(vq, &len));
|
2016-01-25 19:38:06 +03:00
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2020-04-09 11:50:47 +03:00
|
|
|
static int virtballoon_free_page_report(struct page_reporting_dev_info *pr_dev_info,
|
2020-04-07 06:05:05 +03:00
|
|
|
struct scatterlist *sg, unsigned int nents)
|
|
|
|
{
|
|
|
|
struct virtio_balloon *vb =
|
|
|
|
container_of(pr_dev_info, struct virtio_balloon, pr_dev_info);
|
|
|
|
struct virtqueue *vq = vb->reporting_vq;
|
|
|
|
unsigned int unused, err;
|
|
|
|
|
|
|
|
/* We should always be able to add these buffers to an empty queue. */
|
|
|
|
err = virtqueue_add_inbuf(vq, sg, nents, vb, GFP_NOWAIT | __GFP_NOWARN);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In the extremely unlikely case that something has occurred and we
|
|
|
|
* are able to trigger an error we will simply display a warning
|
|
|
|
* and exit without actually processing the pages.
|
|
|
|
*/
|
|
|
|
if (WARN_ON_ONCE(err))
|
|
|
|
return err;
|
|
|
|
|
|
|
|
virtqueue_kick(vq);
|
|
|
|
|
|
|
|
/* When host has read buffer, this completes via balloon_ack */
|
|
|
|
wait_event(vb->acked, virtqueue_get_buf(vq, &unused));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-17 13:31:18 +03:00
|
|
|
static void set_page_pfns(struct virtio_balloon *vb,
|
|
|
|
__virtio32 pfns[], struct page *page)
|
2012-04-12 17:38:00 +04:00
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
2020-02-06 10:40:58 +03:00
|
|
|
BUILD_BUG_ON(VIRTIO_BALLOON_PAGES_PER_PAGE > VIRTIO_BALLOON_ARRAY_PFNS_MAX);
|
|
|
|
|
2017-07-12 15:40:15 +03:00
|
|
|
/*
|
|
|
|
* Set balloon pfns pointing at this page.
|
|
|
|
* Note that the first pfn points at start of the page.
|
|
|
|
*/
|
2012-04-12 17:38:00 +04:00
|
|
|
for (i = 0; i < VIRTIO_BALLOON_PAGES_PER_PAGE; i++)
|
2016-05-17 13:31:18 +03:00
|
|
|
pfns[i] = cpu_to_virtio32(vb->vdev,
|
|
|
|
page_to_balloon_pfn(page) + i);
|
2012-04-12 17:38:00 +04:00
|
|
|
}
|
|
|
|
|
2016-01-25 19:38:05 +03:00
|
|
|
static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
2016-01-25 19:38:05 +03:00
|
|
|
unsigned num_allocated_pages;
|
2017-10-13 16:11:48 +03:00
|
|
|
unsigned num_pfns;
|
|
|
|
struct page *page;
|
|
|
|
LIST_HEAD(pages);
|
2012-12-12 04:02:45 +04:00
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
/* We can only do one array worth at a time. */
|
|
|
|
num = min(num, ARRAY_SIZE(vb->pfns));
|
|
|
|
|
2017-10-13 16:11:48 +03:00
|
|
|
for (num_pfns = 0; num_pfns < num;
|
|
|
|
num_pfns += VIRTIO_BALLOON_PAGES_PER_PAGE) {
|
|
|
|
struct page *page = balloon_page_alloc();
|
2012-12-12 04:02:45 +04:00
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
if (!page) {
|
2012-10-31 02:57:22 +04:00
|
|
|
dev_info_ratelimited(&vb->vdev->dev,
|
2012-12-20 20:37:04 +04:00
|
|
|
"Out of puff! Can't get %u pages\n",
|
|
|
|
VIRTIO_BALLOON_PAGES_PER_PAGE);
|
2008-02-05 07:50:12 +03:00
|
|
|
/* Sleep for at least 1/5 of a second before retry. */
|
|
|
|
msleep(200);
|
|
|
|
break;
|
|
|
|
}
|
2017-10-13 16:11:48 +03:00
|
|
|
|
|
|
|
balloon_page_push(&pages, page);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_lock(&vb->balloon_lock);
|
|
|
|
|
|
|
|
vb->num_pfns = 0;
|
|
|
|
|
|
|
|
while ((page = balloon_page_pop(&pages))) {
|
|
|
|
balloon_page_enqueue(&vb->vb_dev_info, page);
|
|
|
|
|
2016-05-17 13:31:18 +03:00
|
|
|
set_page_pfns(vb, vb->pfns + vb->num_pfns, page);
|
2012-04-12 17:38:00 +04:00
|
|
|
vb->num_pages += VIRTIO_BALLOON_PAGES_PER_PAGE;
|
2015-08-20 00:49:49 +03:00
|
|
|
if (!virtio_has_feature(vb->vdev,
|
|
|
|
VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
|
|
|
|
adjust_managed_page_count(page, -1);
|
2017-12-01 12:50:28 +03:00
|
|
|
vb->num_pfns += VIRTIO_BALLOON_PAGES_PER_PAGE;
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2016-01-25 19:38:05 +03:00
|
|
|
num_allocated_pages = vb->num_pfns;
|
2012-12-12 04:02:45 +04:00
|
|
|
/* Did we get any? */
|
|
|
|
if (vb->num_pfns != 0)
|
|
|
|
tell_host(vb, vb->inflate_vq);
|
|
|
|
mutex_unlock(&vb->balloon_lock);
|
2016-01-25 19:38:05 +03:00
|
|
|
|
|
|
|
return num_allocated_pages;
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2017-07-12 15:40:14 +03:00
|
|
|
static void release_pages_balloon(struct virtio_balloon *vb,
|
|
|
|
struct list_head *pages)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
2017-07-12 15:40:14 +03:00
|
|
|
struct page *page, *next;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2017-07-12 15:40:14 +03:00
|
|
|
list_for_each_entry_safe(page, next, pages, lru) {
|
2015-08-20 00:49:49 +03:00
|
|
|
if (!virtio_has_feature(vb->vdev,
|
|
|
|
VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
|
|
|
|
adjust_managed_page_count(page, 1);
|
2017-07-12 15:40:14 +03:00
|
|
|
list_del(&page->lru);
|
2014-10-10 02:29:27 +04:00
|
|
|
put_page(page); /* balloon reference */
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-10 02:05:29 +03:00
|
|
|
static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
2014-11-10 02:05:29 +03:00
|
|
|
unsigned num_freed_pages;
|
2008-02-05 07:50:12 +03:00
|
|
|
struct page *page;
|
2014-10-10 02:29:29 +04:00
|
|
|
struct balloon_dev_info *vb_dev_info = &vb->vb_dev_info;
|
2017-07-12 15:40:14 +03:00
|
|
|
LIST_HEAD(pages);
|
2008-02-05 07:50:12 +03:00
|
|
|
|
|
|
|
/* We can only do one array worth at a time. */
|
|
|
|
num = min(num, ARRAY_SIZE(vb->pfns));
|
|
|
|
|
2012-12-12 04:02:45 +04:00
|
|
|
mutex_lock(&vb->balloon_lock);
|
2016-07-11 15:28:59 +03:00
|
|
|
/* We can't release more pages than taken */
|
|
|
|
num = min(num, (size_t)vb->num_pages);
|
2012-04-12 17:38:00 +04:00
|
|
|
for (vb->num_pfns = 0; vb->num_pfns < num;
|
|
|
|
vb->num_pfns += VIRTIO_BALLOON_PAGES_PER_PAGE) {
|
2012-12-12 04:02:45 +04:00
|
|
|
page = balloon_page_dequeue(vb_dev_info);
|
|
|
|
if (!page)
|
|
|
|
break;
|
2016-05-17 13:31:18 +03:00
|
|
|
set_page_pfns(vb, vb->pfns + vb->num_pfns, page);
|
2017-07-12 15:40:14 +03:00
|
|
|
list_add(&page->lru, &pages);
|
2012-04-12 17:38:00 +04:00
|
|
|
vb->num_pages -= VIRTIO_BALLOON_PAGES_PER_PAGE;
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2014-11-10 02:05:29 +03:00
|
|
|
num_freed_pages = vb->num_pfns;
|
2011-04-07 21:43:25 +04:00
|
|
|
/*
|
|
|
|
* Note that if
|
|
|
|
* virtio_has_feature(vdev, VIRTIO_BALLOON_F_MUST_TELL_HOST);
|
|
|
|
* is true, we *have* to do it in this order
|
|
|
|
*/
|
2013-07-02 10:05:13 +04:00
|
|
|
if (vb->num_pfns != 0)
|
|
|
|
tell_host(vb, vb->deflate_vq);
|
2017-07-12 15:40:14 +03:00
|
|
|
release_pages_balloon(vb, &pages);
|
2015-12-28 02:35:12 +03:00
|
|
|
mutex_unlock(&vb->balloon_lock);
|
2014-11-10 02:05:29 +03:00
|
|
|
return num_freed_pages;
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2009-11-30 19:14:15 +03:00
|
|
|
static inline void update_stat(struct virtio_balloon *vb, int idx,
|
|
|
|
u16 tag, u64 val)
|
|
|
|
{
|
|
|
|
BUG_ON(idx >= VIRTIO_BALLOON_S_NR);
|
2015-04-15 03:47:43 +03:00
|
|
|
vb->stats[idx].tag = cpu_to_virtio16(vb->vdev, tag);
|
|
|
|
vb->stats[idx].val = cpu_to_virtio64(vb->vdev, val);
|
2009-11-30 19:14:15 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
#define pages_to_bytes(x) ((u64)(x) << PAGE_SHIFT)
|
|
|
|
|
2017-03-28 19:46:58 +03:00
|
|
|
static unsigned int update_balloon_stats(struct virtio_balloon *vb)
|
2009-11-30 19:14:15 +03:00
|
|
|
{
|
|
|
|
unsigned long events[NR_VM_EVENT_ITEMS];
|
|
|
|
struct sysinfo i;
|
2017-03-28 19:46:58 +03:00
|
|
|
unsigned int idx = 0;
|
2016-03-18 00:19:08 +03:00
|
|
|
long available;
|
2017-11-12 15:05:38 +03:00
|
|
|
unsigned long caches;
|
2009-11-30 19:14:15 +03:00
|
|
|
|
|
|
|
all_vm_events(events);
|
|
|
|
si_meminfo(&i);
|
|
|
|
|
2016-03-18 00:19:08 +03:00
|
|
|
available = si_mem_available();
|
2017-11-12 15:05:38 +03:00
|
|
|
caches = global_node_page_state(NR_FILE_PAGES);
|
2016-03-18 00:19:08 +03:00
|
|
|
|
2017-03-28 19:46:59 +03:00
|
|
|
#ifdef CONFIG_VM_EVENT_COUNTERS
|
2009-11-30 19:14:15 +03:00
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_IN,
|
|
|
|
pages_to_bytes(events[PSWPIN]));
|
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_OUT,
|
|
|
|
pages_to_bytes(events[PSWPOUT]));
|
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_MAJFLT, events[PGMAJFAULT]);
|
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_MINFLT, events[PGFAULT]);
|
2018-03-20 01:14:14 +03:00
|
|
|
#ifdef CONFIG_HUGETLB_PAGE
|
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_HTLB_PGALLOC,
|
|
|
|
events[HTLB_BUDDY_PGALLOC]);
|
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_HTLB_PGFAIL,
|
|
|
|
events[HTLB_BUDDY_PGALLOC_FAIL]);
|
|
|
|
#endif
|
2017-03-28 19:46:59 +03:00
|
|
|
#endif
|
2009-11-30 19:14:15 +03:00
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMFREE,
|
|
|
|
pages_to_bytes(i.freeram));
|
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMTOT,
|
|
|
|
pages_to_bytes(i.totalram));
|
2016-03-18 00:19:08 +03:00
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_AVAIL,
|
|
|
|
pages_to_bytes(available));
|
2017-11-12 15:05:38 +03:00
|
|
|
update_stat(vb, idx++, VIRTIO_BALLOON_S_CACHES,
|
|
|
|
pages_to_bytes(caches));
|
2017-03-28 19:46:58 +03:00
|
|
|
|
|
|
|
return idx;
|
2009-11-30 19:14:15 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* While most virtqueues communicate guest-initiated requests to the hypervisor,
|
|
|
|
* the stats queue operates in reverse. The driver initializes the virtqueue
|
|
|
|
* with a single buffer. From that point forward, all conversations consist of
|
|
|
|
* a hypervisor request (a call to this function) which directs us to refill
|
2009-12-11 01:35:15 +03:00
|
|
|
* the virtqueue with a fresh stats buffer. Since stats collection can sleep,
|
2016-01-25 19:38:05 +03:00
|
|
|
* we delegate the job to a freezable workqueue that will do the actual work via
|
|
|
|
* stats_handle_request().
|
2009-11-30 19:14:15 +03:00
|
|
|
*/
|
2009-12-11 01:35:15 +03:00
|
|
|
static void stats_request(struct virtqueue *vq)
|
2009-11-30 19:14:15 +03:00
|
|
|
{
|
2012-07-02 11:33:08 +04:00
|
|
|
struct virtio_balloon *vb = vq->vdev->priv;
|
2009-11-30 19:14:15 +03:00
|
|
|
|
2016-01-25 19:38:05 +03:00
|
|
|
spin_lock(&vb->stop_update_lock);
|
|
|
|
if (!vb->stop_update)
|
2016-01-25 19:38:06 +03:00
|
|
|
queue_work(system_freezable_wq, &vb->update_balloon_stats_work);
|
2016-01-25 19:38:05 +03:00
|
|
|
spin_unlock(&vb->stop_update_lock);
|
2009-12-11 01:35:15 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void stats_handle_request(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
struct virtqueue *vq;
|
|
|
|
struct scatterlist sg;
|
2017-03-28 19:46:58 +03:00
|
|
|
unsigned int len, num_stats;
|
2009-11-30 19:14:15 +03:00
|
|
|
|
2017-03-28 19:46:58 +03:00
|
|
|
num_stats = update_balloon_stats(vb);
|
2009-11-30 19:14:15 +03:00
|
|
|
|
2009-12-11 01:35:15 +03:00
|
|
|
vq = vb->stats_vq;
|
2012-07-02 11:33:08 +04:00
|
|
|
if (!virtqueue_get_buf(vq, &len))
|
|
|
|
return;
|
2017-03-28 19:46:58 +03:00
|
|
|
sg_init_one(&sg, vb->stats, sizeof(vb->stats[0]) * num_stats);
|
2014-03-13 04:53:40 +04:00
|
|
|
virtqueue_add_outbuf(vq, &sg, 1, vb, GFP_KERNEL);
|
2010-04-12 17:18:28 +04:00
|
|
|
virtqueue_kick(vq);
|
2009-11-30 19:14:15 +03:00
|
|
|
}
|
|
|
|
|
2008-03-18 06:58:15 +03:00
|
|
|
static inline s64 towards_target(struct virtio_balloon *vb)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
2012-04-12 09:36:34 +04:00
|
|
|
s64 target;
|
2015-04-15 03:47:43 +03:00
|
|
|
u32 num_pages;
|
2012-04-12 09:36:34 +04:00
|
|
|
|
2015-04-15 03:47:43 +03:00
|
|
|
/* Legacy balloon config space is LE, unlike all other devices. */
|
2020-08-05 00:51:35 +03:00
|
|
|
virtio_cread_le(vb->vdev, struct virtio_balloon_config, num_pages,
|
|
|
|
&num_pages);
|
2015-04-15 03:47:43 +03:00
|
|
|
|
virtio_balloon: Fix endless deflation and inflation on arm64
commit 07622bd415639e9709579f400afd19e7e9866e5e upstream.
The deflation request to the target, which isn't unaligned to the
guest page size causes endless deflation and inflation actions. For
example, we receive the flooding QMP events for the changes on memory
balloon's size after a deflation request to the unaligned target is
sent for the ARM64 guest, where we have 64KB base page size.
/home/gavin/sandbox/qemu.main/build/qemu-system-aarch64 \
-accel kvm -machine virt,gic-version=host -cpu host \
-smp maxcpus=8,cpus=8,sockets=2,clusters=2,cores=2,threads=1 \
-m 1024M,slots=16,maxmem=64G \
-object memory-backend-ram,id=mem0,size=512M \
-object memory-backend-ram,id=mem1,size=512M \
-numa node,nodeid=0,memdev=mem0,cpus=0-3 \
-numa node,nodeid=1,memdev=mem1,cpus=4-7 \
: \
-device virtio-balloon-pci,id=balloon0,bus=pcie.10
{ "execute" : "balloon", "arguments": { "value" : 1073672192 } }
{"return": {}}
{"timestamp": {"seconds": 1693272173, "microseconds": 88667}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272174, "microseconds": 89704}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272175, "microseconds": 90819}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272176, "microseconds": 91961}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272177, "microseconds": 93040}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073676288}}
{"timestamp": {"seconds": 1693272178, "microseconds": 94117}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073676288}}
{"timestamp": {"seconds": 1693272179, "microseconds": 95337}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272180, "microseconds": 96615}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073676288}}
{"timestamp": {"seconds": 1693272181, "microseconds": 97626}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272182, "microseconds": 98693}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073676288}}
{"timestamp": {"seconds": 1693272183, "microseconds": 99698}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272184, "microseconds": 100727}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272185, "microseconds": 90430}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{"timestamp": {"seconds": 1693272186, "microseconds": 102999}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073676288}}
:
<The similar QMP events repeat>
Fix it by aligning the target up to the guest page size, 64KB in this
specific case. With this applied, no flooding QMP events are observed
and the memory balloon's size can be stablizied to 0x3ffe0000 soon
after the deflation request is sent.
{ "execute" : "balloon", "arguments": { "value" : 1073672192 } }
{"return": {}}
{"timestamp": {"seconds": 1693273328, "microseconds": 793075}, \
"event": "BALLOON_CHANGE", "data": {"actual": 1073610752}}
{ "execute" : "query-balloon" }
{"return": {"actual": 1073610752}}
Cc: stable@vger.kernel.org
Signed-off-by: Gavin Shan <gshan@redhat.com>
Tested-by: Zhenyu Zhang <zhenyzha@redhat.com>
Message-Id: <20230831011007.1032822-1-gshan@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2023-08-31 04:10:07 +03:00
|
|
|
/*
|
|
|
|
* Aligned up to guest page size to avoid inflating and deflating
|
|
|
|
* balloon endlessly.
|
|
|
|
*/
|
|
|
|
target = ALIGN(num_pages, VIRTIO_BALLOON_PAGES_PER_PAGE);
|
2012-04-12 09:36:34 +04:00
|
|
|
return target - vb->num_pages;
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
/* Gives back @num_to_return blocks of free pages to mm. */
|
|
|
|
static unsigned long return_free_pages_to_mm(struct virtio_balloon *vb,
|
|
|
|
unsigned long num_to_return)
|
|
|
|
{
|
|
|
|
struct page *page;
|
|
|
|
unsigned long num_returned;
|
|
|
|
|
|
|
|
spin_lock_irq(&vb->free_page_list_lock);
|
|
|
|
for (num_returned = 0; num_returned < num_to_return; num_returned++) {
|
|
|
|
page = balloon_page_pop(&vb->free_page_list);
|
|
|
|
if (!page)
|
|
|
|
break;
|
|
|
|
free_pages((unsigned long)page_address(page),
|
2019-11-19 13:21:47 +03:00
|
|
|
VIRTIO_BALLOON_HINT_BLOCK_ORDER);
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
|
|
|
vb->num_free_page_blocks -= num_returned;
|
|
|
|
spin_unlock_irq(&vb->free_page_list_lock);
|
|
|
|
|
|
|
|
return num_returned;
|
|
|
|
}
|
|
|
|
|
2019-01-07 10:01:04 +03:00
|
|
|
static void virtio_balloon_queue_free_page_work(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
if (!virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* No need to queue the work if the bit was already set. */
|
|
|
|
if (test_and_set_bit(VIRTIO_BALLOON_CONFIG_READ_CMD_ID,
|
|
|
|
&vb->config_read_bitmap))
|
|
|
|
return;
|
|
|
|
|
|
|
|
queue_work(vb->balloon_wq, &vb->report_free_page_work);
|
|
|
|
}
|
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
static void virtballoon_changed(struct virtio_device *vdev)
|
|
|
|
{
|
|
|
|
struct virtio_balloon *vb = vdev->priv;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2019-01-07 10:01:04 +03:00
|
|
|
spin_lock_irqsave(&vb->stop_update_lock, flags);
|
|
|
|
if (!vb->stop_update) {
|
|
|
|
queue_work(system_freezable_wq,
|
|
|
|
&vb->update_balloon_size_work);
|
|
|
|
virtio_balloon_queue_free_page_work(vb);
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
2019-01-07 10:01:04 +03:00
|
|
|
spin_unlock_irqrestore(&vb->stop_update_lock, flags);
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
static void update_balloon_size(struct virtio_balloon *vb)
|
|
|
|
{
|
2015-04-15 03:47:43 +03:00
|
|
|
u32 actual = vb->num_pages;
|
|
|
|
|
|
|
|
/* Legacy balloon config space is LE, unlike all other devices. */
|
2020-08-05 00:51:35 +03:00
|
|
|
virtio_cwrite_le(vb->vdev, struct virtio_balloon_config, actual,
|
|
|
|
&actual);
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2016-01-25 19:38:06 +03:00
|
|
|
static void update_balloon_stats_func(struct work_struct *work)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
2016-01-25 19:38:06 +03:00
|
|
|
struct virtio_balloon *vb;
|
2015-03-10 04:25:08 +03:00
|
|
|
|
2016-01-25 19:38:06 +03:00
|
|
|
vb = container_of(work, struct virtio_balloon,
|
|
|
|
update_balloon_stats_work);
|
|
|
|
stats_handle_request(vb);
|
|
|
|
}
|
2014-03-13 04:53:38 +04:00
|
|
|
|
2016-01-25 19:38:06 +03:00
|
|
|
static void update_balloon_size_func(struct work_struct *work)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
2016-01-25 19:38:05 +03:00
|
|
|
struct virtio_balloon *vb;
|
|
|
|
s64 diff;
|
2015-03-10 04:25:08 +03:00
|
|
|
|
2016-01-25 19:38:06 +03:00
|
|
|
vb = container_of(work, struct virtio_balloon,
|
|
|
|
update_balloon_size_work);
|
2016-01-25 19:38:05 +03:00
|
|
|
diff = towards_target(vb);
|
2014-03-13 04:53:38 +04:00
|
|
|
|
2019-01-07 10:01:05 +03:00
|
|
|
if (!diff)
|
|
|
|
return;
|
|
|
|
|
2016-01-25 19:38:05 +03:00
|
|
|
if (diff > 0)
|
|
|
|
diff -= fill_balloon(vb, diff);
|
2019-01-07 10:01:05 +03:00
|
|
|
else
|
2016-01-25 19:38:05 +03:00
|
|
|
diff += leak_balloon(vb, -diff);
|
|
|
|
update_balloon_size(vb);
|
|
|
|
|
|
|
|
if (diff)
|
|
|
|
queue_work(system_freezable_wq, work);
|
2008-02-05 07:50:12 +03:00
|
|
|
}
|
|
|
|
|
2011-12-22 15:28:34 +04:00
|
|
|
static int init_vqs(struct virtio_balloon *vb)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
2018-08-27 04:32:17 +03:00
|
|
|
struct virtqueue *vqs[VIRTIO_BALLOON_VQ_MAX];
|
|
|
|
vq_callback_t *callbacks[VIRTIO_BALLOON_VQ_MAX];
|
|
|
|
const char *names[VIRTIO_BALLOON_VQ_MAX];
|
|
|
|
int err;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2011-12-22 15:28:34 +04:00
|
|
|
/*
|
2018-08-27 04:32:17 +03:00
|
|
|
* Inflateq and deflateq are used unconditionally. The names[]
|
|
|
|
* will be NULL if the related feature is not enabled, which will
|
|
|
|
* cause no allocation for the corresponding virtqueue in find_vqs.
|
2011-12-22 15:28:34 +04:00
|
|
|
*/
|
2018-08-27 04:32:17 +03:00
|
|
|
callbacks[VIRTIO_BALLOON_VQ_INFLATE] = balloon_ack;
|
|
|
|
names[VIRTIO_BALLOON_VQ_INFLATE] = "inflate";
|
|
|
|
callbacks[VIRTIO_BALLOON_VQ_DEFLATE] = balloon_ack;
|
|
|
|
names[VIRTIO_BALLOON_VQ_DEFLATE] = "deflate";
|
2020-01-03 21:40:43 +03:00
|
|
|
callbacks[VIRTIO_BALLOON_VQ_STATS] = NULL;
|
2018-08-27 04:32:17 +03:00
|
|
|
names[VIRTIO_BALLOON_VQ_STATS] = NULL;
|
2020-01-03 21:40:43 +03:00
|
|
|
callbacks[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL;
|
2018-08-27 04:32:17 +03:00
|
|
|
names[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL;
|
2020-04-07 06:05:05 +03:00
|
|
|
names[VIRTIO_BALLOON_VQ_REPORTING] = NULL;
|
2018-08-27 04:32:17 +03:00
|
|
|
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) {
|
|
|
|
names[VIRTIO_BALLOON_VQ_STATS] = "stats";
|
|
|
|
callbacks[VIRTIO_BALLOON_VQ_STATS] = stats_request;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) {
|
|
|
|
names[VIRTIO_BALLOON_VQ_FREE_PAGE] = "free_page_vq";
|
|
|
|
callbacks[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL;
|
|
|
|
}
|
|
|
|
|
2020-04-07 06:05:05 +03:00
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING)) {
|
|
|
|
names[VIRTIO_BALLOON_VQ_REPORTING] = "reporting_vq";
|
|
|
|
callbacks[VIRTIO_BALLOON_VQ_REPORTING] = balloon_ack;
|
|
|
|
}
|
|
|
|
|
2021-07-23 08:42:59 +03:00
|
|
|
err = virtio_find_vqs(vb->vdev, VIRTIO_BALLOON_VQ_MAX, vqs,
|
|
|
|
callbacks, names, NULL);
|
2009-06-13 08:16:36 +04:00
|
|
|
if (err)
|
2011-12-22 15:28:34 +04:00
|
|
|
return err;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
vb->inflate_vq = vqs[VIRTIO_BALLOON_VQ_INFLATE];
|
|
|
|
vb->deflate_vq = vqs[VIRTIO_BALLOON_VQ_DEFLATE];
|
2009-11-30 19:14:15 +03:00
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) {
|
|
|
|
struct scatterlist sg;
|
2017-03-28 19:46:58 +03:00
|
|
|
unsigned int num_stats;
|
2018-08-27 04:32:17 +03:00
|
|
|
vb->stats_vq = vqs[VIRTIO_BALLOON_VQ_STATS];
|
2009-11-30 19:14:15 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Prime this virtqueue with one buffer so the hypervisor can
|
2014-03-13 04:53:40 +04:00
|
|
|
* use it to signal us later (it can't be broken yet!).
|
2009-11-30 19:14:15 +03:00
|
|
|
*/
|
2017-03-28 19:46:58 +03:00
|
|
|
num_stats = update_balloon_stats(vb);
|
2017-03-23 10:04:18 +03:00
|
|
|
|
2017-03-28 19:46:58 +03:00
|
|
|
sg_init_one(&sg, vb->stats, sizeof(vb->stats[0]) * num_stats);
|
2018-08-16 10:50:56 +03:00
|
|
|
err = virtqueue_add_outbuf(vb->stats_vq, &sg, 1, vb,
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (err) {
|
|
|
|
dev_warn(&vb->vdev->dev, "%s: add stat_vq failed\n",
|
|
|
|
__func__);
|
|
|
|
return err;
|
|
|
|
}
|
2010-04-12 17:18:28 +04:00
|
|
|
virtqueue_kick(vb->stats_vq);
|
2009-11-30 19:14:15 +03:00
|
|
|
}
|
2018-08-27 04:32:17 +03:00
|
|
|
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
|
|
|
|
vb->free_page_vq = vqs[VIRTIO_BALLOON_VQ_FREE_PAGE];
|
|
|
|
|
2020-04-07 06:05:05 +03:00
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING))
|
|
|
|
vb->reporting_vq = vqs[VIRTIO_BALLOON_VQ_REPORTING];
|
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-01-07 10:01:04 +03:00
|
|
|
static u32 virtio_balloon_cmd_id_received(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
if (test_and_clear_bit(VIRTIO_BALLOON_CONFIG_READ_CMD_ID,
|
2020-07-27 19:01:27 +03:00
|
|
|
&vb->config_read_bitmap)) {
|
|
|
|
/* Legacy balloon config space is LE, unlike all other devices. */
|
2020-08-05 00:51:35 +03:00
|
|
|
virtio_cread_le(vb->vdev, struct virtio_balloon_config,
|
|
|
|
free_page_hint_cmd_id,
|
|
|
|
&vb->cmd_id_received_cache);
|
2020-07-27 19:01:27 +03:00
|
|
|
}
|
2019-01-07 10:01:04 +03:00
|
|
|
|
|
|
|
return vb->cmd_id_received_cache;
|
|
|
|
}
|
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
static int send_cmd_id_start(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
struct scatterlist sg;
|
|
|
|
struct virtqueue *vq = vb->free_page_vq;
|
|
|
|
int err, unused;
|
|
|
|
|
|
|
|
/* Detach all the used buffers from the vq */
|
|
|
|
while (virtqueue_get_buf(vq, &unused))
|
|
|
|
;
|
|
|
|
|
2020-07-10 13:34:49 +03:00
|
|
|
vb->cmd_id_active = cpu_to_virtio32(vb->vdev,
|
2019-01-07 10:01:04 +03:00
|
|
|
virtio_balloon_cmd_id_received(vb));
|
2018-08-27 04:32:17 +03:00
|
|
|
sg_init_one(&sg, &vb->cmd_id_active, sizeof(vb->cmd_id_active));
|
|
|
|
err = virtqueue_add_outbuf(vq, &sg, 1, &vb->cmd_id_active, GFP_KERNEL);
|
|
|
|
if (!err)
|
|
|
|
virtqueue_kick(vq);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int send_cmd_id_stop(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
struct scatterlist sg;
|
|
|
|
struct virtqueue *vq = vb->free_page_vq;
|
|
|
|
int err, unused;
|
|
|
|
|
|
|
|
/* Detach all the used buffers from the vq */
|
|
|
|
while (virtqueue_get_buf(vq, &unused))
|
|
|
|
;
|
|
|
|
|
|
|
|
sg_init_one(&sg, &vb->cmd_id_stop, sizeof(vb->cmd_id_stop));
|
|
|
|
err = virtqueue_add_outbuf(vq, &sg, 1, &vb->cmd_id_stop, GFP_KERNEL);
|
|
|
|
if (!err)
|
|
|
|
virtqueue_kick(vq);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int get_free_page_and_send(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
struct virtqueue *vq = vb->free_page_vq;
|
|
|
|
struct page *page;
|
|
|
|
struct scatterlist sg;
|
|
|
|
int err, unused;
|
|
|
|
void *p;
|
|
|
|
|
|
|
|
/* Detach all the used buffers from the vq */
|
|
|
|
while (virtqueue_get_buf(vq, &unused))
|
|
|
|
;
|
|
|
|
|
|
|
|
page = alloc_pages(VIRTIO_BALLOON_FREE_PAGE_ALLOC_FLAG,
|
2019-11-19 13:21:47 +03:00
|
|
|
VIRTIO_BALLOON_HINT_BLOCK_ORDER);
|
2018-08-27 04:32:17 +03:00
|
|
|
/*
|
|
|
|
* When the allocation returns NULL, it indicates that we have got all
|
|
|
|
* the possible free pages, so return -EINTR to stop.
|
|
|
|
*/
|
|
|
|
if (!page)
|
|
|
|
return -EINTR;
|
|
|
|
|
|
|
|
p = page_address(page);
|
2019-11-19 13:21:47 +03:00
|
|
|
sg_init_one(&sg, p, VIRTIO_BALLOON_HINT_BLOCK_BYTES);
|
2018-08-27 04:32:17 +03:00
|
|
|
/* There is always 1 entry reserved for the cmd id to use. */
|
|
|
|
if (vq->num_free > 1) {
|
|
|
|
err = virtqueue_add_inbuf(vq, &sg, 1, p, GFP_KERNEL);
|
|
|
|
if (unlikely(err)) {
|
|
|
|
free_pages((unsigned long)p,
|
2019-11-19 13:21:47 +03:00
|
|
|
VIRTIO_BALLOON_HINT_BLOCK_ORDER);
|
2018-08-27 04:32:17 +03:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
virtqueue_kick(vq);
|
|
|
|
spin_lock_irq(&vb->free_page_list_lock);
|
|
|
|
balloon_page_push(&vb->free_page_list, page);
|
|
|
|
vb->num_free_page_blocks++;
|
|
|
|
spin_unlock_irq(&vb->free_page_list_lock);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* The vq has no available entry to add this page block, so
|
|
|
|
* just free it.
|
|
|
|
*/
|
2019-11-19 13:21:47 +03:00
|
|
|
free_pages((unsigned long)p, VIRTIO_BALLOON_HINT_BLOCK_ORDER);
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
|
|
|
|
2011-12-22 15:28:34 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
static int send_free_pages(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
u32 cmd_id_active;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
/*
|
|
|
|
* If a stop id or a new cmd id was just received from host,
|
|
|
|
* stop the reporting.
|
|
|
|
*/
|
|
|
|
cmd_id_active = virtio32_to_cpu(vb->vdev, vb->cmd_id_active);
|
2019-01-07 10:01:04 +03:00
|
|
|
if (unlikely(cmd_id_active !=
|
|
|
|
virtio_balloon_cmd_id_received(vb)))
|
2018-08-27 04:32:17 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The free page blocks are allocated and sent to host one by
|
|
|
|
* one.
|
|
|
|
*/
|
|
|
|
err = get_free_page_and_send(vb);
|
|
|
|
if (err == -EINTR)
|
|
|
|
break;
|
|
|
|
else if (unlikely(err))
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-01-07 10:01:04 +03:00
|
|
|
static void virtio_balloon_report_free_page(struct virtio_balloon *vb)
|
2018-08-27 04:32:17 +03:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
struct device *dev = &vb->vdev->dev;
|
|
|
|
|
|
|
|
/* Start by sending the received cmd id to host with an outbuf. */
|
|
|
|
err = send_cmd_id_start(vb);
|
|
|
|
if (unlikely(err))
|
|
|
|
dev_err(dev, "Failed to send a start id, err = %d\n", err);
|
|
|
|
|
|
|
|
err = send_free_pages(vb);
|
|
|
|
if (unlikely(err))
|
|
|
|
dev_err(dev, "Failed to send a free page, err = %d\n", err);
|
|
|
|
|
|
|
|
/* End by sending a stop id to host with an outbuf. */
|
|
|
|
err = send_cmd_id_stop(vb);
|
|
|
|
if (unlikely(err))
|
|
|
|
dev_err(dev, "Failed to send a stop id, err = %d\n", err);
|
|
|
|
}
|
|
|
|
|
2019-01-07 10:01:04 +03:00
|
|
|
static void report_free_page_func(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct virtio_balloon *vb = container_of(work, struct virtio_balloon,
|
|
|
|
report_free_page_work);
|
|
|
|
u32 cmd_id_received;
|
|
|
|
|
|
|
|
cmd_id_received = virtio_balloon_cmd_id_received(vb);
|
|
|
|
if (cmd_id_received == VIRTIO_BALLOON_CMD_ID_DONE) {
|
|
|
|
/* Pass ULONG_MAX to give back all the free pages */
|
|
|
|
return_free_pages_to_mm(vb, ULONG_MAX);
|
|
|
|
} else if (cmd_id_received != VIRTIO_BALLOON_CMD_ID_STOP &&
|
|
|
|
cmd_id_received !=
|
|
|
|
virtio32_to_cpu(vb->vdev, vb->cmd_id_active)) {
|
|
|
|
virtio_balloon_report_free_page(vb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-12 04:02:45 +04:00
|
|
|
#ifdef CONFIG_BALLOON_COMPACTION
|
|
|
|
/*
|
|
|
|
* virtballoon_migratepage - perform the balloon page migration on behalf of
|
2021-03-27 06:17:10 +03:00
|
|
|
* a compaction thread. (called under page lock)
|
2014-10-10 02:29:29 +04:00
|
|
|
* @vb_dev_info: the balloon device
|
2012-12-12 04:02:45 +04:00
|
|
|
* @newpage: page that will replace the isolated page after migration finishes.
|
|
|
|
* @page : the isolated (old) page that is about to be migrated to newpage.
|
|
|
|
* @mode : compaction mode -- not used for balloon page migration.
|
|
|
|
*
|
|
|
|
* After a ballooned page gets isolated by compaction procedures, this is the
|
|
|
|
* function that performs the page migration on behalf of a compaction thread
|
|
|
|
* The page migration for virtio balloon is done in a simple swap fashion which
|
|
|
|
* follows these two macro steps:
|
|
|
|
* 1) insert newpage into vb->pages list and update the host about it;
|
|
|
|
* 2) update the host about the old page removed from vb->pages list;
|
|
|
|
*
|
|
|
|
* This function preforms the balloon page migration task.
|
|
|
|
* Called through balloon_mapping->a_ops->migratepage
|
|
|
|
*/
|
2014-10-10 02:29:29 +04:00
|
|
|
static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info,
|
2012-12-12 04:02:45 +04:00
|
|
|
struct page *newpage, struct page *page, enum migrate_mode mode)
|
|
|
|
{
|
2014-10-10 02:29:29 +04:00
|
|
|
struct virtio_balloon *vb = container_of(vb_dev_info,
|
|
|
|
struct virtio_balloon, vb_dev_info);
|
2012-12-12 04:02:45 +04:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In order to avoid lock contention while migrating pages concurrently
|
|
|
|
* to leak_balloon() or fill_balloon() we just give up the balloon_lock
|
|
|
|
* this turn, as it is easier to retry the page migration later.
|
|
|
|
* This also prevents fill_balloon() getting stuck into a mutex
|
|
|
|
* recursion in the case it ends up triggering memory compaction
|
|
|
|
* while it is attempting to inflate the ballon.
|
|
|
|
*/
|
|
|
|
if (!mutex_trylock(&vb->balloon_lock))
|
|
|
|
return -EAGAIN;
|
|
|
|
|
2014-10-10 02:29:27 +04:00
|
|
|
get_page(newpage); /* balloon reference */
|
|
|
|
|
virtio-balloon: fix managed page counts when migrating pages between zones
In case we have to migrate a ballon page to a newpage of another zone, the
managed page count of both zones is wrong. Paired with memory offlining
(which will adjust the managed page count), we can trigger kernel crashes
and all kinds of different symptoms.
One way to reproduce:
1. Start a QEMU guest with 4GB, no NUMA
2. Hotplug a 1GB DIMM and online the memory to ZONE_NORMAL
3. Inflate the balloon to 1GB
4. Unplug the DIMM (be quick, otherwise unmovable data ends up on it)
5. Observe /proc/zoneinfo
Node 0, zone Normal
pages free 16810
min 24848885473806
low 18471592959183339
high 36918337032892872
spanned 262144
present 262144
managed 18446744073709533486
6. Do anything that requires some memory (e.g., inflate the balloon some
more). The OOM goes crazy and the system crashes
[ 238.324946] Out of memory: Killed process 537 (login) total-vm:27584kB, anon-rss:860kB, file-rss:0kB, shmem-rss:00
[ 238.338585] systemd invoked oom-killer: gfp_mask=0x100cca(GFP_HIGHUSER_MOVABLE), order=0, oom_score_adj=0
[ 238.339420] CPU: 0 PID: 1 Comm: systemd Tainted: G D W 5.4.0-next-20191204+ #75
[ 238.340139] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu4
[ 238.341121] Call Trace:
[ 238.341337] dump_stack+0x8f/0xd0
[ 238.341630] dump_header+0x61/0x5ea
[ 238.341942] oom_kill_process.cold+0xb/0x10
[ 238.342299] out_of_memory+0x24d/0x5a0
[ 238.342625] __alloc_pages_slowpath+0xd12/0x1020
[ 238.343024] __alloc_pages_nodemask+0x391/0x410
[ 238.343407] pagecache_get_page+0xc3/0x3a0
[ 238.343757] filemap_fault+0x804/0xc30
[ 238.344083] ? ext4_filemap_fault+0x28/0x42
[ 238.344444] ext4_filemap_fault+0x30/0x42
[ 238.344789] __do_fault+0x37/0x1a0
[ 238.345087] __handle_mm_fault+0x104d/0x1ab0
[ 238.345450] handle_mm_fault+0x169/0x360
[ 238.345790] do_user_addr_fault+0x20d/0x490
[ 238.346154] do_page_fault+0x31/0x210
[ 238.346468] async_page_fault+0x43/0x50
[ 238.346797] RIP: 0033:0x7f47eba4197e
[ 238.347110] Code: Bad RIP value.
[ 238.347387] RSP: 002b:00007ffd7c0c1890 EFLAGS: 00010293
[ 238.347834] RAX: 0000000000000002 RBX: 000055d196a20a20 RCX: 00007f47eba4197e
[ 238.348437] RDX: 0000000000000033 RSI: 00007ffd7c0c18c0 RDI: 0000000000000004
[ 238.349047] RBP: 00007ffd7c0c1c20 R08: 0000000000000000 R09: 0000000000000033
[ 238.349660] R10: 00000000ffffffff R11: 0000000000000293 R12: 0000000000000001
[ 238.350261] R13: ffffffffffffffff R14: 0000000000000000 R15: 00007ffd7c0c18c0
[ 238.350878] Mem-Info:
[ 238.351085] active_anon:3121 inactive_anon:51 isolated_anon:0
[ 238.351085] active_file:12 inactive_file:7 isolated_file:0
[ 238.351085] unevictable:0 dirty:0 writeback:0 unstable:0
[ 238.351085] slab_reclaimable:5565 slab_unreclaimable:10170
[ 238.351085] mapped:3 shmem:111 pagetables:155 bounce:0
[ 238.351085] free:720717 free_pcp:2 free_cma:0
[ 238.353757] Node 0 active_anon:12484kB inactive_anon:204kB active_file:48kB inactive_file:28kB unevictable:0kB iss
[ 238.355979] Node 0 DMA free:11556kB min:36kB low:48kB high:60kB reserved_highatomic:0KB active_anon:152kB inactivB
[ 238.358345] lowmem_reserve[]: 0 2955 2884 2884 2884
[ 238.358761] Node 0 DMA32 free:2677864kB min:7004kB low:10028kB high:13052kB reserved_highatomic:0KB active_anon:0B
[ 238.361202] lowmem_reserve[]: 0 0 72057594037927865 72057594037927865 72057594037927865
[ 238.361888] Node 0 Normal free:193448kB min:99395541895224kB low:73886371836733356kB high:147673348131571488kB reB
[ 238.364765] lowmem_reserve[]: 0 0 0 0 0
[ 238.365101] Node 0 DMA: 7*4kB (U) 5*8kB (UE) 6*16kB (UME) 2*32kB (UM) 1*64kB (U) 2*128kB (UE) 3*256kB (UME) 2*512B
[ 238.366379] Node 0 DMA32: 0*4kB 1*8kB (U) 2*16kB (UM) 2*32kB (UM) 2*64kB (UM) 1*128kB (U) 1*256kB (U) 1*512kB (U)B
[ 238.367654] Node 0 Normal: 1985*4kB (UME) 1321*8kB (UME) 844*16kB (UME) 524*32kB (UME) 300*64kB (UME) 138*128kB (B
[ 238.369184] Node 0 hugepages_total=0 hugepages_free=0 hugepages_surp=0 hugepages_size=2048kB
[ 238.369915] 130 total pagecache pages
[ 238.370241] 0 pages in swap cache
[ 238.370533] Swap cache stats: add 0, delete 0, find 0/0
[ 238.370981] Free swap = 0kB
[ 238.371239] Total swap = 0kB
[ 238.371488] 1048445 pages RAM
[ 238.371756] 0 pages HighMem/MovableOnly
[ 238.372090] 306992 pages reserved
[ 238.372376] 0 pages cma reserved
[ 238.372661] 0 pages hwpoisoned
In another instance (older kernel), I was able to observe this
(negative page count :/):
[ 180.896971] Offlined Pages 32768
[ 182.667462] Offlined Pages 32768
[ 184.408117] Offlined Pages 32768
[ 186.026321] Offlined Pages 32768
[ 187.684861] Offlined Pages 32768
[ 189.227013] Offlined Pages 32768
[ 190.830303] Offlined Pages 32768
[ 190.833071] Built 1 zonelists, mobility grouping on. Total pages: -36920272750453009
In another instance (older kernel), I was no longer able to start any
process:
[root@vm ~]# [ 214.348068] Offlined Pages 32768
[ 215.973009] Offlined Pages 32768
cat /proc/meminfo
-bash: fork: Cannot allocate memory
[root@vm ~]# cat /proc/meminfo
-bash: fork: Cannot allocate memory
Fix it by properly adjusting the managed page count when migrating if
the zone changed. The managed page count of the zones now looks after
unplug of the DIMM (and after deflating the balloon) just like before
inflating the balloon (and plugging+onlining the DIMM).
We'll temporarily modify the totalram page count. If this ever becomes a
problem, we can fine tune by providing helpers that don't touch
the totalram pages (e.g., adjust_zone_managed_page_count()).
Please note that fixing up the managed page count is only necessary when
we adjusted the managed page count when inflating - only if we
don't have VIRTIO_BALLOON_F_DEFLATE_ON_OOM. With that feature, the
managed page count is not touched when inflating/deflating.
Reported-by: Yumei Huang <yuhuang@redhat.com>
Fixes: 3dcc0571cd64 ("mm: correctly update zone->managed_pages")
Cc: <stable@vger.kernel.org> # v3.11+
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2019-12-11 14:11:52 +03:00
|
|
|
/*
|
|
|
|
* When we migrate a page to a different zone and adjusted the
|
|
|
|
* managed page count when inflating, we have to fixup the count of
|
|
|
|
* both involved zones.
|
|
|
|
*/
|
|
|
|
if (!virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM) &&
|
|
|
|
page_zone(page) != page_zone(newpage)) {
|
|
|
|
adjust_managed_page_count(page, 1);
|
|
|
|
adjust_managed_page_count(newpage, -1);
|
|
|
|
}
|
|
|
|
|
2012-12-12 04:02:45 +04:00
|
|
|
/* balloon's page migration 1st step -- inflate "newpage" */
|
|
|
|
spin_lock_irqsave(&vb_dev_info->pages_lock, flags);
|
2014-10-10 02:29:29 +04:00
|
|
|
balloon_page_insert(vb_dev_info, newpage);
|
2012-12-12 04:02:45 +04:00
|
|
|
vb_dev_info->isolated_pages--;
|
2014-10-10 02:29:32 +04:00
|
|
|
__count_vm_event(BALLOON_MIGRATE);
|
2012-12-12 04:02:45 +04:00
|
|
|
spin_unlock_irqrestore(&vb_dev_info->pages_lock, flags);
|
|
|
|
vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE;
|
2016-05-17 13:31:18 +03:00
|
|
|
set_page_pfns(vb, vb->pfns, newpage);
|
2012-12-12 04:02:45 +04:00
|
|
|
tell_host(vb, vb->inflate_vq);
|
|
|
|
|
2014-10-10 02:29:27 +04:00
|
|
|
/* balloon's page migration 2nd step -- deflate "page" */
|
2018-07-18 05:29:28 +03:00
|
|
|
spin_lock_irqsave(&vb_dev_info->pages_lock, flags);
|
2012-12-12 04:02:45 +04:00
|
|
|
balloon_page_delete(page);
|
2018-07-18 05:29:28 +03:00
|
|
|
spin_unlock_irqrestore(&vb_dev_info->pages_lock, flags);
|
2012-12-12 04:02:45 +04:00
|
|
|
vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE;
|
2016-05-17 13:31:18 +03:00
|
|
|
set_page_pfns(vb, vb->pfns, page);
|
2012-12-12 04:02:45 +04:00
|
|
|
tell_host(vb, vb->deflate_vq);
|
|
|
|
|
|
|
|
mutex_unlock(&vb->balloon_lock);
|
|
|
|
|
2014-10-10 02:29:27 +04:00
|
|
|
put_page(page); /* balloon reference */
|
|
|
|
|
2016-07-27 01:26:50 +03:00
|
|
|
return MIGRATEPAGE_SUCCESS;
|
2012-12-12 04:02:45 +04:00
|
|
|
}
|
2016-07-27 01:23:09 +03:00
|
|
|
|
2019-03-25 19:38:25 +03:00
|
|
|
static int balloon_init_fs_context(struct fs_context *fc)
|
2016-07-27 01:23:09 +03:00
|
|
|
{
|
2019-03-25 19:38:25 +03:00
|
|
|
return init_pseudo(fc, BALLOON_KVM_MAGIC) ? 0 : -ENOMEM;
|
2016-07-27 01:23:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct file_system_type balloon_fs = {
|
|
|
|
.name = "balloon-kvm",
|
2019-03-25 19:38:25 +03:00
|
|
|
.init_fs_context = balloon_init_fs_context,
|
2016-07-27 01:23:09 +03:00
|
|
|
.kill_sb = kill_anon_super,
|
|
|
|
};
|
|
|
|
|
2012-12-12 04:02:45 +04:00
|
|
|
#endif /* CONFIG_BALLOON_COMPACTION */
|
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
static unsigned long shrink_free_pages(struct virtio_balloon *vb,
|
|
|
|
unsigned long pages_to_free)
|
2018-08-16 10:50:58 +03:00
|
|
|
{
|
2018-08-27 04:32:17 +03:00
|
|
|
unsigned long blocks_to_free, blocks_freed;
|
2018-08-16 10:50:58 +03:00
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
pages_to_free = round_up(pages_to_free,
|
2019-11-19 13:25:24 +03:00
|
|
|
VIRTIO_BALLOON_HINT_BLOCK_PAGES);
|
|
|
|
blocks_to_free = pages_to_free / VIRTIO_BALLOON_HINT_BLOCK_PAGES;
|
2018-08-27 04:32:17 +03:00
|
|
|
blocks_freed = return_free_pages_to_mm(vb, blocks_to_free);
|
|
|
|
|
2019-11-19 13:25:24 +03:00
|
|
|
return blocks_freed * VIRTIO_BALLOON_HINT_BLOCK_PAGES;
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long virtio_balloon_shrinker_scan(struct shrinker *shrinker,
|
|
|
|
struct shrink_control *sc)
|
|
|
|
{
|
|
|
|
struct virtio_balloon *vb = container_of(shrinker,
|
|
|
|
struct virtio_balloon, shrinker);
|
|
|
|
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
return shrink_free_pages(vb, sc->nr_to_scan);
|
2018-08-16 10:50:58 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long virtio_balloon_shrinker_count(struct shrinker *shrinker,
|
|
|
|
struct shrink_control *sc)
|
|
|
|
{
|
|
|
|
struct virtio_balloon *vb = container_of(shrinker,
|
|
|
|
struct virtio_balloon, shrinker);
|
|
|
|
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
return vb->num_free_page_blocks * VIRTIO_BALLOON_HINT_BLOCK_PAGES;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int virtio_balloon_oom_notify(struct notifier_block *nb,
|
|
|
|
unsigned long dummy, void *parm)
|
|
|
|
{
|
|
|
|
struct virtio_balloon *vb = container_of(nb,
|
|
|
|
struct virtio_balloon, oom_nb);
|
|
|
|
unsigned long *freed = parm;
|
|
|
|
|
|
|
|
*freed += leak_balloon(vb, VIRTIO_BALLOON_OOM_NR_PAGES) /
|
|
|
|
VIRTIO_BALLOON_PAGES_PER_PAGE;
|
|
|
|
update_balloon_size(vb);
|
2018-08-27 04:32:17 +03:00
|
|
|
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
return NOTIFY_OK;
|
2018-08-16 10:50:58 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void virtio_balloon_unregister_shrinker(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
unregister_shrinker(&vb->shrinker);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int virtio_balloon_register_shrinker(struct virtio_balloon *vb)
|
|
|
|
{
|
|
|
|
vb->shrinker.scan_objects = virtio_balloon_shrinker_scan;
|
|
|
|
vb->shrinker.count_objects = virtio_balloon_shrinker_count;
|
|
|
|
vb->shrinker.seeks = DEFAULT_SEEKS;
|
|
|
|
|
|
|
|
return register_shrinker(&vb->shrinker);
|
|
|
|
}
|
|
|
|
|
2011-12-22 15:28:34 +04:00
|
|
|
static int virtballoon_probe(struct virtio_device *vdev)
|
|
|
|
{
|
|
|
|
struct virtio_balloon *vb;
|
|
|
|
int err;
|
|
|
|
|
2015-01-12 17:23:37 +03:00
|
|
|
if (!vdev->config->get) {
|
|
|
|
dev_err(&vdev->dev, "%s failure: config access disabled\n",
|
|
|
|
__func__);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2018-08-16 10:50:57 +03:00
|
|
|
vdev->priv = vb = kzalloc(sizeof(*vb), GFP_KERNEL);
|
2011-12-22 15:28:34 +04:00
|
|
|
if (!vb) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2016-01-25 19:38:06 +03:00
|
|
|
INIT_WORK(&vb->update_balloon_stats_work, update_balloon_stats_func);
|
|
|
|
INIT_WORK(&vb->update_balloon_size_work, update_balloon_size_func);
|
2016-01-25 19:38:05 +03:00
|
|
|
spin_lock_init(&vb->stop_update_lock);
|
2012-12-12 04:02:45 +04:00
|
|
|
mutex_init(&vb->balloon_lock);
|
2012-07-02 11:33:08 +04:00
|
|
|
init_waitqueue_head(&vb->acked);
|
2011-12-22 15:28:34 +04:00
|
|
|
vb->vdev = vdev;
|
|
|
|
|
2014-10-10 02:29:29 +04:00
|
|
|
balloon_devinfo_init(&vb->vb_dev_info);
|
2012-12-12 04:02:45 +04:00
|
|
|
|
2011-12-22 15:28:34 +04:00
|
|
|
err = init_vqs(vb);
|
|
|
|
if (err)
|
2014-10-10 02:29:29 +04:00
|
|
|
goto out_free_vb;
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2016-07-27 01:23:09 +03:00
|
|
|
#ifdef CONFIG_BALLOON_COMPACTION
|
|
|
|
balloon_mnt = kern_mount(&balloon_fs);
|
|
|
|
if (IS_ERR(balloon_mnt)) {
|
|
|
|
err = PTR_ERR(balloon_mnt);
|
|
|
|
goto out_del_vqs;
|
|
|
|
}
|
|
|
|
|
|
|
|
vb->vb_dev_info.migratepage = virtballoon_migratepage;
|
|
|
|
vb->vb_dev_info.inode = alloc_anon_inode(balloon_mnt->mnt_sb);
|
|
|
|
if (IS_ERR(vb->vb_dev_info.inode)) {
|
|
|
|
err = PTR_ERR(vb->vb_dev_info.inode);
|
2020-02-05 19:34:01 +03:00
|
|
|
goto out_kern_unmount;
|
2016-07-27 01:23:09 +03:00
|
|
|
}
|
|
|
|
vb->vb_dev_info.inode->i_mapping->a_ops = &balloon_aops;
|
|
|
|
#endif
|
2018-08-27 04:32:17 +03:00
|
|
|
if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) {
|
|
|
|
/*
|
|
|
|
* There is always one entry reserved for cmd id, so the ring
|
|
|
|
* size needs to be at least two to report free page hints.
|
|
|
|
*/
|
|
|
|
if (virtqueue_get_vring_size(vb->free_page_vq) < 2) {
|
|
|
|
err = -ENOSPC;
|
2020-02-05 19:34:01 +03:00
|
|
|
goto out_iput;
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
|
|
|
vb->balloon_wq = alloc_workqueue("balloon-wq",
|
|
|
|
WQ_FREEZABLE | WQ_CPU_INTENSIVE, 0);
|
|
|
|
if (!vb->balloon_wq) {
|
|
|
|
err = -ENOMEM;
|
2020-02-05 19:34:01 +03:00
|
|
|
goto out_iput;
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
|
|
|
INIT_WORK(&vb->report_free_page_work, report_free_page_func);
|
2019-01-07 10:01:04 +03:00
|
|
|
vb->cmd_id_received_cache = VIRTIO_BALLOON_CMD_ID_STOP;
|
2018-08-27 04:32:17 +03:00
|
|
|
vb->cmd_id_active = cpu_to_virtio32(vb->vdev,
|
|
|
|
VIRTIO_BALLOON_CMD_ID_STOP);
|
|
|
|
vb->cmd_id_stop = cpu_to_virtio32(vb->vdev,
|
|
|
|
VIRTIO_BALLOON_CMD_ID_STOP);
|
|
|
|
spin_lock_init(&vb->free_page_list_lock);
|
|
|
|
INIT_LIST_HEAD(&vb->free_page_list);
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
/*
|
|
|
|
* We're allowed to reuse any free pages, even if they are
|
|
|
|
* still to be processed by the host.
|
|
|
|
*/
|
|
|
|
err = virtio_balloon_register_shrinker(vb);
|
|
|
|
if (err)
|
|
|
|
goto out_del_balloon_wq;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) {
|
|
|
|
vb->oom_nb.notifier_call = virtio_balloon_oom_notify;
|
|
|
|
vb->oom_nb.priority = VIRTIO_BALLOON_OOM_NOTIFY_PRIORITY;
|
|
|
|
err = register_oom_notifier(&vb->oom_nb);
|
|
|
|
if (err < 0)
|
|
|
|
goto out_unregister_shrinker;
|
2020-04-07 06:05:01 +03:00
|
|
|
}
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
|
2020-04-07 06:05:01 +03:00
|
|
|
if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON)) {
|
|
|
|
/* Start with poison val of 0 representing general init */
|
|
|
|
__u32 poison_val = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Let the hypervisor know that we are expecting a
|
|
|
|
* specific value to be written back in balloon pages.
|
2020-07-13 23:35:39 +03:00
|
|
|
*
|
|
|
|
* If the PAGE_POISON value was larger than a byte we would
|
|
|
|
* need to byte swap poison_val here to guarantee it is
|
|
|
|
* little-endian. However for now it is a single byte so we
|
|
|
|
* can pass it as-is.
|
2020-04-07 06:05:01 +03:00
|
|
|
*/
|
|
|
|
if (!want_init_on_free())
|
2018-08-27 04:32:19 +03:00
|
|
|
memset(&poison_val, PAGE_POISON, sizeof(poison_val));
|
2020-04-07 06:05:01 +03:00
|
|
|
|
2020-08-05 00:51:35 +03:00
|
|
|
virtio_cwrite_le(vb->vdev, struct virtio_balloon_config,
|
|
|
|
poison_val, &poison_val);
|
2018-08-27 04:32:17 +03:00
|
|
|
}
|
2020-04-07 06:05:05 +03:00
|
|
|
|
|
|
|
vb->pr_dev_info.report = virtballoon_free_page_report;
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING)) {
|
|
|
|
unsigned int capacity;
|
|
|
|
|
|
|
|
capacity = virtqueue_get_vring_size(vb->reporting_vq);
|
|
|
|
if (capacity < PAGE_REPORTING_CAPACITY) {
|
|
|
|
err = -ENOSPC;
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
goto out_unregister_oom;
|
2020-04-07 06:05:05 +03:00
|
|
|
}
|
|
|
|
|
2021-06-29 05:35:25 +03:00
|
|
|
/*
|
|
|
|
* The default page reporting order is @pageblock_order, which
|
|
|
|
* corresponds to 512MB in size on ARM64 when 64KB base page
|
|
|
|
* size is used. The page reporting won't be triggered if the
|
|
|
|
* freeing page can't come up with a free area like that huge.
|
|
|
|
* So we specify the page reporting order to 5, corresponding
|
|
|
|
* to 2MB. It helps to avoid THP splitting if 4KB base page
|
|
|
|
* size is used by host.
|
|
|
|
*
|
|
|
|
* Ideally, the page reporting order is selected based on the
|
|
|
|
* host's base page size. However, it needs more work to report
|
|
|
|
* that value. The hard-coded order would be fine currently.
|
|
|
|
*/
|
|
|
|
#if defined(CONFIG_ARM64) && defined(CONFIG_ARM64_64K_PAGES)
|
|
|
|
vb->pr_dev_info.order = 5;
|
|
|
|
#endif
|
|
|
|
|
2020-04-07 06:05:05 +03:00
|
|
|
err = page_reporting_register(&vb->pr_dev_info);
|
|
|
|
if (err)
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
goto out_unregister_oom;
|
2020-04-07 06:05:05 +03:00
|
|
|
}
|
|
|
|
|
2015-03-05 05:54:41 +03:00
|
|
|
virtio_device_ready(vdev);
|
|
|
|
|
2016-09-29 13:17:12 +03:00
|
|
|
if (towards_target(vb))
|
|
|
|
virtballoon_changed(vdev);
|
2008-02-05 07:50:12 +03:00
|
|
|
return 0;
|
|
|
|
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
out_unregister_oom:
|
2020-04-07 06:05:05 +03:00
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
unregister_oom_notifier(&vb->oom_nb);
|
|
|
|
out_unregister_shrinker:
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
|
2020-04-07 06:05:05 +03:00
|
|
|
virtio_balloon_unregister_shrinker(vb);
|
2018-08-27 04:32:17 +03:00
|
|
|
out_del_balloon_wq:
|
|
|
|
if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
|
|
|
|
destroy_workqueue(vb->balloon_wq);
|
2020-02-05 19:34:01 +03:00
|
|
|
out_iput:
|
|
|
|
#ifdef CONFIG_BALLOON_COMPACTION
|
|
|
|
iput(vb->vb_dev_info.inode);
|
|
|
|
out_kern_unmount:
|
|
|
|
kern_unmount(balloon_mnt);
|
2016-07-27 01:23:09 +03:00
|
|
|
out_del_vqs:
|
2020-02-16 03:40:39 +03:00
|
|
|
#endif
|
2009-06-13 08:16:36 +04:00
|
|
|
vdev->config->del_vqs(vdev);
|
2008-02-05 07:50:12 +03:00
|
|
|
out_free_vb:
|
|
|
|
kfree(vb);
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-04-26 23:15:57 +04:00
|
|
|
static void remove_common(struct virtio_balloon *vb)
|
2008-02-05 07:50:12 +03:00
|
|
|
{
|
|
|
|
/* There might be pages left in the balloon: free them. */
|
|
|
|
while (vb->num_pages)
|
|
|
|
leak_balloon(vb, vb->num_pages);
|
2012-04-26 23:15:56 +04:00
|
|
|
update_balloon_size(vb);
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2020-02-05 19:34:00 +03:00
|
|
|
/* There might be free pages that are being reported: release them. */
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
|
|
|
|
return_free_pages_to_mm(vb, ULONG_MAX);
|
|
|
|
|
2008-02-05 07:50:12 +03:00
|
|
|
/* Now we reset the device so we can clean up the queues. */
|
2012-04-26 23:15:57 +04:00
|
|
|
vb->vdev->config->reset(vb->vdev);
|
2008-02-05 07:50:12 +03:00
|
|
|
|
2012-04-26 23:15:57 +04:00
|
|
|
vb->vdev->config->del_vqs(vb->vdev);
|
|
|
|
}
|
|
|
|
|
2012-12-22 01:05:30 +04:00
|
|
|
static void virtballoon_remove(struct virtio_device *vdev)
|
2012-04-26 23:15:57 +04:00
|
|
|
{
|
|
|
|
struct virtio_balloon *vb = vdev->priv;
|
|
|
|
|
2020-04-07 06:05:05 +03:00
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING))
|
|
|
|
page_reporting_unregister(&vb->pr_dev_info);
|
2018-08-16 10:50:58 +03:00
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
|
virtio-balloon: switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
Commit 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
changed the behavior when deflation happens automatically. Instead of
deflating when called by the OOM handler, the shrinker is used.
However, the balloon is not simply some other slab cache that should be
shrunk when under memory pressure. The shrinker does not have a concept
of priorities yet, so this behavior cannot be configured. Eventually once
that is in place, we might want to switch back after doing proper testing.
There was a report that this results in undesired side effects when
inflating the balloon to shrink the page cache. [1]
"When inflating the balloon against page cache (i.e. no free memory
remains) vmscan.c will both shrink page cache, but also invoke the
shrinkers -- including the balloon's shrinker. So the balloon
driver allocates memory which requires reclaim, vmscan gets this
memory by shrinking the balloon, and then the driver adds the
memory back to the balloon. Basically a busy no-op."
The name "deflate on OOM" makes it pretty clear when deflation should
happen - after other approaches to reclaim memory failed, not while
reclaiming. This allows to minimize the footprint of a guest - memory
will only be taken out of the balloon when really needed.
Keep using the shrinker for VIRTIO_BALLOON_F_FREE_PAGE_HINT, because
this has no such side effects. Always register the shrinker with
VIRTIO_BALLOON_F_FREE_PAGE_HINT now. We are always allowed to reuse free
pages that are still to be processed by the guest. The hypervisor takes
care of identifying and resolving possible races between processing a
hinting request and the guest reusing a page.
In contrast to pre commit 71994620bb25 ("virtio_balloon: replace oom
notifier with shrinker"), don't add a module parameter to configure the
number of pages to deflate on OOM. Can be re-added if really needed.
Also, pay attention that leak_balloon() returns the number of 4k pages -
convert it properly in virtio_balloon_oom_notify().
Testing done by Tyler for future reference:
Test setup: VM with 16 CPU, 64GB RAM. Running Debian 10. We have a 42
GB file full of random bytes that we continually cat to /dev/null.
This fills the page cache as the file is read. Meanwhile, we trigger
the balloon to inflate, with a target size of 53 GB. This setup causes
the balloon inflation to pressure the page cache as the page cache is
also trying to grow. Afterwards we shrink the balloon back to zero (so
total deflate == total inflate).
Without this patch (kernel 4.19.0-5):
Inflation never reaches the target until we stop the "cat file >
/dev/null" process. Total inflation time was 542 seconds. The longest
period that made no net forward progress was 315 seconds.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 154828377
balloon_deflate 154828377
With this patch (kernel 5.6.0-rc4+):
Total inflation duration was 63 seconds. No deflate-queue activity
occurs when pressuring the page-cache.
Result of "grep balloon /proc/vmstat" after the test:
balloon_inflate 12968539
balloon_deflate 12968539
Conclusion: This patch fixes the issue. In the test it reduced
inflate/deflate activity by 12x, and reduced inflation time by 8.6x.
But more importantly, if we hadn't killed the "cat file > /dev/null"
process then, without the patch, the inflation process would never reach
the target.
[1] https://www.spinics.net/lists/linux-virtualization/msg40863.html
Link: http://lkml.kernel.org/r/20200311135523.18512-2-david@redhat.com
Fixes: 71994620bb25 ("virtio_balloon: replace oom notifier with shrinker")
Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Tyler Sanderson <tysand@google.com>
Tested-by: Tyler Sanderson <tysand@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Wei Wang <wei.w.wang@intel.com>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-04-07 06:05:22 +03:00
|
|
|
unregister_oom_notifier(&vb->oom_nb);
|
|
|
|
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
|
2018-08-16 10:50:58 +03:00
|
|
|
virtio_balloon_unregister_shrinker(vb);
|
2016-01-25 19:38:05 +03:00
|
|
|
spin_lock_irq(&vb->stop_update_lock);
|
|
|
|
vb->stop_update = true;
|
|
|
|
spin_unlock_irq(&vb->stop_update_lock);
|
2016-01-25 19:38:06 +03:00
|
|
|
cancel_work_sync(&vb->update_balloon_size_work);
|
|
|
|
cancel_work_sync(&vb->update_balloon_stats_work);
|
2016-01-25 19:38:05 +03:00
|
|
|
|
2018-08-27 04:32:17 +03:00
|
|
|
if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) {
|
|
|
|
cancel_work_sync(&vb->report_free_page_work);
|
|
|
|
destroy_workqueue(vb->balloon_wq);
|
|
|
|
}
|
|
|
|
|
2012-04-26 23:15:57 +04:00
|
|
|
remove_common(vb);
|
2017-02-25 02:00:40 +03:00
|
|
|
#ifdef CONFIG_BALLOON_COMPACTION
|
2016-07-27 01:23:09 +03:00
|
|
|
if (vb->vb_dev_info.inode)
|
|
|
|
iput(vb->vb_dev_info.inode);
|
2017-02-25 02:00:40 +03:00
|
|
|
|
|
|
|
kern_unmount(balloon_mnt);
|
|
|
|
#endif
|
2008-02-05 07:50:12 +03:00
|
|
|
kfree(vb);
|
|
|
|
}
|
|
|
|
|
2013-09-17 03:55:23 +04:00
|
|
|
#ifdef CONFIG_PM_SLEEP
|
virtio: balloon: Add freeze, restore handlers to support S4
Handling balloon hibernate / restore is tricky. If the balloon was
inflated before going into the hibernation state, upon resume, the host
will not have any memory of that. Any pages that were passed on to the
host earlier would most likely be invalid, and the host will have to
re-balloon to the previous value to get in the pre-hibernate state.
So the only sane thing for the guest to do here is to discard all the
pages that were put in the balloon. When to discard the pages is the
next question.
One solution is to deflate the balloon just before writing the image to
the disk (in the freeze() PM callback). However, asking for pages from
the host just to discard them immediately after seems wasteful of
resources. Hence, it makes sense to do this by just fudging our
counters soon after wakeup. This means we don't deflate the balloon
before sleep, and also don't put unnecessary pressure on the host.
This also helps in the thaw case: if the freeze fails for whatever
reason, the balloon should continue to remain in the inflated state.
This was tested by issuing 'swapoff -a' and trying to go into the S4
state. That fails, and the balloon stays inflated, as expected. Both
the host and the guest are happy.
Finally, in the restore() callback, we empty the list of pages that were
previously given off to the host, add the appropriate number of pages to
the totalram_pages counter, reset the num_pages counter to 0, and
all is fine.
As a last step, delete the vqs on the freeze callback to prepare for
hibernation, and re-create them in the restore and thaw callbacks to
resume normal operation.
The kthread doesn't race with any operations here, since it's frozen
before the freeze() call and is thawed after the thaw() and restore()
callbacks, so we're safe with that.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-12-22 15:28:35 +04:00
|
|
|
static int virtballoon_freeze(struct virtio_device *vdev)
|
|
|
|
{
|
2012-02-29 16:12:51 +04:00
|
|
|
struct virtio_balloon *vb = vdev->priv;
|
|
|
|
|
virtio: balloon: Add freeze, restore handlers to support S4
Handling balloon hibernate / restore is tricky. If the balloon was
inflated before going into the hibernation state, upon resume, the host
will not have any memory of that. Any pages that were passed on to the
host earlier would most likely be invalid, and the host will have to
re-balloon to the previous value to get in the pre-hibernate state.
So the only sane thing for the guest to do here is to discard all the
pages that were put in the balloon. When to discard the pages is the
next question.
One solution is to deflate the balloon just before writing the image to
the disk (in the freeze() PM callback). However, asking for pages from
the host just to discard them immediately after seems wasteful of
resources. Hence, it makes sense to do this by just fudging our
counters soon after wakeup. This means we don't deflate the balloon
before sleep, and also don't put unnecessary pressure on the host.
This also helps in the thaw case: if the freeze fails for whatever
reason, the balloon should continue to remain in the inflated state.
This was tested by issuing 'swapoff -a' and trying to go into the S4
state. That fails, and the balloon stays inflated, as expected. Both
the host and the guest are happy.
Finally, in the restore() callback, we empty the list of pages that were
previously given off to the host, add the appropriate number of pages to
the totalram_pages counter, reset the num_pages counter to 0, and
all is fine.
As a last step, delete the vqs on the freeze callback to prepare for
hibernation, and re-create them in the restore and thaw callbacks to
resume normal operation.
The kthread doesn't race with any operations here, since it's frozen
before the freeze() call and is thawed after the thaw() and restore()
callbacks, so we're safe with that.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-12-22 15:28:35 +04:00
|
|
|
/*
|
2016-01-25 19:38:05 +03:00
|
|
|
* The workqueue is already frozen by the PM core before this
|
virtio: balloon: Add freeze, restore handlers to support S4
Handling balloon hibernate / restore is tricky. If the balloon was
inflated before going into the hibernation state, upon resume, the host
will not have any memory of that. Any pages that were passed on to the
host earlier would most likely be invalid, and the host will have to
re-balloon to the previous value to get in the pre-hibernate state.
So the only sane thing for the guest to do here is to discard all the
pages that were put in the balloon. When to discard the pages is the
next question.
One solution is to deflate the balloon just before writing the image to
the disk (in the freeze() PM callback). However, asking for pages from
the host just to discard them immediately after seems wasteful of
resources. Hence, it makes sense to do this by just fudging our
counters soon after wakeup. This means we don't deflate the balloon
before sleep, and also don't put unnecessary pressure on the host.
This also helps in the thaw case: if the freeze fails for whatever
reason, the balloon should continue to remain in the inflated state.
This was tested by issuing 'swapoff -a' and trying to go into the S4
state. That fails, and the balloon stays inflated, as expected. Both
the host and the guest are happy.
Finally, in the restore() callback, we empty the list of pages that were
previously given off to the host, add the appropriate number of pages to
the totalram_pages counter, reset the num_pages counter to 0, and
all is fine.
As a last step, delete the vqs on the freeze callback to prepare for
hibernation, and re-create them in the restore and thaw callbacks to
resume normal operation.
The kthread doesn't race with any operations here, since it's frozen
before the freeze() call and is thawed after the thaw() and restore()
callbacks, so we're safe with that.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-12-22 15:28:35 +04:00
|
|
|
* function is called.
|
|
|
|
*/
|
2012-04-26 23:15:57 +04:00
|
|
|
remove_common(vb);
|
virtio: balloon: Add freeze, restore handlers to support S4
Handling balloon hibernate / restore is tricky. If the balloon was
inflated before going into the hibernation state, upon resume, the host
will not have any memory of that. Any pages that were passed on to the
host earlier would most likely be invalid, and the host will have to
re-balloon to the previous value to get in the pre-hibernate state.
So the only sane thing for the guest to do here is to discard all the
pages that were put in the balloon. When to discard the pages is the
next question.
One solution is to deflate the balloon just before writing the image to
the disk (in the freeze() PM callback). However, asking for pages from
the host just to discard them immediately after seems wasteful of
resources. Hence, it makes sense to do this by just fudging our
counters soon after wakeup. This means we don't deflate the balloon
before sleep, and also don't put unnecessary pressure on the host.
This also helps in the thaw case: if the freeze fails for whatever
reason, the balloon should continue to remain in the inflated state.
This was tested by issuing 'swapoff -a' and trying to go into the S4
state. That fails, and the balloon stays inflated, as expected. Both
the host and the guest are happy.
Finally, in the restore() callback, we empty the list of pages that were
previously given off to the host, add the appropriate number of pages to
the totalram_pages counter, reset the num_pages counter to 0, and
all is fine.
As a last step, delete the vqs on the freeze callback to prepare for
hibernation, and re-create them in the restore and thaw callbacks to
resume normal operation.
The kthread doesn't race with any operations here, since it's frozen
before the freeze() call and is thawed after the thaw() and restore()
callbacks, so we're safe with that.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-12-22 15:28:35 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-26 23:15:55 +04:00
|
|
|
static int virtballoon_restore(struct virtio_device *vdev)
|
2012-02-29 16:12:51 +04:00
|
|
|
{
|
|
|
|
struct virtio_balloon *vb = vdev->priv;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = init_vqs(vdev->priv);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2014-10-15 03:52:33 +04:00
|
|
|
virtio_device_ready(vdev);
|
|
|
|
|
2016-01-25 19:38:05 +03:00
|
|
|
if (towards_target(vb))
|
|
|
|
virtballoon_changed(vdev);
|
2012-02-29 16:12:51 +04:00
|
|
|
update_balloon_size(vb);
|
|
|
|
return 0;
|
|
|
|
}
|
virtio: balloon: Add freeze, restore handlers to support S4
Handling balloon hibernate / restore is tricky. If the balloon was
inflated before going into the hibernation state, upon resume, the host
will not have any memory of that. Any pages that were passed on to the
host earlier would most likely be invalid, and the host will have to
re-balloon to the previous value to get in the pre-hibernate state.
So the only sane thing for the guest to do here is to discard all the
pages that were put in the balloon. When to discard the pages is the
next question.
One solution is to deflate the balloon just before writing the image to
the disk (in the freeze() PM callback). However, asking for pages from
the host just to discard them immediately after seems wasteful of
resources. Hence, it makes sense to do this by just fudging our
counters soon after wakeup. This means we don't deflate the balloon
before sleep, and also don't put unnecessary pressure on the host.
This also helps in the thaw case: if the freeze fails for whatever
reason, the balloon should continue to remain in the inflated state.
This was tested by issuing 'swapoff -a' and trying to go into the S4
state. That fails, and the balloon stays inflated, as expected. Both
the host and the guest are happy.
Finally, in the restore() callback, we empty the list of pages that were
previously given off to the host, add the appropriate number of pages to
the totalram_pages counter, reset the num_pages counter to 0, and
all is fine.
As a last step, delete the vqs on the freeze callback to prepare for
hibernation, and re-create them in the restore and thaw callbacks to
resume normal operation.
The kthread doesn't race with any operations here, since it's frozen
before the freeze() call and is thawed after the thaw() and restore()
callbacks, so we're safe with that.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-12-22 15:28:35 +04:00
|
|
|
#endif
|
|
|
|
|
2017-06-13 20:56:44 +03:00
|
|
|
static int virtballoon_validate(struct virtio_device *vdev)
|
|
|
|
{
|
2020-05-08 20:40:06 +03:00
|
|
|
/*
|
|
|
|
* Inform the hypervisor that our pages are poisoned or
|
|
|
|
* initialized. If we cannot do that then we should disable
|
|
|
|
* page reporting as it could potentially change the contents
|
|
|
|
* of our free pages.
|
|
|
|
*/
|
2020-12-15 06:13:41 +03:00
|
|
|
if (!want_init_on_free() && !page_poisoning_enabled_static())
|
2018-08-27 04:32:19 +03:00
|
|
|
__virtio_clear_bit(vdev, VIRTIO_BALLOON_F_PAGE_POISON);
|
2020-05-08 20:40:06 +03:00
|
|
|
else if (!virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON))
|
|
|
|
__virtio_clear_bit(vdev, VIRTIO_BALLOON_F_REPORTING);
|
2018-08-27 04:32:19 +03:00
|
|
|
|
2020-06-25 01:24:33 +03:00
|
|
|
__virtio_clear_bit(vdev, VIRTIO_F_ACCESS_PLATFORM);
|
2017-06-13 20:56:44 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-30 19:14:15 +03:00
|
|
|
static unsigned int features[] = {
|
|
|
|
VIRTIO_BALLOON_F_MUST_TELL_HOST,
|
|
|
|
VIRTIO_BALLOON_F_STATS_VQ,
|
2014-11-10 02:06:29 +03:00
|
|
|
VIRTIO_BALLOON_F_DEFLATE_ON_OOM,
|
2018-08-27 04:32:17 +03:00
|
|
|
VIRTIO_BALLOON_F_FREE_PAGE_HINT,
|
2018-08-27 04:32:19 +03:00
|
|
|
VIRTIO_BALLOON_F_PAGE_POISON,
|
2020-04-07 06:05:05 +03:00
|
|
|
VIRTIO_BALLOON_F_REPORTING,
|
2009-11-30 19:14:15 +03:00
|
|
|
};
|
2008-05-03 06:50:50 +04:00
|
|
|
|
2010-01-16 04:01:26 +03:00
|
|
|
static struct virtio_driver virtio_balloon_driver = {
|
2008-05-03 06:50:50 +04:00
|
|
|
.feature_table = features,
|
|
|
|
.feature_table_size = ARRAY_SIZE(features),
|
2008-02-05 07:50:12 +03:00
|
|
|
.driver.name = KBUILD_MODNAME,
|
|
|
|
.driver.owner = THIS_MODULE,
|
|
|
|
.id_table = id_table,
|
2017-06-13 20:56:44 +03:00
|
|
|
.validate = virtballoon_validate,
|
2008-02-05 07:50:12 +03:00
|
|
|
.probe = virtballoon_probe,
|
2012-12-22 01:05:30 +04:00
|
|
|
.remove = virtballoon_remove,
|
2008-02-05 07:50:12 +03:00
|
|
|
.config_changed = virtballoon_changed,
|
2013-09-17 03:55:23 +04:00
|
|
|
#ifdef CONFIG_PM_SLEEP
|
virtio: balloon: Add freeze, restore handlers to support S4
Handling balloon hibernate / restore is tricky. If the balloon was
inflated before going into the hibernation state, upon resume, the host
will not have any memory of that. Any pages that were passed on to the
host earlier would most likely be invalid, and the host will have to
re-balloon to the previous value to get in the pre-hibernate state.
So the only sane thing for the guest to do here is to discard all the
pages that were put in the balloon. When to discard the pages is the
next question.
One solution is to deflate the balloon just before writing the image to
the disk (in the freeze() PM callback). However, asking for pages from
the host just to discard them immediately after seems wasteful of
resources. Hence, it makes sense to do this by just fudging our
counters soon after wakeup. This means we don't deflate the balloon
before sleep, and also don't put unnecessary pressure on the host.
This also helps in the thaw case: if the freeze fails for whatever
reason, the balloon should continue to remain in the inflated state.
This was tested by issuing 'swapoff -a' and trying to go into the S4
state. That fails, and the balloon stays inflated, as expected. Both
the host and the guest are happy.
Finally, in the restore() callback, we empty the list of pages that were
previously given off to the host, add the appropriate number of pages to
the totalram_pages counter, reset the num_pages counter to 0, and
all is fine.
As a last step, delete the vqs on the freeze callback to prepare for
hibernation, and re-create them in the restore and thaw callbacks to
resume normal operation.
The kthread doesn't race with any operations here, since it's frozen
before the freeze() call and is thawed after the thaw() and restore()
callbacks, so we're safe with that.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-12-22 15:28:35 +04:00
|
|
|
.freeze = virtballoon_freeze,
|
|
|
|
.restore = virtballoon_restore,
|
|
|
|
#endif
|
2008-02-05 07:50:12 +03:00
|
|
|
};
|
|
|
|
|
2013-02-13 10:29:28 +04:00
|
|
|
module_virtio_driver(virtio_balloon_driver);
|
2008-02-05 07:50:12 +03:00
|
|
|
MODULE_DEVICE_TABLE(virtio, id_table);
|
|
|
|
MODULE_DESCRIPTION("Virtio balloon driver");
|
|
|
|
MODULE_LICENSE("GPL");
|