Skip to contentSkip to conversation

Introduce drmfs pseudo filesystem for drm subsystem

RFC In review [email protected] 5 participants 15 messages Dec 1, 2016

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Introduce drmfs pseudo filesystem for drm subsystem

From: Swati Dhingra <[email protected]>

Currently, for the purpose of providing output debug/loggging/crc and various other kinds of data from DRM layer to userspace, we don't have a standard filesystem, which would suffice for all the usecases. The filesystems used currently such as debugfs/sysfs have their own constraints and are intended to output a particular type of data. For instance, sysfs is suitable for exporting only small data in form of attributes, thus not suitable to export large data such as error states/logs/crc etc. Likewise for debugfs, which is not available in production kernels, and may not be best place to hold certain kinds of data. As a result, we currently are creating certain files in these filesystems, which are not particularly suited there (For, i915, guc_log is a case in point, which is currently created in debugfs, but not particularly suited there).

Due to these constraints, there is a need for a new pseudo filesytem, customizable to DRM specific requirements and catering to the needs to DRM subsystem components. This will provide a unified location to hold various kinds of data from Linux DRM subsystems, for the files which can't really fit anywhere else into the existing filesystems.

In this patch series, we have introduced a pseudo filesystem named as 'drmfs' for now. The filesystem is introduced in the first patch, and the subsequent patches make use of the filesystem interfaces, in drm driver, and making them available for use by the drm subsystem components, one of which is i915. We've moved the location of i915 GuC logs from debugfs to drmfs in the third patch. Subsequently, more such files such as pipe_crc, error states, memory stats, etc. can be move to this filesystem, if the idea introduced here is acceptable per se. The filesystem introduced is being used to house the data generated by i915 driver in this patch series, but will hopefully be generic enough to provide scope for usage by any other drm subsystem component.

The patch series is being floated as RFC to gather feedback on the idea and infrastructure proposed here and it's suitability to address the specific problem statement/use case.

Swati Dhingra (3):
fs: Introduce drmfs pseudo filesystem interfaces
drm: Register drmfs filesystem from drm init drm/i915: Creating guc log file in drmfs instead of debugfs

 drivers/gpu/drm/drm_drv.c                  |  23 ++
 drivers/gpu/drm/i915/i915_guc_submission.c |  31 +-
 fs/Kconfig                                 |   9 +
 fs/Makefile                                |   1 +
 fs/drmfs/Makefile                          |   4 +
 fs/drmfs/inode.c                           | 561 +++++++++++++++++++++++++++++
 include/drm/drm_drv.h                      |   3 +
 include/linux/drmfs.h                      |  56 +++
 include/uapi/linux/magic.h                 |   3 +
 9 files changed, 670 insertions(+), 21 deletions(-)
 create mode 100644 fs/drmfs/Makefile
 create mode 100644 fs/drmfs/inode.c
 create mode 100644 include/linux/drmfs.h
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

RFC 1/3 fs: Introduce drmfs pseudo filesystem interfaces

From: Swati Dhingra <[email protected]>

The patch introduces a new pseudo filesystem type, named 'drmfs' which is intended to house the files for the data generated by drm subsystem that cannot be accommodated by any of the existing filesystems.
The filesystem is modelled on the lines of existing pseudo-filesystems such as debugfs/tracefs, and borrows ideas from their implementation. This filesystem will be appearing at sys/kernel/drm.

A new config 'CONFIG_DRMFS' is introduced to enable/disable the filesystem, which is dependent on CONFIG_DRM.
The filesystem will not be registered standalone during kernel init time, instead it is intended to be initialized/registered during drm initialization.

The intent for introduction of the filesystem is to act as a location to hold various kinds of data output from Linux DRM subsystems, which can't really fit anywhere else into the existing filesystems such as debugfs/sysfs etc. All these filesystems have their own constraints and are intended to output a particular type of data such as attributes and small debug parameter data. Due to these constraints, there is a need for a new pseudo filesytem, customizable to DRM specific requirements and catering to the needs to DRM subsystem components

---
 drivers/gpu/drm/drm_drv.c  |   1 +
 fs/Kconfig                 |   9 +
 fs/Makefile                |   1 +
 fs/drmfs/Makefile          |   4 +
 fs/drmfs/inode.c           | 561 +++++++++++++++++++++++++++++++++++++++++++++
 include/linux/drmfs.h      |  56 +++++
 include/uapi/linux/magic.h |   3 +
 7 files changed, 635 insertions(+)
 create mode 100644 fs/drmfs/Makefile
 create mode 100644 fs/drmfs/inode.c
 create mode 100644 include/linux/drmfs.h
