David Hildenbrand
2022-Jul-18 11:35 UTC
[PATCH v5 1/1] Create debugfs file with virtio balloon usage information
On 14.07.22 15:20, Alexander Atanasov wrote:> Allow the guest to know how much it is ballooned by the host. > It is useful when debugging out of memory conditions. > > When host gets back memory from the guest it is accounted > as used memory in the guest but the guest have no way to know > how much it is actually ballooned. > > Signed-off-by: Alexander Atanasov <alexander.atanasov at virtuozzo.com> > --- > drivers/virtio/virtio_balloon.c | 79 +++++++++++++++++++++++++++++ > include/uapi/linux/virtio_balloon.h | 1 + > 2 files changed, 80 insertions(+) > > V2: > - fixed coding style > - removed pretty print > V3: > - removed dublicate of features > - comment about balooned_pages more clear > - convert host pages to balloon pages > V4: > - added a define for BALLOON_PAGE_SIZE to make things clear > V5: > - Made the calculatons work properly for both ways of memory accounting > with or without deflate_on_oom > - dropped comment > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index b9737da6c4dd..e17f8cc71ba4 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -10,6 +10,7 @@ > #include <linux/virtio_balloon.h> > #include <linux/swap.h> > #include <linux/workqueue.h> > +#include <linux/debugfs.h> > #include <linux/delay.h> > #include <linux/slab.h> > #include <linux/module.h> > @@ -731,6 +732,79 @@ static void report_free_page_func(struct work_struct *work) > } > } > > +/* > + * DEBUGFS Interface > + */ > +#ifdef CONFIG_DEBUG_FS > + > +#define guest_to_balloon_pages(i) ((i)*VIRTIO_BALLOON_PAGES_PER_PAGE) > +/** > + * virtio_balloon_debug_show - shows statistics of balloon operations. > + * @f: pointer to the &struct seq_file. > + * @offset: ignored. > + * > + * Provides the statistics that can be accessed in virtio-balloon in the debugfs. > + * > + * Return: zero on success or an error code. > + */ > + > +static int virtio_balloon_debug_show(struct seq_file *f, void *offset) > +{ > + struct virtio_balloon *b = f->private;Most other functions call this "vb".> + u32 num_pages, total_pages, current_pages; > + struct sysinfo i; > + > + si_meminfo(&i); > + > + seq_printf(f, "%-22s: %d\n", "page_size", VIRTIO_BALLOON_PAGE_SIZE);Why? Either export all in ordinary page size or in kB. No need to over-complicate the interface with a different page size that users don't actually care about. I'd just stick to /proc/meminfo and use kB.> + > + virtio_cread_le(b->vdev, struct virtio_balloon_config, actual, > + &num_pages);What's wrong with vb->num_pages? I'd prefer not doing config access, if it can be avoided.> + > + seq_printf(f, "%-22s: %u\n", "ballooned_pages", num_pages); > + > + if (virtio_has_feature(b->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) { > + total_pages = guest_to_balloon_pages(i.totalram); > + current_pages = guest_to_balloon_pages(i.totalram) - num_pages; > + } else { > + total_pages = guest_to_balloon_pages(i.totalram) + num_pages; > + current_pages = guest_to_balloon_pages(i.totalram); > + } > + > + /* Total Memory for the guest from host */ > + seq_printf(f, "%-22s: %u\n", "total_pages", total_pages); > + > + /* Current memory for the guest */ > + seq_printf(f, "%-22s: %u\n", "current_pages", current_pages);The think I detest about that interface (total/current) is that it's simply not correct -- because i.totalram for example doesn't include things like (similar to MemTotal in /proc/meminfo) a) crashkernel b) early boot allocations (e.g., memmap) c) any kind of possible memory (un)hotplug in the future I'd really suggest to just KIS and not mess with i.totalram. Exposing how much memory is inflated and some way to identify how that memory is accounted in /proc/meminfo should be good enough. E.g., the output here could simply be "Inflated: 1024 kB" "MemTotalReduced: 1024 kB" That would even allow in the future for flexibility when it comes to how much/what was actually subtracted from MemTotal.> + > + return 0; > +} > + > +DEFINE_SHOW_ATTRIBUTE(virtio_balloon_debug); > + > +static void virtio_balloon_debugfs_init(struct virtio_balloon *b) > +{ > + debugfs_create_file("virtio-balloon", 0444, NULL, b, > + &virtio_balloon_debug_fops); > +} > + > +static void virtio_balloon_debugfs_exit(struct virtio_balloon *b) > +{ > + debugfs_remove(debugfs_lookup("virtio-balloon", NULL)); > +} > + > +#else > + > +static inline void virtio_balloon_debugfs_init(struct virtio_balloon *b) > +{ > +} > + > +static inline void virtio_balloon_debugfs_exit(struct virtio_balloon *b) > +{ > +} > + > +#endif /* CONFIG_DEBUG_FS */[...]> diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h > index ddaa45e723c4..f3ff7c4e5884 100644 > --- a/include/uapi/linux/virtio_balloon.h > +++ b/include/uapi/linux/virtio_balloon.h > @@ -40,6 +40,7 @@ > > /* Size of a PFN in the balloon interface. */ > #define VIRTIO_BALLOON_PFN_SHIFT 12 > +#define VIRTIO_BALLOON_PAGE_SIZE (1<<VIRTIO_BALLOON_PFN_SHIFT)We prefer extra spacing (1 << VIRTIO_BALLOON_PFN_SHIFT) -- Thanks, David / dhildenb