From nobody Sun Feb 8 04:30:57 2026 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 8C184EB64D7 for ; Fri, 30 Jun 2023 09:27:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232823AbjF3J1Y (ORCPT ); Fri, 30 Jun 2023 05:27:24 -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: 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" 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 +=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 =20 obj-$(CONFIG_VFIO_IOMMU_TYPE1) +=3D vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) +=3D 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_dev= ice *device) } #endif =20 +#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 =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) + 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 =3D NULL; + struct device *dev =3D &vdev->device; + + vdev->debug_root =3D debugfs_create_dir(dev_name(vdev->dev), vfio_debugfs= _root); + vfio_dev_migration =3D 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 =3D debugfs_create_dir("vfio", NULL); +} + +void vfio_debugfs_remove_root(void) +{ + debugfs_remove_recursive(vfio_debugfs_root); + vfio_debugfs_root =3D 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 *devi= ce, =20 /* 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); =20 return 0; @@ -339,6 +340,8 @@ void vfio_unregister_group_dev(struct vfio_device *devi= ce) } } =20 + if (device->mig_ops) + vfio_device_debugfs_exit(device); vfio_device_group_unregister(device); =20 /* Balances device_add in register path */ @@ -1415,7 +1418,10 @@ static int __init vfio_init(void) goto err_dev_class; } =20 + + vfio_debugfs_create_root(); pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); + return 0; =20 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(); } =20 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 }; =20 /** --=20 2.24.0 From nobody Sun Feb 8 04:30:57 2026 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 211B9EB64D7 for ; Fri, 30 Jun 2023 09:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232812AbjF3J1u (ORCPT ); Fri, 30 Jun 2023 05:27:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231906AbjF3J1r (ORCPT ); Fri, 30 Jun 2023 05:27:47 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66EB919C for ; Fri, 30 Jun 2023 02:27:46 -0700 (PDT) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Qsqg468VrzLndN; Fri, 30 Jun 2023 17:25:36 +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:43 +0800 From: liulongfang To: , , , CC: , , , Subject: [PATCH v11 2/4] hisi_acc_vfio_pci: extract public functions for container_of Date: Fri, 30 Jun 2023 17:24:55 +0800 Message-ID: <20230630092457.54902-3-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: quoted-printable 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Longfang Liu 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 Sun Feb 8 04:30:57 2026 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 D5858EB64DA for ; Fri, 30 Jun 2023 09:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232571AbjF3J2Z (ORCPT ); Fri, 30 Jun 2023 05:28:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232841AbjF3J2U (ORCPT ); Fri, 30 Jun 2023 05:28:20 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24A0D3594 for ; Fri, 30 Jun 2023 02:28:17 -0700 (PDT) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Qsqjm1Zhhz1HCWy; Fri, 30 Jun 2023 17:27:56 +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:28:14 +0800 From: liulongfang To: , , , CC: , , , Subject: [PATCH v11 3/4] hisi_acc_vfio_pci: register debugfs for hisilicon migration driver Date: Fri, 30 Jun 2023 17:24:56 +0800 Message-ID: <20230630092457.54902-4-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: quoted-printable 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Longfang Liu 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. After registering the HiSilicon accelerator device on the debugfs framework of live migration of vfio, a directory file "hisi_acc" of debugfs is created, and then three debug function files are created in this directory: data file: used to get the migration data from the driver attr file: used to get device attributes parameters from the driver save file: used to read the data of the live migration device and save it to the driver. io_test: used to test IO read and write for the driver. Signed-off-by: Longfang Liu --- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 182 ++++++++++++++++++ .../vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 11 ++ 2 files changed, 193 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..a6f5e94bfaf2 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,164 @@ 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_check(struct seq_file *seq, struct vfio_devic= e *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; + + if (!vdev->mig_ops || !migf) { + seq_printf(seq, "%s\n", "device not support debugfs!"); + return -EINVAL; + } + + /* If device not opened, the debugfs operation will trigger calltrace */ + if (!vdev->open_count) { + seq_printf(seq, "%s\n", "device not opened!"); + return -EINVAL; + } + + return 0; +} + +static int hisi_acc_vf_debug_io(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_qm *vf_qm =3D &hisi_acc_vdev->vf_qm; + u64 value; + int ret; + + ret =3D hisi_acc_vf_debug_check(seq, vdev); + if (ret) + goto io_err; + + ret =3D qm_wait_dev_not_ready(vf_qm); + if (ret) { + seq_printf(seq, "%s\n", "VF device not ready!"); + goto io_err; + } + + value =3D readl(vf_qm->io_base + QM_MB_CMD_SEND_BASE); + seq_printf(seq, "%s:0x%llx\n", "debug mailbox val", value); + +io_err: + return 0; +} + +static int hisi_acc_vf_debug_save(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 *migf =3D hisi_acc_vdev->debug_migf; + int ret; + + ret =3D hisi_acc_vf_debug_check(seq, vdev); + if (ret) + goto save_err; + + ret =3D vf_qm_state_save(hisi_acc_vdev, migf); + if (ret) { + seq_printf(seq, "%s\n", "failed to save device data!"); + goto save_err; + } + seq_printf(seq, "%s\n", "successful to save device data!"); + +save_err: + return 0; +} + +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_hex_dump(seq, "Mig Data:", DUMP_PREFIX_OFFSET, 16, 1, + (unsigned char *)&debug_migf->vf_data, + vf_data_sz, false); + 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 dentry *vfio_dev_migration =3D NULL; + struct dentry *vfio_hisi_acc =3D NULL; + struct device *dev =3D vdev->dev; + void *migf =3D NULL; + + if (!debugfs_initialized()) + return 0; + + migf =3D kzalloc(sizeof(struct hisi_acc_vf_migration_file), GFP_KERNEL); + if (!migf) + return -ENOMEM; + hisi_acc_vdev->debug_migf =3D migf; + + vfio_dev_migration =3D debugfs_lookup("migration", vdev->debug_root); + if (!vfio_dev_migration) { + dev_err(dev, "failed to lookup migration debugfs file!\n"); + return -ENODEV; + } + + vfio_hisi_acc =3D debugfs_create_dir("hisi_acc", vfio_dev_migration); + debugfs_create_devm_seqfile(dev, "data", vfio_hisi_acc, + hisi_acc_vf_data_read); + debugfs_create_devm_seqfile(dev, "attr", vfio_hisi_acc, + hisi_acc_vf_attr_read); + debugfs_create_devm_seqfile(dev, "io_test", vfio_hisi_acc, + hisi_acc_vf_debug_io); + debugfs_create_devm_seqfile(dev, "save", vfio_hisi_acc, + hisi_acc_vf_debug_save); + + return 0; +} + +static void hisi_acc_vf_debugfs_exit(struct hisi_acc_vf_core_device *hisi_= acc_vdev) +{ + if (!debugfs_initialized()) + return; + + 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); @@ -1323,6 +1498,7 @@ static int hisi_acc_vfio_pci_open_device(struct vfio_= device *core_vdev) } =20 vfio_pci_core_finish_enable(vdev); + return 0; } =20 @@ -1420,9 +1596,14 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *p= dev, const struct pci_device ret =3D vfio_pci_core_register_device(&hisi_acc_vdev->core_device); if (ret) goto out_put_vdev; + + if (ops =3D=3D &hisi_acc_vfio_pci_migrn_ops) + hisi_acc_vfio_debug_init(hisi_acc_vdev); 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 +1612,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 Sun Feb 8 04:30:57 2026 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 DD247EB64DA for ; Fri, 30 Jun 2023 09:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229787AbjF3J24 (ORCPT ); Fri, 30 Jun 2023 05:28:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232559AbjF3J2t (ORCPT ); Fri, 30 Jun 2023 05:28:49 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F24C72D69 for ; Fri, 30 Jun 2023 02:28:47 -0700 (PDT) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QsqgW2dSbzcd4d; Fri, 30 Jun 2023 17:25:59 +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:28:45 +0800 From: liulongfang To: , , , CC: , , , Subject: [PATCH v11 4/4] Documentation: add debugfs description for vfio Date: Fri, 30 Jun 2023 17:24:57 +0800 Message-ID: <20230630092457.54902-5-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: 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" From: Longfang Liu 1.Add two debugfs document description file to help users understand how to use the accelerator live migration driver's debugfs. 2.Update the file paths that need to be maintained in MAINTAINERS Signed-off-by: Longfang Liu --- .../ABI/testing/debugfs-hisi-migration | 32 +++++++++++++++++++ Documentation/ABI/testing/debugfs-vfio | 25 +++++++++++++++ MAINTAINERS | 2 ++ 3 files changed, 59 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..0dfc7008a3e1 --- /dev/null +++ b/Documentation/ABI/testing/debugfs-hisi-migration @@ -0,0 +1,32 @@ +What: /sys/kernel/debug/vfio//migration/hisi_acc/data +Date: June 2023 +KernelVersion: 6.4 +Contact: Longfang Liu +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/hisi_acc/attr +Date: June 2023 +KernelVersion: 6.4 +Contact: Longfang Liu +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/hisi_acc/io_test +Date: June 2023 +KernelVersion: 6.4 +Contact: Longfang Liu +Description: Trigger the HiSilicon accelerator device to perform + the io test through the read operation, and directly output + the test result. + +What: /sys/kernel/debug/vfio//migration/hisi_acc/save +Date: June 2023 +KernelVersion: 6.4 +Contact: Longfang Liu +Description: Trigger the Hisilicon accelerator device to perform + the state saving operation of live migration through the read + operation, and directly output the operation result. + diff --git a/Documentation/ABI/testing/debugfs-vfio b/Documentation/ABI/tes= ting/debugfs-vfio new file mode 100644 index 000000000000..e2132a2f602b --- /dev/null +++ b/Documentation/ABI/testing/debugfs-vfio @@ -0,0 +1,25 @@ +What: /sys/kernel/debug/vfio +Date: June 2023 +KernelVersion: 6.4 +Contact: Longfang Liu +Description: This debugfs file directory is used for debugging + of vfio devices. + Each device can create a device subdirectory under this + directory by referencing the public registration interface. + +What: /sys/kernel/debug/vfio//migration +Date: June 2023 +KernelVersion: 6.4 +Contact: Longfang Liu +Description: This debugfs file directory is used for debugging + of vfio devices that support live migration. + The debugfs of each vfio device that supports live migration + could be created under this directory. + +What: /sys/kernel/debug/vfio//migration/state +Date: June 2023 +KernelVersion: 6.4 +Contact: Longfang Liu +Description: Read the live migration status of the vfio device. + The status of these live migrations includes: + ERROR, RUNNING, STOP, STOP_COPY, RESUMING. diff --git a/MAINTAINERS b/MAINTAINERS index ce6ac552d8f6..bdd6a5e7350f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22098,6 +22098,7 @@ L: kvm@vger.kernel.org S: Maintained T: git https://github.com/awilliam/linux-vfio.git F: Documentation/ABI/testing/sysfs-devices-vfio-dev +F: Documentation/ABI/testing/debugfs-vfio F: Documentation/driver-api/vfio.rst F: drivers/vfio/ F: include/linux/vfio.h @@ -22115,6 +22116,7 @@ M: Longfang Liu M: Shameer Kolothum L: kvm@vger.kernel.org S: Maintained +F: Documentation/ABI/testing/debugfs-hisi-migration F: drivers/vfio/pci/hisilicon/ =20 VFIO MEDIATED DEVICE DRIVERS --=20 2.24.0