Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp22037621rwd; Fri, 30 Jun 2023 03:05:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlGM8UqsaPVH3Gr1VsfBRwjL5DkeSgXfkVSmzs/QgwaLYcH3QyxyNFwSFWmXHDuY+vLQv5o2 X-Received: by 2002:a17:902:f683:b0:1b6:9954:2037 with SMTP id l3-20020a170902f68300b001b699542037mr1848539plg.4.1688119556813; Fri, 30 Jun 2023 03:05:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688119556; cv=none; d=google.com; s=arc-20160816; b=t4sBJzd9EswsgpHZY8yebQteMo1J38HFqK9nCxhTxf711yfbpfSgJ8eTm5yvMMc+M4 5g7WpjMGMm3f2L8s2Lmc9ee2mwiDOFpwKBYn2Xi+C7g6yszlwkNvlKhEn+EveejFs7Jg 79Qd67kafM6asdu0Zd569ICBam8iBMuB6Ca7AibYEBq/bAn4J0gMqwU5YEnv2CIPCy/K ih1G36lYMTDGYQjqdYt+mCa/WTFXxJo6ky85f0+YUwMj6V0DiEtTT1T19U8UI3vz3TO8 KjGKxT93PSD6qN9w7aAswSbTle6sbLvTulEFzJxpTTRwXfw2KbFK9azrvgJLV3L6Wfbm rAPg== 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=TZrrrmgTfY8ctOkPfP7i9+2nOge7TFi6FLws6AIOGss=; fh=6zVQB5kyTuWlUVk5uqnsme6LoaXROAcdZ+o72g4GSvQ=; b=wXuYUlYrLU5nOGqJF8kMy28Ila590FDp1TCgYw5CHWWYyxvWM015KL4zVerYYOPrto Wqu1sZQLgPty4LoOv5kEIjyk5RIznTu+B+0zYDNOEIXLrl9j9anwAX/unW2lzwkHqdk1 HQ8FDmmxeY6Se7StBQRof7MqZhkXU1/3ILckT5dS3qkxcjT5ObMJvaZDLauA3dKnw7XK sJkgn88Xy9koZnxHXE0JCmoWPUhPDyu6eJVwVc20LEndyj1ppnT08TP3FVdXf7lagPr8 pXgAp4dEcuiNk9k8sShjPtpdWkUrQxu5ZhjRKkiIW9Q86/r3++/DSWgjfyIjGaogWauO objg== 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 g20-20020a170902e39400b001b7f432316asi9895123ple.220.2023.06.30.03.05.44; Fri, 30 Jun 2023 03:05:56 -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 S232813AbjF3J1W (ORCPT + 99 others); Fri, 30 Jun 2023 05:27:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232798AbjF3J1S (ORCPT ); Fri, 30 Jun 2023 05:27:18 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8543D35AC for ; Fri, 30 Jun 2023 02:27:15 -0700 (PDT) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Qsqdk5JH0zcd0V; Fri, 30 Jun 2023 17:24:26 +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.27; Fri, 30 Jun 2023 17:27:12 +0800 From: liulongfang To: , , , CC: , , , Subject: [PATCH v11 1/4] vfio/migration: Add debugfs to live migration driver Date: Fri, 30 Jun 2023 17:24:54 +0800 Message-ID: <20230630092457.54902-2-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230630092457.54902-1-liulongfang@huawei.com> References: <20230630092457.54902-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: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, 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 From: Longfang Liu 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 | +--save | +--io_test | +--- +---migration +--state +--hisi_acc +--attr +--data +--save +--io_test 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 export the attribute parameters of the current live migration device. data: used to export the live migration data of the current live migration device. save: used to read the current live migration device's data and save it to the driver. io_test: used to test the IO read and write for the driver. 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 | 1 + drivers/vfio/vfio.h | 14 +++++++ drivers/vfio/vfio_debugfs.c | 78 +++++++++++++++++++++++++++++++++++++ drivers/vfio/vfio_main.c | 9 ++++- include/linux/vfio.h | 7 ++++ 5 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 drivers/vfio/vfio_debugfs.c diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile index 66f418aef5a9..6829c58210dc 100644 --- a/drivers/vfio/Makefile +++ b/drivers/vfio/Makefile @@ -7,6 +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 diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h index 7b19c621e0e6..729c52ef579a 100644 --- a/drivers/vfio/vfio.h +++ b/drivers/vfio/vfio.h @@ -264,4 +264,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 f0ca33b2e1df..18d050ec9a12 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -282,7 +282,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; @@ -339,6 +340,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 */ @@ -1415,7 +1418,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: @@ -1433,6 +1439,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 2c137ea94a3e..a114b430be31 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -62,6 +62,13 @@ struct vfio_device { struct iommufd_device *iommufd_device; 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