Page MenuHomeFreeBSD
Files F149366940

D43157.1789934487.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D43157.1789934487.diff
View Options

diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c
--- a/sys/arm64/arm64/busdma_bounce.c
+++ b/sys/arm64/arm64/busdma_bounce.c
@@ -40,9 +40,10 @@
#include <sys/kernel.h>
#include <sys/ktr.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <sys/memdesc.h>
+#include <sys/msan.h>
#include <sys/mutex.h>
+#include <sys/proc.h>
#include <sys/sysctl.h>
#include <sys/uio.h>
@@ -104,6 +105,9 @@
#define DMAMAP_FROM_DMAMEM (1 << 1)
#define DMAMAP_MBUF (1 << 2)
int sync_count;
+#ifdef KMSAN
+ struct memdesc kmsan_mem;
+#endif
struct sync_list slist[];
};
@@ -1149,7 +1153,19 @@
*/
dsb(sy);
}
+
+ kmsan_bus_dmamap_sync(&map->kmsan_mem, op);
+}
+
+#ifdef KMSAN
+static void
+bounce_bus_dmamap_load_kmsan(bus_dmamap_t map, struct memdesc *mem)
+{
+ if (map == NULL)
+ return;
+ memcpy(&map->kmsan_mem, mem, sizeof(map->kmsan_mem));
}
+#endif
struct bus_dma_impl bus_dma_bounce_impl = {
.tag_create = bounce_bus_dma_tag_create,
@@ -1166,5 +1182,8 @@
.map_waitok = bounce_bus_dmamap_waitok,
.map_complete = bounce_bus_dmamap_complete,
.map_unload = bounce_bus_dmamap_unload,
- .map_sync = bounce_bus_dmamap_sync
+ .map_sync = bounce_bus_dmamap_sync,
+#ifdef KMSAN
+ .load_kmsan = bounce_bus_dmamap_load_kmsan,
+#endif
};
diff --git a/sys/arm64/include/bus_dma.h b/sys/arm64/include/bus_dma.h
--- a/sys/arm64/include/bus_dma.h
+++ b/sys/arm64/include/bus_dma.h
@@ -149,4 +149,16 @@
return (tc->impl->map_complete(dmat, map, segs, nsegs, error));
}
+#ifdef KMSAN
+static inline void
+_bus_dmamap_load_kmsan(bus_dma_tag_t dmat, bus_dmamap_t map,
+ struct memdesc *mem)
+{
+ struct bus_dma_tag_common *tc;
+
+ tc = (struct bus_dma_tag_common *)dmat;
+ return (tc->impl->load_kmsan(map, mem));
+}
+#endif
+
#endif /* !_MACHINE_BUS_DMA_H_ */
diff --git a/sys/arm64/include/bus_dma_impl.h b/sys/arm64/include/bus_dma_impl.h
--- a/sys/arm64/include/bus_dma_impl.h
+++ b/sys/arm64/include/bus_dma_impl.h
@@ -75,6 +75,9 @@
void (*map_unload)(bus_dma_tag_t dmat, bus_dmamap_t map);
void (*map_sync)(bus_dma_tag_t dmat, bus_dmamap_t map,
bus_dmasync_op_t op);
+#ifdef KMSAN
+ void (*load_kmsan)(bus_dmamap_t map, struct memdesc *mem);
+#endif
};
int common_bus_dma_tag_create(struct bus_dma_tag_common *parent,

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 20, 8:01 PM (7 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29807468
Default Alt Text
D43157.1789934487.diff (2 KB)

Event Timeline