From: Hans Verkuil <hverkuil@xs4all.nl>
To: linux-media@vger.kernel.org
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Subject: [PATCHv16 34/34] RFC: media-requests: add debugfs node
Date: Thu, 5 Jul 2018 18:03:37 +0200 [thread overview]
Message-ID: <20180705160337.54379-35-hverkuil@xs4all.nl> (raw)
In-Reply-To: <20180705160337.54379-1-hverkuil@xs4all.nl>
From: Hans Verkuil <hans.verkuil@cisco.com>
Keep track of the number of requests and request objects of a media
device. Helps to verify that all request-related memory is freed.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/media-device.c | 41 +++++++++++++++++++++++++++++++++++
drivers/media/media-devnode.c | 17 +++++++++++++++
drivers/media/media-request.c | 5 +++++
include/media/media-device.h | 11 ++++++++++
include/media/media-devnode.h | 4 ++++
include/media/media-request.h | 2 ++
6 files changed, 80 insertions(+)
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 77bfb0654ef2..69bb78c6c8ec 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -688,6 +688,23 @@ void media_device_unregister_entity(struct media_entity *entity)
}
EXPORT_SYMBOL_GPL(media_device_unregister_entity);
+#ifdef CONFIG_DEBUG_FS
+/*
+ * Log the state of media requests.
+ * Very useful for debugging.
+ */
+static int media_device_requests(struct seq_file *file, void *priv)
+{
+ struct media_device *dev = dev_get_drvdata(file->private);
+
+ seq_printf(file, "number of requests: %d\n",
+ atomic_read(&dev->num_requests));
+ seq_printf(file, "number of request objects: %d\n",
+ atomic_read(&dev->num_request_objects));
+ return 0;
+}
+#endif
+
/**
* media_device_init() - initialize a media device
* @mdev: The media device
@@ -710,6 +727,9 @@ void media_device_init(struct media_device *mdev)
mutex_init(&mdev->graph_mutex);
ida_init(&mdev->entity_internal_idx);
+ atomic_set(&mdev->num_requests, 0);
+ atomic_set(&mdev->num_request_objects, 0);
+
dev_dbg(mdev->dev, "Media device initialized\n");
}
EXPORT_SYMBOL_GPL(media_device_init);
@@ -761,6 +781,26 @@ int __must_check __media_device_register(struct media_device *mdev,
dev_dbg(mdev->dev, "Media device registered\n");
+#ifdef CONFIG_DEBUG_FS
+ if (!media_top_dir)
+ return 0;
+
+ mdev->media_dir = debugfs_create_dir(dev_name(&devnode->dev),
+ media_top_dir);
+ if (IS_ERR_OR_NULL(mdev->media_dir)) {
+ dev_warn(mdev->dev, "Failed to create debugfs dir\n");
+ return 0;
+ }
+ mdev->requests_file = debugfs_create_devm_seqfile(&devnode->dev,
+ "requests", mdev->media_dir, media_device_requests);
+ if (IS_ERR_OR_NULL(mdev->requests_file)) {
+ dev_warn(mdev->dev, "Failed to create requests file\n");
+ debugfs_remove_recursive(mdev->media_dir);
+ mdev->media_dir = NULL;
+ return 0;
+ }
+#endif
+
return 0;
}
EXPORT_SYMBOL_GPL(__media_device_register);
@@ -838,6 +878,7 @@ void media_device_unregister(struct media_device *mdev)
dev_dbg(mdev->dev, "Media device unregistered\n");
+ debugfs_remove_recursive(mdev->media_dir);
device_remove_file(&mdev->devnode->dev, &dev_attr_model);
media_devnode_unregister(mdev->devnode);
/* devnode free is handled in media_devnode_*() */
diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 6b87a721dc49..4358ed22f208 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -53,6 +53,12 @@ static dev_t media_dev_t;
static DEFINE_MUTEX(media_devnode_lock);
static DECLARE_BITMAP(media_devnode_nums, MEDIA_NUM_DEVICES);
+/*
+ * debugfs
+ */
+struct dentry *media_top_dir;
+
+
/* Called when the last user of the media device exits. */
static void media_devnode_release(struct device *cd)
{
@@ -259,6 +265,8 @@ int __must_check media_devnode_register(struct media_device *mdev,
goto cdev_add_error;
}
+ dev_set_drvdata(&devnode->dev, mdev);
+
/* Part 4: Activate this minor. The char device can now be used. */
set_bit(MEDIA_FLAG_REGISTERED, &devnode->flags);
@@ -310,6 +318,14 @@ static int __init media_devnode_init(void)
return ret;
}
+#ifdef CONFIG_DEBUG_FS
+ media_top_dir = debugfs_create_dir("media", NULL);
+ if (IS_ERR_OR_NULL(media_top_dir)) {
+ pr_warn("Failed to create debugfs media dir\n");
+ media_top_dir = NULL;
+ }
+#endif
+
ret = bus_register(&media_bus_type);
if (ret < 0) {
unregister_chrdev_region(media_dev_t, MEDIA_NUM_DEVICES);
@@ -322,6 +338,7 @@ static int __init media_devnode_init(void)
static void __exit media_devnode_exit(void)
{
+ debugfs_remove_recursive(media_top_dir);
bus_unregister(&media_bus_type);
unregister_chrdev_region(media_dev_t, MEDIA_NUM_DEVICES);
}
diff --git a/drivers/media/media-request.c b/drivers/media/media-request.c
index a5b70a4e613b..8ba97a9c4bf1 100644
--- a/drivers/media/media-request.c
+++ b/drivers/media/media-request.c
@@ -72,6 +72,7 @@ static void media_request_release(struct kref *kref)
mdev->ops->req_free(req);
else
kfree(req);
+ atomic_dec(&mdev->num_requests);
}
void media_request_put(struct media_request *req)
@@ -318,6 +319,7 @@ int media_request_alloc(struct media_device *mdev,
get_task_comm(comm, current);
snprintf(req->debug_str, sizeof(req->debug_str), "%s:%d",
comm, fd);
+ atomic_inc(&mdev->num_requests);
dev_dbg(mdev->dev, "request: allocated %s\n", req->debug_str);
fd_install(fd, filp);
@@ -342,6 +344,7 @@ static void media_request_object_release(struct kref *kref)
if (WARN_ON(req))
media_request_object_unbind(obj);
obj->ops->release(obj);
+ atomic_dec(&obj->mdev->num_request_objects);
}
struct media_request_object *
@@ -405,10 +408,12 @@ int media_request_object_bind(struct media_request *req,
obj->req = req;
obj->ops = ops;
obj->priv = priv;
+ obj->mdev = req->mdev;
list_add_tail(&obj->list, &req->objects);
req->num_incomplete_objects++;
ret = 0;
+ atomic_inc(&obj->mdev->num_request_objects);
unlock:
spin_unlock_irqrestore(&req->lock, flags);
diff --git a/include/media/media-device.h b/include/media/media-device.h
index 110b89567671..2de0606938d4 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -21,6 +21,7 @@
#include <linux/list.h>
#include <linux/mutex.h>
+#include <linux/atomic.h>
#include <media/media-devnode.h>
#include <media/media-entity.h>
@@ -107,6 +108,10 @@ struct media_device_ops {
* @ops: Operation handler callbacks
* @req_queue_mutex: Serialise the MEDIA_REQUEST_IOC_QUEUE ioctl w.r.t.
* other operations that stop or start streaming.
+ * @num_requests: number of associated requests
+ * @num_request_objects: number of associated request objects
+ * @media_dir: DebugFS media directory
+ * @requests_file: DebugFS requests file
*
* This structure represents an abstract high-level media device. It allows easy
* access to entities and provides basic media device-level support. The
@@ -179,6 +184,12 @@ struct media_device {
const struct media_device_ops *ops;
struct mutex req_queue_mutex;
+ atomic_t num_requests;
+ atomic_t num_request_objects;
+
+ /* debugfs */
+ struct dentry *media_dir;
+ struct dentry *requests_file;
};
/* We don't need to include pci.h or usb.h here */
diff --git a/include/media/media-devnode.h b/include/media/media-devnode.h
index dc2f64e1b08f..984b62b634d3 100644
--- a/include/media/media-devnode.h
+++ b/include/media/media-devnode.h
@@ -28,9 +28,13 @@
#include <linux/fs.h>
#include <linux/device.h>
#include <linux/cdev.h>
+#include <linux/debugfs.h>
struct media_device;
+/* DebugFS top-level media directory */
+extern struct dentry *media_top_dir;
+
/*
* Flag to mark the media_devnode struct as registered. Drivers must not touch
* this flag directly, it will be set and cleared by media_devnode_register and
diff --git a/include/media/media-request.h b/include/media/media-request.h
index fd08d7a431a1..76727d4a89c3 100644
--- a/include/media/media-request.h
+++ b/include/media/media-request.h
@@ -210,6 +210,7 @@ struct media_request_object_ops {
* struct media_request_object - An opaque object that belongs to a media
* request
*
+ * @mdev: Media device this object belongs to
* @ops: object's operations
* @priv: object's priv pointer
* @req: the request this object belongs to (can be NULL)
@@ -221,6 +222,7 @@ struct media_request_object_ops {
* another struct that contains the actual data for this request object.
*/
struct media_request_object {
+ struct media_device *mdev;
const struct media_request_object_ops *ops;
void *priv;
struct media_request *req;
--
2.18.0
prev parent reply other threads:[~2018-07-05 16:03 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 16:03 [PATCHv16 00/34] Request API Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 01/34] Documentation: v4l: document request API Hans Verkuil
2018-08-03 15:00 ` Tomasz Figa
2018-08-04 10:19 ` Hans Verkuil
2018-08-10 10:46 ` Pavel Machek
2018-08-10 10:48 ` Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 02/34] uapi/linux/media.h: add " Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 03/34] media-request: implement media requests Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 04/34] media: doc: Add media-request.h header to documentation build Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 05/34] media-request: add media_request_get_by_fd Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 06/34] media-request: add media_request_object_find Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 07/34] v4l2-device.h: add v4l2_device_supports_requests() helper Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 08/34] v4l2-dev: lock req_queue_mutex Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 09/34] videodev2.h: add request_fd field to v4l2_ext_controls Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 10/34] v4l2-ctrls: v4l2_ctrl_add_handler: add from_other_dev Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 11/34] v4l2-ctrls: prepare internal structs for request API Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 12/34] v4l2-ctrls: alloc memory for p_req Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 13/34] v4l2-ctrls: use ref in helper instead of ctrl Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 14/34] v4l2-ctrls: add core request support Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 15/34] v4l2-ctrls: support g/s_ext_ctrls for requests Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 16/34] vb2: store userspace data in vb2_v4l2_buffer Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 17/34] davinci_vpfe: remove bogus vb2->state check Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 18/34] vb2: drop VB2_BUF_STATE_PREPARED, use bool prepared/synced instead Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 19/34] videodev2.h: Add request_fd field to v4l2_buffer Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 20/34] vb2: add init_buffer buffer op Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 21/34] videobuf2-core: embed media_request_object Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 22/34] videobuf2-core: integrate with media requests Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 23/34] videobuf2-v4l2: " Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 24/34] videobuf2-core: add request helper functions Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 25/34] videobuf2-v4l2: add vb2_request_queue/validate helpers Hans Verkuil
2018-07-06 7:49 ` [PATCHv16.1 " Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 26/34] videobuf2-core: add uses_requests/qbuf flags Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 27/34] videobuf2-v4l2: refuse qbuf if queue uses requests or vv Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 28/34] v4l2-mem2mem: Simplify exiting the function in v4l2_m2m_try_schedule Hans Verkuil
2018-07-11 23:26 ` Ezequiel Garcia
2018-07-05 16:03 ` [PATCHv16 29/34] v4l2-mem2mem: add vb2_m2m_request_queue Hans Verkuil
2018-07-06 7:48 ` [PATCHv16.1 " Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 30/34] vim2m: use workqueue Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 31/34] vim2m: support requests Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 32/34] vivid: add mc Hans Verkuil
2018-07-05 16:03 ` [PATCHv16 33/34] vivid: add request support Hans Verkuil
2018-07-05 16:03 ` Hans Verkuil [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180705160337.54379-35-hverkuil@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=hans.verkuil@cisco.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).