Skip to content

Commit

Permalink
vtd: prune (and rename) cache flush functions
Browse files Browse the repository at this point in the history 
Rename __iommu_flush_cache to iommu_sync_cache and remove
iommu_flush_cache_page. Also remove the iommu_flush_cache_entry
wrapper and just use iommu_sync_cache instead. Note the _entry suffix
was meaningless as the wrapper was already taking a size parameter in
bytes. While there also constify the addr parameter.

No functional change intended.

This is part of XSA-321.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
  • Loading branch information
@royger @jbeulich
royger authored and jbeulich committed Jul 7, 2020
1 parent 5fe515a commit 6229882
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 26 deletions.
3 changes: 1 addition & 2 deletions xen/drivers/passthrough/vtd/extern.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ void disable_qinval(struct vtd_iommu *iommu);
int enable_intremap(struct vtd_iommu *iommu, int eim);
void disable_intremap(struct vtd_iommu *iommu);

void iommu_flush_cache_entry(void *addr, unsigned int size);
void iommu_flush_cache_page(void *addr, unsigned long npages);
void iommu_sync_cache(const void *addr, unsigned int size);
int iommu_alloc(struct acpi_drhd_unit *drhd);
void iommu_free(struct acpi_drhd_unit *drhd);

Expand Down
6 changes: 3 additions & 3 deletions xen/drivers/passthrough/vtd/intremap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static void free_remap_entry(struct vtd_iommu *iommu, int index)
iremap_entries, iremap_entry);

update_irte(iommu, iremap_entry, &new_ire, false);
iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
iommu_flush_iec_index(iommu, 0, index);

unmap_vtd_domain_page(iremap_entries);
Expand Down Expand Up @@ -406,7 +406,7 @@ static int ioapic_rte_to_remap_entry(struct vtd_iommu *iommu,
}

update_irte(iommu, iremap_entry, &new_ire, !init);
iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
iommu_flush_iec_index(iommu, 0, index);

unmap_vtd_domain_page(iremap_entries);
Expand Down Expand Up @@ -695,7 +695,7 @@ static int msi_msg_to_remap_entry(
update_irte(iommu, iremap_entry, &new_ire, msi_desc->irte_initialized);
msi_desc->irte_initialized = true;

iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
iommu_flush_iec_index(iommu, 0, index);

unmap_vtd_domain_page(iremap_entries);
Expand Down
33 changes: 12 additions & 21 deletions xen/drivers/passthrough/vtd/iommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ static int context_get_domain_id(struct context_entry *context,
}

static int iommus_incoherent;
static void __iommu_flush_cache(void *addr, unsigned int size)

void iommu_sync_cache(const void *addr, unsigned int size)
{
int i;
static unsigned int clflush_size = 0;
Expand All @@ -161,16 +162,6 @@ static void __iommu_flush_cache(void *addr, unsigned int size)
cacheline_flush((char *)addr + i);
}

void iommu_flush_cache_entry(void *addr, unsigned int size)
{
__iommu_flush_cache(addr, size);
}

void iommu_flush_cache_page(void *addr, unsigned long npages)
{
__iommu_flush_cache(addr, PAGE_SIZE * npages);
}

/* Allocate page table, return its machine address */
uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node)
{
Expand All @@ -189,7 +180,7 @@ uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node)
vaddr = __map_domain_page(cur_pg);
memset(vaddr, 0, PAGE_SIZE);

iommu_flush_cache_page(vaddr, 1);
iommu_sync_cache(vaddr, PAGE_SIZE);
unmap_domain_page(vaddr);
cur_pg++;
}
Expand Down Expand Up @@ -222,7 +213,7 @@ static u64 bus_to_context_maddr(struct vtd_iommu *iommu, u8 bus)
}
set_root_value(*root, maddr);
set_root_present(*root);
iommu_flush_cache_entry(root, sizeof(struct root_entry));
iommu_sync_cache(root, sizeof(struct root_entry));
}
maddr = (u64) get_context_addr(*root);
unmap_vtd_domain_page(root_entries);
Expand Down Expand Up @@ -269,7 +260,7 @@ static u64 addr_to_dma_page_maddr(struct domain *domain, u64 addr, int alloc)
*/
dma_set_pte_readable(*pte);
dma_set_pte_writable(*pte);
iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
iommu_sync_cache(pte, sizeof(struct dma_pte));
}

if ( level == 2 )
Expand Down Expand Up @@ -645,7 +636,7 @@ static void dma_pte_clear_one(struct domain *domain, uint64_t addr,
*flush_flags |= IOMMU_FLUSHF_modified;

spin_unlock(&hd->arch.mapping_lock);
iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
iommu_sync_cache(pte, sizeof(struct dma_pte));

unmap_vtd_domain_page(page);
}
Expand Down Expand Up @@ -682,7 +673,7 @@ static void iommu_free_page_table(struct page_info *pg)
iommu_free_pagetable(dma_pte_addr(*pte), next_level);

dma_clear_pte(*pte);
iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
iommu_sync_cache(pte, sizeof(struct dma_pte));
}

unmap_vtd_domain_page(pt_vaddr);
Expand Down Expand Up @@ -1401,7 +1392,7 @@ int domain_context_mapping_one(
context_set_address_width(*context, agaw);
context_set_fault_enable(*context);
context_set_present(*context);
iommu_flush_cache_entry(context, sizeof(struct context_entry));
iommu_sync_cache(context, sizeof(struct context_entry));
spin_unlock(&iommu->lock);

/* Context entry was previously non-present (with domid 0). */
Expand Down Expand Up @@ -1565,7 +1556,7 @@ int domain_context_unmap_one(

context_clear_present(*context);
context_clear_entry(*context);
iommu_flush_cache_entry(context, sizeof(struct context_entry));
iommu_sync_cache(context, sizeof(struct context_entry));

iommu_domid= domain_iommu_domid(domain, iommu);
if ( iommu_domid == -1 )
Expand Down Expand Up @@ -1792,7 +1783,7 @@ static int __must_check intel_iommu_map_page(struct domain *d, dfn_t dfn,

*pte = new;

iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
iommu_sync_cache(pte, sizeof(struct dma_pte));
spin_unlock(&hd->arch.mapping_lock);
unmap_vtd_domain_page(page);

Expand Down Expand Up @@ -1869,7 +1860,7 @@ int iommu_pte_flush(struct domain *d, uint64_t dfn, uint64_t *pte,
int iommu_domid;
int rc = 0;

iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
iommu_sync_cache(pte, sizeof(struct dma_pte));

for_each_drhd_unit ( drhd )
{
Expand Down Expand Up @@ -2739,7 +2730,7 @@ static int __init intel_iommu_quarantine_init(struct domain *d)
dma_set_pte_addr(*pte, maddr);
dma_set_pte_readable(*pte);
}
iommu_flush_cache_page(parent, 1);
iommu_sync_cache(parent, PAGE_SIZE);

unmap_vtd_domain_page(parent);
parent = map_vtd_domain_page(maddr);
Expand Down

0 comments on commit 6229882

Please sign in to comment.