From: swati.dhingra@intel.com
To: intel-gfx@lists.freedesktop.org
Cc: Sourab Gupta <sourab.gupta@intel.com>,
Swati Dhingra <swati.dhingra@intel.com>
Subject: [RFC 3/3] drm/i915: Creating guc log file in drmfs instead of debugfs
Date: Thu, 1 Dec 2016 13:44:17 +0530 [thread overview]
Message-ID: <1480580057-27548-4-git-send-email-swati.dhingra@intel.com> (raw)
In-Reply-To: <1480580057-27548-1-git-send-email-swati.dhingra@intel.com>
From: Swati Dhingra <swati.dhingra@intel.com>
In the current scenario, the relay API fit well only with debugfs, due to
availability of parent dentry. Any other existing filesystem was not feasible for
holding guc logs, due to incompatibility with relay. But this makes the guc_log
file unavailable on the production kernels.
GuC log file can therefore be one of candidates for movement to the drmfs
filesystem, which can satisfy all the requirements needed by relay API, and can
house any relayfs based output file.
The patch moves the parent directory of guc 'log_dir' from debugfs_root to
drmfs_root, while using the drmfs api's to create the requisite files.
Signed-off-by: Sourab Gupta <sourab.gupta@intel.com>
Signed-off-by: Swati Dhingra <swati.dhingra@intel.com>
---
drivers/gpu/drm/i915/i915_guc_submission.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index 4462112..cd2e8ed 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -24,6 +24,7 @@
#include <linux/firmware.h>
#include <linux/circ_buf.h>
#include <linux/debugfs.h>
+#include <linux/drmfs.h>
#include <linux/relay.h>
#include "i915_drv.h"
#include "intel_guc.h"
@@ -923,7 +924,7 @@ static int subbuf_start_callback(struct rchan_buf *buf,
}
/*
- * file_create() callback. Creates relay file in debugfs.
+ * file_create() callback. Creates relay file.
*/
static struct dentry *create_buf_file_callback(const char *filename,
struct dentry *parent,
@@ -949,17 +950,26 @@ static struct dentry *create_buf_file_callback(const char *filename,
* dentry of the file associated with the channel buffer and that file's
* name need not be same as the filename passed as an argument.
*/
+#if defined(CONFIG_DRMFS)
+ buf_file = drmfs_create_file("guc_log", mode,
+ parent, buf, &relay_file_operations);
+#else
buf_file = debugfs_create_file("guc_log", mode,
parent, buf, &relay_file_operations);
+#endif
return buf_file;
}
/*
- * file_remove() default callback. Removes relay file in debugfs.
+ * file_remove() default callback. Removes relay file.
*/
static int remove_buf_file_callback(struct dentry *dentry)
{
+#if defined(CONFIG_DRMFS)
+ drmfs_remove(dentry);
+#else
debugfs_remove(dentry);
+#endif
return 0;
}
@@ -1009,6 +1019,10 @@ static int guc_log_create_relay_file(struct intel_guc *guc)
struct dentry *log_dir;
int ret;
+#if defined(CONFIG_DRMFS)
+ /* Create the log file in drmfs dir: /sys/kernel/drm/i915/ */
+ log_dir = dev_priv->drm.driver->drmfs_root;
+#else
/* For now create the log file in /sys/kernel/debug/dri/0 dir */
log_dir = dev_priv->drm.primary->debugfs_root;
@@ -1021,10 +1035,12 @@ static int guc_log_create_relay_file(struct intel_guc *guc)
* relay channel.
* ii) Should be able to use 'relay_file_operations' fops for the file.
* iii) Set the 'i_private' field of file's inode to the pointer of
- * relay channel buffer.
+ * relay channel buffer.
*/
+#endif
+
if (!log_dir) {
- DRM_ERROR("Debugfs dir not available yet for GuC log file\n");
+ DRM_ERROR("Root dir not available yet for GuC log file\n");
return -ENODEV;
}
@@ -1265,7 +1281,7 @@ static int guc_log_create_extras(struct intel_guc *guc)
if (!guc->log.relay_chan) {
/* Create a relay channel, so that we have buffers for storing
* the GuC firmware logs, the channel will be linked with a file
- * later on when debugfs is registered.
+ * later on when debugfs/drmfs is registered.
*/
ret = guc_log_create_relay_channel(guc);
if (ret)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-12-01 8:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 8:14 [RFC 0/3] Introduce drmfs pseudo filesystem for drm subsystem swati.dhingra
2016-12-01 8:14 ` [RFC 1/3] fs: Introduce drmfs pseudo filesystem interfaces swati.dhingra
2016-12-02 7:53 ` Daniel Vetter
2016-12-02 8:27 ` sourab gupta
2016-12-02 22:40 ` Matt Roper
2016-12-03 0:53 ` sourab gupta
2016-12-03 9:25 ` Chris Wilson
2016-12-01 8:14 ` [RFC 2/3] drm: Register drmfs filesystem from drm init swati.dhingra
2016-12-02 7:57 ` Daniel Vetter
2016-12-02 8:32 ` sourab gupta
2016-12-01 8:14 ` swati.dhingra [this message]
2016-12-01 8:45 ` ✓ Fi.CI.BAT: success for Introduce drmfs pseudo filesystem for drm subsystem (rev2) Patchwork
2016-12-02 7:52 ` [RFC 0/3] Introduce drmfs pseudo filesystem for drm subsystem Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2016-12-01 7:02 swati.dhingra
2016-12-01 7:02 ` [RFC 3/3] drm/i915: Creating guc log file in drmfs instead of debugfs swati.dhingra
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=1480580057-27548-4-git-send-email-swati.dhingra@intel.com \
--to=swati.dhingra@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=sourab.gupta@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.