drivers/gpu/drm/drm_drv.c +1 -0
index 6dbb986..84fcfcb 100644
@@ -27,6 +27,7 @@
  */
 
 #include <linux/debugfs.h>
+#include <linux/drmfs.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
fs/Kconfig +9 -0
index 4bd03a2..7d0ac20 100644
@@ -200,6 +200,15 @@ config HUGETLBFS
 config HUGETLB_PAGE
 	def_bool HUGETLBFS
 
+config DRMFS
+	bool "Drmfs file system support"
+	depends on DRM
+	help
+	  Drmfs is a pseudo file system for drm subsystem output data.
+
+	  drmfs is a filesystem to hold miscellaneous output data from drm
+	  subsystems.
+
 config ARCH_HAS_GIGANTIC_PAGE
 	bool
 
fs/Makefile +1 -0
index ed2b632..b34a96e 100644
@@ -120,6 +120,7 @@ obj-$(CONFIG_BEFS_FS)		+= befs/
 obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_CACHEFILES)	+= cachefiles/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
+obj-$(CONFIG_DRMFS)		+= drmfs/
 obj-$(CONFIG_TRACING)		+= tracefs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
 obj-$(CONFIG_BTRFS_FS)		+= btrfs/
fs/drmfs/Makefile new file +3 -0
new file mode 100644
index 0000000..708be0d
@@ -0,0 +1,3 @@
+drmfs-objs	:= inode.o
+
+obj-$(CONFIG_DRMFS)	+= drmfs.o
fs/drmfs/inode.c new file +561 -0

561 lines not on this page · raw message

include/linux/drmfs.h new file +56 -0

56 lines not on this page · raw message

include/uapi/linux/magic.h +3 -0
index 9bd5594..ef01eb7 100644
@@ -61,6 +61,9 @@
 #define STACK_END_MAGIC		0x57AC6E9D
 
 #define TRACEFS_MAGIC          0x74726163
+#define DRMFS_MAGIC	       0x84724143      /* some random number.
+						* Is there a better way?
+						*/
 
 #define V9FS_MAGIC		0x01021997
 
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [RFC 1/3] fs: Introduce drmfs pseudo filesystem interfaces

Quoted 19 lines · On Thu, Dec 01, 2016 at 12:32:31PM +0530, [email protected] wrote:
fs/drmfs/inode.c new file +19 -0
+int drmfs_init(void)
+{
+	int retval;
+
+	retval = sysfs_create_mount_point(kernel_kobj, "drm");
+	if (retval)
+		return -EINVAL;
+
+	retval = register_filesystem(&drm_fs_type);
+	if (!retval)
+		drmfs_registered = true;
+
+	return retval;
+}
+EXPORT_SYMBOL(drmfs_init);
+
+int drmfs_fini(void)
+{
+	int retval;

fs/drmfs/inode.c line 561

Quoted 10 lines
fs/drmfs/inode.c new file +10 -0
+
+	retval = unregister_filesystem(&drm_fs_type);
+	if (retval)
+		return retval;
+
+	drmfs_registered = false;
+
+	sysfs_remove_mount_point(kernel_kobj, "drm");
+}
+EXPORT_SYMBOL(drmfs_fini);

