Michael S. Tsirkin
2022-Aug-09 10:44 UTC
[PATCH v6 1/2] Create debugfs file with virtio balloon usage information
On Tue, Jul 26, 2022 at 02:08:27PM +0000, Alexander Atanasov wrote:> Allow the guest to know how much it is ballooned by the host > and how that memory is accounted. > > It is useful when debugging out of memory conditions, > as well for userspace processes that monitor the memory pressure > and for nested virtualization.Hmm. debugging is ok. monitoring/nested use-cases probably call for sysfs/procfs.> Depending on the deflate on oom flag memory is accounted in two ways. > If the flag is set the inflated pages are accounted as used memory. > If the flag is not set the inflated pages are substracted from totalram. > To make clear how are inflated pages accounted sign prefix the value. > Where negative means substracted from totalram and positive means > they are accounted as used. > > Signed-off-by: Alexander Atanasov <alexander.atanasov at virtuozzo.com> > --- > drivers/virtio/virtio_balloon.c | 59 +++++++++++++++++++++++++++++++++ > 1 file changed, 59 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 > V6: > - reduced the file to minimum > - unify accounting > > I didn't understand if you agree to change the accounting to be the same > so following part 2 is about it. > > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index f4c34a2a6b8e..97d3b29cb9f1 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,59 @@ static void report_free_page_func(struct work_struct *work) > } > } > > +/* > + * DEBUGFS Interface > + */ > +#ifdef CONFIG_DEBUG_FS > + > +/** > + * 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 *vb = f->private; > + s64 num_pages = vb->num_pages << (VIRTIO_BALLOON_PFN_SHIFT - 10); > + > + if (!virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) > + num_pages = -num_pages; > + > + seq_printf(f, "inflated: %lld kB\n", num_pages); > + > + return 0; > +}Can't we just have two attributes, without hacks like this one?> + > +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 */ > + > #ifdef CONFIG_BALLOON_COMPACTION > /* > * virtballoon_migratepage - perform the balloon page migration on behalf of > @@ -1019,6 +1073,9 @@ static int virtballoon_probe(struct virtio_device *vdev) > > if (towards_target(vb)) > virtballoon_changed(vdev); > + > + virtio_balloon_debugfs_init(vb); > + > return 0; > > out_unregister_oom: > @@ -1065,6 +1122,8 @@ static void virtballoon_remove(struct virtio_device *vdev) > { > struct virtio_balloon *vb = vdev->priv; > > + virtio_balloon_debugfs_exit(vb); > + > if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING)) > page_reporting_unregister(&vb->pr_dev_info); > if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) > -- > 2.25.1 > >