[PATCH 1/3] drm/i915: really simple gemfs
Matthew Auld
matthew.auld at intel.com
Thu May 25 18:56:20 UTC 2017
Not a fully blown gemfs, just our very own tmpfs kernel mount. Doing so
moves us away from the shmemfs shm_mnt, and gives us the much needed
flexibility to do things like set our own mount options, namely huge=
which should allow us to enable the use of transparent-huge-pages for
our shmem backed objects.
Signed-off-by: Matthew Auld <matthew.auld at intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_drv.h | 11 ++++
drivers/gpu/drm/i915/i915_gem.c | 26 ++++++++-
drivers/gpu/drm/i915/i915_gemfs.c | 115 ++++++++++++++++++++++++++++++++++++++
4 files changed, 152 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/i915/i915_gemfs.c
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 7b05fb802f4c..1d62ee54c467 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -46,6 +46,7 @@ i915-y += i915_cmd_parser.o \
i915_gem_tiling.o \
i915_gem_timeline.o \
i915_gem_userptr.o \
+ i915_gemfs.o \
i915_trace_points.o \
i915_vma.o \
intel_breadcrumbs.o \
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 17883a84b8c1..90b41f1c20f2 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2226,6 +2226,9 @@ struct drm_i915_private {
DECLARE_HASHTABLE(mm_structs, 7);
struct mutex mm_lock;
+ /* Our tmpfs instance used for shmem backed objects */
+ struct vfsmount *gemfs_mnt;
+
/* The hw wants to have a stable context identifier for the lifetime
* of the context (for OA, PASID, faults, etc). This is limited
* in execlists to 21 bits.
@@ -4156,4 +4159,12 @@ static inline bool i915_gem_object_is_coherent(struct drm_i915_gem_object *obj)
HAS_LLC(to_i915(obj->base.dev)));
}
+/* i915_gemfs.c */
+int i915_gemfs_create(struct drm_i915_private *i915);
+
+void i915_gemfs_destroy(struct drm_i915_private *i915);
+
+struct file *i915_gemfs_file_setup(struct drm_i915_private *i915,
+ const char *name, size_t size);
+
#endif
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a637cc05cc4a..25f670e7c3f1 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4245,6 +4245,24 @@ static const struct drm_i915_gem_object_ops i915_gem_object_ops = {
.pwrite = i915_gem_object_pwrite_gtt,
};
+static int i915_drm_gem_object_init(struct drm_device *dev,
+ struct drm_gem_object *obj,
+ size_t size)
+{
+ struct drm_i915_private *i915 = to_i915(dev);
+ struct file *filp;
+
+ drm_gem_private_object_init(dev, obj, size);
+
+ filp = i915_gemfs_file_setup(i915, "i915 mm object", size);
+ if (IS_ERR(filp))
+ return PTR_ERR(filp);
+
+ obj->filp = filp;
+
+ return 0;
+}
+
struct drm_i915_gem_object *
i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size)
{
@@ -4268,7 +4286,7 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size)
if (obj == NULL)
return ERR_PTR(-ENOMEM);
- ret = drm_gem_object_init(&dev_priv->drm, &obj->base, size);
+ ret = i915_drm_gem_object_init(&dev_priv->drm, &obj->base, size);
if (ret)
goto fail;
@@ -4897,6 +4915,10 @@ i915_gem_load_init(struct drm_i915_private *dev_priv)
spin_lock_init(&dev_priv->fb_tracking.lock);
+ err = i915_gemfs_create(dev_priv);
+ if (err)
+ goto err_priorities;
+
return 0;
err_priorities:
@@ -4930,6 +4952,8 @@ void i915_gem_load_cleanup(struct drm_i915_private *dev_priv)
kmem_cache_destroy(dev_priv->vmas);
kmem_cache_destroy(dev_priv->objects);
+ i915_gemfs_destroy(dev_priv);
+
/* And ensure that our DESTROY_BY_RCU slabs are truly destroyed */
rcu_barrier();
}
diff --git a/drivers/gpu/drm/i915/i915_gemfs.c b/drivers/gpu/drm/i915/i915_gemfs.c
new file mode 100644
index 000000000000..2620ffeaebe2
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_gemfs.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2017 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/vfs.h>
+#include <linux/mount.h>
+#include <linux/ramfs.h>
+#include <linux/pagemap.h>
+#include <linux/file.h>
+
+#include "i915_drv.h"
+
+static const struct dentry_operations anon_ops = {
+ .d_dname = simple_dname
+};
+
+int i915_gemfs_create(struct drm_i915_private *i915)
+{
+ struct file_system_type *type;
+ struct vfsmount *gemfs_mnt;
+
+ type = get_fs_type("tmpfs");
+ if (!type) {
+ return -EINVAL;
+ }
+
+ gemfs_mnt = kern_mount(type);
+ if (IS_ERR(gemfs_mnt)) {
+ return PTR_ERR(gemfs_mnt);
+ }
+
+ i915->gemfs_mnt = gemfs_mnt;
+
+ return 0;
+}
+
+void i915_gemfs_destroy(struct drm_i915_private *i915)
+{
+ kern_unmount(i915->gemfs_mnt);
+ i915->gemfs_mnt = NULL;
+}
+
+struct file *i915_gemfs_file_setup(struct drm_i915_private *i915,
+ const char *name, size_t size)
+{
+ struct super_block *sb = i915->gemfs_mnt->mnt_sb;
+ struct inode *inode;
+ struct path path;
+ struct qstr this;
+ struct file *res;
+ int ret;
+
+ if (size < 0 || size > MAX_LFS_FILESIZE)
+ return ERR_PTR(-EINVAL);
+
+ this.name = name;
+ this.len = strlen(name);
+ this.hash = 0;
+
+ path.mnt = mntget(i915->gemfs_mnt);
+ path.dentry = d_alloc_pseudo(sb, &this);
+ if (!path.dentry) {
+ res = ERR_PTR(-ENOMEM);
+ goto put_path;
+ }
+ d_set_d_op(path.dentry, &anon_ops);
+
+ ret = vfs_create(d_inode(sb->s_root), path.dentry, S_IFREG, false);
+ if (ret) {
+ res = ERR_PTR(ret);
+ goto put_path;
+ }
+
+ inode = d_inode(path.dentry);
+ i_size_write(inode, size);
+ clear_nlink(inode);
+
+ ret = ramfs_nommu_expand_for_mapping(inode, size);
+ if (ret) {
+ res = ERR_PTR(ret);
+ goto put_path;
+ }
+
+ res = alloc_file(&path, FMODE_WRITE | FMODE_READ, inode->i_fop);
+ if (IS_ERR(res))
+ goto put_path;
+
+ return res;
+
+put_path:
+ path_put(&path);
+ return res;
+}
--
2.9.4
More information about the Intel-gfx-trybot
mailing list