diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-13 19:23:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-13 19:23:21 +0300 |
| commit | 7d62cb2a59f4267191cf89f55f1bdf5ab617c123 (patch) | |
| tree | b73b4c56cc82208bb345de81c80abea948c3a552 /include | |
| parent | 8c9c2f851b5a58195ed7ebd67d7c59683d1a02bc (diff) | |
| parent | b9fa16949d18e06bdf728a560f5c8af56d2bdcaf (diff) | |
| download | linux-7d62cb2a59f4267191cf89f55f1bdf5ab617c123.tar.xz | |
Merge tag 'dma-mapping-6.9-2024-03-11' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- fix leaked pages on dma_set_decrypted() failure (Rick Edgecombe)
- add a new swiotlb debugfs file (ZhangPeng)
* tag 'dma-mapping-6.9-2024-03-11' of git://git.infradead.org/users/hch/dma-mapping:
dma-direct: Leak pages on dma_set_decrypted() failure
swiotlb: add debugfs to track swiotlb transient pool usage
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/swiotlb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index ecde0312dd52..ea23097e351f 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -120,6 +120,8 @@ struct io_tlb_pool { * debugfs. * @used_hiwater: The high water mark for total_used. Used only for reporting * in debugfs. + * @transient_nslabs: The total number of slots in all transient pools that + * are currently used across all areas. */ struct io_tlb_mem { struct io_tlb_pool defpool; @@ -137,6 +139,7 @@ struct io_tlb_mem { #ifdef CONFIG_DEBUG_FS atomic_long_t total_used; atomic_long_t used_hiwater; + atomic_long_t transient_nslabs; #endif }; |