luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/amd-iommu: Add core functions for pd allocation/freeing

Browse Source 
This patch factors some code of protection domain allocation
into seperate functions. This way the logic can be used to
allocate the passthrough domain later. As a side effect this
patch fixes an unlikely domain id leakage bug.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Joerg Roedel 2009-08-26 16:52:40 +02:00
parent ac0101d396
commit 2650815fb0
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/x86/kernel/amd_iommu.c
View File

@ -1988,19 +1988,47 @@ static void cleanup_domain(struct protection_domain *domain)
write_unlock_irqrestore(&amd_iommu_devtable_lock, flags); write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
} }
static int amd_iommu_domain_init(struct iommu_domain *dom) static void protection_domain_free(struct protection_domain *domain)
{
if (!domain)
return;
if (domain->id)
domain_id_free(domain->id);
kfree(domain);
}
static struct protection_domain *protection_domain_alloc(void)
{ {
struct protection_domain *domain; struct protection_domain *domain;
domain = kzalloc(sizeof(*domain), GFP_KERNEL); domain = kzalloc(sizeof(*domain), GFP_KERNEL);
if (!domain) if (!domain)
return -ENOMEM; return NULL;
spin_lock_init(&domain->lock); spin_lock_init(&domain->lock);
domain->mode = PAGE_MODE_3_LEVEL;
domain->id = domain_id_alloc(); domain->id = domain_id_alloc();
if (!domain->id) if (!domain->id)
goto out_err;
return domain;
out_err:
kfree(domain);
return NULL;
}
static int amd_iommu_domain_init(struct iommu_domain *dom)
{
struct protection_domain *domain;
domain = protection_domain_alloc();
if (!domain)
goto out_free; goto out_free;
domain->mode = PAGE_MODE_3_LEVEL;
domain->pt_root = (void *)get_zeroed_page(GFP_KERNEL); domain->pt_root = (void *)get_zeroed_page(GFP_KERNEL);
if (!domain->pt_root) if (!domain->pt_root)
goto out_free; goto out_free;
@ -2010,7 +2038,7 @@ static int amd_iommu_domain_init(struct iommu_domain *dom)
return 0; return 0;
out_free: out_free:
kfree(domain); protection_domain_free(domain);
return -ENOMEM; return -ENOMEM;
} }