This needs to act like a singleton for multiple DRM drivers, i.e. add a mutex and use drmfs_registered as a reference count (also then don't call the entrypoint init/fini). Or alternatively (and probably better?), simply do init/fini from the DRM module init. -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [RFC 1/3] fs: Introduce drmfs pseudo filesystem interfaces

Quoted 28 lines · Chris Wilson
Quoted 27 lines · On Thu, Dec 01, 2016 at 12:32:31PM +0530, [email protected] wrote:
fs/drmfs/inode.c new file +27 -0
+int drmfs_init(void)
+{
+	int retval;
+
+	retval = sysfs_create_mount_point(kernel_kobj, "drm");
+	if (retval)
+		return -EINVAL;
+
+	retval = register_filesystem(&drm_fs_type);
+	if (!retval)
+		drmfs_registered = true;
+
+	return retval;
+}
+EXPORT_SYMBOL(drmfs_init);
+
+int drmfs_fini(void)
+{
+	int retval;
+
+	retval = unregister_filesystem(&drm_fs_type);
+	if (retval)
+		return retval;
+
+	drmfs_registered = false;
+
+	sysfs_remove_mount_point(kernel_kobj, "drm");
Quoted 9 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+}
+EXPORT_SYMBOL(drmfs_fini);

This needs to act like a singleton for multiple DRM drivers, i.e. add a mutex and use drmfs_registered as a reference count (also then don't call the entrypoint init/fini). Or alternatively (and probably better?), simply do init/fini from the DRM module init. -Chris

Hi Chris,

In the second patch, drmfs_init is called by drm_core_init, which should thus be called only once (i.e. during drm module init), and likewise for drmfs_fini which is called during drm_core_exit.
Am I missing something here?

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: [RFC 1/3] fs: Introduce drmfs pseudo filesystem interfaces

Quoted 38 lines · sourab gupta
Quoted 28 lines · Chris Wilson
Quoted 27 lines · On Thu, Dec 01, 2016 at 12:32:31PM +0530, [email protected] wrote:
fs/drmfs/inode.c new file +27 -0
+int drmfs_init(void)
+{
+	int retval;
+
+	retval = sysfs_create_mount_point(kernel_kobj, "drm");
+	if (retval)
+		return -EINVAL;
+
+	retval = register_filesystem(&drm_fs_type);
+	if (!retval)
+		drmfs_registered = true;
+
+	return retval;
+}
+EXPORT_SYMBOL(drmfs_init);
+
+int drmfs_fini(void)
+{
+	int retval;
+
+	retval = unregister_filesystem(&drm_fs_type);
+	if (retval)
+		return retval;
+
+	drmfs_registered = false;
+
+	sysfs_remove_mount_point(kernel_kobj, "drm");
Quoted 9 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+}
+EXPORT_SYMBOL(drmfs_fini);

This needs to act like a singleton for multiple DRM drivers, i.e. add a mutex and use drmfs_registered as a reference count (also then don't call the entrypoint init/fini). Or alternatively (and probably better?), simply do init/fini from the DRM module init. -Chris

Quoted 6 lines

Hi Chris,

In the second patch, drmfs_init is called by drm_core_init, which should thus be called only once (i.e. during drm module init), and likewise for drmfs_fini which is called during drm_core_exit.
Am I missing something here?

Nope, that was me missing the change from driver registration to core between chunks. The only thing missing here then are the __init, __exit markers, and to make it perfectly clear that this is a distinct phase move the calls to init/exit into their own patch. -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

Re: [RFC 1/3] fs: Introduce drmfs pseudo filesystem interfaces

In reply to [email protected]
Quoted 25 lines · On Thu, Dec 01, 2016 at 12:32:31PM +0530, [email protected] wrote:
fs/Kconfig +9 -0
index 4bd03a2..7d0ac20 100644
@@ -200,6 +200,15 @@ config HUGETLBFS
 config HUGETLB_PAGE
 	def_bool HUGETLBFS
 
+config DRMFS
+	bool "Drmfs file system support"
+	depends on DRM
+	help
+	  Drmfs is a pseudo file system for drm subsystem output data.
+
+	  drmfs is a filesystem to hold miscellaneous output data from drm
+	  subsystems.
+
 config ARCH_HAS_GIGANTIC_PAGE
 	bool
 
fs/Makefile +0 -0
index ed2b632..b34a96e 100644

fs/Makefile obj-$(CONFIG_BEFS_FS) += befs/ · line 123

Quoted 4 lines
fs/Makefile +1 -0
@@ -120,6 +120,7 @@ obj-$(CONFIG_BEFS_FS)		+= befs/
 obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_CACHEFILES)	+= cachefiles/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
+obj-$(CONFIG_DRMFS)		+= drmfs/

A filesystem does not have to live under fs/. Since this is dedicated and tied to the lifetime of drivers/gpu/drm/drm.ko, we will be happier with not adding a new MAINTAINERS entry.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

Re: [RFC 1/3] fs: Introduce drmfs pseudo filesystem interfaces

Quoted 21 lines · Chris Wilson
Quoted 20 lines · On Thu, Dec 01, 2016 at 12:32:31PM +0530, [email protected] wrote:
fs/Kconfig +9 -0
index 4bd03a2..7d0ac20 100644
@@ -200,6 +200,15 @@ config HUGETLBFS
 config HUGETLB_PAGE
 	def_bool HUGETLBFS
 
+config DRMFS
+	bool "Drmfs file system support"
+	depends on DRM
+	help
+	  Drmfs is a pseudo file system for drm subsystem output data.
+
+	  drmfs is a filesystem to hold miscellaneous output data from drm
+	  subsystems.
+
 config ARCH_HAS_GIGANTIC_PAGE
 	bool
 
Quoted 15 lines

fs/Makefile obj-$(CONFIG_BEFS_FS) += befs/ · line 123

Quoted 9 lines
fs/Makefile +1 -0
index ed2b632..b34a96e 100644
@@ -120,6 +120,7 @@ obj-$(CONFIG_BEFS_FS)		+= befs/
 obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_CACHEFILES)	+= cachefiles/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
+obj-$(CONFIG_DRMFS)		+= drmfs/

A filesystem does not have to live under fs/. Since this is dedicated and tied to the lifetime of drivers/gpu/drm/drm.ko, we will be happier with not adding a new MAINTAINERS entry.
-Chris

Ok, agreed.
So, should we have the drmfs/ source directory (with its associated files) under drivers/gpu/drm/?
Can you please suggest where should the associated 'DRMFS' config be defined? Should drm/Kconfig be a good place?

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

Re: [RFC 1/3] fs: Introduce drmfs pseudo filesystem interfaces

Quoted 37 lines · sourab gupta
Quoted 21 lines · Chris Wilson
Quoted 20 lines · On Thu, Dec 01, 2016 at 12:32:31PM +0530, [email protected] wrote:
fs/Kconfig +9 -0
index 4bd03a2..7d0ac20 100644
@@ -200,6 +200,15 @@ config HUGETLBFS
 config HUGETLB_PAGE
 	def_bool HUGETLBFS
 
+config DRMFS
+	bool "Drmfs file system support"
+	depends on DRM
+	help
+	  Drmfs is a pseudo file system for drm subsystem output data.
+
+	  drmfs is a filesystem to hold miscellaneous output data from drm
+	  subsystems.
+
 config ARCH_HAS_GIGANTIC_PAGE
 	bool
 
Quoted 15 lines

fs/Makefile obj-$(CONFIG_BEFS_FS) += befs/ · line 123

Quoted 9 lines
fs/Makefile +1 -0
index ed2b632..b34a96e 100644
@@ -120,6 +120,7 @@ obj-$(CONFIG_BEFS_FS)		+= befs/
 obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_CACHEFILES)	+= cachefiles/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
