Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 465c403c authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

drm/i915: introduce simple gemfs 



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.

v2: various improvements suggested by Joonas

v3: move gemfs instance to i915.mm and simplify now that we have
file_setup_with_mnt

v4: fallback to tmpfs shm_mnt upon failure to setup gemfs

v5: make tmpfs fallback kinder

v5: better gemfs failure message
    flags variable

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Hugh Dickins <hughd@google.com>
Cc: linux-mm@kvack.org
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006145041.21673-3-matthew.auld@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006221833.32439-2-chris@chris-wilson.co.uk
parent 703321b6

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,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 \

drivers/gpu/drm/i915/i915_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -1511,6 +1511,11 @@ struct i915_gem_mm { 
	/** Usable portion of the GTT for GEM */

	dma_addr_t stolen_base; /* limited to low memory (32-bit) */



	/**

	 * tmpfs instance used for shmem backed objects

	 */

	struct vfsmount *gemfs;



	/** PPGTT used for aliasing the PPGTT with the GTT */

	struct i915_hw_ppgtt *aliasing_ppgtt;

drivers/gpu/drm/i915/i915_gem.c

+32 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "intel_drv.h"

#include "intel_frontbuffer.h"

#include "intel_mocs.h"

#include "i915_gemfs.h"

#include <linux/dma-fence-array.h>

#include <linux/kthread.h>

#include <linux/reservation.h>
@@ -4256,6 +4257,30 @@ static const struct drm_i915_gem_object_ops i915_gem_object_ops = { 
	.pwrite = i915_gem_object_pwrite_gtt,

};



static int i915_gem_object_create_shmem(struct drm_device *dev,

					struct drm_gem_object *obj,

					size_t size)

{

	struct drm_i915_private *i915 = to_i915(dev);

	unsigned long flags = VM_NORESERVE;

	struct file *filp;



	drm_gem_private_object_init(dev, obj, size);



	if (i915->mm.gemfs)

		filp = shmem_file_setup_with_mnt(i915->mm.gemfs, "i915", size,

						 flags);

	else

		filp = shmem_file_setup("i915", size, flags);



	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)

{
@@ -4280,7 +4305,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_gem_object_create_shmem(&dev_priv->drm, &obj->base, size);

	if (ret)

		goto fail;
@@ -4919,6 +4944,10 @@ i915_gem_load_init(struct drm_i915_private *dev_priv) 


	spin_lock_init(&dev_priv->fb_tracking.lock);



	err = i915_gemfs_init(dev_priv);

	if (err)

		DRM_NOTE("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n", err);



	return 0;



err_priorities:
@@ -4957,6 +4986,8 @@ void i915_gem_load_cleanup(struct drm_i915_private *dev_priv) 


	/* And ensure that our DESTROY_BY_RCU slabs are truly destroyed */

	rcu_barrier();



	i915_gemfs_fini(dev_priv);

}



int i915_gem_freeze(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/i915_gemfs.c

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * 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/mount.h>



#include "i915_drv.h"

#include "i915_gemfs.h"



int i915_gemfs_init(struct drm_i915_private *i915)

{

	struct file_system_type *type;

	struct vfsmount *gemfs;



	type = get_fs_type("tmpfs");

	if (!type)

		return -ENODEV;



	gemfs = kern_mount(type);

	if (IS_ERR(gemfs))

		return PTR_ERR(gemfs);



	i915->mm.gemfs = gemfs;



	return 0;

}



void i915_gemfs_fini(struct drm_i915_private *i915)

{

	kern_unmount(i915->mm.gemfs);

}

drivers/gpu/drm/i915/i915_gemfs.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * 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.

 *

 */



#ifndef __I915_GEMFS_H__

#define __I915_GEMFS_H__



struct drm_i915_private;



int i915_gemfs_init(struct drm_i915_private *i915);



void i915_gemfs_fini(struct drm_i915_private *i915);



#endif