summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/include/bus_private.h
diff options
context:
space:
mode:
authortmm <tmm@FreeBSD.org>2003-07-10 23:27:35 +0000
committertmm <tmm@FreeBSD.org>2003-07-10 23:27:35 +0000
commit5b603201cc2ae0b710ed68f289001529568a6e1b (patch)
tree11a0e2331c5f4e82b7579e43d973f2f65cedbc72 /sys/sparc64/include/bus_private.h
parent6b0bee64fce19f60a859b714ffe17282bcd705e9 (diff)
downloadFreeBSD-src-5b603201cc2ae0b710ed68f289001529568a6e1b.zip
FreeBSD-src-5b603201cc2ae0b710ed68f289001529568a6e1b.tar.gz
Lock down the IOMMU bus_dma implementation to make it safe to use
without Giant held. A quick outline of the locking strategy: Since all IOMMUs are synchronized, there is a single lock, iommu_mtx, which protects the hardware registers (where needed) and the global and per-IOMMU software states. As soon as the IOMMUs are divorced, each struct iommu_state will have its own mutex (and the remaining global state will be moved into the struct). The dvma rman has its own internal mutex; the TSB slots may only be accessed by the owner of the corresponding resource, so neither needs extra protection. Since there is a second access path to maps via LRU queues, the consumer- provided locking is not sufficient; therefore, each map which is on a queue is additionally protected by iommu_mtx (in part, there is one member which only the map owner may access). Each map on a queue may be accessed and removed from or repositioned in a queue in any context as long as the lock is held; only the owner may insert a map. To reduce lock contention, some bus_dma functions remove the map from the queue temporarily (on behalf of the map owner) for some operations and reinsert it when they are done. Shorter operations and operations which are not done on behalf of the lock owner are completely covered by the lock. To facilitate the locking, reorganize the streaming buffer handling; while being there, fix an old oversight which would cause the streaming buffer to always be flushed, regardless of whether streaming was enabled in the TSB entry. The streaming buffer is still disabled for now, since there are a number of drivers which lack critical bus_dmamp_sync() calls. Additional testing by: jake
Diffstat (limited to 'sys/sparc64/include/bus_private.h')
-rw-r--r--sys/sparc64/include/bus_private.h24
1 files changed, 20 insertions, 4 deletions
diff --git a/sys/sparc64/include/bus_private.h b/sys/sparc64/include/bus_private.h
index 71c8b76..55f6e53 100644
--- a/sys/sparc64/include/bus_private.h
+++ b/sys/sparc64/include/bus_private.h
@@ -54,13 +54,29 @@ struct bus_dmamap_res {
SLIST_ENTRY(bus_dmamap_res) dr_link;
};
+/*
+ * Callers of the bus_dma interfaces must always protect their tags and maps
+ * appropriately against concurrent access. However, when a map is on a LRU
+ * queue, there is a second access path to it; for this case, the locking rules
+ * are given in the parenthesized comments below:
+ * q - locked by the mutex protecting the queue.
+ * p - private to the owner of the map, no access through the queue.
+ * * - comment refers to pointer target.
+ * Only the owner of the map is allowed to insert the map into a queue. Removal
+ * and repositioning (i.e. temporal removal and reinsertion) is allowed to all
+ * if the queue lock is held.
+ */
struct bus_dmamap {
- TAILQ_ENTRY(bus_dmamap) dm_maplruq;
- SLIST_HEAD(, bus_dmamap_res) dm_reslist;
- int dm_onq;
- int dm_loaded;
+ TAILQ_ENTRY(bus_dmamap) dm_maplruq; /* (q) */
+ SLIST_HEAD(, bus_dmamap_res) dm_reslist; /* (q, *q) */
+ int dm_onq; /* (q) */
+ int dm_flags; /* (p) */
};
+/* Flag values. */
+#define DMF_LOADED 1 /* Map is loaded */
+#define DMF_COHERENT 2 /* Coherent mapping requested */
+
int sparc64_dma_alloc_map(bus_dma_tag_t dmat, bus_dmamap_t *mapp);
void sparc64_dma_free_map(bus_dma_tag_t dmat, bus_dmamap_t map);
OpenPOWER on IntegriCloud