From patchwork Fri Jan 20 03:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 46121 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp681886wrn; Thu, 19 Jan 2023 19:40:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXv9JgeFHeWc6o/t6IRe5MCLDuHP6wMaT5KC+XVcyLA1kAXAO1Uoa9YbfcwLr5C08IVX/pqD X-Received: by 2002:a17:902:834c:b0:194:bea4:57d2 with SMTP id z12-20020a170902834c00b00194bea457d2mr7652617pln.46.1674186022231; Thu, 19 Jan 2023 19:40:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674186022; cv=none; d=google.com; s=arc-20160816; b=qzb/T3hq0OjqiKFoWrPaGIfXGcFjRU0iPNvoSw38JbnSoVf3EjdqeTXlGK63mgn0ZK Hq4yw7JPoaSAebXcWCxbB4a75U8jbzIqceRj2rV2VToQbwGXkmScMMaM+PWe7Al1X5sf BcjBxDtXfJmokbovmyuNOy7sl90p6ZtaZ34lfnTjTlbk6VFVHx5pfaThS+DCgvNm9dSO Ba8zQ8vUinY9cwYIloLNiF00yhtyNolhSLOR6NWVOYqNyP4eWkmffxtQKUgtwgMm6XTD FHK9o1IPPWi3ClUbs1i40BezQp7xGMPpz2hO8hOHCKiI/OSPzObM3z+/ObmEhICGXNVG fjIA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l13-20020a170903120d00b001944983f4e2si31682095plh.491.2023.01.19.19.40.09; Thu, 19 Jan 2023 19:40:22 -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 + 99 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755511282123240055?= X-GMAIL-MSGID: =?utf-8?q?1755511282123240055?= 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 }; /** From patchwork Fri Jan 20 03:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 46124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp684793wrn; Thu, 19 Jan 2023 19:50:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXupaSIPG1/WjnnTs1BrHzLW9K47cbVf7hM9ynAtlgKHWnJwJI+juIiMWLHYUXKHVrbMtsre X-Received: by 2002:a17:907:2bdd:b0:857:b916:94c2 with SMTP id gv29-20020a1709072bdd00b00857b91694c2mr8851134ejc.35.1674186626402; Thu, 19 Jan 2023 19:50:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674186626; cv=none; d=google.com; s=arc-20160816; b=u/jNpta5iUOixJQIlSxQoIEzbwqq9ikFnPnOWWhMMubl3M/QJILQBu6kfjHMKGQP4Y rOozI9iX2bnH9ztqi0Nhu7n5hjhCg2HkrdMJ79f/2WBdJLX1UWUu7ECu2tz+nE/PUsRd 2ZHqw+0MCy+cob9NVZBGjRx6PaVuQy7pJDCHrjxHs9DHg49NR/BcGqOFqAATzDR7VJiI hyU0jlcehSvJNe9UrL1uDK22sOIrDYwuIc8RrWAoJKj2Ny3h7OkBsJACBW77kb4I1ivF yRsOJL72SCpY9odmgS4+L7KuKKbElr6RDsFkb6iEiu1AcjKOU5jwoDgdBOmrdjzZr9C5 3Icw== 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=aZEe5aVazb/rF+fJuIVMBbWiiVB11cOKc/FM8rxt+As=; b=Bd6S94o01aSRq87lEWg7+MPdqumwLjcVZRWceLhtpos/QHior3RFa72ExPIsKlFQVg wWNVPbf6omIhphDDCsqZgjnA/lSyanczAeipSqXkPfvNFDiGo32vpJ/7yn075TvrGXii e4WuHCuCpwzD2f98jjj/mJXm01/iuwFXM3/3prtdgNl4CTbS7rX/tW2bUE4qoYZl8o5s KKZdpVtOI3z4s9/ccLEoOjTt/KkSqOtpptPJmHjbSCcgSYLU+OicpkgOA4gtlLJrqZV5 S14FIb/2UnR7S3pVmQ9XTRlyhAP4v5H92MaXQpiPkDEnKCVK4RvH3g0lqBFV7GYYtR/B QiXg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hv13-20020a17090760cd00b007ad8bd5b636si44941157ejc.377.2023.01.19.19.50.02; Thu, 19 Jan 2023 19:50:26 -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 S229908AbjATDb3 (ORCPT + 99 others); Thu, 19 Jan 2023 22:31:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229701AbjATDbK (ORCPT ); Thu, 19 Jan 2023 22:31:10 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59FB2B1EE5 for ; Thu, 19 Jan 2023 19:31:08 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NylKP6LGtzJqB0; Fri, 20 Jan 2023 11:26:49 +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:31:06 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v7 2/5] hisi_acc_vfio_pci: extract public functions for container_of Date: Fri, 20 Jan 2023 11:29:27 +0800 Message-ID: <20230120032930.43608-3-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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755511916063664735?= X-GMAIL-MSGID: =?utf-8?q?1755511916063664735?= 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 --- .../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 51941bb4f31f..6a219b01c965 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 } } +static struct hisi_acc_vf_core_device *hisi_acc_get_vf_dev(struct vfio_device *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 = container_of(vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(vdev); enum vfio_device_mig_state next_state; struct file *res = 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 = container_of(vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(vdev); mutex_lock(&hisi_acc_vdev->state_mutex); *curr_state = hisi_acc_vdev->mig_state; @@ -1301,8 +1305,7 @@ static long hisi_acc_vfio_pci_ioctl(struct vfio_device *core_vdev, unsigned int static int hisi_acc_vfio_pci_open_device(struct vfio_device *core_vdev) { - struct hisi_acc_vf_core_device *hisi_acc_vdev = container_of(core_vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(core_vdev); struct vfio_pci_core_device *vdev = &hisi_acc_vdev->core_device; int ret; @@ -1325,8 +1328,7 @@ static int hisi_acc_vfio_pci_open_device(struct vfio_device *core_vdev) static void hisi_acc_vfio_pci_close_device(struct vfio_device *core_vdev) { - struct hisi_acc_vf_core_device *hisi_acc_vdev = container_of(core_vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(core_vdev); struct hisi_qm *vf_qm = &hisi_acc_vdev->vf_qm; iounmap(vf_qm->io_base); @@ -1341,8 +1343,7 @@ static const struct vfio_migration_ops hisi_acc_vfio_pci_migrn_state_ops = { static int hisi_acc_vfio_pci_migrn_init_dev(struct vfio_device *core_vdev) { - struct hisi_acc_vf_core_device *hisi_acc_vdev = container_of(core_vdev, - struct hisi_acc_vf_core_device, core_device.vdev); + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(core_vdev); struct pci_dev *pdev = to_pci_dev(core_vdev->dev); struct hisi_qm *pf_qm = hisi_acc_get_pf_qm(pdev); From patchwork Fri Jan 20 03:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 46123 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp684344wrn; Thu, 19 Jan 2023 19:49:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXthPr7pIykTiUonvabh8RdnNGuVXW+ObKcbYivmTcx9fTcxrwlPUCjdDhISJ77Tu6z1JMt1 X-Received: by 2002:a17:906:a07:b0:877:9b75:2e56 with SMTP id w7-20020a1709060a0700b008779b752e56mr854414ejf.73.1674186541224; Thu, 19 Jan 2023 19:49:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674186541; cv=none; d=google.com; s=arc-20160816; b=ZIovW509nAx9ST7a8+ECHumTIqa7BaMwJy+RBkW9jRTRh6wQQJLZHRMy+XfnJSgUjA UucF0uhQwKK0IooWS1z+AqnCnzM6MQBuPEQ6JBMXKiu4lsAkaa7bub8+JVNT0tMDgPlZ y1G2qmszJFjWYZYn8qX8T7JVeQgT+GS39t2ik1Hx55gfuGV6++Vpy83/gOFz2SCvjaM9 HALCfqgSvxwGDRmTBh+AA576l7r1jDxEWZ+zBc2q21887/tVUbdPNaS5I+7dmrQA+TIU 8AhWnDiyVqr2GzrDePQXba9gZjLpeQRW3NljdXGiCSu9OvWUKtrpe6q4jJvKPoPt3ilS +mPQ== 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=IOuV8IRyGbr1yzygsChE1YoLDCcYTRTyt4N738lLykA=; b=ocuZ2pX9xEWzpYrg/0U+5fN2U43kKKFBs/K+EXHz1jrtYK9wztMmTX7YlZ+caHcUiw Wv9vEV8N1G6C/mrDQoUvo6CSbNODbMC5E/3XbjnYesOITeCNUscBqVtOk5aOc9ogL9/v JuoXh2ciZVwxbxDUMl7GAgHh0mh6Vau3xdVeMgx76HnXZSCEXLa9XmhvZCJqXBTP/DOF LiV8Qy1pzmTNXB6KdeHE/drwAXIMB4rWsGGdwyHfcJW8Ihj7vmNx9iLAt4HDScpf9OrJ Tqre5xHwCUbM9RimvSw9mDs1K1Ft0cBG/uKMurogeF+K/cJPoRzEOkg9rcsy3JB1qVQT 125Q== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg11-20020a170907a40b00b007c0b03b23b5si2958393ejc.542.2023.01.19.19.48.37; Thu, 19 Jan 2023 19:49:01 -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 S229776AbjATDcF (ORCPT + 99 others); Thu, 19 Jan 2023 22:32:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229883AbjATDbp (ORCPT ); Thu, 19 Jan 2023 22:31:45 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 164E8B279C for ; Thu, 19 Jan 2023 19:31:39 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NylNv1QcVz16NHy; Fri, 20 Jan 2023 11:29:51 +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:31:36 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v7 3/5] hisi_acc_vfio_pci: register debugfs for hisilicon migration driver Date: Fri, 20 Jan 2023 11:29:28 +0800 Message-ID: <20230120032930.43608-4-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 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755511826959047948?= X-GMAIL-MSGID: =?utf-8?q?1755511826959047948?= 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 6a219b01c965..96e2a021a956 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 #include "hisi_acc_vfio_pci.h" +#include "../vfio_pci_debugfs.h" /* 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_device *hisi_acc_vdev) } } +static void hisi_acc_vf_migf_save(struct hisi_acc_vf_migration_file *src_migf, + struct hisi_acc_vf_migration_file *dst_migf) +{ + if (!dst_migf) + return; + + dst_migf->disabled = false; + dst_migf->total_length = 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_acc_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 = NULL; } 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 = NULL; @@ -1303,6 +1320,265 @@ static long hisi_acc_vfio_pci_ioctl(struct vfio_device *core_vdev, unsigned int return vfio_pci_core_ioctl(core_vdev, cmd, arg); } +static int hisi_acc_vf_debug_io(struct vfio_device *vdev) +{ + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(vdev); + struct hisi_qm *vf_qm = &hisi_acc_vdev->vf_qm; + struct device *dev = vdev->dev; + u64 data; + int ret; + + ret = qm_wait_dev_not_ready(vf_qm); + if (ret) + dev_err(dev, "VF device not ready!\n"); + + data = 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 = hisi_acc_get_vf_dev(vdev); + struct hisi_acc_vf_migration_file *migf = hisi_acc_vdev->debug_migf; + struct device *dev = vdev->dev; + int ret; + + ret = vf_qm_state_save(hisi_acc_vdev, migf); + if (ret) { + dev_err(dev, "failed to save device data!\n"); + return -EINVAL; + } + + ret = vf_qm_check_match(hisi_acc_vdev, migf); + if (ret) { + dev_err(dev, "failed to match the VF!\n"); + return -EINVAL; + } + + ret = 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 = hisi_acc_get_vf_dev(vdev); + struct hisi_acc_vf_migration_file *migf = hisi_acc_vdev->debug_migf; + struct device *dev = vdev->dev; + int ret; + + ret = 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 = hisi_acc_vf_debug_save(vdev); + if (ret) + return ret; + break; + case STATE_RESUME: + ret = hisi_acc_vf_debug_resume(vdev); + if (ret) + return ret; + break; + case RW_IO_TEST: + ret = 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 = hisi_acc_get_vf_dev(vdev); + struct hisi_acc_vf_migration_file *migf = 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 == VFIO_DEVICE_STATE_ERROR || + state == 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 __user *buffer, + size_t count, loff_t *pos) +{ + struct vfio_device *vdev = filp->private_data; + char tbuf[VFIO_DEV_DBG_LEN]; + unsigned long cmd; + int len, ret; + + if (*pos) + return 0; + + if (count >= VFIO_DEV_DBG_LEN) + return -ENOSPC; + + ret = hisi_acc_vf_debug_check(vdev); + if (ret) + return -EINVAL; + + len = 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] = '\0'; + if (kstrtoul(tbuf, 0, &cmd)) + return -EFAULT; + + ret = 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 = { + .owner = THIS_MODULE, + .open = simple_open, + .write = 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 = len; + const u8 *ptr = buf; + + for (i = 0; i < len; i += HEX_ROW_SIZE) { + linelen = min(remaining, HEX_ROW_SIZE); + remaining -= 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 = seq->private; + struct vfio_pci_core_device *core_device = dev_get_drvdata(vf_dev); + struct vfio_device *vdev = &core_device->vdev; + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(vdev); + struct hisi_acc_vf_migration_file *debug_migf = hisi_acc_vdev->debug_migf; + size_t vf_data_sz = 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 = seq->private; + struct vfio_pci_core_device *core_device = dev_get_drvdata(vf_dev); + struct vfio_device *vdev = &core_device->vdev; + struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(vdev); + struct hisi_acc_vf_migration_file *debug_migf = hisi_acc_vdev->debug_migf; + + 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_acc_vdev) +{ + struct vfio_device *vdev = &hisi_acc_vdev->core_device.vdev; + struct device *dev = vdev->dev; + void *migf = NULL; + + if (!debugfs_initialized()) + return 0; + + vfio_pci_vf_debugfs_init(vdev); + + migf = kzalloc(sizeof(struct hisi_acc_vf_migration_file), GFP_KERNEL); + if (!migf) + return -ENOMEM; + + hisi_acc_vdev->debug_migf = migf; + + debugfs_create_devm_seqfile(dev, "mig_data", vdev->debug_root, + hisi_acc_vf_data_read); + debugfs_create_devm_seqfile(dev, "mig_attr", vdev->debug_root, + hisi_acc_vf_attr_read); + + debugfs_create_file("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 = &hisi_acc_vdev->core_device.vdev; + + if (!debugfs_initialized()) + return; + + kfree(hisi_acc_vdev->debug_migf); + vfio_pci_vf_debugfs_exit(vdev); +} + static int hisi_acc_vfio_pci_open_device(struct vfio_device *core_vdev) { struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(core_vdev); @@ -1410,6 +1686,9 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *pdev, const struct pci_device if (IS_ERR(hisi_acc_vdev)) return PTR_ERR(hisi_acc_vdev); + if (ops == &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 = vfio_pci_core_register_device(&hisi_acc_vdev->core_device); if (ret) @@ -1417,6 +1696,8 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *pdev, const struct pci_device return 0; out_put_vdev: + if (ops == &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; } @@ -1425,6 +1706,7 @@ static void hisi_acc_vfio_pci_remove(struct pci_dev *pdev) { struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_drvdata(pdev); + 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 +#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 */ From patchwork Fri Jan 20 03:29:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 46125 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp5103wrn; Thu, 19 Jan 2023 20:22:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXth38vgG+fSF3+ldUl3AX3PuDB6GG7/cAXW89r9QC3PcSDkGT1JxmsqSHVrJWnyHE4fYiro X-Received: by 2002:a17:906:c18f:b0:7f7:a4ed:f2d4 with SMTP id g15-20020a170906c18f00b007f7a4edf2d4mr27100821ejz.77.1674188532306; Thu, 19 Jan 2023 20:22:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674188532; cv=none; d=google.com; s=arc-20160816; b=okpVXtETwaXpEiEE0/rm0ZgxvPDveUXTPiByvmKT07XA6OYCdYhH7rNYpYnCt6D+EE rng+CVJ++aOquePuvwJ43ddVaD4MvX6DMKEon2EOjrSCOKeOD8mA5TFrYWBl6O29xtIl /vYNYEQIvgKLc56TZ+O3nZ2jb7iIcCKtz89taYH+r7y2331AfJ1kaqDpc3gwCotKgBbA wAEI3nTyZz0bHJfz1/QmVaJavrTKyHwqBeJW0gM2E+KKmHMIblSiiZy8BRggDhJtVruY pv1U1y247jmi8cKXpf9wuxdq499WhyRmiz0C1feI8U70LYPwCYVIfyy6xYf4oz9Vx1L7 OBXw== 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=f0bRXZm6kCtS4yja2bvTWGi6fgxN9C8T88ZOoPQitQ4=; b=eL214vJgycjh2E8ciSEydKunwT1ya0kAPycT//STbPQ9/7RzmKOfOKAuNRRkqd1szC YemTJAQbUaE9bNg6kqSug81Mk+pxRjIzCSEmpB/9zhk3zReCa+MkwY9ELD0wwfaSXFGe QAhntHs2/YjqrljEMLfASPEZBQWoyXgtYMsU2nYcSWxtjvKhEl1oiU0tkwTlaJAFG7NK K3sV6pcmxHrwSRdsvpJbSnvCbduHhonu9KLoLh+HEBnbwaTDzV1xuoUbLf6yr56O1npp EG0oSg9c/1qQjzGpX7mzQvS0WOCDGKoC+7cR59S7HJG+CqrnJl8ygEz8aq7ERqrNxKPc NTZQ== 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 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.21.47; Thu, 19 Jan 2023 20:22:12 -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 S229552AbjATDcY (ORCPT + 99 others); Thu, 19 Jan 2023 22:32:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229885AbjATDcK (ORCPT ); Thu, 19 Jan 2023 22:32:10 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9603B1EFA for ; Thu, 19 Jan 2023 19:32:09 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NylPV0G1cz16NHQ; Fri, 20 Jan 2023 11:30:22 +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:32:07 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v7 4/5] Documentation: add debugfs description for hisi_acc_vfio_pci Date: Fri, 20 Jan 2023 11:29:29 +0800 Message-ID: <20230120032930.43608-5-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 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755513914681075206?= X-GMAIL-MSGID: =?utf-8?q?1755513914681075206?= Add a 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 | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/ABI/testing/debugfs-hisi-migration diff --git a/Documentation/ABI/testing/debugfs-hisi-migration b/Documentation/ABI/testing/debugfs-hisi-migration new file mode 100644 index 000000000000..d644a497c464 --- /dev/null +++ b/Documentation/ABI/testing/debugfs-hisi-migration @@ -0,0 +1,32 @@ +What: /sys/kernel/debug/vfio_mig//state +Date: Jan 2023 +Contact: linux-kernel@vger.kernel.org +Description: Read the live migration status of the VF device. + The status of these live migrations includes: + ERROR, RUNNING, STOP, STOP_COPY, RESUMING. + +What: /sys/kernel/debug/vfio_mig//mig_data +Date: Jan 2023 +Contact: linux-kernel@vger.kernel.org +Description: Read the live migration data of the VF device. + The output format of the data is defined by the live + migration driver. + +What: /sys/kernel/debug/vfio_mig//mig_attr +Date: Jan 2023 +Contact: linux-kernel@vger.kernel.org +Description: Read the live migration attributes of the VF device. + The output format of the attributes is defined by the live + migration driver. + +What: /sys/kernel/debug/vfio_mig//debug +Date: Jan 2023 +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 From patchwork Fri Jan 20 03:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 46122 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp682901wrn; Thu, 19 Jan 2023 19:43:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXuLbaVQsCZvIOxuwDPk2Z66GSEj6deCWelT/FaoD0qigY1NpuURoMYzWpxqcmyGQDoKa3WE X-Received: by 2002:a17:907:8b08:b0:838:9b81:1c98 with SMTP id sz8-20020a1709078b0800b008389b811c98mr14253540ejc.1.1674186231833; Thu, 19 Jan 2023 19:43:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674186231; cv=none; d=google.com; s=arc-20160816; b=Du8G4+nDvs3DqMFbpLZosmIC2qB6X5PpyZfVM1mYtTh6RCniRBGUXMTnHpbuZIgCtH 1+xEcPruCoFCRWeaplEBY1HXmii+nBrc7eXECfuRKZn+/4CW/WtlzMzZthIjI1wmFHSr 1feIqKWsJ+Wgj1K4DHPZmxyPiCZvhdkFmjJWTEcuXjuufVcyql+B+Rv1wRUHXZCacsN5 3UsyCesnwkxq8f881YycEQrX4SOcP42+uVpGd+UMMrS7QED6JZ/CcDnVTjcYnvxZMq5v fm4LQODKODTwuBKh2hB3FAKF3KxfGxklZKrEVzylYVuv1uWGUAyUAmeyjCxgRlvuNR5h Vueg== 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=Rci57Gg0p1JdApb4Av93rRyNilKtwTn9bNzoT5akDxs=; b=Ptrg+SsG241ehHQy6uBGwi2mSpBRQCynwRnMvdETZbjI20vhAzmiACeQTlMvzvBhVX 8UrU/AVEGnhY3wtkPbUKVNRF/6+DL8+1b7IHuJoEryrd6e7Dkjjd7xS3VFM9ydpNdJWF Whqqq4YgTTdkfwznsOWUN/ZT0Iz96yC2IWvsvA4eUBubZ+b6sHR9AxE3lYkF9ghaVRAr deKvazxy7zejCg4IC+20td84QJMgXvUwmTQYKHEvMvoscHWWbQV0DHnYcCxdzbBn3Ig1 z0U+4ao9sACI/H/C0oGpuP29lPL3PUgfmAS5YOjfYIhr5cskun//Q1C08emTZZSNPt15 yHCw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xd9-20020a170907078900b007c16107b16bsi31752865ejb.432.2023.01.19.19.43.28; Thu, 19 Jan 2023 19:43:51 -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 S229771AbjATDcs (ORCPT + 99 others); Thu, 19 Jan 2023 22:32:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229631AbjATDco (ORCPT ); Thu, 19 Jan 2023 22:32:44 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 445D2917EC for ; Thu, 19 Jan 2023 19:32:41 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NylLR1QSYzqV9H; Fri, 20 Jan 2023 11:27:43 +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:32:38 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v7 5/5] vfio: update live migration device status Date: Fri, 20 Jan 2023 11:29:30 +0800 Message-ID: <20230120032930.43608-6-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 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755511502686262254?= X-GMAIL-MSGID: =?utf-8?q?1755511502686262254?= 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 96e2a021a956..bdb9043f88f1 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 vfio_device *core_vdev) struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_get_vf_dev(core_vdev); struct hisi_qm *vf_qm = &hisi_acc_vdev->vf_qm; + if (core_vdev->mig_ops) + hisi_acc_vdev->mig_state = 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 031ac8cc215d..64b2fe58355a 100644 --- a/drivers/vfio/pci/mlx5/main.c +++ b/drivers/vfio/pci/mlx5/main.c @@ -1092,6 +1092,9 @@ static void mlx5vf_pci_close_device(struct vfio_device *core_vdev) struct mlx5vf_pci_core_device *mvdev = container_of( core_vdev, struct mlx5vf_pci_core_device, core_device.vdev); + if (mvdev->migrate_cap) + mvdev->mig_state = VFIO_DEVICE_STATE_STOP; + mlx5vf_cmd_close_migratable(mvdev); vfio_pci_core_close_device(core_vdev); }