From patchwork Thu Jan 21 18:43:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 60100 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp178465lbb; Thu, 21 Jan 2016 10:45:43 -0800 (PST) X-Received: by 10.140.235.150 with SMTP id g144mr58360129qhc.11.1453401943493; Thu, 21 Jan 2016 10:45:43 -0800 (PST) Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com. [209.132.183.39]) by mx.google.com with ESMTPS id e110si2601373qge.8.2016.01.21.10.45.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jan 2016 10:45:43 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0LIh95C015634; Thu, 21 Jan 2016 13:43:10 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u0LIh7pI013991 for ; Thu, 21 Jan 2016 13:43:07 -0500 Received: from colepc.redhat.com (ovpn-113-198.phx2.redhat.com [10.3.113.198]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0LIh4Yj032379; Thu, 21 Jan 2016 13:43:07 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 21 Jan 2016 13:43:00 -0500 Message-Id: <382b7d1f76f1afc177d7fbebfc9714f2bbcc3ec2.1453401727.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] lxc: fuse: Stub out Slab bits in /proc/meminfo X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com 'free' on fedora23 wants to use the Slab field for calculated used memory. The equation is: used = MemTotal - MemFree - (Cached + Slab) - Buffers We already set Cached and Buffers to 0, do the same for Slab and its related values https://bugzilla.redhat.com/show_bug.cgi?id=1300781 --- src/lxc/lxc_fuse.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.5.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 0a1c7dc..1988c19 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -217,6 +217,12 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, virBufferAsprintf(new_meminfo, "SwapFree: %8llu kB\n", (meminfo.swaptotal - meminfo.memtotal - meminfo.swapusage + meminfo.memusage)); + } else if (STREQ(line, "Slab")) { + virBufferAsprintf(new_meminfo, "Slab: %8d kB\n", 0); + } else if (STREQ(line, "SReclaimable")) { + virBufferAsprintf(new_meminfo, "SReclaimable: %8d kB\n", 0); + } else if (STREQ(line, "SUnreclaim")) { + virBufferAsprintf(new_meminfo, "SUnreclaim: %8d kB\n", 0); } else { *ptr = ':'; virBufferAdd(new_meminfo, line, -1);