FROMLIST: virt: geniezone: Provide individual VM memory statistics within debugfs

Created a dedicated per-VM debugfs folder under gzvm, providing
user-level programs with easy access to per-VM memory statistics for
debugging and profiling purposes. This enables users to effectively
analyze and optimize the memory usage of individual virtual machines.

Two types of information can be obtained:

`cat /sys/kernel/debug/gzvm/<pid>-<vmid>/protected_hyp_mem` shows memory
used by the hypervisor and the size of the stage 2 table in bytes.

`cat /sys/kernel/debug/gzvm/<pid>-<vmid>/protected_shared_mem` gives
memory used by the shared resources of the guest and host in bytes.

For example:
console:/ # cat /sys/kernel/debug/gzvm/3417-15/protected_hyp_mem
180328
console:/ # cat /sys/kernel/debug/gzvm/3417-15/protected_shared_mem
262144
console:/ #

More stats will be added in the future.

Signed-off-by: Jerry Wang <ze-yu.wang@mediatek.com>
Signed-off-by: Yi-De Wu <yi-de.wu@mediatek.com>
Signed-off-by: Liju Chen <liju-clr.chen@mediatek.com>
Change-Id: Ie16237f12cb5e2c31d6866f67d024c384a1aade6
Bug: 379230831
Link: https://lore.kernel.org/lkml/20241114100802.4116-20-liju-clr.chen@mediatek.com/
This commit is contained in:
Jerry Wang
2024-04-10 15:57:21 +08:00
committed by Liju-clr Chen
parent 9320d670bb
commit 164e3d6558
5 changed files with 171 additions and 0 deletions
+2
View File
@@ -26,6 +26,7 @@ enum {
GZVM_FUNC_SET_DTB_CONFIG = 16,
GZVM_FUNC_MAP_GUEST = 17,
GZVM_FUNC_MAP_GUEST_BLOCK = 18,
GZVM_FUNC_GET_STATISTICS = 19,
NR_GZVM_FUNC,
};
@@ -52,6 +53,7 @@ enum {
#define MT_HVC_GZVM_SET_DTB_CONFIG GZVM_HCALL_ID(GZVM_FUNC_SET_DTB_CONFIG)
#define MT_HVC_GZVM_MAP_GUEST GZVM_HCALL_ID(GZVM_FUNC_MAP_GUEST)
#define MT_HVC_GZVM_MAP_GUEST_BLOCK GZVM_HCALL_ID(GZVM_FUNC_MAP_GUEST_BLOCK)
#define MT_HVC_GZVM_GET_STATISTICS GZVM_HCALL_ID(GZVM_FUNC_GET_STATISTICS)
#define GIC_V3_NR_LRS 16
+13
View File
@@ -444,3 +444,16 @@ int gzvm_arch_map_guest_block(u16 vm_id, int memslot_id, u64 gfn, u64 nr_pages)
return gzvm_hypcall_wrapper(MT_HVC_GZVM_MAP_GUEST_BLOCK, vm_id,
memslot_id, gfn, nr_pages, 0, 0, 0, &res);
}
int gzvm_arch_get_statistics(struct gzvm *gzvm)
{
struct arm_smccc_res res;
int ret;
ret = gzvm_hypcall_wrapper(MT_HVC_GZVM_GET_STATISTICS, gzvm->vm_id,
0, 0, 0, 0, 0, 0, &res);
gzvm->stat.protected_hyp_mem = ((ret == 0) ? res.a1 : 0);
gzvm->stat.protected_shared_mem = ((ret == 0) ? res.a2 : 0);
return ret;
}
+25
View File
@@ -3,6 +3,7 @@
* Copyright (c) 2023 MediaTek Inc.
*/
#include <linux/debugfs.h>
#include <linux/device.h>
#include <linux/file.h>
#include <linux/kdev_t.h>
@@ -80,6 +81,25 @@ static void gzvm_drv_sysfs_exit(void)
kobject_del(gzvm_drv.sysfs_root_dir);
}
static int gzvm_drv_debug_init(void)
{
if (!debugfs_initialized()) {
pr_warn("debugfs not initialized!\n");
return 0;
}
gzvm_drv.gzvm_debugfs_dir = debugfs_create_dir("gzvm", NULL);
if (!gzvm_drv.gzvm_debugfs_dir)
return -ENOMEM;
return 0;
}
static void gzvm_drv_debug_exit(void)
{
debugfs_remove_recursive(gzvm_drv.gzvm_debugfs_dir);
}
/**
* gzvm_err_to_errno() - Convert geniezone return value to standard errno
*
@@ -221,6 +241,10 @@ static int gzvm_drv_probe(struct platform_device *pdev)
if (ret)
return ret;
ret = gzvm_drv_debug_init();
if (ret)
return ret;
ret = gzvm_drv_sysfs_init();
if (ret)
return ret;
@@ -236,6 +260,7 @@ static void gzvm_drv_remove(struct platform_device *pdev)
{
gzvm_drv_irqfd_exit();
misc_deregister(&gzvm_dev);
gzvm_drv_debug_exit();
gzvm_drv_sysfs_exit();
}
+115
View File
@@ -4,6 +4,7 @@
*/
#include <linux/anon_inodes.h>
#include <linux/debugfs.h>
#include <linux/file.h>
#include <linux/kdev_t.h>
#include <linux/mm.h>
@@ -342,6 +343,12 @@ static void gzvm_destroy_all_ppage(struct gzvm *gzvm)
}
}
static int gzvm_destroy_vm_debugfs(struct gzvm *vm)
{
debugfs_remove_recursive(vm->debug_dir);
return 0;
}
static void gzvm_destroy_vm(struct gzvm *gzvm)
{
size_t allocated_size;
@@ -369,6 +376,8 @@ static void gzvm_destroy_vm(struct gzvm *gzvm)
/* No need to lock here becauese it's single-threaded execution */
gzvm_destroy_all_ppage(gzvm);
gzvm_destroy_vm_debugfs(gzvm);
kfree(gzvm);
}
@@ -427,6 +436,108 @@ static void setup_vm_demand_paging(struct gzvm *vm)
}
}
/**
* hyp_mem_read() - Get size of hypervisor-allocated memory and stage 2 table
* @file: Pointer to struct file
* @buf: User space buffer for storing the return value
* @len: Size of @buf, in bytes
* @offset: Pointer to loff_t
*
* Return: Size of hypervisor-allocated memory and stage 2 table, in bytes
*/
static ssize_t hyp_mem_read(struct file *file, char __user *buf, size_t len,
loff_t *offset)
{
char tmp_buffer[GZVM_MAX_DEBUGFS_VALUE_SIZE] = {0};
struct gzvm *vm = file->private_data;
int ret;
if (*offset == 0) {
ret = gzvm_arch_get_statistics(vm);
if (ret)
return ret;
snprintf(tmp_buffer, sizeof(tmp_buffer), "%llu\n",
vm->stat.protected_hyp_mem);
if (copy_to_user(buf, tmp_buffer, sizeof(tmp_buffer)))
return -EFAULT;
*offset += sizeof(tmp_buffer);
return sizeof(tmp_buffer);
}
return 0;
}
/**
* shared_mem_read() - Get size of memory shared between host and guest
* @file: Pointer to struct file
* @buf: User space buffer for storing the return value
* @len: Size of @buf, in bytes
* @offset: Pointer to loff_t
*
* Return: Size of memory shared between host and guest, in bytes
*/
static ssize_t shared_mem_read(struct file *file, char __user *buf, size_t len,
loff_t *offset)
{
char tmp_buffer[GZVM_MAX_DEBUGFS_VALUE_SIZE] = {0};
struct gzvm *vm = file->private_data;
int ret;
if (*offset == 0) {
ret = gzvm_arch_get_statistics(vm);
if (ret)
return ret;
snprintf(tmp_buffer, sizeof(tmp_buffer), "%llu\n",
vm->stat.protected_shared_mem);
if (copy_to_user(buf, tmp_buffer, sizeof(tmp_buffer)))
return -EFAULT;
*offset += sizeof(tmp_buffer);
return sizeof(tmp_buffer);
}
return 0;
}
static const struct file_operations hyp_mem_fops = {
.open = simple_open,
.read = hyp_mem_read,
};
static const struct file_operations shared_mem_fops = {
.open = simple_open,
.read = shared_mem_read,
};
static int gzvm_create_vm_debugfs(struct gzvm *vm)
{
struct dentry *dent;
char dir_name[GZVM_MAX_DEBUGFS_DIR_NAME_SIZE];
if (!vm->gzvm_drv->gzvm_debugfs_dir) {
pr_warn("VM debugfs directory is not exist\n");
return -EFAULT;
}
if (vm->debug_dir) {
pr_warn("VM debugfs directory is duplicated\n");
return 0;
}
snprintf(dir_name, sizeof(dir_name), "%d-%d", task_pid_nr(current), vm->vm_id);
dent = debugfs_lookup(dir_name, vm->gzvm_drv->gzvm_debugfs_dir);
if (dent) {
pr_warn("Debugfs directory is duplicated\n");
dput(dent);
return 0;
}
dent = debugfs_create_dir(dir_name, vm->gzvm_drv->gzvm_debugfs_dir);
vm->debug_dir = dent;
debugfs_create_file("protected_shared_mem", 0444, dent, vm, &shared_mem_fops);
debugfs_create_file("protected_hyp_mem", 0444, dent, vm, &hyp_mem_fops);
return 0;
}
static int setup_mem_alloc_mode(struct gzvm *vm)
{
int ret;
@@ -487,6 +598,10 @@ static struct gzvm *gzvm_create_vm(struct gzvm_driver *drv, unsigned long vm_typ
list_add(&gzvm->vm_list, &gzvm_list);
mutex_unlock(&gzvm_list_lock);
ret = gzvm_create_vm_debugfs(gzvm);
if (ret)
pr_debug("Failed to create debugfs for VM-%u\n", gzvm->vm_id);
pr_debug("VM-%u is created\n", gzvm->vm_id);
return gzvm;
+16
View File
@@ -30,6 +30,8 @@ struct gzvm_driver {
struct kobject *sysfs_root_dir;
u32 demand_paging_batch_pages;
struct dentry *gzvm_debugfs_dir;
};
/*
@@ -67,6 +69,9 @@ struct gzvm_driver {
#define GZVM_DRV_DEMAND_PAGING_BATCH_PAGES \
(GZVM_BLOCK_BASED_DEMAND_PAGE_SIZE / PAGE_SIZE)
#define GZVM_MAX_DEBUGFS_DIR_NAME_SIZE 20
#define GZVM_MAX_DEBUGFS_VALUE_SIZE 20
enum gzvm_demand_paging_mode {
GZVM_FULLY_POPULATED = 0,
GZVM_DEMAND_PAGING = 1,
@@ -132,6 +137,11 @@ struct gzvm_pinned_page {
u64 ipa;
};
struct gzvm_vm_stat {
u64 protected_hyp_mem;
u64 protected_shared_mem;
};
/**
* struct gzvm: the following data structures are for data transferring between
* driver and hypervisor, and they're aligned with hypervisor definitions.
@@ -156,6 +166,8 @@ struct gzvm_pinned_page {
* @demand_page_buffer: the mailbox for transferring large portion pages
* @demand_paging_lock: lock for preventing multiple cpu using the same demand
* page mailbox at the same time
* @stat: information for VM memory statistics
* @debug_dir: debugfs directory node for VM memory statistics
*/
struct gzvm {
struct gzvm_driver *gzvm_drv;
@@ -188,6 +200,9 @@ struct gzvm {
u32 demand_page_gran;
u64 *demand_page_buffer;
struct mutex demand_paging_lock;
struct gzvm_vm_stat stat;
struct dentry *debug_dir;
};
long gzvm_dev_ioctl_check_extension(struct gzvm *gzvm, unsigned long args);
@@ -213,6 +228,7 @@ int gzvm_arch_destroy_vm(u16 vm_id);
int gzvm_arch_map_guest(u16 vm_id, int memslot_id, u64 pfn, u64 gfn,
u64 nr_pages);
int gzvm_arch_map_guest_block(u16 vm_id, int memslot_id, u64 gfn, u64 nr_pages);
int gzvm_arch_get_statistics(struct gzvm *gzvm);
int gzvm_vm_ioctl_arch_enable_cap(struct gzvm *gzvm,
struct gzvm_enable_cap *cap,
void __user *argp);