From nobody Sat Sep 26 19:35:05 2026 Received: from canpmsgout02.his.huawei.com (canpmsgout02.his.huawei.com [113.46.200.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 387F831194C; Mon, 31 Aug 2026 09:10:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.217 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788167430; cv=none; b=XJ7xk+VY7qWk+igHS2alLg31BB47uMPUF+L8WYbtMQ4iUazuHcj/c+qbY/u2GqJpd3/VAwvoDXmuV/FdNbco+hjFCYJqkZtHGlJ7J+BiNFTjj0rYFi95pqn5SBgqvLe744IdJw9ztx9j+Z6cxduOg8xNOfDj9eejmYL5INoQkf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788167430; c=relaxed/simple; bh=IARrRNNyiTAKoF6wwICzbs9Wa28MtqXKIxPUJZ1ERvk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VKGehUoBKqk1V+0slYcFCecMgUAIlERXCALIeM6jxIecCO2+KiAp5jUShxlaBlOxzA3s2ICnwRU/q5WwnbipJD8nUPv/gpGlClR6V5qNuH2BorcM0CV6I9Ywcklc+LZBOvkem3F5LvyF7Z/uf/Dl2ClqxViemHQqtFq7MMhyk+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=fID65l5t; arc=none smtp.client-ip=113.46.200.217 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="fID65l5t" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=LYTsOMWil8VNbH9yTrDfh9/73Sw9jTDzZkwHDpz4ui4=; b=fID65l5tZ8Qh3HVzMbR/8vat7qoT2rQwOF4Dd2QvL9C47nAqf+QMzb2kDhJeSzlmCKYYUQsJ7 yVGXKNQktB+6fwBN7Aqp5RtvLJePXDbqPVRgkKOWoW+J4SKzBqzQYb0YkGvh/m/Qp9REymJj34O XxiIEQwjBTueeuXXv8pvfRE= Received: from mail.maildlp.com (unknown [172.19.163.0]) by canpmsgout02.his.huawei.com (SkyGuard) with ESMTPS id 4hYNGk1w36zcb4j; Mon, 31 Aug 2026 16:59:42 +0800 (CST) Received: from dggpemf500015.china.huawei.com (unknown [7.185.36.143]) by mail.maildlp.com (Postfix) with ESMTPS id 42A0B40561; Mon, 31 Aug 2026 17:10:24 +0800 (CST) Received: from huawei.com (10.50.163.32) by dggpemf500015.china.huawei.com (7.185.36.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 31 Aug 2026 17:10:23 +0800 From: Longfang Liu To: , CC: , , Subject: [PATCH v3 1/3] hisi_acc_vfio_pci: fix live migration enable conditions for PF passthrough Date: Mon, 31 Aug 2026 17:09:49 +0800 Message-ID: <20260831090951.844569-2-liulongfang@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831090951.844569-1-liulongfang@huawei.com> References: <20260831090951.844569-1-liulongfang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100001.china.huawei.com (7.221.188.238) To dggpemf500015.china.huawei.com (7.185.36.143) Content-Type: text/plain; charset="utf-8" When a PF device is bound to the live migration driver in passthrough mode, it cannot support live migration functionality, and key pointers will remain uninitialized. Although most migration functions within the driver are unreachable, low-level error handling callbacks may be triggered directly, causing a crash due to null pointer dereference. The fix involves adding validity checks at three entry points: device probe, error handling, and migration initialization. If the pointer is invalid, the operation is exited or rejected directly to avoid crashes, while redundant internal checks are removed. Fixes: b0eed085903e ("hisi_acc_vfio_pci: Add support for VFIO live migratio= n") Signed-off-by: Longfang Liu --- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/= pci/hisilicon/hisi_acc_vfio_pci.c index 86362ec424a5..e95d0ab0f11a 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1154,9 +1154,14 @@ static void hisi_acc_vf_pci_reset_prepare(struct pci= _dev *pdev) { struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_drvdata(pdev); struct hisi_qm *qm =3D hisi_acc_vdev->pf_qm; - struct device *dev =3D &qm->pdev->dev; + struct device *dev =3D &pdev->dev; u32 delay =3D 0; =20 + if (!qm || !qm->io_base) { + dev_err(dev, "PF QM not available for reset\n"); + return; + } + /* All reset requests need to be queued for processing */ while (test_and_set_bit(QM_RESETTING, &qm->misc_ctl)) { msleep(1); @@ -1174,8 +1179,12 @@ static void hisi_acc_vf_pci_aer_reset_done(struct pc= i_dev *pdev) struct hisi_acc_vf_core_device *hisi_acc_vdev =3D hisi_acc_drvdata(pdev); struct hisi_qm *qm =3D hisi_acc_vdev->pf_qm; =20 - if (hisi_acc_vdev->set_reset_flag) - clear_bit(QM_RESETTING, &qm->misc_ctl); + if (hisi_acc_vdev->set_reset_flag) { + if (qm && qm->io_base) + clear_bit(QM_RESETTING, &qm->misc_ctl); + else + dev_err(&pdev->dev, "PF QM not available for reset done\n"); + } =20 if (!hisi_acc_vdev->core_device.vdev.mig_ops) return; @@ -1565,6 +1574,11 @@ static int hisi_acc_vfio_pci_migrn_init_dev(struct v= fio_device *core_vdev) struct pci_dev *pdev =3D to_pci_dev(core_vdev->dev); struct hisi_qm *pf_qm =3D hisi_acc_get_pf_qm(pdev); =20 + if (!pf_qm) { + dev_err(&pdev->dev, "PF driver not loaded, cannot enable migration\n"); + return -ENODEV; + } + hisi_acc_vdev->vf_id =3D pci_iov_vf_id(pdev) + 1; hisi_acc_vdev->pf_qm =3D pf_qm; hisi_acc_vdev->vf_dev =3D pdev; @@ -1670,13 +1684,11 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *= pdev, const struct pci_device struct hisi_acc_vf_core_device *hisi_acc_vdev; const struct vfio_device_ops *ops =3D &hisi_acc_vfio_pci_ops; struct hisi_qm *pf_qm; - int vf_id; int ret; =20 pf_qm =3D hisi_acc_get_pf_qm(pdev); if (pf_qm && pf_qm->ver >=3D QM_HW_V3) { - vf_id =3D pci_iov_vf_id(pdev); - if (vf_id >=3D 0) + if (pdev->is_virtfn) ops =3D &hisi_acc_vfio_pci_migrn_ops; else pci_warn(pdev, "migration support failed, continue with generic interfa= ce\n"); --=20 2.43.0 From nobody Sat Sep 26 19:35:05 2026 Received: from canpmsgout12.his.huawei.com (canpmsgout12.his.huawei.com [113.46.200.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 103B13D1CC1; Mon, 31 Aug 2026 09:11:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788167466; cv=none; b=T0fSafXZN31jDeCNBoBJcIH5oF9SbXlbMGnOcq1/Rz6QSNMcwQCt2ylGZHKFJHjztVXjTJbsoEWgTvy/xK8bGM3h13YlfHdjm/qQK5e8Ia2BNOMdbcQd34F3TTkUhG8dygHVofNXeltM0sCV6zM4ozIUqN7+DTBLmmNpuFdwRcI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788167466; c=relaxed/simple; bh=bRVegjh7kqwOClGWRibP8qqYTfhvDyLQp1VK6459kYw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JZcxoRdFF1j44rbm/VLYfntYacdu8kQh7n6cnHLJXzfMAcP4LarTuM/XmJZ4lLjdndJk9p9H0bd73Q+dNZIJf5hc2eQfktjZs6OnaL+M/g0KE4zfHb+LqsxJf/rse4jA7oUJqVFd6qtu9l9SIxnbuAamGgSR/4vltTKYNOBoYjI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=UOIDmJYn; arc=none smtp.client-ip=113.46.200.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="UOIDmJYn" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=lBgo/uYQKxqMeB0V4fkOVRE0+0BUTuXRnE++cS8xRrE=; b=UOIDmJYn5xG6cpu9afV4PbSEH8GP1x2dg5vqMDykII1SqPgnM0/25PgxYeIas0VwH2W6vC0Wq tIA88IlghNp6/XjAhVoPP/vhjVQZyFbJqQ/Vv804OfLhsBsMDVtBiRHIb9Wx+hrLQ3cjgop71ge BOTWl9WHMr166ZPun46AhwY= Received: from mail.maildlp.com (unknown [172.19.162.92]) by canpmsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4hYNGh6TGTznTVv; Mon, 31 Aug 2026 16:59:40 +0800 (CST) Received: from dggpemf500015.china.huawei.com (unknown [7.185.36.143]) by mail.maildlp.com (Postfix) with ESMTPS id 4836640565; Mon, 31 Aug 2026 17:10:55 +0800 (CST) Received: from huawei.com (10.50.163.32) by dggpemf500015.china.huawei.com (7.185.36.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 31 Aug 2026 17:10:54 +0800 From: Longfang Liu To: , CC: , , Subject: [PATCH v3 2/3] hisi_acc_vfio_pci: clear set_reset_flag after reset completed Date: Mon, 31 Aug 2026 17:09:50 +0800 Message-ID: <20260831090951.844569-3-liulongfang@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831090951.844569-1-liulongfang@huawei.com> References: <20260831090951.844569-1-liulongfang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100001.china.huawei.com (7.221.188.238) To dggpemf500015.china.huawei.com (7.185.36.143) Content-Type: text/plain; charset="utf-8" set_reset_flag is a sticky latch set in reset_prepare() when this driver acquires the QM_RESETTING lock, but it is never cleared. If a later reset attempt times out in reset_prepare() because another agent already holds the lock, aer_reset_done() sees the stale true flag and calls clear_bit() on QM_RESETTING, prematurely releasing a lock owned by the other agent. Clear set_reset_flag right after clearing the QM_RESETTING bit in aer_reset_done(), so every reset cycle is self-contained and a timed-out reset cannot release a foreign lock. Fixes: a22099ed7936f ("hisi_acc_vfio_pci: fix VF reset timeout issue") Signed-off-by: Longfang Liu --- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 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 e95d0ab0f11a..4abed2e49986 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1180,10 +1180,12 @@ static void hisi_acc_vf_pci_aer_reset_done(struct p= ci_dev *pdev) struct hisi_qm *qm =3D hisi_acc_vdev->pf_qm; =20 if (hisi_acc_vdev->set_reset_flag) { - if (qm && qm->io_base) + if (qm && qm->io_base) { clear_bit(QM_RESETTING, &qm->misc_ctl); - else + hisi_acc_vdev->set_reset_flag =3D false; + } else { dev_err(&pdev->dev, "PF QM not available for reset done\n"); + } } =20 if (!hisi_acc_vdev->core_device.vdev.mig_ops) --=20 2.43.0 From nobody Sat Sep 26 19:35:05 2026 Received: from canpmsgout10.his.huawei.com (canpmsgout10.his.huawei.com [113.46.200.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49569314A60; Mon, 31 Aug 2026 09:11:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788167491; cv=none; b=keosVYnN0JHkoy2EChYy29IBGuZqSMzq3aKAqK9Tu++Er3RobGtRV0Akmkf9iWxZoWwzCY2Zg6l9Gybf4Z6omHOd/8cWVcQhbaHMwXpe+92vOKR8OIs60OVAQ/a0MEQGtsdk2HKn9kdgss9/oR5oOX3If/yMNGh9FYfuu4H0DSA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788167491; c=relaxed/simple; bh=AXeX4BwH772tajBA9P5Vt2kDxJK4NLg4FEhYOK4iblY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Oidd/qa5tOz78SXiJ2vhgqGISQQozHcPeGSP/HMBS5+u03xgski9SV5+VykhHxNsBfjT3d5HOVT+39gE9aftIdehEEfwFUaaL5nXDWFcItYiQsUmzLfBFwJdVWDD4FbGjRDTTdh2cdbgngl/R4GzdzyA668bNKfcHg22SFM1e2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=rU9aKF5b; arc=none smtp.client-ip=113.46.200.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="rU9aKF5b" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=X0mf82n+J6jkdtZ2VBJPcRPPrydsFgzumUz3bXcAmMQ=; b=rU9aKF5bWqhCCUrMVlsSEPeXe6u9m9+Wf6x55C5wThG/DhBAR39q6bxXne4O644quOCbXBB3P XQPr4rUfCEnWoygWgoiMoZLQNkHBVG2CafAuS7LjffdmAGQrQlbJtk7krhG/4uWlXed4tR/pg+l EoDknNh2Pa6EjMgReTrKkc8= Received: from mail.maildlp.com (unknown [172.19.163.214]) by canpmsgout10.his.huawei.com (SkyGuard) with ESMTPS id 4hYNHn3qbgz1K9XX; Mon, 31 Aug 2026 17:00:37 +0800 (CST) Received: from dggpemf500015.china.huawei.com (unknown [7.185.36.143]) by mail.maildlp.com (Postfix) with ESMTPS id 71AD44056C; Mon, 31 Aug 2026 17:11:26 +0800 (CST) Received: from huawei.com (10.50.163.32) by dggpemf500015.china.huawei.com (7.185.36.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 31 Aug 2026 17:11:25 +0800 From: Longfang Liu To: , CC: , , Subject: [PATCH v3 3/3] hisi_acc_vfio_pci: reject live migration on 64KB page with QM_HW_V3 hardware Date: Mon, 31 Aug 2026 17:09:51 +0800 Message-ID: <20260831090951.844569-4-liulongfang@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831090951.844569-1-liulongfang@huawei.com> References: <20260831090951.844569-1-liulongfang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems100001.china.huawei.com (7.221.188.238) To dggpemf500015.china.huawei.com (7.185.36.143) Content-Type: text/plain; charset="utf-8" In the scenario combining QM_HW_V3 hardware with 64KB large pages, the device functional region and migration registers share the BAR2 physical page, resulting in a lack of isolation that triggers security issues. More critically, since KVM does not support the specific 16-byte read/write instructions used by the guest driver, operating under the KVM emulated device scheme will lead to Guest kernel calltrace issues. To prevent Guest exceptions and avoid security vulnerabilities, the driver directly disables live migration functionality in this scenario. This ensures the system fails cleanly with an error early during startup, while other configuration modes remain unaffected and can still utilize passthrough functionality normally. Fixes: b0eed085903e ("hisi_acc_vfio_pci: Add support for VFIO live migratio= n") Signed-off-by: Longfang Liu --- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/= pci/hisilicon/hisi_acc_vfio_pci.c index 4abed2e49986..4f12cab96545 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1210,6 +1210,23 @@ static int hisi_acc_vf_qm_init(struct hisi_acc_vf_co= re_device *hisi_acc_vdev) else hisi_acc_vdev->drv_mode =3D HW_ACC_MIG_VF_CTRL; =20 + /* + * On VF_CTRL hardware, BAR2 holds 32KB functional + 32KB + * migration registers. When the host page exceeds 32KB, the + * two share one physical page and cannot be isolated by mmap. + * Reject the open so QEMU fails cleanly at startup. + */ + if (hisi_acc_vdev->drv_mode =3D=3D HW_ACC_MIG_VF_CTRL) { + resource_size_t func_len =3D + pci_resource_len(vf_dev, VFIO_PCI_BAR2_REGION_INDEX) >> 1; + + if (func_len < PAGE_SIZE) { + dev_err(&vf_dev->dev, + "migration not supported on 64KB pages with QM_HW_V3\n"); + return -EINVAL; + } + } + if (hisi_acc_vdev->drv_mode =3D=3D HW_ACC_MIG_PF_CTRL) { /* * On hardware platforms greater than QM_HW_V3, the migration function --=20 2.43.0