1 From 9c7aab7ebe1ac6b5519e3b05a9c771df4c7e7aaf Mon Sep 17 00:00:00 2001
2 From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
3 Date: Thu, 29 Aug 2024 12:55:39 +0200
4 Subject: [PATCH] media: mc: add debugfs node to keep track of requests
6 Keep track of the number of requests and request objects of a media
7 device. Helps to verify that all request-related memory is freed.
9 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
11 drivers/media/mc/mc-device.c | 30 ++++++++++++++++++++++++++++++
12 drivers/media/mc/mc-devnode.c | 5 +++++
13 drivers/media/mc/mc-request.c | 6 ++++++
14 include/media/media-device.h | 9 +++++++++
15 include/media/media-devnode.h | 4 ++++
16 include/media/media-request.h | 2 ++
17 6 files changed, 56 insertions(+)
19 --- a/drivers/media/mc/mc-device.c
20 +++ b/drivers/media/mc/mc-device.c
21 @@ -679,6 +679,23 @@ void media_device_unregister_entity(stru
23 EXPORT_SYMBOL_GPL(media_device_unregister_entity);
25 +#ifdef CONFIG_DEBUG_FS
27 + * Log the state of media requests.
28 + * Very useful for debugging.
30 +static int media_device_requests(struct seq_file *file, void *priv)
32 + struct media_device *dev = dev_get_drvdata(file->private);
34 + seq_printf(file, "number of requests: %d\n",
35 + atomic_read(&dev->num_requests));
36 + seq_printf(file, "number of request objects: %d\n",
37 + atomic_read(&dev->num_request_objects));
42 void media_device_init(struct media_device *mdev)
44 INIT_LIST_HEAD(&mdev->entities);
45 @@ -697,6 +714,9 @@ void media_device_init(struct media_devi
46 media_set_bus_info(mdev->bus_info, sizeof(mdev->bus_info),
49 + atomic_set(&mdev->num_requests, 0);
50 + atomic_set(&mdev->num_request_objects, 0);
52 dev_dbg(mdev->dev, "Media device initialized\n");
54 EXPORT_SYMBOL_GPL(media_device_init);
55 @@ -748,6 +768,15 @@ int __must_check __media_device_register
57 dev_dbg(mdev->dev, "Media device registered\n");
59 +#ifdef CONFIG_DEBUG_FS
60 + if (!media_debugfs_root)
61 + media_debugfs_root = debugfs_create_dir("media", NULL);
62 + mdev->media_dir = debugfs_create_dir(dev_name(&devnode->dev),
63 + media_debugfs_root);
64 + debugfs_create_devm_seqfile(&devnode->dev, "requests",
65 + mdev->media_dir, media_device_requests);
70 EXPORT_SYMBOL_GPL(__media_device_register);
71 @@ -824,6 +853,7 @@ void media_device_unregister(struct medi
73 dev_dbg(mdev->dev, "Media device unregistered\n");
75 + debugfs_remove_recursive(mdev->media_dir);
76 device_remove_file(&mdev->devnode->dev, &dev_attr_model);
77 media_devnode_unregister(mdev->devnode);
78 /* devnode free is handled in media_devnode_*() */
79 --- a/drivers/media/mc/mc-devnode.c
80 +++ b/drivers/media/mc/mc-devnode.c
81 @@ -45,6 +45,9 @@ static dev_t media_dev_t;
82 static DEFINE_MUTEX(media_devnode_lock);
83 static DECLARE_BITMAP(media_devnode_nums, MEDIA_NUM_DEVICES);
86 +struct dentry *media_debugfs_root;
88 /* Called when the last user of the media device exits. */
89 static void media_devnode_release(struct device *cd)
91 @@ -236,6 +239,7 @@ int __must_check media_devnode_register(
93 devnode->dev.parent = devnode->parent;
94 dev_set_name(&devnode->dev, "media%d", devnode->minor);
95 + dev_set_drvdata(&devnode->dev, mdev);
96 device_initialize(&devnode->dev);
98 /* Part 2: Initialize the character device */
99 @@ -313,6 +317,7 @@ static int __init media_devnode_init(voi
101 static void __exit media_devnode_exit(void)
103 + debugfs_remove_recursive(media_debugfs_root);
104 bus_unregister(&media_bus_type);
105 unregister_chrdev_region(media_dev_t, MEDIA_NUM_DEVICES);
107 --- a/drivers/media/mc/mc-request.c
108 +++ b/drivers/media/mc/mc-request.c
109 @@ -75,6 +75,7 @@ static void media_request_release(struct
110 mdev->ops->req_free(req);
113 + atomic_dec(&mdev->num_requests);
116 void media_request_put(struct media_request *req)
117 @@ -332,6 +333,7 @@ int media_request_alloc(struct media_dev
119 snprintf(req->debug_str, sizeof(req->debug_str), "%u:%d",
120 atomic_inc_return(&mdev->request_id), fd);
121 + atomic_inc(&mdev->num_requests);
122 dev_dbg(mdev->dev, "request: allocated %s\n", req->debug_str);
124 fd_install(fd, filp);
125 @@ -355,10 +357,12 @@ static void media_request_object_release
126 struct media_request_object *obj =
127 container_of(kref, struct media_request_object, kref);
128 struct media_request *req = obj->req;
129 + struct media_device *mdev = obj->mdev;
132 media_request_object_unbind(obj);
133 obj->ops->release(obj);
134 + atomic_dec(&mdev->num_request_objects);
137 struct media_request_object *
138 @@ -423,6 +427,7 @@ int media_request_object_bind(struct med
142 + obj->mdev = req->mdev;
145 list_add_tail(&obj->list, &req->objects);
146 @@ -430,6 +435,7 @@ int media_request_object_bind(struct med
147 list_add(&obj->list, &req->objects);
148 req->num_incomplete_objects++;
150 + atomic_inc(&obj->mdev->num_request_objects);
153 spin_unlock_irqrestore(&req->lock, flags);
154 --- a/include/media/media-device.h
155 +++ b/include/media/media-device.h
157 #ifndef _MEDIA_DEVICE_H
158 #define _MEDIA_DEVICE_H
160 +#include <linux/atomic.h>
161 #include <linux/list.h>
162 #include <linux/mutex.h>
163 #include <linux/pci.h>
164 @@ -106,6 +107,9 @@ struct media_device_ops {
165 * @ops: Operation handler callbacks
166 * @req_queue_mutex: Serialise the MEDIA_REQUEST_IOC_QUEUE ioctl w.r.t.
167 * other operations that stop or start streaming.
168 + * @num_requests: number of associated requests
169 + * @num_request_objects: number of associated request objects
170 + * @media_dir: DebugFS media directory
171 * @request_id: Used to generate unique request IDs
173 * This structure represents an abstract high-level media device. It allows easy
174 @@ -179,6 +183,11 @@ struct media_device {
175 const struct media_device_ops *ops;
177 struct mutex req_queue_mutex;
178 + atomic_t num_requests;
179 + atomic_t num_request_objects;
182 + struct dentry *media_dir;
186 --- a/include/media/media-devnode.h
187 +++ b/include/media/media-devnode.h
189 #include <linux/fs.h>
190 #include <linux/device.h>
191 #include <linux/cdev.h>
192 +#include <linux/debugfs.h>
196 +/* debugfs top-level media directory */
197 +extern struct dentry *media_debugfs_root;
200 * Flag to mark the media_devnode struct as registered. Drivers must not touch
201 * this flag directly, it will be set and cleared by media_devnode_register and
202 --- a/include/media/media-request.h
203 +++ b/include/media/media-request.h
204 @@ -290,6 +290,7 @@ struct media_request_object_ops {
205 * struct media_request_object - An opaque object that belongs to a media
208 + * @mdev: Media device this object belongs to
209 * @ops: object's operations
210 * @priv: object's priv pointer
211 * @req: the request this object belongs to (can be NULL)
212 @@ -301,6 +302,7 @@ struct media_request_object_ops {
213 * another struct that contains the actual data for this request object.
215 struct media_request_object {
216 + struct media_device *mdev;
217 const struct media_request_object_ops *ops;
219 struct media_request *req;