Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp589956imw; Thu, 14 Jul 2022 07:14:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tEtSzWeclDESH4B12ETLyoGzBgTn01YjA7iRQ1mgoEteJN5R2dJerCHnVT6jSwNLMqUzQ+ X-Received: by 2002:a05:6830:1e14:b0:61c:3f4c:7ff1 with SMTP id s20-20020a0568301e1400b0061c3f4c7ff1mr3418417otr.114.1657808093145; Thu, 14 Jul 2022 07:14:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657808093; cv=none; d=google.com; s=arc-20160816; b=W7algHH/hb3GkWYv5iw5LOmPNhyAUf3Y/CqiBmS+TzKbwvflzHCIKo6roNhPR7clEu N3csB0WOoDlqG0Ej+yCicAjZZLplcWiUSBNx1UuWBVxfFEjvENZ/mJktl5Wf30qWGP5G sAtvQ4smBD/OEUwKYXCF8O16TH0RvfGsvDPrx2go9Qrd8TRqdQ/Q0kBkPfWtPQyRC4xW atAy8uOtHiEOz+9XxCaa2HbHwo+1Pps+heZO2yQ9A/1idO0nqPyKQevCNVDDupUnQSsA 4c5YoaiDrsQvP49f8p2kSN4ChE/2g62tOOlIp8tBHV+wNdDhs48I013zoceZFCrLd/Hq guEQ== 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; bh=ErHkPN9ez19SI8TYG8dfIW04yqg4cnuONQfickOI2ZI=; b=k7+skSCGaC610IE/6vWQ2RsmhNBWeb42+V+lubPUWI7buKjxVgmTrypOSIZTHcthOz TLmi6nvHPtUyMRfQCo9r1+QIPiNeK9b/LmksA2Wu/8UqDOEYfJvkZ6lD+BHwXROdk21M Xkmdj1gbWzNURa0d0bQK9Dbz8vSYQDf+cK4taxTSVaebJaXNQROVHYJV7OII9neT3kqQ 3j0oFlcL6LuAiVbZy2sldkKISzJmV3vEq0RMNyS3EvHK38cMMG40KQFQ/LzflhZ2JkhO Ned0iTI5Q05FkigA7N1gCyCMSQ/yCRc0dnRTgbN2Swr1KEjV47i7pxelR2ezAGPdb4Up hfdg== 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 cz20-20020a0568306a1400b006169f92ec13si1768361otb.126.2022.07.14.07.14.40; Thu, 14 Jul 2022 07:14:53 -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 S239866AbiGNNWI (ORCPT + 99 others); Thu, 14 Jul 2022 09:22:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239727AbiGNNVZ (ORCPT ); Thu, 14 Jul 2022 09:21:25 -0400 Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E3DA5D5A1 for ; Thu, 14 Jul 2022 06:21:24 -0700 (PDT) Received: from [192.168.16.236] (helo=vzdev.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1oBylc-00AE3T-CD; Thu, 14 Jul 2022 15:20:55 +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 v5 1/1] Create debugfs file with virtio balloon usage information Date: Thu, 14 Jul 2022 13:20:52 +0000 Message-Id: <20220714132053.56323-1-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <7fd5e645-3892-6e0d-de80-08728e29b150@redhat.com> References: <7fd5e645-3892-6e0d-de80-08728e29b150@redhat.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 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 | 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 #include #include +#include #include #include #include @@ -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; + 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); + + virtio_cread_le(b->vdev, struct virtio_balloon_config, actual, + &num_pages); + + 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); + + 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 +1093,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 +1142,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)) 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<