From patchwork Sat Dec 17 06:32:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 34182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1380344wrn; Fri, 16 Dec 2022 22:36:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXt9GpTrWHLeQ+0RF6qvh/AYS0FvC7WY4s3XwkfcSGFuWdgD6be377vEXpp/61MAlzAEBnWZ X-Received: by 2002:a05:6402:5413:b0:461:524f:b20e with SMTP id ev19-20020a056402541300b00461524fb20emr13402287edb.11.1671258967414; Fri, 16 Dec 2022 22:36:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671258967; cv=none; d=google.com; s=arc-20160816; b=wTScfeLvom+y4RZcTbzyRG/PEpfobiRx2fEYSf6JPJFaPt+LPJb4p4594i9Yx+2r9z yndNTz6Tjs0HHMvTVunTJu1+wcSO6cj3Z1JuLf5F2cg77lc31n8kZnegJufaaS9VPAj8 MvWn0wWnjRWQv1ikQ04Xzd+rtv/UAlYGGTCfieaoJh9m8QefSpVKnFVHdlyKEqhbwK54 oUJQqszc3udbGif/SxpLtfOfMUjVzGTpyzXoug41Gxnd3Zbzk3GbdlYQGvJIpRlOcQW4 zwFX4VykovcbdRSg331rrD5dJm5jpxQFKNoQBPIlzg3IZ0wSAm6mPfACN/Ec/ylJvuOJ 090w== 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=wR5MSZk5gYkrM/Mss7EH2R3kmQSI/nT1Nv9mYptwvY4=; b=x8GQN6jqNKCGGS9xIk8bk32wqd1I0t1KAEtv7bVFIcTjK3qxriTeVjeR59XFD+Es0i EKWLYjI4xIn/6/iFtaPrC+VoOSvIc++eCfzZ7eMTEf9Z/bsPlGyLBv+n3k2bu5APyXq1 C2kG6NZAl8v+wqVp4zS5X/70ncqSB38JTUliApqo+L5dIcd9sSSfiGYs7fWaZIW+aa+k v2YFg/NtcIVQgFZi19NUSGGswL8WSYxJeQQCDMdzdrDt3xaej37NFgu/3dtsI1zacuhF 8XUrmoA5WKiagxUTKQJXUR8Hvd6AL+TpAF0WlI0oBJWCIJhrjDSWdmYuUj2kArp3Npxw fk7Q== 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 n2-20020aa7db42000000b0046721c5b7e0si3763861edt.511.2022.12.16.22.35.44; Fri, 16 Dec 2022 22:36:07 -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 S229925AbiLQGej (ORCPT + 99 others); Sat, 17 Dec 2022 01:34:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229789AbiLQGei (ORCPT ); Sat, 17 Dec 2022 01:34:38 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 963AC22528 for ; Fri, 16 Dec 2022 22:34:36 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NYx0k1c8yzqT9c; Sat, 17 Dec 2022 14:30:14 +0800 (CST) Received: from huawei.com (10.67.164.66) 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; Sat, 17 Dec 2022 14:34:34 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v5 1/5] vfio/migration: Add debugfs to live migration driver Date: Sat, 17 Dec 2022 14:32:44 +0800 Message-ID: <20221217063248.6735-2-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20221217063248.6735-1-liulongfang@huawei.com> References: <20221217063248.6735-1-liulongfang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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?1752442042770668068?= X-GMAIL-MSGID: =?utf-8?q?1752442042770668068?= 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 | +-------+--------+ +-------+--------+ 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 | 4 ++ drivers/vfio/pci/vfio_pci_core.c | 3 ++ drivers/vfio/pci/vfio_pci_debugfs.c | 76 +++++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci_debugfs.h | 30 ++++++++++++ include/linux/vfio.h | 6 +++ 5 files changed, 119 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..efe032623664 100644 --- a/drivers/vfio/pci/Makefile +++ b/drivers/vfio/pci/Makefile @@ -4,6 +4,10 @@ vfio-pci-core-y := vfio_pci_core.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_con vfio-pci-core-$(CONFIG_VFIO_PCI_ZDEV_KVM) += vfio_pci_zdev.o obj-$(CONFIG_VFIO_PCI_CORE) += vfio-pci-core.o +ifneq ($(CONFIG_DEBUG_FS),) + vfio-pci-core-y += vfio_pci_debugfs.o +endif + vfio-pci-y := vfio_pci.o vfio-pci-$(CONFIG_VFIO_PCI_IGD) += vfio_pci_igd.o obj-$(CONFIG_VFIO_PCI) += 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..33d663fb04f2 --- /dev/null +++ b/drivers/vfio/pci/vfio_pci_debugfs.c @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2022, 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; + + (void)vdev->mig_ops->migration_get_state(vdev, &state); + 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..8d1a4aef05db --- /dev/null +++ b/drivers/vfio/pci/vfio_pci_debugfs.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * vfio_pci_debugfs.h - VFIO migration debugfs interface + * + * Copyright (c) 2022, 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..7d6d02f165cf 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -54,6 +54,12 @@ struct vfio_device { struct completion comp; struct list_head group_next; struct list_head iommu_entry; + + /* + * debug_root is a static property of the vfio_device + * which must be set prior to registering the vfio_device. + */ + struct dentry *debug_root; }; /** From patchwork Sat Dec 17 06:32:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 34183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1380657wrn; Fri, 16 Dec 2022 22:37:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXv5zrXc5B/WejlbaZ45W4+KLI9kMnr6Io4hqpIL+6RAcLJ7Yd6h3tVjWVWn/MLslhBfk+hV X-Received: by 2002:a05:6402:1949:b0:475:32d2:74a6 with SMTP id f9-20020a056402194900b0047532d274a6mr8820760edz.11.1671259043188; Fri, 16 Dec 2022 22:37:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671259043; cv=none; d=google.com; s=arc-20160816; b=WP8EWfmJmIG8MlLMtAwzQh6VtKoZ4k1+1PU+KlkKJjnff1MaMZSMfZdF+3QtPW3Zo8 WDIHuJb6uP4L+ImrsR2e/URs8ylXkTuBV88V7K1qh3fdCjbMyoN4xtvS3BOgjO0snX/l qz4vPpeWmzuqc+JTeZvjdfFHNfn6iUUC+6NmTPFeKUKtAvfKijQd0rzdhwTZiyKny6Va p7Mfnb2UntpmzsH5ZE0GKrSrQu3WKYWyu7dF3l4sUOpTDe71AKoWNxoK9IwCeqdPGAkg TyoqJi1HYElUzuMFVcDLA4VYRTSqjVuhRfkJlZ7ZdTnqmxNftGHISDScxl0EMwKAALMT unWA== 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=B+vG1bcwkyWqbO8TFsiDEW6aYye4gaQSggRHEXyosi2HvD7RYaJ0/OJZ1GkL9wRjx2 35HqhCxHozh39+NJ856uKW9+aPPgtWQVuW5hdcvb2dr4cNvvKf1FpIc3WaxfPrbrsdud dU6oal7+kQzWqSjrS9ju8EU1XU/PZ2wZif/I1g3+dtDZsMhgjueWiMGsS719Mlt5D3xb 9TsO6o8u7qzNMRMMzlLUSls/yeb6H3z5GR0nN1eXUzoIBCkL92+Dh/Oka1L58hZzFISP VArm03z6ABcfu+DNIoXnNU8/6crXUhRhx+jzfs/J2YVNonDDhmR3dbaTYNqsPsjDprU2 l+mw== 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 dt19-20020a170907729300b007b284329e36si4950915ejc.131.2022.12.16.22.36.59; Fri, 16 Dec 2022 22:37:23 -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 S229954AbiLQGfL (ORCPT + 99 others); Sat, 17 Dec 2022 01:35:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbiLQGfJ (ORCPT ); Sat, 17 Dec 2022 01:35:09 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B926C240AA for ; Fri, 16 Dec 2022 22:35:07 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NYx243CKnzJpPs; Sat, 17 Dec 2022 14:31:24 +0800 (CST) Received: from huawei.com (10.67.164.66) 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; Sat, 17 Dec 2022 14:35:05 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v5 2/5] hisi_acc_vfio_pci: extract public functions for container_of Date: Sat, 17 Dec 2022 14:32:45 +0800 Message-ID: <20221217063248.6735-3-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20221217063248.6735-1-liulongfang@huawei.com> References: <20221217063248.6735-1-liulongfang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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?1752442122574763188?= X-GMAIL-MSGID: =?utf-8?q?1752442122574763188?= 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 Sat Dec 17 06:32:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 34184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1381699wrn; Fri, 16 Dec 2022 22:41:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf41lv+u/B4U6XYMyw9W+GpEYSTo1rDPEsADOiqClrT7SViv0Jb6px4WQT6Cy2PE0wqK5h9Z X-Received: by 2002:a17:906:8c9:b0:7c1:ad6:638a with SMTP id o9-20020a17090608c900b007c10ad6638amr36972989eje.17.1671259261545; Fri, 16 Dec 2022 22:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671259261; cv=none; d=google.com; s=arc-20160816; b=nuV5GN1hbWfNTJ5squnnHcW703sE4T0zjd4VdTZslheVyFR5oeAPAGPHMXVK4BJb+h 3s7WGkZoeM6UzQpOpvIPDpssTHJ4GHt3j8RFY08I3xeX4/UNr2Qkq/zUJE1JALqFizEU R0VJg+oKMVVKyXxfULPfnVfnB6lUfoQp2lIVEL+paJSHnK9iJ0CNULwIOMLV4JfIE8mJ Yt2q+qOaF+uxTcqH0sIX/wlQCIqG1H/Xrn6KKfZhhI5RsjTWOWmJrOqzoJnHkb1Iq4dk 7ABeODUJMbZdYcAxFYLkGSZGM59wV6A8mAFv7PDT8ICBUjCQk6rOBT70w3mMlqfoC2sH GrTw== 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=mstiPxJ4I3gJZiutfKFvytlL2Fwr20VFgx4WuhlXXUo=; b=faK3V4mJtIK3DdHISKue1cBae3c10Qs68i3xdmBfTDtbM7bx5Ew3U48bryyL/1z0pO 6ixQ63QNS+J7GRO6fcaX9pht1zrleX3wFmUmHTRc6XXGZBfDzmctPIxXkTyqhWqWgowo eM8FHF2HRy4DGOV66yQpkjJb4ubxiyx4ukF6kTkswtGkuK4nuhUieMiOn3CiKvEQwEb3 vwsbOg9dP4GNf1j5ooI+UrreAJ2VQ3Htc7euTONPsTV2Bwpxfs5Dv2yNvhJjTW00L+jp iHejnMvgEK952RuLuias1/cZaF4RiL8SEO3V48Ua9d2XhU7dz0gyrN3r8j1un7gTSJtG /7uA== 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 qf16-20020a1709077f1000b007e545980769si4141393ejc.738.2022.12.16.22.40.38; Fri, 16 Dec 2022 22:41: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 S229985AbiLQGfn (ORCPT + 99 others); Sat, 17 Dec 2022 01:35:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbiLQGfl (ORCPT ); Sat, 17 Dec 2022 01:35:41 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7932BD3 for ; Fri, 16 Dec 2022 22:35:38 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NYx5q5LcMzJqXm; Sat, 17 Dec 2022 14:34:39 +0800 (CST) Received: from huawei.com (10.67.164.66) 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; Sat, 17 Dec 2022 14:35:36 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v5 3/5] hisi_acc_vfio_pci: register debugfs for hisilicon migration driver Date: Sat, 17 Dec 2022 14:32:46 +0800 Message-ID: <20221217063248.6735-4-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20221217063248.6735-1-liulongfang@huawei.com> References: <20221217063248.6735-1-liulongfang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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?1752442351508533274?= X-GMAIL-MSGID: =?utf-8?q?1752442351508533274?= On the debugfs framework of VFIO, register the debug function 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 | 276 ++++++++++++++++++ .../vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 11 + 2 files changed, 287 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..186a44091b59 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,259 @@ 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; + + 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; + + 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 +1680,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 +1690,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 +1700,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 Sat Dec 17 06:32:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 34185 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1381832wrn; Fri, 16 Dec 2022 22:41:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf4/u6DY0ovd1c8TFv0vOTXfbs8cS4jHyzb68/2hT58WINT4ILF9XS6nB2hPtDcUNaI07HOY X-Received: by 2002:a17:906:710:b0:7c0:f462:575a with SMTP id y16-20020a170906071000b007c0f462575amr28233150ejb.29.1671259286931; Fri, 16 Dec 2022 22:41:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671259286; cv=none; d=google.com; s=arc-20160816; b=w3xldnw/EIRJurJlDdlG6z+ak4RbKcdyCZaedb8SeagMrPxKAJFaLnRdlCTG/7Ow42 nqLq8efKeaJRj6BPLHBU5l3w5kqFsVGU2/ARODAHUqMKbMvdDGyV95t//BLyOlnzpoGU BQeuJbX5dC4JHeZXpqIOiqy1RZ1Dqucduz5LvC7T1EnFT9ayI3o8w6eSQx5k4lyWeKFg aRkCDLk+KmEYwCtn/PiEjNIZIX7l/aneQsK5+7BTjPT6DzhiJX/YydNe9igVFHPQV+1e RfZdCXPLKvI1zZJNr9cIqCRJn6vqg7OPFXgD7LPp9XMPqnCKHvGqgdKzyLOVUQVjb5+2 l/vQ== 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=vT7BMWVDvF3UW8kvYu0VifrvHV7czuxU1P4z+0blQv4=; b=W5K6wvc72jP/yDcCZ5Y4KOCXGUi7hX/h9jDxJbbnyNvqgbMUTozSORsJ+/wikfvCSQ 78kfDSSq3aCwCv0UoCNYirB3NoB7YUfNRHy1C3YCDsrhklfkCmPTuf06bJatfPR0eDKC B7SHs5s0rSnKOvkdEWiuoW3BgP7L1nanL7oHYAbvMaSRW2ged68SCDy4MKhNCf1MT9zV MhBUp27n/yNbEmjK9Q5WDsfoSgHo4WZ3vWZ8NOcfsZOgr25CKaZBAdzE0uRNYgplGawq qTe36qbU1XweanTCTv3X/SxODe8559lryDI4NfldybzprKLYTVLT3jk9OEhS62waeXxc K92A== 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 sa25-20020a1709076d1900b007f46a3735c4si1787907ejc.555.2022.12.16.22.41.04; Fri, 16 Dec 2022 22:41: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 S229789AbiLQGgM (ORCPT + 99 others); Sat, 17 Dec 2022 01:36:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbiLQGgJ (ORCPT ); Sat, 17 Dec 2022 01:36:09 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1127215F33 for ; Fri, 16 Dec 2022 22:36:09 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NYx3G2QqYzJpNl; Sat, 17 Dec 2022 14:32:26 +0800 (CST) Received: from huawei.com (10.67.164.66) 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; Sat, 17 Dec 2022 14:36:07 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v5 4/5] Documentation: add debugfs description for hisi_acc_vfio_pci Date: Sat, 17 Dec 2022 14:32:47 +0800 Message-ID: <20221217063248.6735-5-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20221217063248.6735-1-liulongfang@huawei.com> References: <20221217063248.6735-1-liulongfang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] 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?1752442377760393399?= X-GMAIL-MSGID: =?utf-8?q?1752442377760393399?= 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..a8cfc7688b88 --- /dev/null +++ b/Documentation/ABI/testing/debugfs-hisi-migration @@ -0,0 +1,32 @@ +What: /sys/kernel/debug/vfio_mig//state +Date: Nov 2022 +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: Nov 2022 +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: Nov 2022 +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: Nov 2022 +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 Sat Dec 17 06:32:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 34186 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1381863wrn; Fri, 16 Dec 2022 22:41:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf4T6yHiOCrXMNA+OfeV7DqvnMIC0zmBePZCCxha7zGcZRldOrE87hFFvB1zPOwawzTknERa X-Received: by 2002:a05:6402:289c:b0:461:bf47:ba43 with SMTP id eg28-20020a056402289c00b00461bf47ba43mr42173008edb.28.1671259296099; Fri, 16 Dec 2022 22:41:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671259296; cv=none; d=google.com; s=arc-20160816; b=dfUL4nFsHv8qrc75DcjbddaCNGVdKHh+pwl4jRF0CnbY0qX8n9AcuJklsWK5UPZUq8 +BF+N8fg7QMxwgIhRrzlMvDf3qTSOLavEO4bTkzybB7ZeNg/yN8RAYWrGI0vTKxj663d FgQtOekaXzz4GGD7m0pK95Y5kRQwVskouTBV2OJVrD0SBenr56dTeWLtz7vwBSD4pon0 T5luyViQiy2deff4+aZUWu0Z11nXlPnU/pg11yU4fZW7xJBmxK8kGfN3bcoUgA5pGAw6 6RB8kX5dpK/4dXgQknPiwD9qilQQSgvn9CvapXAIbrKKvE5llSQ7jignO/KV/eTthi5F vK+A== 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=vNzonrBiwU3485oLWwcjMKrgUz+dGa4tYf++AQE5SMg=; b=Kr+naM2poXIvAF8vV9nE7cuKrxwGHsxN76AWtGS7IFabFrzuQGB/M61M/VGjxtJ3SW KnItOiXRRvB5KuBrWHnkP/chiJqj+GKv+kY7ZqnHBCRgt2U6roqH7IE/sSZAS1lzk718 Qc2BW7VJ2uUJuvXqgSY0fDBL8Z4B/iLiUhMUBGNTUUmK7TScicwCtsWsNqdNfUdDyH8u K/+paMdoHsEM3cXWPi/ua2M1AvwkXqktqCQSTrDBi2v0I+6AImPh/SYh7d85sfpnWY6i sBS6KBvLzQwWdiDLRuOZs+3KsGCCqCBy6Db2u0ePJHqR/kRdJrZTYiA9VdH95lyA13yD xacQ== 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 gs7-20020a1709072d0700b007bbf9652314si4783998ejc.435.2022.12.16.22.41.13; Fri, 16 Dec 2022 22:41:36 -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 S230038AbiLQGgq (ORCPT + 99 others); Sat, 17 Dec 2022 01:36:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbiLQGgl (ORCPT ); Sat, 17 Dec 2022 01:36:41 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EE2413CDA for ; Fri, 16 Dec 2022 22:36:40 -0800 (PST) Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NYx714MFPzJqTd; Sat, 17 Dec 2022 14:35:41 +0800 (CST) Received: from huawei.com (10.67.164.66) 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; Sat, 17 Dec 2022 14:36:38 +0800 From: Longfang Liu To: , , , CC: , , , Subject: [PATCH v5 5/5] vfio: update live migration device status Date: Sat, 17 Dec 2022 14:32:48 +0800 Message-ID: <20221217063248.6735-6-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20221217063248.6735-1-liulongfang@huawei.com> References: <20221217063248.6735-1-liulongfang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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?1752442387506279730?= X-GMAIL-MSGID: =?utf-8?q?1752442387506279730?= 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 186a44091b59..3e58d635afb6 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1601,6 +1601,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); }