Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2911795iog; Mon, 27 Jun 2022 05:36:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1swA4x8UVqqiERT0EbKmr7IUdR53Qm8eucrINtljXLyvJYchd4sSiytqhDw7PVYyhts4i2P X-Received: by 2002:a17:90b:4a86:b0:1ee:e43e:ba47 with SMTP id lp6-20020a17090b4a8600b001eee43eba47mr3761833pjb.241.1656333407510; Mon, 27 Jun 2022 05:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656333407; cv=none; d=google.com; s=arc-20160816; b=TQ9NVasKhoiFcP60xnGSad+mGY855Mg2A9+9s6uUmShaNM+2YeKMCRfQv9aSNXNvOL uk2ds84k4qgAWBaxryxJLDgOb+l7lyZuqYHn4SsORiWnebZ7sRrYWnuw+MkysPkGP91X 1T+nGb/uNd74x/VMYGmCCV2T9T3cEcOrogrz7NZgZYX1TkFnozMxEKs+A69MKBawzXYq 9ngW663do0ntxRMphyw3y4Nf+YIawBez66aGB+EXSOcUhy5QI8HrX9n4nSu3pImXMmPS 1BEft2Q4W+DnyXZgwTEC0PsvUPlb8uwivmHALDFaCxmtUjlUzmeU/Q/l9Ryov2qesM+u zYaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=rkO56MjE8r0tYMBhfjyNut18WjrIT6gkl4ad/IeIIO4=; b=dX0/oEniyaH5oqJP2oH3TbGLEGFehdFiF/gFYyWXOHKL6wG1CqPL2tCyOUBa7tQLMm cfg53ZrHbCIA9RNC+vbTZHpTFJ3lzMUH91RjQzX/n0tdfG92/3/GdCiZwP8JVc3GZdoK KSon1KiSnziA0u3FCvPgPxcD799JBCpg+6OEeqvEjl1i8svcKKa1V5ODBBHPHXtnsKg2 ubY9cOaiU10j7+1f/KdgShun5XcegznPnj2B3R03GPqGUjJXs9/q3HDq9PpndLjYkLUw EsKwXsPoE5CjbL/JokqYD1yGWJ8q4WlqNAmOwek9qcRmPWv67imUP3i4j9+dh6YzI5Mp TtoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o4-20020a635a04000000b003fcbc8b5e7dsi14555439pgb.811.2022.06.27.05.36.32; Mon, 27 Jun 2022 05:36:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234361AbiF0Mah (ORCPT + 99 others); Mon, 27 Jun 2022 08:30:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232906AbiF0Mae (ORCPT ); Mon, 27 Jun 2022 08:30:34 -0400 X-Greylist: delayed 515 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 27 Jun 2022 05:30:31 PDT Received: from mail.itpri.com (mx1.itpri.com [185.125.111.158]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DAC8766F for ; Mon, 27 Jun 2022 05:30:31 -0700 (PDT) X-Virus-Scanned: Yes From: alexander.atanasov@virtuozzo.com To: "Michael S. Tsirkin" , David Hildenbrand , Jason Wang Cc: kernel@openvz.org, Alexander Atanasov , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] Create debugfs file with virtio balloon usage information Date: Mon, 27 Jun 2022 12:20:38 +0000 Message-Id: <20220627122038.1921522-1-alexander.atanasov@virtuozzo.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Atanasov 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 --- drivers/virtio/virtio_balloon.c | 91 +++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index b9737da6c4dd..a32a52c28a1f 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -731,6 +732,91 @@ 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 *b = f->private; + u32 num_pages; + struct sysinfo i; + + si_meminfo(&i); + + seq_printf(f, "%-22s:", "capabilities"); + + if (virtio_has_feature(b->vdev, VIRTIO_BALLOON_F_MUST_TELL_HOST)) + seq_puts(f, " tell_host"); + + if (virtio_has_feature(b->vdev, VIRTIO_BALLOON_F_STATS_VQ)) + seq_puts(f, " stats"); + + if (virtio_has_feature(b->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) + seq_puts(f, " deflate_on_oom"); + + if (virtio_has_feature(b->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) + seq_puts(f, " free_page_hint"); + + if (virtio_has_feature(b->vdev, VIRTIO_BALLOON_F_PAGE_POISON)) + seq_puts(f, " page_poison"); + + if (virtio_has_feature(b->vdev, VIRTIO_BALLOON_F_REPORTING)) + seq_puts(f, " reporting"); + + seq_puts(f, "\n"); + + seq_printf(f, "%-22s: %d\n", "page_size", 4096); + + virtio_cread_le(b->vdev, struct virtio_balloon_config, actual, + &num_pages); + /* Memory returned to host or amount we can inflate if possible */ + seq_printf(f, "%-22s: %u\n", "ballooned_pages", num_pages); + + /* Total Memory for the guest from host */ + seq_printf(f, "%-22s: %lu\n", "total_pages", i.totalram); + + /* Current memory for the guest */ + seq_printf(f, "%-22s: %lu\n", "current_pages", i.totalram-num_pages); + + 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 */ + #ifdef CONFIG_BALLOON_COMPACTION /* * virtballoon_migratepage - perform the balloon page migration on behalf of @@ -1019,6 +1105,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 +1154,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