dma-debug: Expose nr_total_entries in debugfs

Expose nr_total_entries in debugfs, so that {num,min}_free_entries
become even more meaningful to users interested in current/maximum
utilisation. This becomes even more relevant once nr_total_entries
may change at runtime beyond just the existing AMD GART debug code.

Suggested-by: John Garry <john.garry@huawei.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Qian Cai <cai@lca.pw>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index ac66ae2509a91c50174f4e21091d025529cfe7fd..6bdb095393b056a4a6c27a3804f803d4e47bacf2 100644 (file)
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -723,6 +723,9 @@ dma-api/min_free_entries    This read-only file can be read to get the
 dma-api/num_free_entries       The current number of free dma_debug_entries
                                in the allocator.
 
+dma-api/nr_total_entries       The total number of dma_debug_entries in the
+                               allocator, both free and used.
+
 dma-api/driver-filter          You can write a name of a driver into this file
                                to limit the debug output to requests from that
                                particular driver. Write an empty string to

diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 231ca4628062bd026d590c97931e0de36af38c9d..f6a141eb9438848405816183347d90e86ba9913e 100644 (file)
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -142,6 +142,7 @@ static struct dentry *show_all_errors_dent  __read_mostly;
 static struct dentry *show_num_errors_dent  __read_mostly;
 static struct dentry *num_free_entries_dent __read_mostly;
 static struct dentry *min_free_entries_dent __read_mostly;
+static struct dentry *nr_total_entries_dent __read_mostly;
 static struct dentry *filter_dent           __read_mostly;
 
 /* per-driver filter related state */
@@ -926,6 +927,12 @@ static int dma_debug_fs_init(void)
        if (!min_free_entries_dent)
                goto out_err;
 
+       nr_total_entries_dent = debugfs_create_u32("nr_total_entries", 0444,
+                       dma_debug_dent,
+                       &nr_total_entries);
+       if (!nr_total_entries_dent)
+               goto out_err;
+
        filter_dent = debugfs_create_file("driver_filter", 0644,
                                          dma_debug_dent, NULL, &filter_fops);
        if (!filter_dent)