Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'dma-mapping-6.12-2024-10-20' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fix from Christoph Hellwig:
"Just another small tracing fix from Sean"
* tag 'dma-mapping-6.12-2024-10-20' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory
+8
-8
+8
-8
include/trace/events/dma.h
+8
-8
include/trace/events/dma.h
···
121
121
122
122
TP_STRUCT__entry(
123
123
__string(device, dev_name(dev))
124
-
__field(u64, phys_addr)
124
+
__field(void *, virt_addr)
125
125
__field(u64, dma_addr)
126
126
__field(size_t, size)
127
127
__field(gfp_t, flags)
···
130
130
131
131
TP_fast_assign(
132
132
__assign_str(device);
133
-
__entry->phys_addr = virt_to_phys(virt_addr);
133
+
__entry->virt_addr = virt_addr;
134
134
__entry->dma_addr = dma_addr;
135
135
__entry->size = size;
136
136
__entry->flags = flags;
137
137
__entry->attrs = attrs;
138
138
),
139
139
140
-
TP_printk("%s dma_addr=%llx size=%zu phys_addr=%llx flags=%s attrs=%s",
140
+
TP_printk("%s dma_addr=%llx size=%zu virt_addr=%p flags=%s attrs=%s",
141
141
__get_str(device),
142
142
__entry->dma_addr,
143
143
__entry->size,
144
-
__entry->phys_addr,
144
+
__entry->virt_addr,
145
145
show_gfp_flags(__entry->flags),
146
146
decode_dma_attrs(__entry->attrs))
147
147
);
···
153
153
154
154
TP_STRUCT__entry(
155
155
__string(device, dev_name(dev))
156
-
__field(u64, phys_addr)
156
+
__field(void *, virt_addr)
157
157
__field(u64, dma_addr)
158
158
__field(size_t, size)
159
159
__field(unsigned long, attrs)
···
161
161
162
162
TP_fast_assign(
163
163
__assign_str(device);
164
-
__entry->phys_addr = virt_to_phys(virt_addr);
164
+
__entry->virt_addr = virt_addr;
165
165
__entry->dma_addr = dma_addr;
166
166
__entry->size = size;
167
167
__entry->attrs = attrs;
168
168
),
169
169
170
-
TP_printk("%s dma_addr=%llx size=%zu phys_addr=%llx attrs=%s",
170
+
TP_printk("%s dma_addr=%llx size=%zu virt_addr=%p attrs=%s",
171
171
__get_str(device),
172
172
__entry->dma_addr,
173
173
__entry->size,
174
-
__entry->phys_addr,
174
+
__entry->virt_addr,
175
175
decode_dma_attrs(__entry->attrs))
176
176
);
177
177