+obj-$(CONFIG_DRMFS)		+= drmfs/

A filesystem does not have to live under fs/. Since this is dedicated and tied to the lifetime of drivers/gpu/drm/drm.ko, we will be happier with not adding a new MAINTAINERS entry.
-Chris

Quoted 3 lines

Ok, agreed.
So, should we have the drmfs/ source directory (with its associated files) under drivers/gpu/drm/?

If it sticks to one file, drmfs.c. (Slightly breaks the trend, but still consistent as we are using the drmfs_ prefix.) If we follow the pattern of having mount.c, file.c, dir.c etc, then drivers/gpu/drm/drmfs/

Quoted 2 lines

Can you please suggest where should the associated 'DRMFS' config be defined? Should drm/Kconfig be a good place?

Yes, drivers/gpu/drm/Kconfig.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

RFC 2/3 drm: Register drmfs filesystem from drm init

In reply to [email protected]

From: Swati Dhingra <[email protected]>

During drm module initialization, drm_core_init initializes the drmfs filesystem and register this with kernel. A driver specific directory is created inside drmfs root, and dentry of this directory is saved for subsequent use by the driver (e.g. i915). The driver can then create files/directories inside this root directory directly.
In case of i915 driver, the top directory is created at '/sys/kernel/drm/i915'.

---
 drivers/gpu/drm/drm_drv.c | 22 ++++++++++++++++++++++
 include/drm/drm_drv.h     |  3 +++
 2 files changed, 25 insertions(+)
