iommu/vt-d: Reduce extra first level entry in iommu->domains
In commit <8bf478163e69> ("iommu/vt-d: Split up iommu->domains array"), it it splits iommu->domains in two levels. Each first level contains 256 entries of second level. In case of the ndomains is exact a multiple of 256, it would have one more extra first level entry for current implementation. This patch refines this calculation to reduce the extra first level entry. Signed-off-by: Wei Yang <richard.weiyang@gmail.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
5edb56491d
commit
86f004c77c
|
@ -1672,7 +1672,7 @@ static int iommu_init_domains(struct intel_iommu *iommu)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
size = ((ndomains >> 8) + 1) * sizeof(struct dmar_domain **);
|
size = (ALIGN(ndomains, 256) >> 8) * sizeof(struct dmar_domain **);
|
||||||
iommu->domains = kzalloc(size, GFP_KERNEL);
|
iommu->domains = kzalloc(size, GFP_KERNEL);
|
||||||
|
|
||||||
if (iommu->domains) {
|
if (iommu->domains) {
|
||||||
|
@ -1737,7 +1737,7 @@ static void disable_dmar_iommu(struct intel_iommu *iommu)
|
||||||
static void free_dmar_iommu(struct intel_iommu *iommu)
|
static void free_dmar_iommu(struct intel_iommu *iommu)
|
||||||
{
|
{
|
||||||
if ((iommu->domains) && (iommu->domain_ids)) {
|
if ((iommu->domains) && (iommu->domain_ids)) {
|
||||||
int elems = (cap_ndoms(iommu->cap) >> 8) + 1;
|
int elems = ALIGN(cap_ndoms(iommu->cap), 256) >> 8;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < elems; i++)
|
for (i = 0; i < elems; i++)
|
||||||
|
|
Loading…
Reference in a new issue