Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp2058377rwb; Thu, 19 Jan 2023 20:18:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXuQKpPLA0o21OZ3u32riEt2OYtpxSNeKFqN4S0sf/Jx2kkn+uAkK25A1WP5QOCJiicilhFg X-Received: by 2002:a05:6402:14d0:b0:498:1995:ac54 with SMTP id f16-20020a05640214d000b004981995ac54mr12464230edx.40.1674188322200; Thu, 19 Jan 2023 20:18:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674188322; cv=none; d=google.com; s=arc-20160816; b=BSSuvenWRyCjM5QZpL/t/hjKImVhUISARWEpsVMNaK+bPhYeiI99G8nurMnGNSEo9O ktB7VR0NVlSXheSR4z32Ji43FVdcXSwO68fgl0Uid3HBuvSWJfhSGRA1tGoXO73PTVZd xn0ayo4qvHGYmD8tKdt99HYrqqRBgli9w23tK3bckXSle9YcJ9sGj9llEk3UdAo9wTt6 BRdWjVkeZieNW/MIj+mtSsFOmrPsLiDLlHXv/nsj3UB69M0v9AV0XObic2VogL12e0+C M1V2L62uxMmNr3RNraL8YI94GhDtSRZ9W6I8Yj/8Rjo7rLrnWs0R3BgJrUh84yidzYKq Pw6Q== 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=S0CubqX+xGNEzOWimuozEiu1YljqmpDGa4Nk+CS9cA8=; b=Qa8slCfD9NVTWGJfv5F8PlpmBAzXpr5RAwuUUkChgA6SW631GmSFfjbitAUPYw5n1z Da0CTFDsCYjVfzwfh0e4boLReFnyOZXmGvMNfxw46Jg/IPVys52qllesQPbQTT07Q40+ CZMZjnnxnL4Vv6xKE+paaqmUIPiOL5bAWo2VxJqHEVx5ZhKfGAFBAP5AiEjI9mQHlEhZ g1Wb730EnUcLNf0s3xrDjh1zOKqUY4dPFJHdR36PbPHb6zWanQb9at7aS5jW6qfno0IP JbN9OX/7mwozvOmeLM3iZRG6mZkoerFC4QG+BE8JXQVhEpf4wXpXZ0Gg9ASHNZ0Xw8e5 XuNQ== 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 i20-20020a0564020f1400b0049d699c63ccsi20626598eda.82.2023.01.19.20.18.30; Thu, 19 Jan 2023 20:18:42 -0800 (PST) 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 S229740AbjATDbD (ORCPT + 48 others); Thu, 19 Jan 2023 22:31:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229772AbjATDar (ORCPT ); Thu, 19 Jan 2023 22:30:47 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ED34A5CC2 for ; Thu, 19 Jan 2023 19:30:38 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NylN61tRMzJrW1; Fri, 20 Jan 2023 11:29:10 +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.2375.34; Fri, 20 Jan 2023 11:30:35 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v7 1/5] vfio/migration: Add debugfs to live migration driver Date: Fri, 20 Jan 2023 11:29:26 +0800 Message-ID: <20230120032930.43608-2-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20230120032930.43608-1-liulongfang@huawei.com> References: <20230120032930.43608-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=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 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 VF | | dst VF | +-+------+ +-+------+ | ^ | ^ v | v | +-------+-+------+ +-------+-+------+ |Debugfs|state | |Debugfs|state | +-------+--------+ +-------+--------+ | debug_root | | debug_root | +-------+--------+ +-------+--------+ 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_pci_debugfs.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_mig" file. then create a "debug_root" file for each live migration VF device. state file: used to get the status of the live migration device. debug_root: used to create your own custom debug files for live migration device drivers. 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/pci/Makefile | 1 + drivers/vfio/pci/vfio_pci_core.c | 3 ++ drivers/vfio/pci/vfio_pci_debugfs.c | 80 +++++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci_debugfs.h | 28 ++++++++++ include/linux/vfio.h | 8 +++ 5 files changed, 120 insertions(+) create mode 100644 drivers/vfio/pci/vfio_pci_debugfs.c create mode 100644 drivers/vfio/pci/vfio_pci_debugfs.h diff --git a/drivers/vfio/pci/Makefile b/drivers/vfio/pci/Makefile index 24c524224da5..75fe37e72e8d 100644 --- a/drivers/vfio/pci/Makefile +++ b/drivers/vfio/pci/Makefile @@ -2,6 +2,7 @@ vfio-pci-core-y := vfio_pci_core.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o vfio-pci-core-$(CONFIG_VFIO_PCI_ZDEV_KVM) += vfio_pci_zdev.o +vfio-pci-core-$(CONFIG_DEBUG_FS) += vfio_pci_debugfs.o obj-$(CONFIG_VFIO_PCI_CORE) += vfio-pci-core.o vfio-pci-y := vfio_pci.o diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index f9365a5bc961..e85df2deb8e6 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -31,6 +31,7 @@ #include #endif +#include "vfio_pci_debugfs.h" #include "vfio_pci_priv.h" #define DRIVER_AUTHOR "Alex Williamson " @@ -2555,11 +2556,13 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_set_params); static void vfio_pci_core_cleanup(void) { + vfio_pci_debugfs_remove_root(); vfio_pci_uninit_perm_bits(); } static int __init vfio_pci_core_init(void) { + vfio_pci_debugfs_create_root(); /* Allocate shared config space permission data used by all devices */ return vfio_pci_init_perm_bits(); } diff --git a/drivers/vfio/pci/vfio_pci_debugfs.c b/drivers/vfio/pci/vfio_pci_debugfs.c new file mode 100644 index 000000000000..0bcf0bf034e5 --- /dev/null +++ b/drivers/vfio/pci/vfio_pci_debugfs.c @@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2023, HiSilicon Ltd. + */ + +#include +#include + +#include "vfio_pci_debugfs.h" + +static struct dentry *vfio_pci_debugfs_root; + +static int vfio_pci_vf_state_read(struct seq_file *seq, void *data) +{ + struct device *vf_dev = seq->private; + struct vfio_pci_core_device *core_device = dev_get_drvdata(vf_dev); + struct vfio_device *vdev = &core_device->vdev; + 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_pci_vf_debugfs_init(struct vfio_device *vdev) +{ + struct device *dev = vdev->dev; + + vdev->debug_root = debugfs_create_dir(dev_name(dev), vfio_pci_debugfs_root); + + debugfs_create_devm_seqfile(dev, "state", vdev->debug_root, + vfio_pci_vf_state_read); +} +EXPORT_SYMBOL_GPL(vfio_pci_vf_debugfs_init); + +void vfio_pci_vf_debugfs_exit(struct vfio_device *vdev) +{ + debugfs_remove_recursive(vdev->debug_root); +} +EXPORT_SYMBOL_GPL(vfio_pci_vf_debugfs_exit); + +void vfio_pci_debugfs_create_root(void) +{ + vfio_pci_debugfs_root = debugfs_create_dir("vfio_mig", NULL); +} +EXPORT_SYMBOL_GPL(vfio_pci_debugfs_create_root); + +void vfio_pci_debugfs_remove_root(void) +{ + debugfs_remove_recursive(vfio_pci_debugfs_root); + vfio_pci_debugfs_root = NULL; +} +EXPORT_SYMBOL_GPL(vfio_pci_debugfs_remove_root); + diff --git a/drivers/vfio/pci/vfio_pci_debugfs.h b/drivers/vfio/pci/vfio_pci_debugfs.h new file mode 100644 index 000000000000..beaaa709725e --- /dev/null +++ b/drivers/vfio/pci/vfio_pci_debugfs.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * vfio_pci_debugfs.h - VFIO migration debugfs interface + * + * Copyright (c) 2023, HiSilicon Ltd. + * + * Author: Longfang Liu + */ + +#ifndef __VFIO_PCI_DEBUGFS_H +#define __VFIO_PCI_DEBUGFS_H + +#include +#include + +#ifdef CONFIG_DEBUG_FS +void vfio_pci_debugfs_create_root(void); +void vfio_pci_debugfs_remove_root(void); +void vfio_pci_vf_debugfs_init(struct vfio_device *vdev); +void vfio_pci_vf_debugfs_exit(struct vfio_device *vdev); +#else +static inline void vfio_pci_debugfs_create_root(void) {} +static inline void vfio_pci_debugfs_remove_root(void) {} +static inline void vfio_pci_vf_debugfs_init(struct vfio_device *vdev) {} +static inline void vfio_pci_vf_debugfs_exit(struct vfio_device *vdev) {} +#endif /* CONFIG_DEBUG_FS */ + +#endif /* __VFIO_PCI_DEBUGFS_H */ diff --git a/include/linux/vfio.h b/include/linux/vfio.h index b4d5d4ca3d7d..b4bc8dfe8413 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -54,6 +54,14 @@ struct vfio_device { struct completion comp; struct list_head group_next; struct list_head iommu_entry; + +#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