Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e241e3f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio update from Michael Tsirkin:
 "This adds reporting hugepage stats to virtio-balloon"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_balloon: export hugetlb page allocation counts
parents e5c37228 6c64fe7f

drivers/virtio/virtio_balloon.c

+6 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ static unsigned int update_balloon_stats(struct virtio_balloon *vb) 
				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]);

#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

#endif

	update_stat(vb, idx++, VIRTIO_BALLOON_S_MEMFREE,

				pages_to_bytes(i.freeram));

include/uapi/linux/virtio_balloon.h

+3 −1
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ struct virtio_balloon_config { 
#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_CACHES   7   /* Disk caches */

#define VIRTIO_BALLOON_S_NR       8

#define VIRTIO_BALLOON_S_HTLB_PGALLOC  8  /* Hugetlb page allocations */

#define VIRTIO_BALLOON_S_HTLB_PGFAIL   9  /* Hugetlb page allocation failures */

#define VIRTIO_BALLOON_S_NR       10



/*

 * Memory statistics structure.