Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp1746183rwl; Sat, 8 Apr 2023 00:45:14 -0700 (PDT) X-Google-Smtp-Source: AKy350ZPlmp96X+7x95PGtMclQO0SQ02SKkqAxcz0O2D5NpYZSK25qDNTbKNalP/RGtW8b9KavLH X-Received: by 2002:a17:906:c019:b0:947:630b:35f9 with SMTP id e25-20020a170906c01900b00947630b35f9mr868288ejz.74.1680939914427; Sat, 08 Apr 2023 00:45:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680939914; cv=none; d=google.com; s=arc-20160816; b=u2Tap6mavjJqC0vwS25sY8pb2GJY0Vms87fSZbAwmK4kkpQoSXMOMJLa7KY0G3p1Q5 llh37pnBF6ILlq6pSh0MciIoIw8No+LKpHjik09p/7SqeSH4Qrmrh9mtYo8p+zRXJPxL 5bGuSdlJyeslgNRk1yJ+SshRYnfZA7oH2rmYbdZewX+FcioVdY28trnl5nMnctx2mIzK Ave93PJS+LNlbmJ+kmW057iWx+FtUAR1GlQYM1gwn2iNRGagPml/hKsw57wF1rXrOKZW dS/YTKcdYjT5HSH84GNCxWvnFHq5xFJQCcCy15N9PWJveaBvlV82mX+mYQrHHPe6UzDa Ax0A== 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=JZa5p5LqPFcpJboWOPngvYUyd/wE0CyutVmnYH/9E4g=; b=QIBxssfVwCJIv67UUz+NEUR+X1I8qBwzCVGkZVgYEFZbyrNebA2KSNTrNhQn9it+UE kmKkeI0FOgFW/n7AvGbYr1ix1y7DpfV9leR0YB/FtehZVhJD0vXiMlvf8F6J666t0ynK UQPSv7O9h6GVf0X3/cxv2p92u8KvVACXTkftfXgB+WwYfeUqoQor7a0vD/ItWxMX8qxm OsSeznYnlIMvHCRllN/emfsi6FRexC3V19qX5XrGJvSwY7Obx1l4ZAhuJKhz8vd+AlrT AERGaon3rP0Yz5ojyuFYaIehcZGLiTyYA3CMpylwRJQpTJFIAIAx90adIRXu/r7vmrDu 979g== 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=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ne30-20020a1709077b9e00b0093306604e69si3704969ejc.119.2023.04.08.00.44.49; Sat, 08 Apr 2023 00:45:14 -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=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229591AbjDHHnr (ORCPT + 99 others); Sat, 8 Apr 2023 03:43:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjDHHnq (ORCPT ); Sat, 8 Apr 2023 03:43:46 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 119A4D324 for ; Sat, 8 Apr 2023 00:43:43 -0700 (PDT) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PtnGs6vM4zKx8w; Sat, 8 Apr 2023 15:41:09 +0800 (CST) Received: from huawei.com (10.50.163.32) by kwepemm600005.china.huawei.com (7.193.23.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sat, 8 Apr 2023 15:43:41 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v10 1/5] vfio/migration: Add debugfs to live migration driver Date: Sat, 8 Apr 2023 15:42:20 +0800 Message-ID: <20230408074224.62608-2-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230408074224.62608-1-liulongfang@huawei.com> References: <20230408074224.62608-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 There are multiple devices, software and operational steps involved in the process of live migration. An error occurred on any node may cause the live migration operation to fail. This complex process makes it very difficult to locate and analyze the cause when the function fails. In order to quickly locate the cause of the problem when the live migration fails, I added a set of debugfs to the vfio live migration driver. +-------------------------------------------+ | | | | | QEMU | | | | | +---+----------------------------+----------+ | ^ | ^ | | | | | | | | v | v | +---------+--+ +---------+--+ |src vfio_dev| |dst vfio_dev| +--+---------+ +--+---------+ | ^ | ^ | | | | v | | | +-----------+----+ +-----------+----+ |src dev debugfs | |dst dev debugfs | +----------------+ +----------------+ The entire debugfs directory will be based on the definition of the CONFIG_DEBUG_FS macro. If this macro is not enabled, the interfaces in vfio.h will be empty definitions, and the creation and initialization of the debugfs directory will not be executed. vfio | +--- | +---migration | +--state | +--hisi_acc | +--attr | +--data | +--debug | +--- +---migration +--state +--hisi_acc +--attr +--data +--debug debugfs will create a public root directory "vfio" file. then create a dev_name() file for each live migration device. First, create a unified state acquisition file of "migration" in this device directory. Then, create a public live migration state lookup file "state" Finally, create a directory file based on the device type, and then create the device's own debugging files under this directory file. Here, HiSilicon accelerator creates three debug files: attr: used to obtain the attribute parameters of the current live migration device. data: used to get the live migration data of the current live migration device. debug: Used to debug the current live migration device through commands. The live migration function of the current device can be tested by operating the debug files, and the functional status of the equipment and software at each stage can be tested step by step without performing the complete live migration function. And after the live migration is performed, the migration device data of the live migration can be obtained through the debug files. Signed-off-by: Longfang Liu --- drivers/vfio/Makefile | 2 +- drivers/vfio/vfio.h | 14 +++++++ drivers/vfio/vfio_debugfs.c | 78 +++++++++++++++++++++++++++++++++++++ drivers/vfio/vfio_main.c | 9 ++++- include/linux/vfio.h | 8 ++++ 5 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 drivers/vfio/vfio_debugfs.c diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile index 70e7dcb302ef..1debcff31d30 100644 --- a/drivers/vfio/Makefile +++ b/drivers/vfio/Makefile @@ -7,7 +7,7 @@ vfio-y += vfio_main.o \ vfio-$(CONFIG_IOMMUFD) += iommufd.o vfio-$(CONFIG_VFIO_CONTAINER) += container.o vfio-$(CONFIG_VFIO_VIRQFD) += virqfd.o - +vfio-$(CONFIG_DEBUG_FS) += vfio_debugfs.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o obj-$(CONFIG_VFIO_PCI) += pci/ diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h index e9721d8424bc..8e5cafa6aa3a 100644 --- a/drivers/vfio/vfio.h +++ b/drivers/vfio/vfio.h @@ -258,4 +258,18 @@ static inline void vfio_device_put_kvm(struct vfio_device *device) } #endif +#ifdef CONFIG_DEBUG_FS +void vfio_debugfs_create_root(void); +void vfio_debugfs_remove_root(void); + +void vfio_device_debugfs_init(struct vfio_device *vdev); +void vfio_device_debugfs_exit(struct vfio_device *vdev); +#else +static inline void vfio_debugfs_create_root(void) { } +static inline void vfio_debugfs_remove_root(void) { } + +static inline void vfio_device_debugfs_init(struct vfio_device *vdev) { } +static inline void vfio_device_debugfs_exit(struct vfio_device *vdev) { } +#endif /* CONFIG_DEBUG_FS */ + #endif diff --git a/drivers/vfio/vfio_debugfs.c b/drivers/vfio/vfio_debugfs.c new file mode 100644 index 000000000000..7bff30f76bd9 --- /dev/null +++ b/drivers/vfio/vfio_debugfs.c @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2023, HiSilicon Ltd. + */ + +#include +#include +#include +#include +#include "vfio.h" + +static struct dentry *vfio_debugfs_root; + +static int vfio_device_state_read(struct seq_file *seq, void *data) +{ + struct device *vf_dev = seq->private; + struct vfio_device *vdev = container_of(vf_dev, struct vfio_device, device); + enum vfio_device_mig_state state; + int ret; + + ret = vdev->mig_ops->migration_get_state(vdev, &state); + if (ret) + return -EINVAL; + + switch (state) { + case VFIO_DEVICE_STATE_RUNNING: + seq_printf(seq, "%s\n", "RUNNING"); + break; + case VFIO_DEVICE_STATE_STOP_COPY: + seq_printf(seq, "%s\n", "STOP_COPY"); + break; + case VFIO_DEVICE_STATE_STOP: + seq_printf(seq, "%s\n", "STOP"); + break; + case VFIO_DEVICE_STATE_RESUMING: + seq_printf(seq, "%s\n", "RESUMING"); + break; + case VFIO_DEVICE_STATE_RUNNING_P2P: + seq_printf(seq, "%s\n", "RESUMING_P2P"); + break; + case VFIO_DEVICE_STATE_ERROR: + seq_printf(seq, "%s\n", "ERROR"); + break; + default: + seq_printf(seq, "%s\n", "Invalid"); + } + + return 0; +} + +void vfio_device_debugfs_init(struct vfio_device *vdev) +{ + struct dentry *vfio_dev_migration = NULL; + struct device *dev = &vdev->device; + + vdev->debug_root = debugfs_create_dir(dev_name(vdev->dev), vfio_debugfs_root); + vfio_dev_migration = debugfs_create_dir("migration", vdev->debug_root); + + debugfs_create_devm_seqfile(dev, "state", vfio_dev_migration, + vfio_device_state_read); +} + +void vfio_device_debugfs_exit(struct vfio_device *vdev) +{ + debugfs_remove_recursive(vdev->debug_root); +} + +void vfio_debugfs_create_root(void) +{ + vfio_debugfs_root = debugfs_create_dir("vfio", NULL); +} + +void vfio_debugfs_remove_root(void) +{ + debugfs_remove_recursive(vfio_debugfs_root); + vfio_debugfs_root = NULL; +} + diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index 3a597e799918..e9ddf6612e44 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -274,7 +274,8 @@ static int __vfio_register_dev(struct vfio_device *device, /* Refcounting can't start until the driver calls register */ refcount_set(&device->refcount, 1); - + if (device->mig_ops) + vfio_device_debugfs_init(device); vfio_device_group_register(device); return 0; @@ -331,6 +332,8 @@ void vfio_unregister_group_dev(struct vfio_device *device) } } + if (device->mig_ops) + vfio_device_debugfs_exit(device); vfio_device_group_unregister(device); /* Balances device_add in register path */ @@ -1407,7 +1410,10 @@ static int __init vfio_init(void) goto err_dev_class; } + + vfio_debugfs_create_root(); pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); + return 0; err_dev_class: @@ -1425,6 +1431,7 @@ static void __exit vfio_cleanup(void) vfio_virqfd_exit(); vfio_group_cleanup(); xa_destroy(&vfio_device_set_xa); + vfio_debugfs_remove_root(); } module_init(vfio_init); diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 93134b023968..fa6b898ebb58 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -63,6 +63,14 @@ struct vfio_device { struct iommufd_ctx *iommufd_ictx; bool iommufd_attached; #endif + +#ifdef CONFIG_DEBUG_FS + /* + * debug_root is a static property of the vfio_device + * which must be set prior to registering the vfio_device. + */ + struct dentry *debug_root; +#endif }; /** -- 2.24.0