* [PATCH] dma-mapping: fix DMA API tracing for chained scatterlists
@ 2024-09-26 7:33 Christoph Hellwig
2024-09-26 15:34 ` Sean Anderson
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Hellwig @ 2024-09-26 7:33 UTC (permalink / raw)
To: sean.anderson
Cc: m.szyprowski, robin.murphy, iommu, syzbot+95e4ef83a3024384ec7a
scatterlist allocations can be chained, and thus all iterations need to
use the chain-aware iterators. Switch the newly added tracing to use the
proper iterators so that they work with chained scatterlists.
Fixes: 038eb433dc14 ("dma-mapping: add tracing for dma-mapping API calls")
Reported-by: syzbot+95e4ef83a3024384ec7a@syzkaller.appspotmail.com
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: syzbot+95e4ef83a3024384ec7a@syzkaller.appspotmail.com
---
include/trace/events/dma.h | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/include/trace/events/dma.h b/include/trace/events/dma.h
index f57f05331d7385..569f86a44aaaf4 100644
--- a/include/trace/events/dma.h
+++ b/include/trace/events/dma.h
@@ -176,9 +176,9 @@ TRACE_EVENT(dma_free,
);
TRACE_EVENT(dma_map_sg,
- TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
+ TP_PROTO(struct device *dev, struct scatterlist *sgl, int nents,
int ents, enum dma_data_direction dir, unsigned long attrs),
- TP_ARGS(dev, sg, nents, ents, dir, attrs),
+ TP_ARGS(dev, sgl, nents, ents, dir, attrs),
TP_STRUCT__entry(
__string(device, dev_name(dev))
@@ -190,17 +190,17 @@ TRACE_EVENT(dma_map_sg,
),
TP_fast_assign(
+ struct scatterlist *sg;
int i;
__assign_str(device);
- for (i = 0; i < nents; i++)
- ((u64 *)__get_dynamic_array(phys_addrs))[i] =
- sg_phys(sg + i);
- for (i = 0; i < ents; i++) {
+ for_each_sg(sgl, sg, nents, i)
+ ((u64 *)__get_dynamic_array(phys_addrs))[i] = sg_phys(sg);
+ for_each_sg(sgl, sg, ents, i) {
((u64 *)__get_dynamic_array(dma_addrs))[i] =
- sg_dma_address(sg + i);
+ sg_dma_address(sg);
((unsigned int *)__get_dynamic_array(lengths))[i] =
- sg_dma_len(sg + i);
+ sg_dma_len(sg);
}
__entry->dir = dir;
__entry->attrs = attrs;
@@ -222,9 +222,9 @@ TRACE_EVENT(dma_map_sg,
);
TRACE_EVENT(dma_unmap_sg,
- TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
+ TP_PROTO(struct device *dev, struct scatterlist *sgl, int nents,
enum dma_data_direction dir, unsigned long attrs),
- TP_ARGS(dev, sg, nents, dir, attrs),
+ TP_ARGS(dev, sgl, nents, dir, attrs),
TP_STRUCT__entry(
__string(device, dev_name(dev))
@@ -234,12 +234,12 @@ TRACE_EVENT(dma_unmap_sg,
),
TP_fast_assign(
+ struct scatterlist *sg;
int i;
__assign_str(device);
- for (i = 0; i < nents; i++)
- ((u64 *)__get_dynamic_array(addrs))[i] =
- sg_phys(sg + i);
+ for_each_sg(sgl, sg, nents, i)
+ ((u64 *)__get_dynamic_array(addrs))[i] = sg_phys(sg);
__entry->dir = dir;
__entry->attrs = attrs;
),
@@ -290,9 +290,9 @@ DEFINE_EVENT(dma_sync_single, dma_sync_single_for_device,
TP_ARGS(dev, dma_addr, size, dir));
DECLARE_EVENT_CLASS(dma_sync_sg,
- TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
+ TP_PROTO(struct device *dev, struct scatterlist *sgl, int nents,
enum dma_data_direction dir),
- TP_ARGS(dev, sg, nents, dir),
+ TP_ARGS(dev, sgl, nents, dir),
TP_STRUCT__entry(
__string(device, dev_name(dev))
@@ -302,14 +302,15 @@ DECLARE_EVENT_CLASS(dma_sync_sg,
),
TP_fast_assign(
+ struct scatterlist *sg;
int i;
__assign_str(device);
- for (i = 0; i < nents; i++) {
+ for_each_sg(sgl, sg, nents, i) {
((u64 *)__get_dynamic_array(dma_addrs))[i] =
- sg_dma_address(sg + i);
+ sg_dma_address(sg);
((unsigned int *)__get_dynamic_array(lengths))[i] =
- sg_dma_len(sg + i);
+ sg_dma_len(sg);
}
__entry->dir = dir;
),
--
2.45.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dma-mapping: fix DMA API tracing for chained scatterlists
2024-09-26 7:33 [PATCH] dma-mapping: fix DMA API tracing for chained scatterlists Christoph Hellwig
@ 2024-09-26 15:34 ` Sean Anderson
0 siblings, 0 replies; 2+ messages in thread
From: Sean Anderson @ 2024-09-26 15:34 UTC (permalink / raw)
To: Christoph Hellwig
Cc: m.szyprowski, robin.murphy, iommu, syzbot+95e4ef83a3024384ec7a
On 9/26/24 03:33, Christoph Hellwig wrote:
> scatterlist allocations can be chained, and thus all iterations need to
> use the chain-aware iterators. Switch the newly added tracing to use the
> proper iterators so that they work with chained scatterlists.
>
> Fixes: 038eb433dc14 ("dma-mapping: add tracing for dma-mapping API calls")
> Reported-by: syzbot+95e4ef83a3024384ec7a@syzkaller.appspotmail.com
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Tested-by: syzbot+95e4ef83a3024384ec7a@syzkaller.appspotmail.com
> ---
> include/trace/events/dma.h | 37 +++++++++++++++++++------------------
> 1 file changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/include/trace/events/dma.h b/include/trace/events/dma.h
> index f57f05331d7385..569f86a44aaaf4 100644
> --- a/include/trace/events/dma.h
> +++ b/include/trace/events/dma.h
> @@ -176,9 +176,9 @@ TRACE_EVENT(dma_free,
> );
>
> TRACE_EVENT(dma_map_sg,
> - TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
> + TP_PROTO(struct device *dev, struct scatterlist *sgl, int nents,
> int ents, enum dma_data_direction dir, unsigned long attrs),
> - TP_ARGS(dev, sg, nents, ents, dir, attrs),
> + TP_ARGS(dev, sgl, nents, ents, dir, attrs),
>
> TP_STRUCT__entry(
> __string(device, dev_name(dev))
> @@ -190,17 +190,17 @@ TRACE_EVENT(dma_map_sg,
> ),
>
> TP_fast_assign(
> + struct scatterlist *sg;
> int i;
>
> __assign_str(device);
> - for (i = 0; i < nents; i++)
> - ((u64 *)__get_dynamic_array(phys_addrs))[i] =
> - sg_phys(sg + i);
> - for (i = 0; i < ents; i++) {
> + for_each_sg(sgl, sg, nents, i)
> + ((u64 *)__get_dynamic_array(phys_addrs))[i] = sg_phys(sg);
> + for_each_sg(sgl, sg, ents, i) {
> ((u64 *)__get_dynamic_array(dma_addrs))[i] =
> - sg_dma_address(sg + i);
> + sg_dma_address(sg);
> ((unsigned int *)__get_dynamic_array(lengths))[i] =
> - sg_dma_len(sg + i);
> + sg_dma_len(sg);
> }
> __entry->dir = dir;
> __entry->attrs = attrs;
> @@ -222,9 +222,9 @@ TRACE_EVENT(dma_map_sg,
> );
>
> TRACE_EVENT(dma_unmap_sg,
> - TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
> + TP_PROTO(struct device *dev, struct scatterlist *sgl, int nents,
> enum dma_data_direction dir, unsigned long attrs),
> - TP_ARGS(dev, sg, nents, dir, attrs),
> + TP_ARGS(dev, sgl, nents, dir, attrs),
>
> TP_STRUCT__entry(
> __string(device, dev_name(dev))
> @@ -234,12 +234,12 @@ TRACE_EVENT(dma_unmap_sg,
> ),
>
> TP_fast_assign(
> + struct scatterlist *sg;
> int i;
>
> __assign_str(device);
> - for (i = 0; i < nents; i++)
> - ((u64 *)__get_dynamic_array(addrs))[i] =
> - sg_phys(sg + i);
> + for_each_sg(sgl, sg, nents, i)
> + ((u64 *)__get_dynamic_array(addrs))[i] = sg_phys(sg);
> __entry->dir = dir;
> __entry->attrs = attrs;
> ),
> @@ -290,9 +290,9 @@ DEFINE_EVENT(dma_sync_single, dma_sync_single_for_device,
> TP_ARGS(dev, dma_addr, size, dir));
>
> DECLARE_EVENT_CLASS(dma_sync_sg,
> - TP_PROTO(struct device *dev, struct scatterlist *sg, int nents,
> + TP_PROTO(struct device *dev, struct scatterlist *sgl, int nents,
> enum dma_data_direction dir),
> - TP_ARGS(dev, sg, nents, dir),
> + TP_ARGS(dev, sgl, nents, dir),
>
> TP_STRUCT__entry(
> __string(device, dev_name(dev))
> @@ -302,14 +302,15 @@ DECLARE_EVENT_CLASS(dma_sync_sg,
> ),
>
> TP_fast_assign(
> + struct scatterlist *sg;
> int i;
>
> __assign_str(device);
> - for (i = 0; i < nents; i++) {
> + for_each_sg(sgl, sg, nents, i) {
> ((u64 *)__get_dynamic_array(dma_addrs))[i] =
> - sg_dma_address(sg + i);
> + sg_dma_address(sg);
> ((unsigned int *)__get_dynamic_array(lengths))[i] =
> - sg_dma_len(sg + i);
> + sg_dma_len(sg);
> }
> __entry->dir = dir;
> ),
Reviewed-by: Sean Anderson <sean.anderson@linux.dev>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-26 15:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-26 7:33 [PATCH] dma-mapping: fix DMA API tracing for chained scatterlists Christoph Hellwig
2024-09-26 15:34 ` Sean Anderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox