summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorShakeel Butt <shakeelb@google.com>2017-10-05 18:07:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-25 14:23:43 +0100
commit206e1621ba721bf4bb4b71938a867ba5b8305bcb (patch)
tree9be20e487e2fd6acb07f2dd8c1bfe5e41a8978e8 /virt
parentbdb33bb5e2cea11bb94907e6ca9666c067fc9fd3 (diff)
downloadlinux-stable-206e1621ba721bf4bb4b71938a867ba5b8305bcb.tar.gz
linux-stable-206e1621ba721bf4bb4b71938a867ba5b8305bcb.tar.bz2
linux-stable-206e1621ba721bf4bb4b71938a867ba5b8305bcb.zip
kvm, mm: account kvm related kmem slabs to kmemcg
[ Upstream commit 46bea48ac241fe0b413805952dda74dd0c09ba8b ] The kvm slabs can consume a significant amount of system memory and indeed in our production environment we have observed that a lot of machines are spending significant amount of memory that can not be left as system memory overhead. Also the allocations from these slabs can be triggered directly by user space applications which has access to kvm and thus a buggy application can leak such memory. So, these caches should be accounted to kmemcg. Signed-off-by: Shakeel Butt <shakeelb@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 68c078e47811..1b20768e781d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3904,7 +3904,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
if (!vcpu_align)
vcpu_align = __alignof__(struct kvm_vcpu);
kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
- 0, NULL);
+ SLAB_ACCOUNT, NULL);
if (!kvm_vcpu_cache) {
r = -ENOMEM;
goto out_free_3;