drivers/gpu/drm/drm_drv.c +22 -0
index 84fcfcb..ead360bd 100644
@@ -688,6 +688,14 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
 {
 	int ret;
 
+#ifdef CONFIG_DRMFS
+	dev->driver->drmfs_root = drmfs_create_dir(dev->driver->name, NULL);
+	if (IS_ERR(dev->driver->drmfs_root)) {
+		DRM_ERROR("Failed to get drmfs root dentry\n");
+		return PTR_ERR(dev->driver->drmfs_root);
+	}
+#endif
+
 	mutex_lock(&drm_global_mutex);
 
 	ret = drm_minor_register(dev, DRM_MINOR_CONTROL);
@@ -758,6 +766,9 @@ void drm_dev_unregister(struct drm_device *dev)
 	drm_minor_unregister(dev, DRM_MINOR_PRIMARY);
 	drm_minor_unregister(dev, DRM_MINOR_RENDER);
 	drm_minor_unregister(dev, DRM_MINOR_CONTROL);
+#ifdef CONFIG_DRMFS
+	drmfs_remove(dev->driver->drmfs_root);
+#endif
 }
 EXPORT_SYMBOL(drm_dev_unregister);
 
@@ -825,6 +836,9 @@ static void drm_core_exit(void)
 {
 	unregister_chrdev(DRM_MAJOR, "drm");
 	debugfs_remove(drm_debugfs_root);
+#ifdef CONFIG_DRMFS
+	drmfs_fini();
+#endif
 	drm_sysfs_destroy();
 	idr_destroy(&drm_minors_idr);
 	drm_connector_ida_destroy();
@@ -845,6 +859,14 @@ static int __init drm_core_init(void)
 		goto error;
 	}
 
