42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
From c7b0d41391267e278a3d7e9297041b29888a461e Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 8 Apr 2024 00:12:40 -0700
|
||
|
|
Subject: [PATCH] smmu: Clear SMMUPciBus pointer cache when system reset
|
||
|
|
|
||
|
|
s->smmu_pcibus_by_bus_num is a SMMUPciBus pointer cache indexed
|
||
|
|
by bus number, bus number may not always be a fixed value,
|
||
|
|
i.e., guest reboot to different kernel which set bus number with
|
||
|
|
different algorithm.
|
||
|
|
|
||
|
|
This could lead to smmu_iommu_mr() providing the wrong iommu MR.
|
||
|
|
|
||
|
|
Suggested-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
||
|
|
Message-Id: <20240125073706.339369-3-zhenzhong.duan@intel.com>
|
||
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Tested-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
(cherry picked from commit 8a6b3f4dc95a064e88adaca86374108da0ecb38d)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/arm/smmu-common.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
|
||
|
|
index e09b9c13b7..d8fc81c102 100644
|
||
|
|
--- a/hw/arm/smmu-common.c
|
||
|
|
+++ b/hw/arm/smmu-common.c
|
||
|
|
@@ -530,6 +530,8 @@ static void smmu_base_reset(DeviceState *dev)
|
||
|
|
{
|
||
|
|
SMMUState *s = ARM_SMMU(dev);
|
||
|
|
|
||
|
|
+ memset(s->smmu_pcibus_by_bus_num, 0, sizeof(s->smmu_pcibus_by_bus_num));
|
||
|
|
+
|
||
|
|
g_hash_table_remove_all(s->configs);
|
||
|
|
g_hash_table_remove_all(s->iotlb);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|