From nobody Thu Sep 11 17:11:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F4ABC05027 for ; Fri, 17 Feb 2023 08:49:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229966AbjBQIts (ORCPT ); Fri, 17 Feb 2023 03:49:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229816AbjBQItm (ORCPT ); Fri, 17 Feb 2023 03:49:42 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DE265DE18 for ; Fri, 17 Feb 2023 00:49:15 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PJ55k0bn5znWCJ; Fri, 17 Feb 2023 16:46:50 +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.17; Fri, 17 Feb 2023 16:49:13 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v8 1/5] vfio/migration: Add debugfs to live migration driver Date: Fri, 17 Feb 2023 16:48:27 +0800 Message-ID: <20230217084831.35783-2-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230217084831.35783-1-liulongfang@huawei.com> References: <20230217084831.35783-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 | | | | | +---+----------------------------+----------+ | ^ | ^ | | | | +--------+ | | | | | vfio | v | v | +--------+ +---------+--+ +---------+--+ ^ |src vfio_dev| |dst vfio_dev| | +--+---------+ +--+---------+ | | ^ | ^ | | | | | | v | | | | +-----------+ +-----------+----+ | | +--+file_x+<----+---+migration_attr | | | | +-----------+ | +----------------+ | | | +---+migration_data | | | | | +----------------+ | | | +---+migration_debug | | | | | +----------------+ | | | | +----------------+ | | | +---+migration_state | | | | +----------------+ | | | | | | +-----------+ +----------------+ | | +--+file_y|<----+---+migration_attr | | | +-----------+ | +----------------+ | | +---+migration_data | | | | +----------------+<---------------+ | +---+migration_debug | | | +----------------+ | | +----------------+ | +---+migration_state +-----------------------+ +----------------+ 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. debugfs will create a public root directory "vfio" file. then create a device named file for each live migration device. First, create a unified state acquisition file of "migration_state" in this device directory. Then, create your own debugging files independently according to the functional requirements of each device. Here, HiSilicon accelerator creates three debug files: migration_attr: used to obtain the attribute parameters of the current live migration device. migration_data: used to get the live migration data of the current live migration device. migration_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 | 82 +++++++++++++++++++++++++++++++++++++ drivers/vfio/vfio_main.c | 5 +++ include/linux/vfio.h | 8 ++++ 5 files changed, 110 insertions(+), 1 deletion(-) 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 +=3D vfio_main.o \ vfio-$(CONFIG_IOMMUFD) +=3D iommufd.o vfio-$(CONFIG_VFIO_CONTAINER) +=3D container.o vfio-$(CONFIG_VFIO_VIRQFD) +=3D virqfd.o - +vfio-$(CONFIG_DEBUG_FS) +=3D vfio_debugfs.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) +=3D vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) +=3D vfio_iommu_spapr_tce.o obj-$(CONFIG_VFIO_PCI) +=3D pci/ diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h index e9721d8424bc..66c00f97e9cc 100644 --- a/drivers/vfio/vfio.h +++ b/drivers/vfio/vfio.h @@ -258,4 +258,18 @@ static inline void vfio_device_put_kvm(struct vfio_dev= ice *device) } #endif =20 +#ifdef CONFIG_DEBUG_FS +void vfio_debugfs_create_root(void); +void vfio_debugfs_remove_root(void); + +void vfio_vf_debugfs_init(struct vfio_device *vdev); +void vfio_vf_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_vf_debugfs_init(struct vfio_device *vdev) { } +static inline void vfio_vf_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..c5df1496fe0e --- /dev/null +++ b/drivers/vfio/vfio_debugfs.c @@ -0,0 +1,82 @@ +// 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_vf_state_read(struct seq_file *seq, void *data) +{ + struct device *vf_dev =3D seq->private; + struct vfio_device *vdev =3D container_of(vf_dev, struct vfio_device, dev= ice); + enum vfio_device_mig_state state; + int ret; + + ret =3D vdev->mig_ops->migration_get_state(vdev, &state); + if (ret) { + dev_err(vf_dev, "failed to get device migration state"); + 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_vf_debugfs_init(struct vfio_device *vdev) +{ + struct device *dev =3D &vdev->device; + + vdev->debug_root =3D debugfs_create_dir(dev_name(vdev->dev), vfio_debugfs= _root); + + debugfs_create_devm_seqfile(dev, "migration_state", vdev->debug_root, + vfio_vf_state_read); +} +EXPORT_SYMBOL_GPL(vfio_vf_debugfs_init); + +void vfio_vf_debugfs_exit(struct vfio_device *vdev) +{ + debugfs_remove_recursive(vdev->debug_root); +} +EXPORT_SYMBOL_GPL(vfio_vf_debugfs_exit); + +void vfio_debugfs_create_root(void) +{ + vfio_debugfs_root =3D debugfs_create_dir("vfio", NULL); +} +EXPORT_SYMBOL_GPL(vfio_debugfs_create_root); + +void vfio_debugfs_remove_root(void) +{ + debugfs_remove_recursive(vfio_debugfs_root); + vfio_debugfs_root =3D NULL; +} +EXPORT_SYMBOL_GPL(vfio_debugfs_remove_root); + diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index 3a597e799918..09772fd3a396 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -1408,6 +1408,9 @@ static int __init vfio_init(void) } =20 pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); + + vfio_debugfs_create_root(); + return 0; =20 err_dev_class: @@ -1425,6 +1428,8 @@ static void __exit vfio_cleanup(void) vfio_virqfd_exit(); vfio_group_cleanup(); xa_destroy(&vfio_device_set_xa); + + vfio_debugfs_remove_root(); } =20 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 }; =20 /** --=20 2.24.0 From nobody Thu Sep 11 17:11:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D542C05027 for ; Fri, 17 Feb 2023 08:50:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229724AbjBQIub (ORCPT ); Fri, 17 Feb 2023 03:50:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbjBQIu3 (ORCPT ); Fri, 17 Feb 2023 03:50:29 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9E1360A6E for ; Fri, 17 Feb 2023 00:50:02 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PJ56b1MVcz16Nm7; Fri, 17 Feb 2023 16:47:35 +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.17; Fri, 17 Feb 2023 16:49:44 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v8 2/5] hisi_acc_vfio_pci: extract public functions for container_of Date: Fri, 17 Feb 2023 16:48:28 +0800 Message-ID: <20230217084831.35783-3-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230217084831.35783-1-liulongfang@huawei.com> References: <20230217084831.35783-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the current driver, vdev is obtained from struct hisi_acc_vf_core_device through the container_of function. This method is used in many places in the driver. In order to reduce this repetitive operation, I extracted a public function to replace it. Signed-off-by: Longfang Liu Reviewed-by: Jason Gunthorpe --- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/= pci/hisilicon/hisi_acc_vfio_pci.c index a117eaf21c14..a1589947e721 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -630,6 +630,12 @@ static void hisi_acc_vf_disable_fds(struct hisi_acc_vf= _core_device *hisi_acc_vde } } =20 +static struct hisi_acc_vf_core_device *hisi_acc_get_vf_dev(struct vfio_dev= ice *vdev) +{ + return container_of(vdev, struct hisi_acc_vf_core_device, + core_device.vdev); +} + /* * This function is called in all state_mutex unlock cases to * handle a 'deferred_reset' if exists. @@ -1042,8 +1048,7 @@ static struct file * hisi_acc_vfio_pci_set_device_state(struct vfio_device *vdev, enum vfio_device_mig_state new_state) { - struct hisi_acc_vf_core_device *hisi_acc_vdev =3D container_of(vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); enum vfio_device_mig_state next_state; struct file *res =3D NULL; int ret; @@ -1084,8 +1089,7 @@ static int hisi_acc_vfio_pci_get_device_state(struct vfio_device *vdev, enum vfio_device_mig_state *curr_state) { - struct hisi_acc_vf_core_device *hisi_acc_vdev =3D container_of(vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); =20 mutex_lock(&hisi_acc_vdev->state_mutex); *curr_state =3D hisi_acc_vdev->mig_state; @@ -1301,8 +1305,7 @@ static long hisi_acc_vfio_pci_ioctl(struct vfio_devic= e *core_vdev, unsigned int =20 static int hisi_acc_vfio_pci_open_device(struct vfio_device *core_vdev) { - struct hisi_acc_vf_core_device *hisi_acc_vdev =3D container_of(core_vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(cor= e_vdev); struct vfio_pci_core_device *vdev =3D &hisi_acc_vdev->core_device; int ret; =20 @@ -1325,8 +1328,7 @@ static int hisi_acc_vfio_pci_open_device(struct vfio_= device *core_vdev) =20 static void hisi_acc_vfio_pci_close_device(struct vfio_device *core_vdev) { - struct hisi_acc_vf_core_device *hisi_acc_vdev =3D container_of(core_vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(cor= e_vdev); struct hisi_qm *vf_qm =3D &hisi_acc_vdev->vf_qm; =20 iounmap(vf_qm->io_base); @@ -1341,8 +1343,7 @@ static const struct vfio_migration_ops hisi_acc_vfio_= pci_migrn_state_ops =3D { =20 static int hisi_acc_vfio_pci_migrn_init_dev(struct vfio_device *core_vdev) { - struct hisi_acc_vf_core_device *hisi_acc_vdev =3D container_of(core_vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(cor= e_vdev); struct pci_dev *pdev =3D to_pci_dev(core_vdev->dev); struct hisi_qm *pf_qm =3D hisi_acc_get_pf_qm(pdev); =20 --=20 2.24.0 From nobody Thu Sep 11 17:11:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64E7AC636D4 for ; Fri, 17 Feb 2023 08:51:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229551AbjBQIu6 (ORCPT ); Fri, 17 Feb 2023 03:50:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229681AbjBQIu4 (ORCPT ); Fri, 17 Feb 2023 03:50:56 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 572EC60F91 for ; Fri, 17 Feb 2023 00:50:36 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PJ57w3zmVzGpkH; Fri, 17 Feb 2023 16:48:44 +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.17; Fri, 17 Feb 2023 16:50:15 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v8 3/5] hisi_acc_vfio_pci: register debugfs for hisilicon migration driver Date: Fri, 17 Feb 2023 16:48:29 +0800 Message-ID: <20230217084831.35783-4-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230217084831.35783-1-liulongfang@huawei.com> References: <20230217084831.35783-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" On the debugfs framework of VFIO, if the CONFIG_DEBUG_FS macro is enabled, the debug function is registered for the live migration driver of the HiSilicon accelerator device. On the basis of the original public debug function, a private debug function is added: mig_data file: used to get the migration data of the live migration device mig_attr file: used to get device attributes of the live migration device debug file: used to test for acquiring and writing device state data for VF device. Signed-off-by: Longfang Liu --- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 282 ++++++++++++++++++ .../vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 11 + 2 files changed, 293 insertions(+) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/= pci/hisilicon/hisi_acc_vfio_pci.c index a1589947e721..a0ecb1cd5707 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -15,6 +15,7 @@ #include =20 #include "hisi_acc_vfio_pci.h" +#include "../../vfio.h" =20 /* Return 0 on VM acc device ready, -ETIMEDOUT hardware timeout */ static int qm_wait_dev_not_ready(struct hisi_qm *qm) @@ -606,6 +607,18 @@ hisi_acc_check_int_state(struct hisi_acc_vf_core_devic= e *hisi_acc_vdev) } } =20 +static void hisi_acc_vf_migf_save(struct hisi_acc_vf_migration_file *src_m= igf, + struct hisi_acc_vf_migration_file *dst_migf) +{ + if (!dst_migf) + return; + + dst_migf->disabled =3D false; + dst_migf->total_length =3D src_migf->total_length; + memcpy(&dst_migf->vf_data, &src_migf->vf_data, + sizeof(struct acc_vf_data)); +} + static void hisi_acc_vf_disable_fd(struct hisi_acc_vf_migration_file *migf) { mutex_lock(&migf->lock); @@ -618,12 +631,16 @@ static void hisi_acc_vf_disable_fd(struct hisi_acc_vf= _migration_file *migf) static void hisi_acc_vf_disable_fds(struct hisi_acc_vf_core_device *hisi_a= cc_vdev) { if (hisi_acc_vdev->resuming_migf) { + hisi_acc_vf_migf_save(hisi_acc_vdev->resuming_migf, + hisi_acc_vdev->debug_migf); hisi_acc_vf_disable_fd(hisi_acc_vdev->resuming_migf); fput(hisi_acc_vdev->resuming_migf->filp); hisi_acc_vdev->resuming_migf =3D NULL; } =20 if (hisi_acc_vdev->saving_migf) { + hisi_acc_vf_migf_save(hisi_acc_vdev->saving_migf, + hisi_acc_vdev->debug_migf); hisi_acc_vf_disable_fd(hisi_acc_vdev->saving_migf); fput(hisi_acc_vdev->saving_migf->filp); hisi_acc_vdev->saving_migf =3D NULL; @@ -1303,6 +1320,265 @@ static long hisi_acc_vfio_pci_ioctl(struct vfio_dev= ice *core_vdev, unsigned int return vfio_pci_core_ioctl(core_vdev, cmd, arg); } =20 +static int hisi_acc_vf_debug_io(struct vfio_device *vdev) +{ + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); + struct hisi_qm *vf_qm =3D &hisi_acc_vdev->vf_qm; + struct device *dev =3D vdev->dev; + u64 data; + int ret; + + ret =3D qm_wait_dev_not_ready(vf_qm); + if (ret) + dev_err(dev, "VF device not ready!\n"); + + data =3D readl(vf_qm->io_base + QM_MB_CMD_SEND_BASE); + dev_info(dev, "debug mailbox val: 0x%llx\n", data); + + return ret; +} + +static int hisi_acc_vf_debug_resume(struct vfio_device *vdev) +{ + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); + struct hisi_acc_vf_migration_file *migf =3D hisi_acc_vdev->debug_migf; + struct device *dev =3D vdev->dev; + int ret; + + ret =3D vf_qm_state_save(hisi_acc_vdev, migf); + if (ret) { + dev_err(dev, "failed to save device data!\n"); + return -EINVAL; + } + + ret =3D vf_qm_check_match(hisi_acc_vdev, migf); + if (ret) { + dev_err(dev, "failed to match the VF!\n"); + return -EINVAL; + } + + ret =3D vf_qm_load_data(hisi_acc_vdev, migf); + if (ret) { + dev_err(dev, "failed to recover the VF!\n"); + return -EINVAL; + } + + vf_qm_fun_reset(&hisi_acc_vdev->vf_qm); + dev_info(dev, "successful to resume device data!\n"); + + return 0; +} + +static int hisi_acc_vf_debug_save(struct vfio_device *vdev) +{ + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); + struct hisi_acc_vf_migration_file *migf =3D hisi_acc_vdev->debug_migf; + struct device *dev =3D vdev->dev; + int ret; + + ret =3D vf_qm_state_save(hisi_acc_vdev, migf); + if (ret) { + dev_err(dev, "failed to save device data!\n"); + return -EINVAL; + } + dev_info(dev, "successful to save device data!\n"); + + return 0; +} + +static int +hisi_acc_vf_debug_operate(struct vfio_device *vdev, unsigned int cmd) +{ + int ret; + + switch (cmd) { + case STATE_SAVE: + ret =3D hisi_acc_vf_debug_save(vdev); + if (ret) + return ret; + break; + case STATE_RESUME: + ret =3D hisi_acc_vf_debug_resume(vdev); + if (ret) + return ret; + break; + case RW_IO_TEST: + ret =3D hisi_acc_vf_debug_io(vdev); + if (ret) + return ret; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int hisi_acc_vf_debug_check(struct vfio_device *vdev) +{ + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); + struct hisi_acc_vf_migration_file *migf =3D hisi_acc_vdev->debug_migf; + enum vfio_device_mig_state state; + + if (!vdev->mig_ops || !migf) { + dev_err(vdev->dev, "device not support debugfs!\n"); + return -EINVAL; + } + + /* If device not opened, the debugfs operation will trigger calltrace */ + (void)vdev->mig_ops->migration_get_state(vdev, &state); + if (state =3D=3D VFIO_DEVICE_STATE_ERROR || + state =3D=3D VFIO_DEVICE_STATE_STOP) { + dev_err(vdev->dev, "device not opened!\n"); + return -EINVAL; + } + + return 0; +} + +static ssize_t hisi_acc_vf_debug_write(struct file *filp, const char __use= r *buffer, + size_t count, loff_t *pos) +{ + struct vfio_device *vdev =3D filp->private_data; + char tbuf[VFIO_DEV_DBG_LEN]; + unsigned long cmd; + int len, ret; + + if (*pos) + return 0; + + if (count >=3D VFIO_DEV_DBG_LEN) + return -ENOSPC; + + ret =3D hisi_acc_vf_debug_check(vdev); + if (ret) + return -EINVAL; + + len =3D simple_write_to_buffer(tbuf, VFIO_DEV_DBG_LEN - 1, + pos, buffer, count); + if (len < 0 || len > VFIO_DEV_DBG_LEN - 1) + return -EINVAL; + tbuf[len] =3D '\0'; + if (kstrtoul(tbuf, 0, &cmd)) + return -EFAULT; + + ret =3D hisi_acc_vf_debug_operate(vdev, cmd); + if (ret) { + dev_err(vdev->dev, "device debug test failed!\n"); + return -EINVAL; + } + + return count; +} + +static const struct file_operations hisi_acc_vf_debug_fops =3D { + .owner =3D THIS_MODULE, + .open =3D simple_open, + .write =3D hisi_acc_vf_debug_write, +}; + +static void seq_print_hex_data(struct seq_file *seq, const void *buf, size= _t len) +{ +#define HEX_LINE_SIZE 131 +#define HEX_ROW_SIZE 16 + unsigned char linebuf[HEX_LINE_SIZE]; + int i, linelen, remaining =3D len; + const u8 *ptr =3D buf; + + for (i =3D 0; i < len; i +=3D HEX_ROW_SIZE) { + linelen =3D min(remaining, HEX_ROW_SIZE); + remaining -=3D HEX_ROW_SIZE; + + hex_dump_to_buffer(ptr + i, linelen, HEX_ROW_SIZE, 1, + linebuf, sizeof(linebuf), false); + + seq_printf(seq, "%s%.8x: %s\n", "Mig Data:", i, linebuf); + } +} + +static int hisi_acc_vf_data_read(struct seq_file *seq, void *data) +{ + struct device *vf_dev =3D seq->private; + struct vfio_pci_core_device *core_device =3D dev_get_drvdata(vf_dev); + struct vfio_device *vdev =3D &core_device->vdev; + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); + struct hisi_acc_vf_migration_file *debug_migf =3D hisi_acc_vdev->debug_mi= gf; + size_t vf_data_sz =3D offsetofend(struct acc_vf_data, padding); + + if (debug_migf && debug_migf->total_length) + seq_print_hex_data(seq, (unsigned char *)&debug_migf->vf_data, + vf_data_sz); + else + seq_printf(seq, "%s\n", "device not migrated!"); + + return 0; +} + +static int hisi_acc_vf_attr_read(struct seq_file *seq, void *data) +{ + struct device *vf_dev =3D seq->private; + struct vfio_pci_core_device *core_device =3D dev_get_drvdata(vf_dev); + struct vfio_device *vdev =3D &core_device->vdev; + struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(vde= v); + struct hisi_acc_vf_migration_file *debug_migf =3D hisi_acc_vdev->debug_mi= gf; + + if (debug_migf && debug_migf->total_length) { + seq_printf(seq, + "acc device:\n" + "device state: %d\n" + "device ready: %u\n" + "data valid: %d\n" + "data size: %lu\n", + hisi_acc_vdev->mig_state, + hisi_acc_vdev->vf_qm_state, + debug_migf->disabled, + debug_migf->total_length); + } else { + seq_printf(seq, "%s\n", "device not migrated!"); + } + + return 0; +} + +static int hisi_acc_vfio_debug_init(struct hisi_acc_vf_core_device *hisi_a= cc_vdev) +{ + struct vfio_device *vdev =3D &hisi_acc_vdev->core_device.vdev; + struct device *dev =3D vdev->dev; + void *migf =3D NULL; + + if (!debugfs_initialized()) + return 0; + + vfio_vf_debugfs_init(vdev); + + migf =3D kzalloc(sizeof(struct hisi_acc_vf_migration_file), GFP_KERNEL); + if (!migf) + return -ENOMEM; + + hisi_acc_vdev->debug_migf =3D migf; + + debugfs_create_devm_seqfile(dev, "migration_data", vdev->debug_root, + hisi_acc_vf_data_read); + debugfs_create_devm_seqfile(dev, "migration_attr", vdev->debug_root, + hisi_acc_vf_attr_read); + + debugfs_create_file("migration_debug", 0200, vdev->debug_root, + vdev, &hisi_acc_vf_debug_fops); + + return 0; +} + +static void hisi_acc_vf_debugfs_exit(struct hisi_acc_vf_core_device *hisi_= acc_vdev) +{ + struct vfio_device *vdev =3D &hisi_acc_vdev->core_device.vdev; + + if (!debugfs_initialized()) + return; + + vfio_vf_debugfs_exit(vdev); + kfree(hisi_acc_vdev->debug_migf); +} + static int hisi_acc_vfio_pci_open_device(struct vfio_device *core_vdev) { struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(cor= e_vdev); @@ -1416,6 +1692,9 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *pd= ev, const struct pci_device if (IS_ERR(hisi_acc_vdev)) return PTR_ERR(hisi_acc_vdev); =20 + if (ops =3D=3D &hisi_acc_vfio_pci_migrn_ops) + hisi_acc_vfio_debug_init(hisi_acc_vdev); + dev_set_drvdata(&pdev->dev, &hisi_acc_vdev->core_device); ret =3D vfio_pci_core_register_device(&hisi_acc_vdev->core_device); if (ret) @@ -1423,6 +1702,8 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *pd= ev, const struct pci_device return 0; =20 out_put_vdev: + if (ops =3D=3D &hisi_acc_vfio_pci_migrn_ops) + hisi_acc_vf_debugfs_exit(hisi_acc_vdev); vfio_put_device(&hisi_acc_vdev->core_device.vdev); return ret; } @@ -1431,6 +1712,7 @@ static void hisi_acc_vfio_pci_remove(struct pci_dev *= pdev) { struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_drvdata(pdev); =20 + hisi_acc_vf_debugfs_exit(hisi_acc_vdev); vfio_pci_core_unregister_device(&hisi_acc_vdev->core_device); vfio_put_device(&hisi_acc_vdev->core_device.vdev); } diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h b/drivers/vfio/= pci/hisilicon/hisi_acc_vfio_pci.h index dcabfeec6ca1..ef50b12f018d 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h @@ -49,6 +49,14 @@ #define QM_EQC_DW0 0X8000 #define QM_AEQC_DW0 0X8020 =20 +#define VFIO_DEV_DBG_LEN 256 + +enum mig_debug_cmd { + STATE_SAVE, + STATE_RESUME, + RW_IO_TEST, +}; + struct acc_vf_data { #define QM_MATCH_SIZE offsetofend(struct acc_vf_data, qm_rsv_state) /* QM match information */ @@ -113,5 +121,8 @@ struct hisi_acc_vf_core_device { spinlock_t reset_lock; struct hisi_acc_vf_migration_file *resuming_migf; struct hisi_acc_vf_migration_file *saving_migf; + + /* For debugfs */ + struct hisi_acc_vf_migration_file *debug_migf; }; #endif /* HISI_ACC_VFIO_PCI_H */ --=20 2.24.0 From nobody Thu Sep 11 17:11:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE755C05027 for ; Fri, 17 Feb 2023 08:51:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbjBQIvX (ORCPT ); Fri, 17 Feb 2023 03:51:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229936AbjBQIvN (ORCPT ); Fri, 17 Feb 2023 03:51:13 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 221195FBF6 for ; Fri, 17 Feb 2023 00:50:48 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PJ57W3zYMz16NlJ; Fri, 17 Feb 2023 16:48:23 +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.17; Fri, 17 Feb 2023 16:50:46 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v8 4/5] Documentation: add debugfs description for vfio Date: Fri, 17 Feb 2023 16:48:30 +0800 Message-ID: <20230217084831.35783-5-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230217084831.35783-1-liulongfang@huawei.com> References: <20230217084831.35783-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add two debugfs document description file to help users understand how to use the accelerator live migration driver's debugfs. Signed-off-by: Longfang Liu --- .../ABI/testing/debugfs-hisi-migration | 28 +++++++++++++++++++ Documentation/ABI/testing/debugfs-vfio | 17 +++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Documentation/ABI/testing/debugfs-hisi-migration create mode 100644 Documentation/ABI/testing/debugfs-vfio diff --git a/Documentation/ABI/testing/debugfs-hisi-migration b/Documentati= on/ABI/testing/debugfs-hisi-migration new file mode 100644 index 000000000000..0f45f30ff6d4 --- /dev/null +++ b/Documentation/ABI/testing/debugfs-hisi-migration @@ -0,0 +1,28 @@ +What: /sys/kernel/debug/vfio//migration_data +Date: Feb 2023 +KernelVersion: 6.2 +Contact: linux-kernel@vger.kernel.org +Description: Read the live migration data of the vfio device. + The output format of the data is defined by the live + migration driver. + +What: /sys/kernel/debug/vfio//migration_attr +Date: Feb 2023 +KernelVersion: 6.2 +Contact: linux-kernel@vger.kernel.org +Description: Read the live migration attributes of the vfio device. + The output format of the attributes is defined by the live + migration driver. + +What: /sys/kernel/debug/vfio//migration_debug +Date: Feb 2023 +KernelVersion: 6.2 +Contact: linux-kernel@vger.kernel.org +Description: This debug file supports "echo" command write operations. + The command is actually represented by an integer number, and the + specific meaning is defined by the corresponding device driver. + For example, three commands are defined in the HiSilicon accelerator + live migration driver: + 0: State save + 1: State resume + 2: IO test diff --git a/Documentation/ABI/testing/debugfs-vfio b/Documentation/ABI/tes= ting/debugfs-vfio new file mode 100644 index 000000000000..e22531d16674 --- /dev/null +++ b/Documentation/ABI/testing/debugfs-vfio @@ -0,0 +1,17 @@ +What: /sys/kernel/debug/vfio +Date: Feb 2023 +KernelVersion: 6.2 +Contact: linux-kernel@vger.kernel.org +Description: This debugfs file directory is used for debugging + of vfio devices that support live migration. + Each device that supports live migration can create a device + subdirectory under this directory by referencing the public + registration interface. + +What: /sys/kernel/debug/vfio//migration_state +Date: Feb 2023 +KernelVersion: 6.2 +Contact: linux-kernel@vger.kernel.org +Description: Read the live migration status of the vfio device. + The status of these live migrations includes: + ERROR, RUNNING, STOP, STOP_COPY, RESUMING. --=20 2.24.0 From nobody Thu Sep 11 17:11:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33298C636D4 for ; Fri, 17 Feb 2023 08:51:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbjBQIvk (ORCPT ); Fri, 17 Feb 2023 03:51:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbjBQIvi (ORCPT ); Fri, 17 Feb 2023 03:51:38 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74CC560FA6 for ; Fri, 17 Feb 2023 00:51:19 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PJ55M377mzDsTG; Fri, 17 Feb 2023 16:46:31 +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.17; Fri, 17 Feb 2023 16:51:17 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v8 5/5] vfio: update live migration device status Date: Fri, 17 Feb 2023 16:48:31 +0800 Message-ID: <20230217084831.35783-6-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230217084831.35783-1-liulongfang@huawei.com> References: <20230217084831.35783-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" migration debugfs needs to perform debug operations based on the status of the current device. If the device is not loaded or has stopped, debugfs does not allow operations. so, after the live migration function is executed and the device is turned off, the device no longer needs to be accessed. At this time, the status of the device needs to be set to stop. Signed-off-by: Longfang Liu --- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 3 +++ drivers/vfio/pci/mlx5/main.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/= pci/hisilicon/hisi_acc_vfio_pci.c index a0ecb1cd5707..ec73e8b19c89 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1607,6 +1607,9 @@ static void hisi_acc_vfio_pci_close_device(struct vfi= o_device *core_vdev) struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_get_vf_dev(cor= e_vdev); struct hisi_qm *vf_qm =3D &hisi_acc_vdev->vf_qm; =20 + if (core_vdev->mig_ops) + hisi_acc_vdev->mig_state =3D VFIO_DEVICE_STATE_STOP; + iounmap(vf_qm->io_base); vfio_pci_core_close_device(core_vdev); } diff --git a/drivers/vfio/pci/mlx5/main.c b/drivers/vfio/pci/mlx5/main.c index e897537a9e8a..dc3564436946 100644 --- a/drivers/vfio/pci/mlx5/main.c +++ b/drivers/vfio/pci/mlx5/main.c @@ -1269,6 +1269,9 @@ static void mlx5vf_pci_close_device(struct vfio_devic= e *core_vdev) struct mlx5vf_pci_core_device *mvdev =3D container_of( core_vdev, struct mlx5vf_pci_core_device, core_device.vdev); =20 + if (mvdev->migrate_cap) + mvdev->mig_state =3D VFIO_DEVICE_STATE_STOP; + mlx5vf_cmd_close_migratable(mvdev); vfio_pci_core_close_device(core_vdev); } --=20 2.24.0