Page MenuHomeFreeBSD
Files F140692517

D20097.id56957.diff
No OneTemporary
Actions

D20097.id56957.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/scatterlist.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/scatterlist.h
+++ sys/compat/linuxkpi/common/include/linux/scatterlist.h
@@ -36,6 +36,7 @@
#include <linux/slab.h>
#include <linux/mm.h>
+struct bus_dmamap;
struct scatterlist {
unsigned long page_link;
#define SG_PAGE_LINK_CHAIN 0x1UL
@@ -44,7 +45,7 @@
unsigned int offset;
unsigned int length;
dma_addr_t dma_address;
- unsigned int dma_length;
+ struct bus_dmamap *dma_map; /* FreeBSD specific */
};
CTASSERT((sizeof(struct scatterlist) & SG_PAGE_LINK_MASK) == 0);
@@ -79,7 +80,7 @@
((struct scatterlist *) ((sg)->page_link & ~SG_PAGE_LINK_MASK))
#define sg_dma_address(sg) (sg)->dma_address
-#define sg_dma_len(sg) (sg)->dma_length
+#define sg_dma_len(sg) (sg)->length
#define for_each_sg_page(sgl, iter, nents, pgoffset) \
for (_sg_iter_init(sgl, iter, nents, pgoffset); \
Index: sys/compat/linuxkpi/common/src/linux_pci.c
===================================================================
--- sys/compat/linuxkpi/common/src/linux_pci.c
+++ sys/compat/linuxkpi/common/src/linux_pci.c
@@ -410,7 +410,9 @@
struct linux_dma_obj {
void *vaddr;
uint64_t dma_addr;
- bus_dmamap_t dmamap;
+ bus_dmamap_t dma_map;
+ size_t dma_length;
+ uint32_t dma_refcount;
};
static uma_zone_t linux_dma_trie_zone;
@@ -480,10 +482,15 @@
align = PAGE_SIZE << get_order(size);
mem = (void *)kmem_alloc_contig(size, flag, 0, high, align, 0,
VM_MEMATTR_DEFAULT);
- if (mem)
+ if (mem != NULL) {
*dma_handle = linux_dma_map_phys(dev, vtophys(mem), size);
- else
+ if (*dma_handle == 0) {
+ kmem_free((vm_offset_t)mem, size);
+ mem = NULL;
+ }
+ } else {
*dma_handle = 0;
+ }
return (mem);
}
@@ -492,6 +499,7 @@
{
struct linux_dma_priv *priv;
struct linux_dma_obj *obj;
+ struct linux_dma_obj *old;
int error, nseg;
bus_dma_segment_t seg;
@@ -500,34 +508,64 @@
obj = uma_zalloc(linux_dma_obj_zone, 0);
DMA_PRIV_LOCK(priv);
- if (bus_dmamap_create(priv->dmat, 0, &obj->dmamap) != 0) {
+ if (bus_dmamap_create(priv->dmat, 0, &obj->dma_map) != 0) {
DMA_PRIV_UNLOCK(priv);
uma_zfree(linux_dma_obj_zone, obj);
return (0);
}
nseg = -1;
- if (_bus_dmamap_load_phys(priv->dmat, obj->dmamap, phys, len,
+ if (_bus_dmamap_load_phys(priv->dmat, obj->dma_map, phys, len,
BUS_DMA_NOWAIT, &seg, &nseg) != 0) {
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
+ bus_dmamap_destroy(priv->dmat, obj->dma_map);
DMA_PRIV_UNLOCK(priv);
uma_zfree(linux_dma_obj_zone, obj);
return (0);
}
- KASSERT(++nseg == 1, ("More than one segment (nseg=%d)", nseg));
+ KASSERT(nseg == 0, ("More than one segment (nseg=%d)", nseg + 1));
obj->dma_addr = seg.ds_addr;
+ obj->dma_length = seg.ds_len;
+ obj->dma_refcount = 1;
+ /* check if there is an existing mapping */
+ old = LINUX_DMA_PCTRIE_LOOKUP(&priv->ptree, obj->dma_addr);
+ if (unlikely(old != NULL)) {
+ /* sanity check refcount */
+ if (unlikely(old->dma_refcount == 0 ||
+ old->dma_refcount == UINT_MAX))
+ goto error_locked;
+
+ /* check if old mapping is sufficient */
+ if (obj->dma_length > old->dma_length) {
+ obj->dma_refcount = old->dma_refcount + 1;
+ LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, old->dma_addr);
+ bus_dmamap_unload(priv->dmat, old->dma_map);
+ bus_dmamap_destroy(priv->dmat, old->dma_map);
+ uma_zfree(linux_dma_obj_zone, old);
+ } else {
+ old->dma_refcount++;
+ bus_dmamap_unload(priv->dmat, obj->dma_map);
+ bus_dmamap_destroy(priv->dmat, obj->dma_map);
+ DMA_PRIV_UNLOCK(priv);
+ uma_zfree(linux_dma_obj_zone, obj);
+ return (old->dma_addr);
+ }
+ }
+
+ /* insert new mapping */
error = LINUX_DMA_PCTRIE_INSERT(&priv->ptree, obj);
- if (error != 0) {
- bus_dmamap_unload(priv->dmat, obj->dmamap);
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
- DMA_PRIV_UNLOCK(priv);
- uma_zfree(linux_dma_obj_zone, obj);
- return (0);
- }
+ if (error != 0)
+ goto error_locked;
DMA_PRIV_UNLOCK(priv);
return (obj->dma_addr);
+
+error_locked:
+ bus_dmamap_unload(priv->dmat, obj->dma_map);
+ bus_dmamap_destroy(priv->dmat, obj->dma_map);
+ DMA_PRIV_UNLOCK(priv);
+ uma_zfree(linux_dma_obj_zone, obj);
+ return (0);
}
void
@@ -536,17 +574,29 @@
struct linux_dma_priv *priv;
struct linux_dma_obj *obj;
+ /* check if DMA address is not mapped */
+ if (unlikely(dma_addr == 0))
+ return;
+
priv = dev->dma_priv;
DMA_PRIV_LOCK(priv);
obj = LINUX_DMA_PCTRIE_LOOKUP(&priv->ptree, dma_addr);
- if (obj == NULL) {
+ if (unlikely(obj == NULL)) {
+ pr_debug("linux_dma_unmap: Bad DMA address 0x%zx\n", (size_t)dma_addr);
DMA_PRIV_UNLOCK(priv);
return;
}
+
+ KASSERT(obj->dma_refcount >= 1, ("Invalid refcount %u", obj->dma_refcount));
+
+ if (--(obj->dma_refcount) != 0) {
+ DMA_PRIV_UNLOCK(priv);
+ return;
+ }
LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, dma_addr);
- bus_dmamap_unload(priv->dmat, obj->dmamap);
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
+ bus_dmamap_unload(priv->dmat, obj->dma_map);
+ bus_dmamap_destroy(priv->dmat, obj->dma_map);
DMA_PRIV_UNLOCK(priv);
uma_zfree(linux_dma_obj_zone, obj);
@@ -557,70 +607,37 @@
enum dma_data_direction dir, struct dma_attrs *attrs)
{
struct linux_dma_priv *priv;
- struct linux_dma_obj *obj;
- struct scatterlist *dma_sg, *sg;
- int dma_nents, error, nseg;
- size_t seg_len;
- vm_paddr_t seg_phys, prev_phys_end;
+ struct scatterlist *sg;
+ int i, nseg;
bus_dma_segment_t seg;
priv = dev->dma_priv;
- obj = uma_zalloc(linux_dma_obj_zone, 0);
+ DMA_PRIV_LOCK(priv);
- DMA_PRIV_LOCK(priv);
- if (bus_dmamap_create(priv->dmat, 0, &obj->dmamap) != 0) {
+ /* create common DMA map in the first S/G entry */
+ if (bus_dmamap_create(priv->dmat, 0, &sgl->dma_map) != 0) {
DMA_PRIV_UNLOCK(priv);
- uma_zfree(linux_dma_obj_zone, obj);
return (0);
}
- sg = sgl;
- dma_sg = sg;
- dma_nents = 0;
-
- while (nents > 0) {
- seg_phys = sg_phys(sg);
- seg_len = sg->length;
- while (--nents > 0) {
- prev_phys_end = sg_phys(sg) + sg->length;
- sg = sg_next(sg);
- if (prev_phys_end != sg_phys(sg))
- break;
- seg_len += sg->length;
- }
-
+ /* load all S/G list entries */
+ for_each_sg(sgl, sg, nents, i) {
nseg = -1;
- if (_bus_dmamap_load_phys(priv->dmat, obj->dmamap,
- seg_phys, seg_len, BUS_DMA_NOWAIT,
+ if (_bus_dmamap_load_phys(priv->dmat, sgl->dma_map,
+ sg_phys(sg), sg->length, BUS_DMA_NOWAIT,
&seg, &nseg) != 0) {
- bus_dmamap_unload(priv->dmat, obj->dmamap);
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
+ bus_dmamap_unload(priv->dmat, sgl->dma_map);
+ bus_dmamap_destroy(priv->dmat, sgl->dma_map);
DMA_PRIV_UNLOCK(priv);
- uma_zfree(linux_dma_obj_zone, obj);
return (0);
}
- KASSERT(++nseg == 1, ("More than one segment (nseg=%d)", nseg));
-
- sg_dma_address(dma_sg) = seg.ds_addr;
- sg_dma_len(dma_sg) = seg.ds_len;
-
- dma_sg = sg_next(dma_sg);
- dma_nents++;
- }
-
- obj->dma_addr = sg_dma_address(sgl);
-
- error = LINUX_DMA_PCTRIE_INSERT(&priv->ptree, obj);
- if (error != 0) {
- bus_dmamap_unload(priv->dmat, obj->dmamap);
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
- DMA_PRIV_UNLOCK(priv);
- uma_zfree(linux_dma_obj_zone, obj);
- return (0);
+ KASSERT(nseg == 0, ("More than one segment (nseg=%d)", nseg + 1));
+ sg_dma_address(sg) = seg.ds_addr;
}
DMA_PRIV_UNLOCK(priv);
- return (dma_nents);
+
+ return (nents);
}
void
@@ -628,22 +645,13 @@
int nents, enum dma_data_direction dir, struct dma_attrs *attrs)
{
struct linux_dma_priv *priv;
- struct linux_dma_obj *obj;
priv = dev->dma_priv;
DMA_PRIV_LOCK(priv);
- obj = LINUX_DMA_PCTRIE_LOOKUP(&priv->ptree, sg_dma_address(sgl));
- if (obj == NULL) {
- DMA_PRIV_UNLOCK(priv);
- return;
- }
- LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, sg_dma_address(sgl));
- bus_dmamap_unload(priv->dmat, obj->dmamap);
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
+ bus_dmamap_unload(priv->dmat, sgl->dma_map);
+ bus_dmamap_destroy(priv->dmat, sgl->dma_map);
DMA_PRIV_UNLOCK(priv);
-
- uma_zfree(linux_dma_obj_zone, obj);
}
struct dma_pool {
@@ -668,15 +676,17 @@
nseg = -1;
DMA_POOL_LOCK(pool);
- error = _bus_dmamap_load_phys(pool->pool_dmat, obj->dmamap,
+ error = _bus_dmamap_load_phys(pool->pool_dmat, obj->dma_map,
vtophys(obj->vaddr), pool->pool_entry_size, BUS_DMA_NOWAIT,
&seg, &nseg);
DMA_POOL_UNLOCK(pool);
if (error != 0) {
return (error);
}
- KASSERT(++nseg == 1, ("More than one segment (nseg=%d)", nseg));
+ KASSERT(nseg == 0, ("More than one segment (nseg=%d)", nseg + 1));
obj->dma_addr = seg.ds_addr;
+ obj->dma_length = seg.ds_len;
+ obj->dma_refcount = 1;
return (0);
}
@@ -688,7 +698,7 @@
struct dma_pool *pool = arg;
DMA_POOL_LOCK(pool);
- bus_dmamap_unload(pool->pool_dmat, obj->dmamap);
+ bus_dmamap_unload(pool->pool_dmat, obj->dma_map);
DMA_POOL_UNLOCK(pool);
}
@@ -708,7 +718,7 @@
break;
error = bus_dmamem_alloc(pool->pool_dmat, &obj->vaddr,
- BUS_DMA_NOWAIT, &obj->dmamap);
+ BUS_DMA_NOWAIT, &obj->dma_map);
if (error!= 0) {
uma_zfree(linux_dma_obj_zone, obj);
break;
@@ -731,7 +741,7 @@
priv = pool->pool_device->dma_priv;
for (i = 0; i < count; i++) {
obj = store[i];
- bus_dmamem_free(pool->pool_dmat, obj->vaddr, obj->dmamap);
+ bus_dmamem_free(pool->pool_dmat, obj->vaddr, obj->dma_map);
uma_zfree(linux_dma_obj_zone, obj);
}
}
@@ -811,12 +821,24 @@
{
struct linux_dma_obj *obj;
+ /* check if DMA address is not mapped */
+ if (unlikely(dma_addr == 0))
+ return;
+
DMA_POOL_LOCK(pool);
obj = LINUX_DMA_PCTRIE_LOOKUP(&pool->pool_ptree, dma_addr);
- if (obj == NULL) {
+ if (unlikely(obj == NULL)) {
+ pr_debug("linux_dma_pool_free: Bad DMA address 0x%zx\n", (size_t)dma_addr);
DMA_POOL_UNLOCK(pool);
return;
}
+
+ KASSERT(obj->dma_refcount >= 1, ("Invalid refcount %u", obj->dma_refcount));
+
+ if (--(obj->dma_refcount) != 0) {
+ DMA_POOL_UNLOCK(pool);
+ return;
+ }
LINUX_DMA_PCTRIE_REMOVE(&pool->pool_ptree, dma_addr);
DMA_POOL_UNLOCK(pool);

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 27, 11:14 PM (9 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27315664
Default Alt Text
D20097.id56957.diff (9 KB)

Event Timeline