Use pmap_quick_enter_page() to handle bouncing of unmapped buffers in the x86 busdma_bounce implementation. Also treat user buffers as unmapped.
This allows two things: 1. Sync'ing bounced maps in non-sleepable contexts. The physcopy* calls previously used could sleep on sf_buf operations in some cases. 2. Sync'ing user buffers outside the context of the owning process Approved by: kib (mentor)
This commit is contained in:
parent
3ebe4c01f7
commit
7b59f7bc5c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=286787
@ -79,7 +79,8 @@ struct bounce_page {
|
||||
vm_offset_t vaddr; /* kva of bounce buffer */
|
||||
bus_addr_t busaddr; /* Physical address */
|
||||
vm_offset_t datavaddr; /* kva of client data */
|
||||
bus_addr_t dataaddr; /* client physical address */
|
||||
vm_page_t datapage; /* physical page of client data */
|
||||
vm_offset_t dataoffs; /* page offset of client data */
|
||||
bus_size_t datacount; /* client data count */
|
||||
STAILQ_ENTRY(bounce_page) links;
|
||||
};
|
||||
@ -658,7 +659,7 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
|
||||
{
|
||||
bus_size_t sgsize, max_sgsize;
|
||||
bus_addr_t curaddr;
|
||||
vm_offset_t vaddr;
|
||||
vm_offset_t kvaddr, vaddr;
|
||||
int error;
|
||||
|
||||
if (map == NULL)
|
||||
@ -681,10 +682,13 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
|
||||
/*
|
||||
* Get the physical address for this segment.
|
||||
*/
|
||||
if (pmap == kernel_pmap)
|
||||
if (pmap == kernel_pmap) {
|
||||
curaddr = pmap_kextract(vaddr);
|
||||
else
|
||||
kvaddr = vaddr;
|
||||
} else {
|
||||
curaddr = pmap_extract(pmap, vaddr);
|
||||
kvaddr = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Compute the segment size, and adjust counts.
|
||||
@ -696,7 +700,7 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
|
||||
bus_dma_run_filter(&dmat->common, curaddr)) {
|
||||
sgsize = roundup2(sgsize, dmat->common.alignment);
|
||||
sgsize = MIN(sgsize, max_sgsize);
|
||||
curaddr = add_bounce_page(dmat, map, vaddr, curaddr,
|
||||
curaddr = add_bounce_page(dmat, map, kvaddr, curaddr,
|
||||
sgsize);
|
||||
} else {
|
||||
sgsize = MIN(sgsize, max_sgsize);
|
||||
@ -757,6 +761,7 @@ bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
|
||||
bus_dmasync_op_t op)
|
||||
{
|
||||
struct bounce_page *bpage;
|
||||
vm_offset_t datavaddr, tempvaddr;
|
||||
|
||||
if ((bpage = STAILQ_FIRST(&map->bpages)) == NULL)
|
||||
return;
|
||||
@ -770,13 +775,19 @@ bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
|
||||
|
||||
if ((op & BUS_DMASYNC_PREWRITE) != 0) {
|
||||
while (bpage != NULL) {
|
||||
if (bpage->datavaddr != 0) {
|
||||
bcopy((void *)bpage->datavaddr,
|
||||
(void *)bpage->vaddr, bpage->datacount);
|
||||
} else {
|
||||
physcopyout(bpage->dataaddr,
|
||||
(void *)bpage->vaddr, bpage->datacount);
|
||||
tempvaddr = 0;
|
||||
datavaddr = bpage->datavaddr;
|
||||
if (datavaddr == 0) {
|
||||
tempvaddr =
|
||||
pmap_quick_enter_page(bpage->datapage);
|
||||
datavaddr = tempvaddr | bpage->dataoffs;
|
||||
}
|
||||
|
||||
bcopy((void *)datavaddr,
|
||||
(void *)bpage->vaddr, bpage->datacount);
|
||||
|
||||
if (tempvaddr != 0)
|
||||
pmap_quick_remove_page(tempvaddr);
|
||||
bpage = STAILQ_NEXT(bpage, links);
|
||||
}
|
||||
dmat->bounce_zone->total_bounced++;
|
||||
@ -784,14 +795,19 @@ bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
|
||||
|
||||
if ((op & BUS_DMASYNC_POSTREAD) != 0) {
|
||||
while (bpage != NULL) {
|
||||
if (bpage->datavaddr != 0) {
|
||||
bcopy((void *)bpage->vaddr,
|
||||
(void *)bpage->datavaddr,
|
||||
bpage->datacount);
|
||||
} else {
|
||||
physcopyin((void *)bpage->vaddr,
|
||||
bpage->dataaddr, bpage->datacount);
|
||||
tempvaddr = 0;
|
||||
datavaddr = bpage->datavaddr;
|
||||
if (datavaddr == 0) {
|
||||
tempvaddr =
|
||||
pmap_quick_enter_page(bpage->datapage);
|
||||
datavaddr = tempvaddr | bpage->dataoffs;
|
||||
}
|
||||
|
||||
bcopy((void *)bpage->vaddr,
|
||||
(void *)datavaddr, bpage->datacount);
|
||||
|
||||
if (tempvaddr != 0)
|
||||
pmap_quick_remove_page(tempvaddr);
|
||||
bpage = STAILQ_NEXT(bpage, links);
|
||||
}
|
||||
dmat->bounce_zone->total_bounced++;
|
||||
@ -989,7 +1005,8 @@ add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr,
|
||||
bpage->busaddr |= addr & PAGE_MASK;
|
||||
}
|
||||
bpage->datavaddr = vaddr;
|
||||
bpage->dataaddr = addr;
|
||||
bpage->datapage = PHYS_TO_VM_PAGE(addr & ~PAGE_MASK);
|
||||
bpage->dataoffs = addr & PAGE_MASK;
|
||||
bpage->datacount = size;
|
||||
STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);
|
||||
return (bpage->busaddr);
|
||||
|
Loading…
Reference in New Issue
Block a user