d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct the termination condition of the DVMA pruning loop in

Browse Source 
iommu_dvma_vallocseg(), which I botched in r1.32. This bug could
cause an endless loop when a map was loaded and DVMA was scarce,
or that map had a stringent alignment or boundary.

Report and additional testing:	Marius Strobl <marius@alchemy.franken.de>
This commit is contained in:
Thomas Moestl 2004-03-23 23:20:34 +00:00
parent 252cc8f6b2
commit 62b7be1be9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=127344
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/sparc64/sparc64/iommu.c
View File

@ -190,7 +190,7 @@ struct mtx iommu_mtx;
* the IOTSBs are divorced.
* LRU queue handling for lazy resource allocation.
*/
static TAILQ_HEAD(, bus_dmamap) iommu_maplruq =
static TAILQ_HEAD(iommu_maplruq_head, bus_dmamap) iommu_maplruq =
TAILQ_HEAD_INITIALIZER(iommu_maplruq);
/* DVMA space rman. */
@ -746,7 +746,7 @@ static int
iommu_dvma_vallocseg(bus_dma_tag_t dt, struct iommu_state *is, bus_dmamap_t map,
vm_offset_t voffs, bus_size_t size, bus_addr_t amask, bus_addr_t *addr)
{
bus_dmamap_t tm;
bus_dmamap_t tm, last;
bus_addr_t dvmaddr, freed;
int error, complete = 0;
@ -757,7 +757,7 @@ iommu_dvma_vallocseg(bus_dma_tag_t dt, struct iommu_state *is, bus_dmamap_t map,
while ((error = iommu_dvma_valloc(dt, is, map,
voffs + size)) == ENOMEM && !complete) {
/*
* Free the allocated DVMA of a few tags until
* Free the allocated DVMA of a few maps until
* the required size is reached. This is an
* approximation to not have to call the allocation
* function too often; most likely one free run
@ -766,16 +766,16 @@ iommu_dvma_vallocseg(bus_dma_tag_t dt, struct iommu_state *is, bus_dmamap_t map,
*/
IS_LOCK(is);
freed = 0;
last = TAILQ_LAST(&iommu_maplruq, iommu_maplruq_head);
do {
tm = TAILQ_FIRST(&iommu_maplruq);
if (tm == NULL) {
complete = 1;
complete = tm == last;
if (tm == NULL)
break;
}
freed += iommu_dvma_vprune(is, tm);
/* Move to the end. */
iommu_map_insq(is, tm);
} while (freed < size);
} while (freed < size && !complete);
IS_UNLOCK(is);
}
if (error != 0)