diff options
| author | Christoph Hellwig <hch@lst.de> | 2024-10-15 10:29:20 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2024-10-29 08:53:37 +0100 |
| commit | 150745b49aca4dec8057e8908d5ce5383e036a4f (patch) | |
| tree | e4ab72ba73936b369dc1be738f884daa77d14efc | |
| parent | 9d4f645a1fd49eea70a21e8671d358ebe1c08d02 (diff) | |
| download | lwn-150745b49aca4dec8057e8908d5ce5383e036a4f.tar.gz lwn-150745b49aca4dec8057e8908d5ce5383e036a4f.zip | |
dma-debug: remove DMA_API_DEBUG_SG
The scatterlist validity checks are pretty simple and cheap, perform them
unconditionally.
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | kernel/dma/Kconfig | 17 | ||||
| -rw-r--r-- | kernel/dma/debug.c | 2 |
2 files changed, 0 insertions, 19 deletions
diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig index 4c0dcd909121..31cfdb6b4bc3 100644 --- a/kernel/dma/Kconfig +++ b/kernel/dma/Kconfig @@ -260,23 +260,6 @@ config DMA_API_DEBUG If unsure, say N. -config DMA_API_DEBUG_SG - bool "Debug DMA scatter-gather usage" - default y - depends on DMA_API_DEBUG - help - Perform extra checking that callers of dma_map_sg() have respected the - appropriate segment length/boundary limits for the given device when - preparing DMA scatterlists. - - This is particularly likely to have been overlooked in cases where the - dma_map_sg() API is used for general bulk mapping of pages rather than - preparing literal scatter-gather descriptors, where there is a risk of - unexpected behaviour from DMA API implementations if the scatterlist - is technically out-of-spec. - - If unsure, say N. - config DMA_MAP_BENCHMARK bool "Enable benchmarking of streaming DMA mapping" depends on DEBUG_FS diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 4e3692afdf0d..295396226f31 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -1163,7 +1163,6 @@ out: static void check_sg_segment(struct device *dev, struct scatterlist *sg) { -#ifdef CONFIG_DMA_API_DEBUG_SG unsigned int max_seg = dma_get_max_seg_size(dev); u64 start, end, boundary = dma_get_seg_boundary(dev); @@ -1184,7 +1183,6 @@ static void check_sg_segment(struct device *dev, struct scatterlist *sg) if ((start ^ end) & ~boundary) err_printk(dev, NULL, "mapping sg segment across boundary [start=0x%016llx] [end=0x%016llx] [boundary=0x%016llx]\n", start, end, boundary); -#endif } void debug_dma_map_single(struct device *dev, const void *addr, |