Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp3274034iog; Mon, 27 Jun 2022 12:42:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u8t494EcZjTQfeGVnT9yze3t0u6NcTXa9zTK97pIBvBMkVl0OnfDbkYsVBy216nRr/yChp X-Received: by 2002:a17:907:8a14:b0:726:b4df:7863 with SMTP id sc20-20020a1709078a1400b00726b4df7863mr4340456ejc.552.1656358964668; Mon, 27 Jun 2022 12:42:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656358964; cv=none; d=google.com; s=arc-20160816; b=UYeHaPi1ytd3sCLA2kQPHXvsYdvldqH6VHecSl8v+LShEsqcdXSB3xlV15ubDxStrK JqPVeb0QuYuTtb4I8OJCEjaTp4/kVyaEE0gGgY70qrjyWCysvdbPUvTzbkpN9+VCDLmR DPZRRA+n+c3KM2GfKdVsef7yABKrrPKFjTFua7fsr1gxwpc7PjchP9HZBogTKv+Ok6gc RIHXBboGWr8OuVBnbb8eox4mrDd4esxF/GHxModRxJfdXrQha+GZXsXPuHi7ndv339de 7gHiNSmWf/N7T8zPcNFP7AfGcp7PA51+9fyIpx3Y+IfwL8GDzN0QAkkIc0Gk68U4pOjo /E5Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ol0SPNpsS9P0kf07HAfEJVmhOsLRiK3rFdfeYzBfhaA=; b=Xrocqa9UvDBQA2hHq2KjtCz665Dy8IxCYSUMOgHytmJ7tfptZ8NJodJMEaE2F+C0TF PilnviOZX8M73QPLmd8pTMiwOPRRYdkO3AjJ2AaUfAZ9/uI+LEhOajgKKVfQzd9VtQ/7 Fk2qkPzQnD0NGQN+hTI24oJAjaMVHrUvw9gwRhIrkLyQ9obr98UbrlXaXOmTSa9VTFy/ Il/VIEPg06aYXZgS2OfSRJ6Sen/pAk/j+oyxp7sBpoeCztczWqlwoAfYQuDOg2iFnP5O s+k78UxcP6tsEGhTnFcIHKOFkaLBJyeH8amigqw/4Dzq1Qmbm6aBEGucR+ml8JbGjsee PFNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="lB4IA/Xj"; 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=pass (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 x13-20020aa7d6cd000000b004356564f29fsi12943955edr.401.2022.06.27.12.42.18; Mon, 27 Jun 2022 12:42:44 -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; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="lB4IA/Xj"; 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=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240237AbiF0TfV (ORCPT + 99 others); Mon, 27 Jun 2022 15:35:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236184AbiF0TfT (ORCPT ); Mon, 27 Jun 2022 15:35:19 -0400 X-Greylist: delayed 924 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 27 Jun 2022 12:35:15 PDT Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00A5262EC for ; Mon, 27 Jun 2022 12:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-Id:Date:Subject:From: Content-Type; bh=Ol0SPNpsS9P0kf07HAfEJVmhOsLRiK3rFdfeYzBfhaA=; b=lB4IA/XjC2Fa 8i9vrW68byUGnjfp64OYzn4o/5gA2dFxptGa/Kzf+ZsRuuZTd7ftJTHDEt8M+36ztl1Cyo8/C211b dC/7A8R8gEiHmLXK+pPj1DNbAOk84UcUqbd1Vj4SXx2rG7fHoS9alPvX5LJA8b+c6NijZl5LNVnpV 4w2jg=; Received: from [192.168.16.236] (helo=vzdev.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.94.2) (envelope-from ) id 1o5uFz-007PBk-RA; Mon, 27 Jun 2022 21:18:47 +0200 From: Alexander Atanasov 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 19:19:09 +0000 Message-Id: <20220627191910.22734-1-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220627085838-mutt-send-email-mst@kernel.org> References: <20220627085838-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 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. No pretty printing and fixed as per coding style. Signed-off-by: Alexander Atanasov --- drivers/virtio/virtio_balloon.c | 71 +++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) - Leave pretty print to userspace - Fixed coding style diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index b9737da6c4dd..1bb6a6d0e37b 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,71 @@ 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: %llx\n", "capabilities", b->vdev->features); + + 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 +1085,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 +1134,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