From 6401b95d91100bce73604fe6fe938b7ea453cbe6 Mon Sep 17 00:00:00 2001 From: JiangShui Yang Date: Tue, 22 Jul 2025 20:52:26 +0800 Subject: [PATCH 1/2] Revert "migration: update status after RAS error" driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/ICO41B CVE: NA ---------------------------------------------------------------------- Due to an error in "migration: update status after RAS error" patch, it has been rolled back. This reverts commit ba3143ae58d7d6d22624570d5cd343a059b7b1ec. Signed-off-by: JiangShui Yang --- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c index 9d1c42466324..904fc5f84a78 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1183,7 +1183,8 @@ static void hisi_acc_vf_pci_aer_reset_done(struct pci_dev *pdev) { struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_drvdata(pdev); - if (hisi_acc_vdev->core_device.vdev.mig_ops) + if (hisi_acc_vdev->core_device.vdev.migration_flags != + VFIO_MIGRATION_STOP_COPY) return; mutex_lock(&hisi_acc_vdev->state_mutex); -- Gitee From dd86a2321b0d5b4adb28b85a56aa6489de811574 Mon Sep 17 00:00:00 2001 From: Longfang Liu Date: Thu, 5 Jun 2025 11:31:10 +0800 Subject: [PATCH 2/2] migration: update status after RAS error driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICO41B CVE: NA ---------------------------------------------------------------------- After a RSA error occurs on the accelerator device. the accelarater device will be reset. The live migration state will be abnormal after reset, and the original state needs to be restored during the reset process. Therefore, reset processing needs to be performed in a live migration scenario. Fixes: 7bb6f2d5b3a1 ("hisi_acc_vfio_pci: register debugfs for hisilicon migration driver") Signed-off-by: Longfang Liu Signed-off-by: JiangShui Yang --- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c index 904fc5f84a78..0030ab31ef15 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1183,8 +1183,7 @@ static void hisi_acc_vf_pci_aer_reset_done(struct pci_dev *pdev) { struct hisi_acc_vf_core_device *hisi_acc_vdev = hisi_acc_drvdata(pdev); - if (hisi_acc_vdev->core_device.vdev.migration_flags != - VFIO_MIGRATION_STOP_COPY) + if (!hisi_acc_vdev->core_device.vdev.mig_ops) return; mutex_lock(&hisi_acc_vdev->state_mutex); -- Gitee