From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= Subject: Re: [PATCH] virtio_balloon: include buffers and chached memory statistics Date: Wed, 20 Sep 2017 18:01:13 +0200 Message-ID: <20170920180113.73b76041@fiorina> References: <0bc0c49663fafdf3b03844fe048cac3216d88c5b.1505922364.git.tgolembi@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Cc: Wei Wang , Shaohua Li , Huang Ying , "Michael S. Tsirkin" , Jason Wang To: linux-mm@kvack.org, virtio-dev@lists.oasis-open.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Return-path: Received: from mail-wr0-f170.google.com ([209.85.128.170]:53401 "EHLO mail-wr0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751550AbdITQBS (ORCPT ); Wed, 20 Sep 2017 12:01:18 -0400 Received: by mail-wr0-f170.google.com with SMTP id l22so2575927wrc.10 for ; Wed, 20 Sep 2017 09:01:18 -0700 (PDT) In-Reply-To: <0bc0c49663fafdf3b03844fe048cac3216d88c5b.1505922364.git.tgolembi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Wed, 20 Sep 2017 17:48:36 +0200 Tomáš Golembiovský wrote: > Add a new fields, VIRTIO_BALLOON_S_BUFFERS and VIRTIO_BALLOON_S_CACHED, > to virtio_balloon memory statistics protocol. The values correspond to > 'Buffers' and 'Cached' in /proc/meminfo. > > To be able to compute the value of 'Cached' memory it is necessary to > export total_swapcache_pages() to modules. > > Signed-off-by: Tomáš Golembiovský > --- > drivers/virtio/virtio_balloon.c | 11 +++++++++++ > include/uapi/linux/virtio_balloon.h | 4 +++- > mm/swap_state.c | 1 + > 3 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index f0b3a0b9d42f..c2558ec47a62 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -244,12 +244,19 @@ static unsigned int update_balloon_stats(struct virtio_balloon *vb) > struct sysinfo i; > unsigned int idx = 0; > long available; > + long cached; > > all_vm_events(events); > si_meminfo(&i); > > available = si_mem_available(); > > + cached = global_node_page_state(NR_FILE_PAGES) - > + total_swapcache_pages() - i.bufferram; > + if (cached < 0) > + cached = 0; > + > + > #ifdef CONFIG_VM_EVENT_COUNTERS > update_stat(vb, idx++, VIRTIO_BALLOON_S_SWAP_IN, > pages_to_bytes(events[PSWPIN])); > @@ -264,6 +271,10 @@ static unsigned int update_balloon_stats(struct virtio_balloon *vb) > pages_to_bytes(i.totalram)); > update_stat(vb, idx++, VIRTIO_BALLOON_S_AVAIL, > pages_to_bytes(available)); > + update_stat(vb, idx++, VIRTIO_BALLOON_S_BUFFERS, > + pages_to_bytes(i.bufferram)); > + update_stat(vb, idx++, VIRTIO_BALLOON_S_CACHED, > + pages_to_bytes(cached)); > > return idx; > } > diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h > index 343d7ddefe04..119224c34389 100644 > --- a/include/uapi/linux/virtio_balloon.h > +++ b/include/uapi/linux/virtio_balloon.h > @@ -52,7 +52,9 @@ struct virtio_balloon_config { > #define VIRTIO_BALLOON_S_MEMFREE 4 /* Total amount of free memory */ > #define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */ > #define VIRTIO_BALLOON_S_AVAIL 6 /* Available memory as in /proc */ > -#define VIRTIO_BALLOON_S_NR 7 > +#define VIRTIO_BALLOON_S_BUFFERS 7 /* Bufferes memory as in /proc */ I've just noticed I have a typo in the comment: 'Bufferes' should be 'Buffers'. > +#define VIRTIO_BALLOON_S_CACHED 8 /* Cached memory as in /proc */ > +#define VIRTIO_BALLOON_S_NR 9 > > /* > * Memory statistics structure. > diff --git a/mm/swap_state.c b/mm/swap_state.c > index 71ce2d1ccbf7..f3a4ff7d6c52 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -95,6 +95,7 @@ unsigned long total_swapcache_pages(void) > rcu_read_unlock(); > return ret; > } > +EXPORT_SYMBOL_GPL(total_swapcache_pages); > > static atomic_t swapin_readahead_hits = ATOMIC_INIT(4); > > -- > 2.14.1 > -- Tomáš Golembiovský