From 62ad310c93831fef195e4c0fbecaeb998e1064cb Mon Sep 17 00:00:00 2001
From: Ruslan Bukin
Date: Sat, 25 Jul 2020 09:28:38 +0000
Subject: [PATCH] Split-out the Intel GAS (Guest Address Space) management
component from Intel DMAR support, so it can be used on other IOMMU systems.
Reviewed by: kib
Sponsored by: DARPA/AFRL
Differential Revision: https://reviews.freebsd.org/D25743
---
sys/dev/iommu/iommu.h | 9 ++
sys/x86/iommu/intel_ctx.c | 56 ++++---
sys/x86/iommu/intel_dmar.h | 31 ++--
sys/x86/iommu/intel_drv.c | 14 +-
sys/x86/iommu/intel_gas.c | 297 ++++++++++++++++------------------
sys/x86/iommu/intel_idpgtbl.c | 24 ++-
sys/x86/iommu/intel_utils.c | 4 +-
7 files changed, 219 insertions(+), 216 deletions(-)
diff --git a/sys/dev/iommu/iommu.h b/sys/dev/iommu/iommu.h
index 8d039c2dee09..d0ac3052a313 100644
--- a/sys/dev/iommu/iommu.h
+++ b/sys/dev/iommu/iommu.h
@@ -48,6 +48,10 @@ struct bus_dma_tag_common;
struct iommu_map_entry;
TAILQ_HEAD(iommu_map_entries_tailq, iommu_map_entry);
+RB_HEAD(iommu_gas_entries_tree, iommu_map_entry);
+RB_PROTOTYPE(iommu_gas_entries_tree, iommu_map_entry, rb_entry,
+ iommu_gas_cmp_entries);
+
struct iommu_qi_genseq {
u_int gen;
uint32_t seq;
@@ -107,6 +111,11 @@ struct iommu_domain {
u_int entries_cnt; /* (d) */
struct iommu_map_entries_tailq unload_entries; /* (d) Entries to
unload */
+ struct iommu_gas_entries_tree rb_root; /* (d) */
+ iommu_gaddr_t end; /* (c) Highest address + 1 in
+ the guest AS */
+ struct iommu_map_entry *first_place, *last_place; /* (d) */
+ u_int flags; /* (u) */
};
struct iommu_ctx {
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index dd551c2f56d3..9d67a5cf20f4 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -132,7 +132,7 @@ device_tag_init(struct dmar_ctx *ctx, device_t dev)
bus_addr_t maxaddr;
domain = (struct dmar_domain *)ctx->context.domain;
- maxaddr = MIN(domain->end, BUS_SPACE_MAXADDR);
+ maxaddr = MIN(domain->iodom.end, BUS_SPACE_MAXADDR);
ctx->context.tag->common.ref_count = 1; /* Prevent free */
ctx->context.tag->common.impl = &bus_dma_iommu_impl;
ctx->context.tag->common.boundary = 0;
@@ -186,7 +186,7 @@ ctx_id_entry_init(struct dmar_ctx *ctx, dmar_ctx_entry_t *ctxp, bool move,
pci_get_function(ctx->context.tag->owner),
ctxp->ctx1, ctxp->ctx2));
- if ((domain->flags & DMAR_DOMAIN_IDMAP) != 0 &&
+ if ((domain->iodom.flags & DMAR_DOMAIN_IDMAP) != 0 &&
(unit->hw_ecap & DMAR_ECAP_PT) != 0) {
KASSERT(domain->pgtbl_obj == NULL,
("ctx %p non-null pgtbl_obj", ctx));
@@ -254,7 +254,7 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus,
* and round as neccesary.
*
* We also allow the overlapping RMRR entries, see
- * dmar_gas_alloc_region().
+ * iommu_gas_alloc_region().
*/
start = entry->start;
end = entry->end;
@@ -282,7 +282,8 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus,
ma[i] = vm_page_getfake(entry->start + PAGE_SIZE * i,
VM_MEMATTR_DEFAULT);
}
- error1 = dmar_gas_map_region(domain, entry,
+ error1 = iommu_gas_map_region((struct iommu_domain *)domain,
+ entry,
IOMMU_MAP_ENTRY_READ | IOMMU_MAP_ENTRY_WRITE,
IOMMU_MF_CANWAIT | IOMMU_MF_RMRR, ma);
/*
@@ -294,7 +295,7 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus,
if (error1 == 0 && entry->end != entry->start) {
IOMMU_LOCK(domain->iodom.iommu);
domain->refs++; /* XXXKIB prevent free */
- domain->flags |= DMAR_DOMAIN_RMRR;
+ domain->iodom.flags |= DMAR_DOMAIN_RMRR;
IOMMU_UNLOCK(domain->iodom.iommu);
} else {
if (error1 != 0) {
@@ -308,7 +309,8 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus,
error = error1;
}
TAILQ_REMOVE(&rmrr_entries, entry, unroll_link);
- dmar_gas_free_entry(domain, entry);
+ iommu_gas_free_entry((struct iommu_domain *)domain,
+ entry);
}
for (i = 0; i < size; i++)
vm_page_putfake(ma[i]);
@@ -320,6 +322,7 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus,
static struct dmar_domain *
dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped)
{
+ struct iommu_domain *iodom;
struct dmar_domain *domain;
int error, id, mgaw;
@@ -327,9 +330,10 @@ dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped)
if (id == -1)
return (NULL);
domain = malloc(sizeof(*domain), M_DMAR_DOMAIN, M_WAITOK | M_ZERO);
+ iodom = (struct iommu_domain *)domain;
domain->domain = id;
LIST_INIT(&domain->contexts);
- RB_INIT(&domain->rb_root);
+ RB_INIT(&domain->iodom.rb_root);
TAILQ_INIT(&domain->iodom.unload_entries);
TASK_INIT(&domain->iodom.unload_task, 0, dmar_domain_unload_task,
domain);
@@ -343,29 +347,29 @@ dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped)
* It is useful for the identity mapping, and less so for the
* virtualized bus address space.
*/
- domain->end = id_mapped ? ptoa(Maxmem) : BUS_SPACE_MAXADDR;
- mgaw = dmar_maxaddr2mgaw(dmar, domain->end, !id_mapped);
+ domain->iodom.end = id_mapped ? ptoa(Maxmem) : BUS_SPACE_MAXADDR;
+ mgaw = dmar_maxaddr2mgaw(dmar, domain->iodom.end, !id_mapped);
error = domain_set_agaw(domain, mgaw);
if (error != 0)
goto fail;
if (!id_mapped)
/* Use all supported address space for remapping. */
- domain->end = 1ULL << (domain->agaw - 1);
+ domain->iodom.end = 1ULL << (domain->agaw - 1);
- dmar_gas_init_domain(domain);
+ iommu_gas_init_domain((struct iommu_domain *)domain);
if (id_mapped) {
if ((dmar->hw_ecap & DMAR_ECAP_PT) == 0) {
domain->pgtbl_obj = domain_get_idmap_pgtbl(domain,
- domain->end);
+ domain->iodom.end);
}
- domain->flags |= DMAR_DOMAIN_IDMAP;
+ domain->iodom.flags |= DMAR_DOMAIN_IDMAP;
} else {
error = domain_alloc_pgtbl(domain);
if (error != 0)
goto fail;
/* Disable local apic region access */
- error = dmar_gas_reserve_region(domain, 0xfee00000,
+ error = iommu_gas_reserve_region(iodom, 0xfee00000,
0xfeefffff + 1);
if (error != 0)
goto fail;
@@ -436,12 +440,12 @@ dmar_domain_destroy(struct dmar_domain *domain)
("destroying dom %p with ctx_cnt %d", domain, domain->ctx_cnt));
KASSERT(domain->refs == 0,
("destroying dom %p with refs %d", domain, domain->refs));
- if ((domain->flags & DMAR_DOMAIN_GAS_INITED) != 0) {
+ if ((domain->iodom.flags & DMAR_DOMAIN_GAS_INITED) != 0) {
DMAR_DOMAIN_LOCK(domain);
- dmar_gas_fini_domain(domain);
+ iommu_gas_fini_domain((struct iommu_domain *)domain);
DMAR_DOMAIN_UNLOCK(domain);
}
- if ((domain->flags & DMAR_DOMAIN_PGTBL_INITED) != 0) {
+ if ((domain->iodom.flags & DMAR_DOMAIN_PGTBL_INITED) != 0) {
if (domain->pgtbl_obj != NULL)
DMAR_DOMAIN_PGLOCK(domain);
domain_free_pgtbl(domain);
@@ -639,7 +643,7 @@ dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx)
/* If flush failed, rolling back would not work as well. */
printf("dmar%d rid %x domain %d->%d %s-mapped\n",
dmar->iommu.unit, ctx->rid, old_domain->domain, domain->domain,
- (domain->flags & DMAR_DOMAIN_IDMAP) != 0 ? "id" : "re");
+ (domain->iodom.flags & DMAR_DOMAIN_IDMAP) != 0 ? "id" : "re");
dmar_unref_domain_locked(dmar, old_domain);
TD_PINNED_ASSERT;
return (error);
@@ -663,7 +667,7 @@ dmar_unref_domain_locked(struct dmar_unit *dmar, struct dmar_domain *domain)
return;
}
- KASSERT((domain->flags & DMAR_DOMAIN_RMRR) == 0,
+ KASSERT((domain->iodom.flags & DMAR_DOMAIN_RMRR) == 0,
("lost ref on RMRR domain %p", domain));
LIST_REMOVE(domain, link);
@@ -781,17 +785,17 @@ dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid)
void
dmar_domain_free_entry(struct iommu_map_entry *entry, bool free)
{
- struct dmar_domain *domain;
+ struct iommu_domain *domain;
- domain = (struct dmar_domain *)entry->domain;
- DMAR_DOMAIN_LOCK(domain);
+ domain = entry->domain;
+ IOMMU_DOMAIN_LOCK(domain);
if ((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0)
- dmar_gas_free_region(domain, entry);
+ iommu_gas_free_region(domain, entry);
else
- dmar_gas_free_space(domain, entry);
- DMAR_DOMAIN_UNLOCK(domain);
+ iommu_gas_free_space(domain, entry);
+ IOMMU_DOMAIN_UNLOCK(domain);
if (free)
- dmar_gas_free_entry(domain, entry);
+ iommu_gas_free_entry(domain, entry);
else
entry->flags = 0;
}
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index e6212255b382..ef2bdd3c9bf7 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -38,10 +38,6 @@
struct dmar_unit;
-RB_HEAD(dmar_gas_entries_tree, iommu_map_entry);
-RB_PROTOTYPE(dmar_gas_entries_tree, iommu_map_entry, rb_entry,
- dmar_gas_cmp_entries);
-
/*
* Locking annotations:
* (u) - Protected by iommu unit lock
@@ -68,17 +64,12 @@ struct dmar_domain {
int pglvl; /* (c) The pagelevel */
int awlvl; /* (c) The pagelevel as the bitmask,
to set in context entry */
- iommu_gaddr_t end; /* (c) Highest address + 1 in
- the guest AS */
u_int ctx_cnt; /* (u) Number of contexts owned */
u_int refs; /* (u) Refs, including ctx */
struct dmar_unit *dmar; /* (c) */
LIST_ENTRY(dmar_domain) link; /* (u) Member in the dmar list */
LIST_HEAD(, dmar_ctx) contexts; /* (u) */
vm_object_t pgtbl_obj; /* (c) Page table pages */
- u_int flags; /* (u) */
- struct dmar_gas_entries_tree rb_root; /* (d) */
- struct iommu_map_entry *first_place, *last_place; /* (d) */
u_int batch_no;
};
@@ -269,7 +260,7 @@ void dmar_qi_invalidate_iec(struct dmar_unit *unit, u_int start, u_int cnt);
vm_object_t domain_get_idmap_pgtbl(struct dmar_domain *domain,
iommu_gaddr_t maxaddr);
void put_idmap_pgtbl(vm_object_t obj);
-int domain_map_buf(struct dmar_domain *domain, iommu_gaddr_t base,
+int domain_map_buf(struct iommu_domain *domain, iommu_gaddr_t base,
iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags);
int domain_unmap_buf(struct dmar_domain *domain, iommu_gaddr_t base,
iommu_gaddr_t size, int flags);
@@ -295,22 +286,22 @@ void dmar_domain_unload(struct dmar_domain *domain,
struct iommu_map_entries_tailq *entries, bool cansleep);
void dmar_domain_free_entry(struct iommu_map_entry *entry, bool free);
-void dmar_gas_init_domain(struct dmar_domain *domain);
-void dmar_gas_fini_domain(struct dmar_domain *domain);
-struct iommu_map_entry *dmar_gas_alloc_entry(struct dmar_domain *domain,
+void iommu_gas_init_domain(struct iommu_domain *domain);
+void iommu_gas_fini_domain(struct iommu_domain *domain);
+struct iommu_map_entry *iommu_gas_alloc_entry(struct iommu_domain *domain,
u_int flags);
-void dmar_gas_free_entry(struct dmar_domain *domain,
+void iommu_gas_free_entry(struct iommu_domain *domain,
struct iommu_map_entry *entry);
-void dmar_gas_free_space(struct dmar_domain *domain,
+void iommu_gas_free_space(struct iommu_domain *domain,
struct iommu_map_entry *entry);
-int dmar_gas_map(struct dmar_domain *domain,
+int iommu_gas_map(struct iommu_domain *domain,
const struct bus_dma_tag_common *common, iommu_gaddr_t size, int offset,
u_int eflags, u_int flags, vm_page_t *ma, struct iommu_map_entry **res);
-void dmar_gas_free_region(struct dmar_domain *domain,
+void iommu_gas_free_region(struct iommu_domain *domain,
struct iommu_map_entry *entry);
-int dmar_gas_map_region(struct dmar_domain *domain,
+int iommu_gas_map_region(struct iommu_domain *domain,
struct iommu_map_entry *entry, u_int eflags, u_int flags, vm_page_t *ma);
-int dmar_gas_reserve_region(struct dmar_domain *domain, iommu_gaddr_t start,
+int iommu_gas_reserve_region(struct iommu_domain *domain, iommu_gaddr_t start,
iommu_gaddr_t end);
void dmar_dev_parse_rmrr(struct dmar_domain *domain, int dev_domain,
@@ -342,7 +333,7 @@ extern iommu_haddr_t dmar_high;
extern int haw;
extern int dmar_tbl_pagecnt;
extern int dmar_batch_coalesce;
-extern int dmar_check_free;
+extern int iommu_check_free;
static inline uint32_t
dmar_read4(const struct dmar_unit *unit, int reg)
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index 90cc923180fa..1d3b1abc914d 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -176,7 +176,7 @@ dmar_identify(driver_t *driver, device_t parent)
if (!dmar_enable)
return;
#ifdef INVARIANTS
- TUNABLE_INT_FETCH("hw.dmar.check_free", &dmar_check_free);
+ TUNABLE_INT_FETCH("hw.iommu.check_free", &iommu_check_free);
#endif
status = AcpiGetTable(ACPI_SIG_DMAR, 1, (ACPI_TABLE_HEADER **)&dmartbl);
if (ACPI_FAILURE(status))
@@ -945,7 +945,8 @@ dmar_rmrr_iter(ACPI_DMAR_HEADER *dmarh, void *arg)
match = dmar_match_devscope(devscope, ria->dev_busno,
ria->dev_path, ria->dev_path_len);
if (match == 1) {
- entry = dmar_gas_alloc_entry(ria->domain,
+ entry = iommu_gas_alloc_entry(
+ (struct iommu_domain *)ria->domain,
DMAR_PGF_WAITOK);
entry->start = resmem->BaseAddress;
/* The RMRR entry end address is inclusive. */
@@ -1152,15 +1153,18 @@ dmar_print_ctx(struct dmar_ctx *ctx)
static void
dmar_print_domain(struct dmar_domain *domain, bool show_mappings)
{
+ struct iommu_domain *iodom;
struct iommu_map_entry *entry;
struct dmar_ctx *ctx;
+ iodom = (struct iommu_domain *)domain;
+
db_printf(
" @%p dom %d mgaw %d agaw %d pglvl %d end %jx refs %d\n"
" ctx_cnt %d flags %x pgobj %p map_ents %u\n",
domain, domain->domain, domain->mgaw, domain->agaw, domain->pglvl,
- (uintmax_t)domain->end, domain->refs, domain->ctx_cnt,
- domain->flags, domain->pgtbl_obj, domain->iodom.entries_cnt);
+ (uintmax_t)domain->iodom.end, domain->refs, domain->ctx_cnt,
+ domain->iodom.flags, domain->pgtbl_obj, domain->iodom.entries_cnt);
if (!LIST_EMPTY(&domain->contexts)) {
db_printf(" Contexts:\n");
LIST_FOREACH(ctx, &domain->contexts, link)
@@ -1169,7 +1173,7 @@ dmar_print_domain(struct dmar_domain *domain, bool show_mappings)
if (!show_mappings)
return;
db_printf(" mapped:\n");
- RB_FOREACH(entry, dmar_gas_entries_tree, &domain->rb_root) {
+ RB_FOREACH(entry, iommu_gas_entries_tree, &iodom->rb_root) {
dmar_print_domain_entry(entry);
if (db_pager_quit)
break;
diff --git a/sys/x86/iommu/intel_gas.c b/sys/x86/iommu/intel_gas.c
index 9df0da9242b2..83302bb19db4 100644
--- a/sys/x86/iommu/intel_gas.c
+++ b/sys/x86/iommu/intel_gas.c
@@ -32,7 +32,7 @@
#include
__FBSDID("$FreeBSD$");
-#define RB_AUGMENT(entry) dmar_gas_augment_entry(entry)
+#define RB_AUGMENT(entry) iommu_gas_augment_entry(entry)
#include
#include
@@ -63,12 +63,15 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#if defined(__amd64__) || defined(__i386__)
#include
#include
#include
#include
+#include
#include
#include
+#endif
/*
* Guest Address Space management.
@@ -87,7 +90,7 @@ intel_gas_init(void)
SYSINIT(intel_gas, SI_SUB_DRIVERS, SI_ORDER_FIRST, intel_gas_init, NULL);
struct iommu_map_entry *
-dmar_gas_alloc_entry(struct dmar_domain *domain, u_int flags)
+iommu_gas_alloc_entry(struct iommu_domain *domain, u_int flags)
{
struct iommu_map_entry *res;
@@ -97,25 +100,25 @@ dmar_gas_alloc_entry(struct dmar_domain *domain, u_int flags)
res = uma_zalloc(iommu_map_entry_zone, ((flags & DMAR_PGF_WAITOK) !=
0 ? M_WAITOK : M_NOWAIT) | M_ZERO);
if (res != NULL) {
- res->domain = (struct iommu_domain *)domain;
- atomic_add_int(&domain->iodom.entries_cnt, 1);
+ res->domain = domain;
+ atomic_add_int(&domain->entries_cnt, 1);
}
return (res);
}
void
-dmar_gas_free_entry(struct dmar_domain *domain, struct iommu_map_entry *entry)
+iommu_gas_free_entry(struct iommu_domain *domain, struct iommu_map_entry *entry)
{
- KASSERT(domain == (struct dmar_domain *)entry->domain,
+ KASSERT(domain == (struct iommu_domain *)entry->domain,
("mismatched free domain %p entry %p entry->domain %p", domain,
entry, entry->domain));
- atomic_subtract_int(&domain->iodom.entries_cnt, 1);
+ atomic_subtract_int(&domain->entries_cnt, 1);
uma_zfree(iommu_map_entry_zone, entry);
}
static int
-dmar_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b)
+iommu_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b)
{
/* Last entry have zero size, so <= */
@@ -137,7 +140,7 @@ dmar_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b)
}
static void
-dmar_gas_augment_entry(struct iommu_map_entry *entry)
+iommu_gas_augment_entry(struct iommu_map_entry *entry)
{
struct iommu_map_entry *child;
iommu_gaddr_t free_down;
@@ -159,18 +162,18 @@ dmar_gas_augment_entry(struct iommu_map_entry *entry)
entry->free_down = free_down;
}
-RB_GENERATE(dmar_gas_entries_tree, iommu_map_entry, rb_entry,
- dmar_gas_cmp_entries);
+RB_GENERATE(iommu_gas_entries_tree, iommu_map_entry, rb_entry,
+ iommu_gas_cmp_entries);
#ifdef INVARIANTS
static void
-dmar_gas_check_free(struct dmar_domain *domain)
+iommu_gas_check_free(struct iommu_domain *domain)
{
struct iommu_map_entry *entry, *l, *r;
iommu_gaddr_t v;
- RB_FOREACH(entry, dmar_gas_entries_tree, &domain->rb_root) {
- KASSERT(domain == (struct dmar_domain *)entry->domain,
+ RB_FOREACH(entry, iommu_gas_entries_tree, &domain->rb_root) {
+ KASSERT(domain == (struct iommu_domain *)entry->domain,
("mismatched free domain %p entry %p entry->domain %p",
domain, entry, entry->domain));
l = RB_LEFT(entry, rb_entry);
@@ -190,85 +193,88 @@ dmar_gas_check_free(struct dmar_domain *domain)
#endif
static bool
-dmar_gas_rb_insert(struct dmar_domain *domain, struct iommu_map_entry *entry)
+iommu_gas_rb_insert(struct iommu_domain *domain, struct iommu_map_entry *entry)
{
struct iommu_map_entry *found;
- found = RB_INSERT(dmar_gas_entries_tree, &domain->rb_root, entry);
+ found = RB_INSERT(iommu_gas_entries_tree,
+ &domain->rb_root, entry);
return (found == NULL);
}
static void
-dmar_gas_rb_remove(struct dmar_domain *domain, struct iommu_map_entry *entry)
+iommu_gas_rb_remove(struct iommu_domain *domain, struct iommu_map_entry *entry)
{
- RB_REMOVE(dmar_gas_entries_tree, &domain->rb_root, entry);
+ RB_REMOVE(iommu_gas_entries_tree, &domain->rb_root, entry);
}
void
-dmar_gas_init_domain(struct dmar_domain *domain)
+iommu_gas_init_domain(struct iommu_domain *domain)
{
struct iommu_map_entry *begin, *end;
- begin = dmar_gas_alloc_entry(domain, DMAR_PGF_WAITOK);
- end = dmar_gas_alloc_entry(domain, DMAR_PGF_WAITOK);
+ begin = iommu_gas_alloc_entry(domain, DMAR_PGF_WAITOK);
+ end = iommu_gas_alloc_entry(domain, DMAR_PGF_WAITOK);
- DMAR_DOMAIN_LOCK(domain);
- KASSERT(domain->iodom.entries_cnt == 2, ("dirty domain %p", domain));
- KASSERT(RB_EMPTY(&domain->rb_root), ("non-empty entries %p", domain));
+ IOMMU_DOMAIN_LOCK(domain);
+ KASSERT(domain->entries_cnt == 2, ("dirty domain %p", domain));
+ KASSERT(RB_EMPTY(&domain->rb_root),
+ ("non-empty entries %p", domain));
begin->start = 0;
- begin->end = DMAR_PAGE_SIZE;
+ begin->end = IOMMU_PAGE_SIZE;
begin->flags = IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_UNMAPPED;
- dmar_gas_rb_insert(domain, begin);
+ iommu_gas_rb_insert(domain, begin);
end->start = domain->end;
end->end = domain->end;
end->flags = IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_UNMAPPED;
- dmar_gas_rb_insert(domain, end);
+ iommu_gas_rb_insert(domain, end);
domain->first_place = begin;
domain->last_place = end;
domain->flags |= DMAR_DOMAIN_GAS_INITED;
- DMAR_DOMAIN_UNLOCK(domain);
+ IOMMU_DOMAIN_UNLOCK(domain);
}
void
-dmar_gas_fini_domain(struct dmar_domain *domain)
+iommu_gas_fini_domain(struct iommu_domain *domain)
{
struct iommu_map_entry *entry, *entry1;
- DMAR_DOMAIN_ASSERT_LOCKED(domain);
- KASSERT(domain->iodom.entries_cnt == 2,
+ IOMMU_DOMAIN_ASSERT_LOCKED(domain);
+ KASSERT(domain->entries_cnt == 2,
("domain still in use %p", domain));
- entry = RB_MIN(dmar_gas_entries_tree, &domain->rb_root);
+ entry = RB_MIN(iommu_gas_entries_tree, &domain->rb_root);
KASSERT(entry->start == 0, ("start entry start %p", domain));
- KASSERT(entry->end == DMAR_PAGE_SIZE, ("start entry end %p", domain));
+ KASSERT(entry->end == IOMMU_PAGE_SIZE, ("start entry end %p", domain));
KASSERT(entry->flags == IOMMU_MAP_ENTRY_PLACE,
("start entry flags %p", domain));
- RB_REMOVE(dmar_gas_entries_tree, &domain->rb_root, entry);
- dmar_gas_free_entry(domain, entry);
+ RB_REMOVE(iommu_gas_entries_tree, &domain->rb_root, entry);
+ iommu_gas_free_entry(domain, entry);
- entry = RB_MAX(dmar_gas_entries_tree, &domain->rb_root);
+ entry = RB_MAX(iommu_gas_entries_tree, &domain->rb_root);
KASSERT(entry->start == domain->end, ("end entry start %p", domain));
KASSERT(entry->end == domain->end, ("end entry end %p", domain));
KASSERT(entry->flags == IOMMU_MAP_ENTRY_PLACE,
("end entry flags %p", domain));
- RB_REMOVE(dmar_gas_entries_tree, &domain->rb_root, entry);
- dmar_gas_free_entry(domain, entry);
+ RB_REMOVE(iommu_gas_entries_tree, &domain->rb_root, entry);
+ iommu_gas_free_entry(domain, entry);
- RB_FOREACH_SAFE(entry, dmar_gas_entries_tree, &domain->rb_root,
+ RB_FOREACH_SAFE(entry, iommu_gas_entries_tree, &domain->rb_root,
entry1) {
KASSERT((entry->flags & IOMMU_MAP_ENTRY_RMRR) != 0,
("non-RMRR entry left %p", domain));
- RB_REMOVE(dmar_gas_entries_tree, &domain->rb_root, entry);
- dmar_gas_free_entry(domain, entry);
+ RB_REMOVE(iommu_gas_entries_tree, &domain->rb_root,
+ entry);
+ iommu_gas_free_entry(domain, entry);
}
}
-struct dmar_gas_match_args {
- struct dmar_domain *domain;
+struct iommu_gas_match_args {
+ struct iommu_domain *domain;
iommu_gaddr_t size;
int offset;
const struct bus_dma_tag_common *common;
@@ -277,25 +283,25 @@ struct dmar_gas_match_args {
};
/*
- * The interval [beg, end) is a free interval between two dmar_map_entries.
+ * The interval [beg, end) is a free interval between two iommu_map_entries.
* maxaddr is an upper bound on addresses that can be allocated. Try to
* allocate space in the free interval, subject to the conditions expressed
* by a, and return 'true' if and only if the allocation attempt succeeds.
*/
static bool
-dmar_gas_match_one(struct dmar_gas_match_args *a, iommu_gaddr_t beg,
+iommu_gas_match_one(struct iommu_gas_match_args *a, iommu_gaddr_t beg,
iommu_gaddr_t end, iommu_gaddr_t maxaddr)
{
iommu_gaddr_t bs, start;
- a->entry->start = roundup2(beg + DMAR_PAGE_SIZE,
+ a->entry->start = roundup2(beg + IOMMU_PAGE_SIZE,
a->common->alignment);
if (a->entry->start + a->size > maxaddr)
return (false);
- /* DMAR_PAGE_SIZE to create gap after new entry. */
- if (a->entry->start < beg + DMAR_PAGE_SIZE ||
- a->entry->start + a->size + a->offset + DMAR_PAGE_SIZE > end)
+ /* IOMMU_PAGE_SIZE to create gap after new entry. */
+ if (a->entry->start < beg + IOMMU_PAGE_SIZE ||
+ a->entry->start + a->size + a->offset + IOMMU_PAGE_SIZE > end)
return (false);
/* No boundary crossing. */
@@ -311,8 +317,8 @@ dmar_gas_match_one(struct dmar_gas_match_args *a, iommu_gaddr_t beg,
bs = rounddown2(a->entry->start + a->offset + a->common->boundary,
a->common->boundary);
start = roundup2(bs, a->common->alignment);
- /* DMAR_PAGE_SIZE to create gap after new entry. */
- if (start + a->offset + a->size + DMAR_PAGE_SIZE <= end &&
+ /* IOMMU_PAGE_SIZE to create gap after new entry. */
+ if (start + a->offset + a->size + IOMMU_PAGE_SIZE <= end &&
start + a->offset + a->size <= maxaddr &&
iommu_test_boundary(start + a->offset, a->size,
a->common->boundary)) {
@@ -337,7 +343,7 @@ dmar_gas_match_one(struct dmar_gas_match_args *a, iommu_gaddr_t beg,
}
static void
-dmar_gas_match_insert(struct dmar_gas_match_args *a)
+iommu_gas_match_insert(struct iommu_gas_match_args *a)
{
bool found;
@@ -351,84 +357,84 @@ dmar_gas_match_insert(struct dmar_gas_match_args *a)
*/
a->entry->end = a->entry->start + a->size;
- found = dmar_gas_rb_insert(a->domain, a->entry);
+ found = iommu_gas_rb_insert(a->domain, a->entry);
KASSERT(found, ("found dup %p start %jx size %jx",
a->domain, (uintmax_t)a->entry->start, (uintmax_t)a->size));
a->entry->flags = IOMMU_MAP_ENTRY_MAP;
}
static int
-dmar_gas_lowermatch(struct dmar_gas_match_args *a, struct iommu_map_entry *entry)
+iommu_gas_lowermatch(struct iommu_gas_match_args *a, struct iommu_map_entry *entry)
{
struct iommu_map_entry *child;
child = RB_RIGHT(entry, rb_entry);
if (child != NULL && entry->end < a->common->lowaddr &&
- dmar_gas_match_one(a, entry->end, child->first,
+ iommu_gas_match_one(a, entry->end, child->first,
a->common->lowaddr)) {
- dmar_gas_match_insert(a);
+ iommu_gas_match_insert(a);
return (0);
}
- if (entry->free_down < a->size + a->offset + DMAR_PAGE_SIZE)
+ if (entry->free_down < a->size + a->offset + IOMMU_PAGE_SIZE)
return (ENOMEM);
if (entry->first >= a->common->lowaddr)
return (ENOMEM);
child = RB_LEFT(entry, rb_entry);
- if (child != NULL && 0 == dmar_gas_lowermatch(a, child))
+ if (child != NULL && 0 == iommu_gas_lowermatch(a, child))
return (0);
if (child != NULL && child->last < a->common->lowaddr &&
- dmar_gas_match_one(a, child->last, entry->start,
+ iommu_gas_match_one(a, child->last, entry->start,
a->common->lowaddr)) {
- dmar_gas_match_insert(a);
+ iommu_gas_match_insert(a);
return (0);
}
child = RB_RIGHT(entry, rb_entry);
- if (child != NULL && 0 == dmar_gas_lowermatch(a, child))
+ if (child != NULL && 0 == iommu_gas_lowermatch(a, child))
return (0);
return (ENOMEM);
}
static int
-dmar_gas_uppermatch(struct dmar_gas_match_args *a, struct iommu_map_entry *entry)
+iommu_gas_uppermatch(struct iommu_gas_match_args *a, struct iommu_map_entry *entry)
{
struct iommu_map_entry *child;
- if (entry->free_down < a->size + a->offset + DMAR_PAGE_SIZE)
+ if (entry->free_down < a->size + a->offset + IOMMU_PAGE_SIZE)
return (ENOMEM);
if (entry->last < a->common->highaddr)
return (ENOMEM);
child = RB_LEFT(entry, rb_entry);
- if (child != NULL && 0 == dmar_gas_uppermatch(a, child))
+ if (child != NULL && 0 == iommu_gas_uppermatch(a, child))
return (0);
if (child != NULL && child->last >= a->common->highaddr &&
- dmar_gas_match_one(a, child->last, entry->start,
+ iommu_gas_match_one(a, child->last, entry->start,
a->domain->end)) {
- dmar_gas_match_insert(a);
+ iommu_gas_match_insert(a);
return (0);
}
child = RB_RIGHT(entry, rb_entry);
if (child != NULL && entry->end >= a->common->highaddr &&
- dmar_gas_match_one(a, entry->end, child->first,
+ iommu_gas_match_one(a, entry->end, child->first,
a->domain->end)) {
- dmar_gas_match_insert(a);
+ iommu_gas_match_insert(a);
return (0);
}
- if (child != NULL && 0 == dmar_gas_uppermatch(a, child))
+ if (child != NULL && 0 == iommu_gas_uppermatch(a, child))
return (0);
return (ENOMEM);
}
static int
-dmar_gas_find_space(struct dmar_domain *domain,
+iommu_gas_find_space(struct iommu_domain *domain,
const struct bus_dma_tag_common *common, iommu_gaddr_t size,
int offset, u_int flags, struct iommu_map_entry *entry)
{
- struct dmar_gas_match_args a;
+ struct iommu_gas_match_args a;
int error;
- DMAR_DOMAIN_ASSERT_LOCKED(domain);
+ IOMMU_DOMAIN_ASSERT_LOCKED(domain);
KASSERT(entry->flags == 0, ("dirty entry %p %p", domain, entry));
- KASSERT((size & DMAR_PAGE_MASK) == 0, ("size %jx", (uintmax_t)size));
+ KASSERT((size & IOMMU_PAGE_MASK) == 0, ("size %jx", (uintmax_t)size));
a.domain = domain;
a.size = size;
@@ -439,42 +445,43 @@ dmar_gas_find_space(struct dmar_domain *domain,
/* Handle lower region. */
if (common->lowaddr > 0) {
- error = dmar_gas_lowermatch(&a, RB_ROOT(&domain->rb_root));
+ error = iommu_gas_lowermatch(&a,
+ RB_ROOT(&domain->rb_root));
if (error == 0)
return (0);
KASSERT(error == ENOMEM,
- ("error %d from dmar_gas_lowermatch", error));
+ ("error %d from iommu_gas_lowermatch", error));
}
/* Handle upper region. */
if (common->highaddr >= domain->end)
return (ENOMEM);
- error = dmar_gas_uppermatch(&a, RB_ROOT(&domain->rb_root));
+ error = iommu_gas_uppermatch(&a, RB_ROOT(&domain->rb_root));
KASSERT(error == ENOMEM,
- ("error %d from dmar_gas_uppermatch", error));
+ ("error %d from iommu_gas_uppermatch", error));
return (error);
}
static int
-dmar_gas_alloc_region(struct dmar_domain *domain, struct iommu_map_entry *entry,
+iommu_gas_alloc_region(struct iommu_domain *domain, struct iommu_map_entry *entry,
u_int flags)
{
struct iommu_map_entry *next, *prev;
bool found;
- DMAR_DOMAIN_ASSERT_LOCKED(domain);
+ IOMMU_DOMAIN_ASSERT_LOCKED(domain);
- if ((entry->start & DMAR_PAGE_MASK) != 0 ||
- (entry->end & DMAR_PAGE_MASK) != 0)
+ if ((entry->start & IOMMU_PAGE_MASK) != 0 ||
+ (entry->end & IOMMU_PAGE_MASK) != 0)
return (EINVAL);
if (entry->start >= entry->end)
return (EINVAL);
if (entry->end >= domain->end)
return (EINVAL);
- next = RB_NFIND(dmar_gas_entries_tree, &domain->rb_root, entry);
+ next = RB_NFIND(iommu_gas_entries_tree, &domain->rb_root, entry);
KASSERT(next != NULL, ("next must be non-null %p %jx", domain,
(uintmax_t)entry->start));
- prev = RB_PREV(dmar_gas_entries_tree, &domain->rb_root, next);
+ prev = RB_PREV(iommu_gas_entries_tree, &domain->rb_root, next);
/* prev could be NULL */
/*
@@ -504,15 +511,15 @@ dmar_gas_alloc_region(struct dmar_domain *domain, struct iommu_map_entry *entry,
if (prev != NULL && prev->end > entry->start) {
/* This assumes that prev is the placeholder entry. */
- dmar_gas_rb_remove(domain, prev);
+ iommu_gas_rb_remove(domain, prev);
prev = NULL;
}
if (next->start < entry->end) {
- dmar_gas_rb_remove(domain, next);
+ iommu_gas_rb_remove(domain, next);
next = NULL;
}
- found = dmar_gas_rb_insert(domain, entry);
+ found = iommu_gas_rb_insert(domain, entry);
KASSERT(found, ("found RMRR dup %p start %jx end %jx",
domain, (uintmax_t)entry->start, (uintmax_t)entry->end));
if ((flags & IOMMU_MF_RMRR) != 0)
@@ -520,8 +527,8 @@ dmar_gas_alloc_region(struct dmar_domain *domain, struct iommu_map_entry *entry,
#ifdef INVARIANTS
struct iommu_map_entry *ip, *in;
- ip = RB_PREV(dmar_gas_entries_tree, &domain->rb_root, entry);
- in = RB_NEXT(dmar_gas_entries_tree, &domain->rb_root, entry);
+ ip = RB_PREV(iommu_gas_entries_tree, &domain->rb_root, entry);
+ in = RB_NEXT(iommu_gas_entries_tree, &domain->rb_root, entry);
KASSERT(prev == NULL || ip == prev,
("RMRR %p (%jx %jx) prev %p (%jx %jx) ins prev %p (%jx %jx)",
entry, entry->start, entry->end, prev,
@@ -538,45 +545,45 @@ dmar_gas_alloc_region(struct dmar_domain *domain, struct iommu_map_entry *entry,
}
void
-dmar_gas_free_space(struct dmar_domain *domain, struct iommu_map_entry *entry)
+iommu_gas_free_space(struct iommu_domain *domain, struct iommu_map_entry *entry)
{
- DMAR_DOMAIN_ASSERT_LOCKED(domain);
+ IOMMU_DOMAIN_ASSERT_LOCKED(domain);
KASSERT((entry->flags & (IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_RMRR |
IOMMU_MAP_ENTRY_MAP)) == IOMMU_MAP_ENTRY_MAP,
("permanent entry %p %p", domain, entry));
- dmar_gas_rb_remove(domain, entry);
+ iommu_gas_rb_remove(domain, entry);
entry->flags &= ~IOMMU_MAP_ENTRY_MAP;
#ifdef INVARIANTS
- if (dmar_check_free)
- dmar_gas_check_free(domain);
+ if (iommu_check_free)
+ iommu_gas_check_free(domain);
#endif
}
void
-dmar_gas_free_region(struct dmar_domain *domain, struct iommu_map_entry *entry)
+iommu_gas_free_region(struct iommu_domain *domain, struct iommu_map_entry *entry)
{
struct iommu_map_entry *next, *prev;
- DMAR_DOMAIN_ASSERT_LOCKED(domain);
+ IOMMU_DOMAIN_ASSERT_LOCKED(domain);
KASSERT((entry->flags & (IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_RMRR |
IOMMU_MAP_ENTRY_MAP)) == IOMMU_MAP_ENTRY_RMRR,
("non-RMRR entry %p %p", domain, entry));
- prev = RB_PREV(dmar_gas_entries_tree, &domain->rb_root, entry);
- next = RB_NEXT(dmar_gas_entries_tree, &domain->rb_root, entry);
- dmar_gas_rb_remove(domain, entry);
+ prev = RB_PREV(iommu_gas_entries_tree, &domain->rb_root, entry);
+ next = RB_NEXT(iommu_gas_entries_tree, &domain->rb_root, entry);
+ iommu_gas_rb_remove(domain, entry);
entry->flags &= ~IOMMU_MAP_ENTRY_RMRR;
if (prev == NULL)
- dmar_gas_rb_insert(domain, domain->first_place);
+ iommu_gas_rb_insert(domain, domain->first_place);
if (next == NULL)
- dmar_gas_rb_insert(domain, domain->last_place);
+ iommu_gas_rb_insert(domain, domain->last_place);
}
int
-dmar_gas_map(struct dmar_domain *domain,
+iommu_gas_map(struct iommu_domain *domain,
const struct bus_dma_tag_common *common, iommu_gaddr_t size, int offset,
u_int eflags, u_int flags, vm_page_t *ma, struct iommu_map_entry **res)
{
@@ -586,38 +593,34 @@ dmar_gas_map(struct dmar_domain *domain,
KASSERT((flags & ~(IOMMU_MF_CANWAIT | IOMMU_MF_CANSPLIT)) == 0,
("invalid flags 0x%x", flags));
- entry = dmar_gas_alloc_entry(domain,
+ entry = iommu_gas_alloc_entry(domain,
(flags & IOMMU_MF_CANWAIT) != 0 ? DMAR_PGF_WAITOK : 0);
if (entry == NULL)
return (ENOMEM);
- DMAR_DOMAIN_LOCK(domain);
- error = dmar_gas_find_space(domain, common, size, offset, flags,
+ IOMMU_DOMAIN_LOCK(domain);
+ error = iommu_gas_find_space(domain, common, size, offset, flags,
entry);
if (error == ENOMEM) {
- DMAR_DOMAIN_UNLOCK(domain);
- dmar_gas_free_entry(domain, entry);
+ IOMMU_DOMAIN_UNLOCK(domain);
+ iommu_gas_free_entry(domain, entry);
return (error);
}
#ifdef INVARIANTS
- if (dmar_check_free)
- dmar_gas_check_free(domain);
+ if (iommu_check_free)
+ iommu_gas_check_free(domain);
#endif
KASSERT(error == 0,
- ("unexpected error %d from dmar_gas_find_entry", error));
+ ("unexpected error %d from iommu_gas_find_entry", error));
KASSERT(entry->end < domain->end, ("allocated GPA %jx, max GPA %jx",
(uintmax_t)entry->end, (uintmax_t)domain->end));
entry->flags |= eflags;
- DMAR_DOMAIN_UNLOCK(domain);
+ IOMMU_DOMAIN_UNLOCK(domain);
error = domain_map_buf(domain, entry->start, entry->end - entry->start,
- ma,
- ((eflags & IOMMU_MAP_ENTRY_READ) != 0 ? DMAR_PTE_R : 0) |
- ((eflags & IOMMU_MAP_ENTRY_WRITE) != 0 ? DMAR_PTE_W : 0) |
- ((eflags & IOMMU_MAP_ENTRY_SNOOP) != 0 ? DMAR_PTE_SNP : 0) |
- ((eflags & IOMMU_MAP_ENTRY_TM) != 0 ? DMAR_PTE_TM : 0),
- (flags & IOMMU_MF_CANWAIT) != 0 ? DMAR_PGF_WAITOK : 0);
+ ma, eflags,
+ ((flags & IOMMU_MF_CANWAIT) != 0 ? DMAR_PGF_WAITOK : 0));
if (error == ENOMEM) {
- dmar_domain_unload_entry(entry, true);
+ iommu_domain_unload_entry(entry, true);
return (error);
}
KASSERT(error == 0,
@@ -628,7 +631,7 @@ dmar_gas_map(struct dmar_domain *domain,
}
int
-dmar_gas_map_region(struct dmar_domain *domain, struct iommu_map_entry *entry,
+iommu_gas_map_region(struct iommu_domain *domain, struct iommu_map_entry *entry,
u_int eflags, u_int flags, vm_page_t *ma)
{
iommu_gaddr_t start;
@@ -640,26 +643,22 @@ dmar_gas_map_region(struct dmar_domain *domain, struct iommu_map_entry *entry,
("invalid flags 0x%x", flags));
start = entry->start;
- DMAR_DOMAIN_LOCK(domain);
- error = dmar_gas_alloc_region(domain, entry, flags);
+ IOMMU_DOMAIN_LOCK(domain);
+ error = iommu_gas_alloc_region(domain, entry, flags);
if (error != 0) {
- DMAR_DOMAIN_UNLOCK(domain);
+ IOMMU_DOMAIN_UNLOCK(domain);
return (error);
}
entry->flags |= eflags;
- DMAR_DOMAIN_UNLOCK(domain);
+ IOMMU_DOMAIN_UNLOCK(domain);
if (entry->end == entry->start)
return (0);
error = domain_map_buf(domain, entry->start, entry->end - entry->start,
- ma + OFF_TO_IDX(start - entry->start),
- ((eflags & IOMMU_MAP_ENTRY_READ) != 0 ? DMAR_PTE_R : 0) |
- ((eflags & IOMMU_MAP_ENTRY_WRITE) != 0 ? DMAR_PTE_W : 0) |
- ((eflags & IOMMU_MAP_ENTRY_SNOOP) != 0 ? DMAR_PTE_SNP : 0) |
- ((eflags & IOMMU_MAP_ENTRY_TM) != 0 ? DMAR_PTE_TM : 0),
- (flags & IOMMU_MF_CANWAIT) != 0 ? DMAR_PGF_WAITOK : 0);
+ ma + OFF_TO_IDX(start - entry->start), eflags,
+ ((flags & IOMMU_MF_CANWAIT) != 0 ? DMAR_PGF_WAITOK : 0));
if (error == ENOMEM) {
- dmar_domain_unload_entry(entry, false);
+ iommu_domain_unload_entry(entry, false);
return (error);
}
KASSERT(error == 0,
@@ -669,74 +668,62 @@ dmar_gas_map_region(struct dmar_domain *domain, struct iommu_map_entry *entry,
}
int
-dmar_gas_reserve_region(struct dmar_domain *domain, iommu_gaddr_t start,
+iommu_gas_reserve_region(struct iommu_domain *domain, iommu_gaddr_t start,
iommu_gaddr_t end)
{
struct iommu_map_entry *entry;
int error;
- entry = dmar_gas_alloc_entry(domain, DMAR_PGF_WAITOK);
+ entry = iommu_gas_alloc_entry(domain, DMAR_PGF_WAITOK);
entry->start = start;
entry->end = end;
- DMAR_DOMAIN_LOCK(domain);
- error = dmar_gas_alloc_region(domain, entry, IOMMU_MF_CANWAIT);
+ IOMMU_DOMAIN_LOCK(domain);
+ error = iommu_gas_alloc_region(domain, entry, IOMMU_MF_CANWAIT);
if (error == 0)
entry->flags |= IOMMU_MAP_ENTRY_UNMAPPED;
- DMAR_DOMAIN_UNLOCK(domain);
+ IOMMU_DOMAIN_UNLOCK(domain);
if (error != 0)
- dmar_gas_free_entry(domain, entry);
+ iommu_gas_free_entry(domain, entry);
return (error);
}
struct iommu_map_entry *
-iommu_map_alloc_entry(struct iommu_domain *iodom, u_int flags)
+iommu_map_alloc_entry(struct iommu_domain *domain, u_int flags)
{
- struct dmar_domain *domain;
struct iommu_map_entry *res;
- domain = (struct dmar_domain *)iodom;
-
- res = dmar_gas_alloc_entry(domain, flags);
+ res = iommu_gas_alloc_entry(domain, flags);
return (res);
}
void
-iommu_map_free_entry(struct iommu_domain *iodom, struct iommu_map_entry *entry)
+iommu_map_free_entry(struct iommu_domain *domain, struct iommu_map_entry *entry)
{
- struct dmar_domain *domain;
- domain = (struct dmar_domain *)iodom;
-
- dmar_gas_free_entry(domain, entry);
+ iommu_gas_free_entry(domain, entry);
}
int
-iommu_map(struct iommu_domain *iodom,
+iommu_map(struct iommu_domain *domain,
const struct bus_dma_tag_common *common, iommu_gaddr_t size, int offset,
u_int eflags, u_int flags, vm_page_t *ma, struct iommu_map_entry **res)
{
- struct dmar_domain *domain;
int error;
- domain = (struct dmar_domain *)iodom;
-
- error = dmar_gas_map(domain, common, size, offset, eflags, flags,
+ error = iommu_gas_map(domain, common, size, offset, eflags, flags,
ma, res);
return (error);
}
int
-iommu_map_region(struct iommu_domain *iodom, struct iommu_map_entry *entry,
+iommu_map_region(struct iommu_domain *domain, struct iommu_map_entry *entry,
u_int eflags, u_int flags, vm_page_t *ma)
{
- struct dmar_domain *domain;
int error;
- domain = (struct dmar_domain *)iodom;
-
- error = dmar_gas_map_region(domain, entry, eflags, flags, ma);
+ error = iommu_gas_map_region(domain, entry, eflags, flags, ma);
return (error);
}
diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c
index 2febb55f9426..89b3bf5d96d2 100644
--- a/sys/x86/iommu/intel_idpgtbl.c
+++ b/sys/x86/iommu/intel_idpgtbl.c
@@ -499,15 +499,23 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base,
}
int
-domain_map_buf(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size,
- vm_page_t *ma, uint64_t pflags, int flags)
+domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base,
+ iommu_gaddr_t size, vm_page_t *ma, uint64_t eflags, int flags)
{
+ struct dmar_domain *domain;
struct dmar_unit *unit;
+ uint64_t pflags;
int error;
+ pflags = ((eflags & IOMMU_MAP_ENTRY_READ) != 0 ? DMAR_PTE_R : 0) |
+ ((eflags & IOMMU_MAP_ENTRY_WRITE) != 0 ? DMAR_PTE_W : 0) |
+ ((eflags & IOMMU_MAP_ENTRY_SNOOP) != 0 ? DMAR_PTE_SNP : 0) |
+ ((eflags & IOMMU_MAP_ENTRY_TM) != 0 ? DMAR_PTE_TM : 0);
+
+ domain = (struct dmar_domain *)iodom;
unit = domain->dmar;
- KASSERT((domain->flags & DMAR_DOMAIN_IDMAP) == 0,
+ KASSERT((domain->iodom.flags & DMAR_DOMAIN_IDMAP) == 0,
("modifying idmap pagetable domain %p", domain));
KASSERT((base & DMAR_PAGE_MASK) == 0,
("non-aligned base %p %jx %jx", domain, (uintmax_t)base,
@@ -618,7 +626,7 @@ domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base,
if (size == 0)
return (0);
- KASSERT((domain->flags & DMAR_DOMAIN_IDMAP) == 0,
+ KASSERT((domain->iodom.flags & DMAR_DOMAIN_IDMAP) == 0,
("modifying idmap pagetable domain %p", domain));
KASSERT((base & DMAR_PAGE_MASK) == 0,
("non-aligned base %p %jx %jx", domain, (uintmax_t)base,
@@ -705,7 +713,7 @@ domain_alloc_pgtbl(struct dmar_domain *domain)
m->ref_count = 1;
DMAR_DOMAIN_PGUNLOCK(domain);
DMAR_LOCK(domain->dmar);
- domain->flags |= DMAR_DOMAIN_PGTBL_INITED;
+ domain->iodom.flags |= DMAR_DOMAIN_PGTBL_INITED;
DMAR_UNLOCK(domain->dmar);
return (0);
}
@@ -719,16 +727,16 @@ domain_free_pgtbl(struct dmar_domain *domain)
obj = domain->pgtbl_obj;
if (obj == NULL) {
KASSERT((domain->dmar->hw_ecap & DMAR_ECAP_PT) != 0 &&
- (domain->flags & DMAR_DOMAIN_IDMAP) != 0,
+ (domain->iodom.flags & DMAR_DOMAIN_IDMAP) != 0,
("lost pagetable object domain %p", domain));
return;
}
DMAR_DOMAIN_ASSERT_PGLOCKED(domain);
domain->pgtbl_obj = NULL;
- if ((domain->flags & DMAR_DOMAIN_IDMAP) != 0) {
+ if ((domain->iodom.flags & DMAR_DOMAIN_IDMAP) != 0) {
put_idmap_pgtbl(obj);
- domain->flags &= ~DMAR_DOMAIN_IDMAP;
+ domain->iodom.flags &= ~DMAR_DOMAIN_IDMAP;
return;
}
diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c
index 739952328b18..72a1c2a3a0d3 100644
--- a/sys/x86/iommu/intel_utils.c
+++ b/sys/x86/iommu/intel_utils.c
@@ -668,9 +668,9 @@ SYSCTL_PROC(_hw_dmar, OID_AUTO, timeout,
dmar_timeout_sysctl, "QU",
"Timeout for command wait, in nanoseconds");
#ifdef INVARIANTS
-int dmar_check_free;
+int iommu_check_free;
SYSCTL_INT(_hw_dmar, OID_AUTO, check_free, CTLFLAG_RWTUN,
- &dmar_check_free, 0,
+ &iommu_check_free, 0,
"Check the GPA RBtree for free_down and free_after validity");
#endif