kevin/linux
1
Fork 0
Code

dma-mapping fix for Linux 6.12

Browse Source 
Just another small tracing fix from Sean.
 -----BEGIN PGP SIGNATURE-----
 
 iQI/BAABCgApFiEEgdbnc3r/njty3Iq9D55TZVIEUYMFAmcUhhoLHGhjaEBsc3Qu
 ZGUACgkQD55TZVIEUYPzww//XpnJtQ2glWj9MZAbrPAHsBooazaIae1wfxPXCb9u
 EzaookDsTZhVtS0buSH9+EcNC5fWsr7Q7wyazx4cmGl6wOdHZ6mq+YbpxGQmhgWe
 MHDXu/X+rCRsa4cU5X8LUCjWVpKsu0kQE2B3E7M6cYfCWH9r1r9jaW0uXxdTQRWf
 Yi6W43cL/G946aT76wTspFrCfBqLgxypuTPGgehHpbF99sC/eJ6YHzGkOxc+mZ/5
 AatMB/npW8Y0G38yScp6gJZ4XaetJ6hflXoFN1pR7ehDggmZAjM/WfPwFlqZgjbk
 sVL0GjLuE4kbLnXIWX7GzzY/sXlUbebIKkAiYw3uqeo3KchU8/pA2Cqb9qWzdQmf
 FkMJQO7rgj7BvlJnxccDVAZYedkoywdj4Jw/B8hnm5jF355g4tZDmXm+4A88KtHZ
 qnz7pBNdfFumyMEJFwUzOAMWyN2ZDdirb3lrDsCXlIV56h4NH60I6D+cAsX9a+94
 Qao0xLr72jlk4NNDQShYJgHybCVTMMep3Wjkejg/EEZCxdkkyMpSOZXJeBLlxn80
 O2fdRynM5EhG+e28pjFYvU+/zLT0poSRaE+jBfWJLtG9xCFMybWRKtASH7VcaRLQ
 /kDPR51ZttfNYQscVWi7S+R37VWksPLEbFQHSFDvOcwGKgcnFpllDuwv+o62TuUc
 eKk=
 =MnDt
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-10-20 10:56:42 -07:00
commit 10e93e1900
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/trace/events/dma.h
View File

@ -121,7 +121,7 @@ TRACE_EVENT(dma_alloc,
TP_STRUCT__entry( TP_STRUCT__entry(
__string(device, dev_name(dev)) __string(device, dev_name(dev))
__field(u64, phys_addr) __field(void *, virt_addr)
__field(u64, dma_addr) __field(u64, dma_addr)
__field(size_t, size) __field(size_t, size)
__field(gfp_t, flags) __field(gfp_t, flags)
@ -130,18 +130,18 @@ TRACE_EVENT(dma_alloc,
TP_fast_assign( TP_fast_assign(
__assign_str(device); __assign_str(device);
__entry->phys_addr = virt_to_phys(virt_addr); __entry->virt_addr = virt_addr;
__entry->dma_addr = dma_addr; __entry->dma_addr = dma_addr;
__entry->size = size; __entry->size = size;
__entry->flags = flags; __entry->flags = flags;
__entry->attrs = attrs; __entry->attrs = attrs;
), ),
TP_printk("%s dma_addr=%llx size=%zu phys_addr=%llx flags=%s attrs=%s", TP_printk("%s dma_addr=%llx size=%zu virt_addr=%p flags=%s attrs=%s",
__get_str(device), __get_str(device),
__entry->dma_addr, __entry->dma_addr,
__entry->size, __entry->size,
__entry->phys_addr, __entry->virt_addr,
show_gfp_flags(__entry->flags), show_gfp_flags(__entry->flags),
decode_dma_attrs(__entry->attrs)) decode_dma_attrs(__entry->attrs))
); );
@ -153,7 +153,7 @@ TRACE_EVENT(dma_free,
TP_STRUCT__entry( TP_STRUCT__entry(
__string(device, dev_name(dev)) __string(device, dev_name(dev))
__field(u64, phys_addr) __field(void *, virt_addr)
__field(u64, dma_addr) __field(u64, dma_addr)
__field(size_t, size) __field(size_t, size)
__field(unsigned long, attrs) __field(unsigned long, attrs)
@ -161,17 +161,17 @@ TRACE_EVENT(dma_free,
TP_fast_assign( TP_fast_assign(
__assign_str(device); __assign_str(device);
__entry->phys_addr = virt_to_phys(virt_addr); __entry->virt_addr = virt_addr;
__entry->dma_addr = dma_addr; __entry->dma_addr = dma_addr;
__entry->size = size; __entry->size = size;
__entry->attrs = attrs; __entry->attrs = attrs;
), ),
TP_printk("%s dma_addr=%llx size=%zu phys_addr=%llx attrs=%s", TP_printk("%s dma_addr=%llx size=%zu virt_addr=%p attrs=%s",
__get_str(device), __get_str(device),
__entry->dma_addr, __entry->dma_addr,
__entry->size, __entry->size,
__entry->phys_addr, __entry->virt_addr,
decode_dma_attrs(__entry->attrs)) decode_dma_attrs(__entry->attrs))
); );