Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp3786676iog; Tue, 28 Jun 2022 02:47:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v1xgSIkxaSvjyxLs2AAMLNG8V/3Nn/BCpfyq2aKq/vY6fYeX2KxrB5XQTBePtoLS9LKgFI X-Received: by 2002:a17:902:9f87:b0:16a:1efc:42fe with SMTP id g7-20020a1709029f8700b0016a1efc42femr4116022plq.124.1656409644747; Tue, 28 Jun 2022 02:47:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656409644; cv=none; d=google.com; s=arc-20160816; b=itYWT63GeVrew50jwrdu2pc4FQT0mJVQRzdrGUq3XGvJfIaEm///BsWnwCDqf1PWTu U7C1FjoZ2QKxC4qni37FUkzFST7MKefwJU11z0L9/FAnswP2wer7wQvS3kqHWgh7Yf85 hp3/ImgBZ/lcSddGaJ1gLz/gxpGwC8eXPbJV0InaOextL42sb66t5Al/BctwmRpAvQPM WVH/iL3TY2Y2w+jpEXdLnkvXIuhLXpsp4mOPExIwVYnxqNSWhl5SR/Ln46UZuYZKx4Bf ZeOa2ME418YUs9VP1mMOeuqReDcXhGOKX6HOAZwaCcq5+3htqcZAQlOTvVp48A0hWWSr F52g== 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=K9eCtLlHPuGIMT0syoANbcmOKfOt8OVhC2sSkmVBNcI=; b=smN3Jm/kAPMrpGu2kGv8vFCrIDGskYJqZLxqCKtgfSOzWnpGFvLNaMShyEUlGmbZAb UGHQpTNZ1ojdHcPRslaCd8WG/OF9KhlfsPm6oLC+2Rhj7nOzIa6+yuybacX8Ydq6sWHf ih0ROlFszsS0A3uO/ZCeFaWyOapZz4mylBanSDFj/EduE73Vvv48T7uz4XeGYXR5M4PK +iKhoNF5m4wXLsobQvU06tnKar0UivMjSCImBQjTb1DYiieQn09QkJd6YtBhO8AHZ4sR pkZTZO72I16jb26OrKAJ318rJdcz9i0fV6PXaJDq0AjTrm5dYnb9zofdRuABWLuW0Mkh Xk4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=Ua4dWG2+; 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 s5-20020a170902988500b0016a17da4ad3si16877037plp.339.2022.06.28.02.47.12; Tue, 28 Jun 2022 02:47:24 -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=Ua4dWG2+; 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 S229816AbiF1JYj (ORCPT + 99 others); Tue, 28 Jun 2022 05:24:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344218AbiF1JYP (ORCPT ); Tue, 28 Jun 2022 05:24:15 -0400 Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 607F42496A for ; Tue, 28 Jun 2022 02:24:04 -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=K9eCtLlHPuGIMT0syoANbcmOKfOt8OVhC2sSkmVBNcI=; b=Ua4dWG2+2mbF VXiI4O8z2Flh0/lj3cU08yH2KqYV7FJDKRi7kYOPqKWEYRtYAlarQ09JuNDRUG15CELEEvP0qekjF td+6FKWPVkJmyRmU2LAQO/ptL6GUCc44lLTe8D5m4wxBBxoa2CPrP3fmDY0mbraNKjnsdiY81ROq6 m7aAQ=; Received: from [192.168.16.236] (helo=vzdev.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.94.2) (envelope-from ) id 1o67Qu-007YQ1-9B; Tue, 28 Jun 2022 11:22:56 +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 v3 1/1] Create debugfs file with virtio balloon usage information Date: Tue, 28 Jun 2022 09:23:24 +0000 Message-Id: <20220628092324.23656-1-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220627163714-mutt-send-email-mst@kernel.org> References: <20220627163714-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. Signed-off-by: Alexander Atanasov --- drivers/virtio/virtio_balloon.c | 78 +++++++++++++++++++++++++++++++++ 1 file changed, 78 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 diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index b9737da6c4dd..65964afd4f13 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,78 @@ 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; + u32 num_pages; + struct sysinfo i; + + si_meminfo(&i); + + seq_printf(f, "%-22s: %d\n", "page_size", 4096); + + virtio_cread_le(b->vdev, struct virtio_balloon_config, actual, + &num_pages); + /* + * Pages allocated by host from the guest memory. + * Host inflates the balloon to get more memory. + * Guest needs to deflate the balloon to get more memory. + */ + 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", + guest_to_balloon_pages(i.totalram)); + + /* Current memory for the guest */ + seq_printf(f, "%-22s: %lu\n", "current_pages", + guest_to_balloon_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 +1092,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 +1141,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