mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
x86/vtd: fix iommu_share_p2m_table
Commit 2916951c1 "mm / iommu: include need_iommu() test in
iommu_use_hap_pt()" changed the check in iommu_share_p2m_table to use
need_iommu(d) (as part of iommu_use_hap_pt) instead of iommu_enabled,
which broke the check because at the point in domain construction
where iommu_share_p2m_table is called need_iommu(d) will always return
false.
Fix this by reverting to the previous logic.
While there turn the hap_enabled check into an ASSERT, since the only
caller of iommu_share_p2m_table already performs the hap_enabled check
before calling the function.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
5e04bf333b
commit
e9be34be5f
1 file changed
+6
-1
@@ -505,7 +505,12 @@ int iommu_do_domctl(
|
||||
|
||||
void iommu_share_p2m_table(struct domain* d)
|
||||
{
|
||||
if ( iommu_use_hap_pt(d) )
|
||||
ASSERT(hap_enabled(d));
|
||||
/*
|
||||
* iommu_use_hap_pt(d) cannot be used here because during domain
|
||||
* construction need_iommu(d) will always return false here.
|
||||
*/
|
||||
if ( iommu_enabled && iommu_hap_pt_share )
|
||||
iommu_get_ops()->share_p2m(d);
|
||||
}
|
||||
|
||||
|
||||