+#ifdef CONFIG_DRMFS
+	ret = drmfs_init();
+	if (ret < 0) {
+		DRM_ERROR("Cannot create DRM FS: %d\n", ret);
+		goto error;
+	}
+#endif
+
 	drm_debugfs_root = debugfs_create_dir("dri", NULL);
 	if (!drm_debugfs_root) {
 		ret = -ENOMEM;
include/drm/drm_drv.h +3 -0
index aad8bba..34804de 100644
@@ -403,6 +403,9 @@ struct drm_driver {
 
 	/* List of devices hanging off this driver with stealth attach. */
 	struct list_head legacy_dev_list;
+
+	/* drmfs parent directory dentry for this driver */
+	struct dentry *drmfs_root;
 };
 
 extern __printf(6, 7)
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

Re: [RFC 2/3] drm: Register drmfs filesystem from drm init

drivers/gpu/drm/drm_drv.c int drm_dev_register(struct drm_device *dev, unsigned long flags) · line 691

Quoted 9 lines · On Thu, Dec 01, 2016 at 12:32:32PM +0530, [email protected] wrote:
drivers/gpu/drm/drm_drv.c +1 -0
index 84fcfcb..ead360bd 100644
@@ -688,6 +688,14 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
 {
 	int ret;
 
+#ifdef CONFIG_DRMFS

Rule of thumb: avoid #ifdeffry in the body of the code, use headers to hide conditional compilation.

drivers/gpu/drm/drm_drv.c int drm_dev_register(struct drm_device *dev, unsigned long flags) · line 696

Quoted 5 lines
drivers/gpu/drm/drm_drv.c +5 -0
+	dev->driver->drmfs_root = drmfs_create_dir(dev->driver->name, NULL);
+	if (IS_ERR(dev->driver->drmfs_root)) {
+		DRM_ERROR("Failed to get drmfs root dentry\n");
+		return PTR_ERR(dev->driver->drmfs_root);
+	}

Considering use of drmfs is optional, should an error here prevent the driver from loading?
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

Re: [RFC 2/3] drm: Register drmfs filesystem from drm init

Quoted 9 lines · Chris Wilson
Quoted 8 lines · On Thu, Dec 01, 2016 at 12:32:32PM +0530, [email protected] wrote:
drivers/gpu/drm/drm_drv.c +0 -0
index 84fcfcb..ead360bd 100644
@@ -688,6 +688,14 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
 {
 	int ret;
 
Quoted 4 lines

drivers/gpu/drm/drm_drv.c int drm_dev_register(struct drm_device *dev, unsigned long flags) · line 691

Quoted 1 line
drivers/gpu/drm/drm_drv.c +1 -0
+#ifdef CONFIG_DRMFS

Rule of thumb: avoid #ifdeffry in the body of the code, use headers to hide conditional compilation.

Ok. Will do the requisite changes.

Quoted 10 lines

drivers/gpu/drm/drm_drv.c int drm_dev_register(struct drm_device *dev, unsigned long flags) · line 696

Quoted 6 lines
drivers/gpu/drm/drm_drv.c +5 -0
+	dev->driver->drmfs_root = drmfs_create_dir(dev->driver->name, NULL);
+	if (IS_ERR(dev->driver->drmfs_root)) {
+		DRM_ERROR("Failed to get drmfs root dentry\n");
+		return PTR_ERR(dev->driver->drmfs_root);
+	}

Considering use of drmfs is optional, should an error here prevent the driver from loading?
-Chris

Ok. Will remove the return on the error here.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

RFC 3/3 drm/i915: Creating guc log file in drmfs instead of debugfs

In reply to [email protected]

From: Swati Dhingra <[email protected]>

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.

---
 drivers/gpu/drm/i915/i915_guc_submission.c | 31 ++++++++++--------------------
 1 file changed, 10 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +10 -21
index 4462112..dacae71 100644
@@ -23,7 +23,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 +923,7 @@ static int subbuf_start_callback(struct rchan_buf *buf,
 }
 
 /*
- * file_create() callback. Creates relay file in debugfs.
+ * file_create() callback. Creates relay file in drmfs.
  */
 static struct dentry *create_buf_file_callback(const char *filename,
 					       struct dentry *parent,
@@ -949,17 +949,17 @@ 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.
 	 */
-	buf_file = debugfs_create_file("guc_log", mode,
+	buf_file = drmfs_create_file("guc_log", mode,
 				       parent, buf, &relay_file_operations);
 	return buf_file;
 }
 
 /*
- * file_remove() default callback. Removes relay file in debugfs.
+ * file_remove() default callback. Removes relay file in drmfs.
  */
 static int remove_buf_file_callback(struct dentry *dentry)
 {
-	debugfs_remove(dentry);
+	drmfs_remove(dentry);
 	return 0;
 }
 
@@ -1009,22 +1009,11 @@ static int guc_log_create_relay_file(struct intel_guc *guc)
 	struct dentry *log_dir;
 	int ret;
 
-	/* For now create the log file in /sys/kernel/debug/dri/0 dir */
-	log_dir = dev_priv->drm.primary->debugfs_root;
-
-	/* If /sys/kernel/debug/dri/0 location do not exist, then debugfs is
-	 * not mounted and so can't create the relay file.
-	 * The relay API seems to fit well with debugfs only, for availing relay
-	 * there are 3 requirements which can be met for debugfs file only in a
-	 * straightforward/clean manner :-
-	 * i)   Need the associated dentry pointer of the file, while opening the
-	 *      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.
-	 */
+	/* Create the log file in drmfs dir: /sys/kernel/drm/i915/ */
+	log_dir = dev_priv->drm.driver->drmfs_root;
+
 	if (!log_dir) {
-		DRM_ERROR("Debugfs dir not available yet for GuC log file\n");
+		DRM_ERROR("Drmfs dir not available yet for GuC log file\n");
 		return -ENODEV;
 	}
 
@@ -1265,7 +1254,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 drmfs is registered.
 		 */
 		ret = guc_log_create_relay_channel(guc);
 		if (ret)
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#12 lore raw

✗ Fi.CI.BAT: failure for Introduce drmfs pseudo filesystem for drm subsystem

In reply to [email protected]
== Series Details ==

== Series Details ==

Series: Introduce drmfs pseudo filesystem for drm subsystem
URL : https://patchwork.freedesktop.org/series/16203/
State : failure

== Summary ==

  CC [M]  drivers/gpu/drm/i915/gvt/opregion.o
  CC [M]  drivers/gpu/drm/i915/gvt/mmio.o
  LD      drivers/video/fbdev/core/built-in.o
  CC [M]  drivers/gpu/drm/i915/gvt/edid.o
  CC [M]  drivers/gpu/drm/i915/gvt/display.o
  CC [M]  drivers/gpu/drm/i915/gvt/execlist.o
  CC [M]  drivers/gpu/drm/i915/gvt/scheduler.o
  CC [M]  drivers/gpu/drm/i915/gvt/sched_policy.o
  CC [M]  drivers/gpu/drm/i915/gvt/render.o
  CC [M]  drivers/gpu/drm/i915/gvt/cmd_parser.o
  LD      drivers/tty/serial/8250/8250.o
  LD      drivers/scsi/scsi_mod.o
  LD      drivers/acpi/acpica/acpi.o
  LD      drivers/gpu/drm/drm.o
  LD [M]  drivers/misc/mei/mei-me.o
  LD      drivers/misc/built-in.o
  LD      drivers/video/fbdev/built-in.o
  LD      drivers/pci/pcie/aer/aerdriver.o
  LD      drivers/pci/pcie/aer/built-in.o
  LD [M]  drivers/net/ethernet/broadcom/genet/genet.o
  LD      drivers/pci/pcie/built-in.o
  LD      drivers/usb/storage/usb-storage.o
  LD      drivers/pci/built-in.o
  LD      drivers/usb/storage/built-in.o
  LD      drivers/acpi/acpica/built-in.o
  LD [M]  sound/pci/hda/snd-hda-codec-generic.o
  LD      sound/pci/built-in.o
  LD      drivers/thermal/thermal_sys.o
  LD      drivers/acpi/built-in.o
  LD      drivers/thermal/built-in.o
  LD      drivers/spi/built-in.o
  LD [M]  drivers/usb/serial/usbserial.o
  LD      sound/built-in.o
drivers/gpu/drm/i915/i915_guc_submission.c: In function ‘create_buf_file_callback’:
drivers/gpu/drm/i915/i915_guc_submission.c:841:13: error: implicit declaration of function ‘drmfs_create_file’ [-Werror=implicit-function-declaration]
  buf_file = drmfs_create_file("guc_log", mode,
             ^
drivers/gpu/drm/i915/i915_guc_submission.c:841:11: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
  buf_file = drmfs_create_file("guc_log", mode,
           ^

drivers/gpu/drm/i915/i915_guc_submission.c: In function ‘remove_buf_file_callback’:
drivers/gpu/drm/i915/i915_guc_submission.c:851:2: error: implicit declaration of function ‘drmfs_remove’ [-Werror=implicit-function-declaration]
drmfs_remove(dentry);
^

  LD      drivers/usb/gadget/udc/udc-core.o
  LD      net/ipv6/ipv6.o
  LD      drivers/usb/gadget/udc/built-in.o
  AR      lib/lib.a
  LD      drivers/usb/gadget/libcomposite.o
  EXPORTS lib/lib-ksyms.o
  LD      net/ipv6/built-in.o
  LD      drivers/tty/serial/8250/8250_base.o
  LD      drivers/scsi/sd_mod.o
  LD      drivers/usb/gadget/built-in.o
  LD      drivers/video/console/built-in.o
  LD      drivers/scsi/built-in.o
  LD      drivers/tty/serial/8250/built-in.o
  LD      lib/built-in.o
  LD      drivers/tty/serial/built-in.o
  LD      drivers/video/built-in.o
  LD      drivers/iommu/built-in.o
  LD      fs/btrfs/btrfs.o
  LD      fs/btrfs/built-in.o
  LD      drivers/usb/core/usbcore.o
  LD      drivers/usb/core/built-in.o
  LD [M]  drivers/net/ethernet/intel/igbvf/igbvf.o
  LD      net/ipv4/built-in.o
  LD [M]  drivers/net/ethernet/intel/e1000/e1000.o

cc1: all warnings being treated as errors
scripts/Makefile.build:293: recipe for target 'drivers/gpu/drm/i915/i915_guc_submission.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_guc_submission.o] Error 1
make[4]: *** Waiting for unfinished jobs....

  LD      drivers/tty/vt/built-in.o
  LD      drivers/tty/built-in.o
  LD      drivers/md/md-mod.o
  LD      drivers/md/built-in.o
  CC      arch/x86/kernel/cpu/capflags.o
  LD      arch/x86/kernel/cpu/built-in.o
  LD      arch/x86/kernel/built-in.o
  LD      arch/x86/built-in.o
  LD      drivers/usb/host/xhci-hcd.o
  LD      net/core/built-in.o
  LD      fs/ext4/ext4.o
  LD      net/built-in.o
  LD      fs/ext4/built-in.o
  LD      fs/built-in.o
  LD      drivers/usb/host/built-in.o
  LD      drivers/usb/built-in.o
  LD [M]  drivers/net/ethernet/intel/igb/igb.o
  LD [M]  drivers/net/ethernet/intel/e1000e/e1000e.o
  LD      drivers/net/ethernet/built-in.o
  LD      drivers/net/built-in.o

scripts/Makefile.build:544: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:544: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:544: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:986: recipe for target 'drivers' failed
make: *** [drivers] Error 2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#13 lore raw
In reply to [email protected]
Quoted 13 lines · On Thu, 01 Dec 2016, [email protected] wrote:

Currently, for the purpose of providing output debug/loggging/crc and various other kinds of data from DRM layer to userspace, we don't have a standard filesystem, which would suffice for all the usecases. The filesystems used currently such as debugfs/sysfs have their own constraints and are intended to output a particular type of data. For instance, sysfs is suitable for exporting only small data in form of attributes, thus not suitable to export large data such as error states/logs/crc etc. Likewise for debugfs, which is not available in production kernels, and may not be best place to hold certain kinds of data. As a result, we currently are creating certain files in these filesystems, which are not particularly suited there (For, i915, guc_log is a case in point, which is currently created in debugfs, but not particularly suited there).

Quoted 5 lines

Due to these constraints, there is a need for a new pseudo filesytem, customizable to DRM specific requirements and catering to the needs to DRM subsystem components. This will provide a unified location to hold various kinds of data from Linux DRM subsystems, for the files which can't really fit anywhere else into the existing filesystems.

I don't think you properly describe the problems you have with the current interfaces. You need to be very specific here.

I don't think having one "standard filesystem" for drm that would cover all use cases is going to work out. We will need to combine several interfaces for our needs.

Do you realize that you can't really remove anything from the current ABI? You can't move stuff from, say, sysfs to your new drmfs, you'd only be able to duplicate the API...

Did you notice that a new interface for CRCs was recently introduced?

Did you look at all options, such as adding a new device node for the guc logging needs, instead of adding a whole new filesystem? What is wrong with that? Where does it fall short?

My first impression here is that you think this will make things easier, but eventually you'll notice you've ended up with all the same problems as before, but with an additional filesystem to maintain to the end of time.

I'm not a fan unless you come up with much more compelling reasons.

BR,
Jani.

PS. Needs to be posted to dri-devel.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#14 lore raw
Quoted 20 lines · Jani Nikula
Quoted 13 lines · On Thu, 01 Dec 2016, [email protected] wrote:

Currently, for the purpose of providing output debug/loggging/crc and various other kinds of data from DRM layer to userspace, we don't have a standard filesystem, which would suffice for all the usecases. The filesystems used currently such as debugfs/sysfs have their own constraints and are intended to output a particular type of data. For instance, sysfs is suitable for exporting only small data in form of attributes, thus not suitable to export large data such as error states/logs/crc etc. Likewise for debugfs, which is not available in production kernels, and may not be best place to hold certain kinds of data. As a result, we currently are creating certain files in these filesystems, which are not particularly suited there (For, i915, guc_log is a case in point, which is currently created in debugfs, but not particularly suited there).

Quoted 5 lines

Due to these constraints, there is a need for a new pseudo filesytem, customizable to DRM specific requirements and catering to the needs to DRM subsystem components. This will provide a unified location to hold various kinds of data from Linux DRM subsystems, for the files which can't really fit anywhere else into the existing filesystems.

Quoted 6 lines

I don't think you properly describe the problems you have with the current interfaces. You need to be very specific here.

I don't think having one "standard filesystem" for drm that would cover all use cases is going to work out. We will need to combine several interfaces for our needs.

The only thing that DRM is registering is a filesystem to manage a canonical mountpoint. That does not limit everyone to only using that psuedofs underneath.

Quoted 3 lines

Do you realize that you can't really remove anything from the current ABI? You can't move stuff from, say, sysfs to your new drmfs, you'd only be able to duplicate the API...

Exactly, why we wanted an ABI kernfs in the first place. sysfs is not compatible, debugfs is not ABI.

Quoted 5 lines

Did you notice that a new interface for CRCs was recently introduced?

Did you look at all options, such as adding a new device node for the guc logging needs, instead of adding a whole new filesystem? What is wrong with that? Where does it fall short?

Adding a device node was pretty ugly in comparison and would be less transferrable/sharable to similar situations in future, or between DRM drivers.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx