Commit 210a0f5c authored by Simona Vetter's avatar Simona Vetter
Browse files

drm/i915: move scheduler slabs to direct module init/exit 



With the global kmem_cache shrink infrastructure gone there's nothing
special and we can convert them over.

I'm doing this split up into each patch because there's quite a bit of
noise with removing the static global.slab_dependencies|priorities to just a
slab_dependencies|priorities.

v2: Make slab static (Jason, 0day)

Reviewed-by: default avatarJason Ekstrand <jason@jlekstrand.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727121037.2041102-8-daniel.vetter@ffwll.ch
parent 47514ac7

drivers/gpu/drm/i915/i915_globals.c

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/workqueue.h>



#include "i915_globals.h"

#include "i915_scheduler.h"

#include "i915_vma.h"



static LIST_HEAD(globals);
@@ -29,7 +28,6 @@ static void __i915_globals_cleanup(void) 
}



static __initconst int (* const initfn[])(void) = {

	i915_global_scheduler_init,

	i915_global_vma_init,

};

drivers/gpu/drm/i915/i915_globals.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ int i915_globals_init(void); 
void i915_globals_exit(void);



/* constructors */

int i915_global_request_init(void);

int i915_global_scheduler_init(void);

int i915_global_vma_init(void);



#endif /* _I915_GLOBALS_H_ */

drivers/gpu/drm/i915/i915_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "i915_perf.h"

#include "i915_globals.h"

#include "i915_selftest.h"

#include "i915_scheduler.h"



#define PLATFORM(x) .platform = (x)

#define GEN(x) \
@@ -1270,6 +1271,7 @@ static const struct { 
	{ i915_gem_context_module_init, i915_gem_context_module_exit },

	{ i915_objects_module_init, i915_objects_module_exit },

	{ i915_request_module_init, i915_request_module_exit },

	{ i915_scheduler_module_init, i915_scheduler_module_exit },

	{ i915_globals_init, i915_globals_exit },

	{ i915_mock_selftests, NULL },

	{ i915_pmu_init, i915_pmu_exit },

drivers/gpu/drm/i915/i915_scheduler.c

+15 −24
Original line number Diff line number Diff line
@@ -7,15 +7,11 @@ 
#include <linux/mutex.h>



#include "i915_drv.h"

#include "i915_globals.h"

#include "i915_request.h"

#include "i915_scheduler.h"



static struct i915_global_scheduler {

	struct i915_global base;

	struct kmem_cache *slab_dependencies;

	struct kmem_cache *slab_priorities;

} global;

static struct kmem_cache *slab_dependencies;

static struct kmem_cache *slab_priorities;



static DEFINE_SPINLOCK(schedule_lock);
@@ -93,7 +89,7 @@ i915_sched_lookup_priolist(struct i915_sched_engine *sched_engine, int prio) 
	if (prio == I915_PRIORITY_NORMAL) {

		p = &sched_engine->default_priolist;

	} else {

		p = kmem_cache_alloc(global.slab_priorities, GFP_ATOMIC);

		p = kmem_cache_alloc(slab_priorities, GFP_ATOMIC);

		/* Convert an allocation failure to a priority bump */

		if (unlikely(!p)) {

			prio = I915_PRIORITY_NORMAL; /* recurses just once */
@@ -122,7 +118,7 @@ i915_sched_lookup_priolist(struct i915_sched_engine *sched_engine, int prio) 


void __i915_priolist_free(struct i915_priolist *p)

{

	kmem_cache_free(global.slab_priorities, p);

	kmem_cache_free(slab_priorities, p);

}



struct sched_cache {
@@ -320,13 +316,13 @@ void i915_sched_node_reinit(struct i915_sched_node *node) 
static struct i915_dependency *

i915_dependency_alloc(void)

{

	return kmem_cache_alloc(global.slab_dependencies, GFP_KERNEL);

	return kmem_cache_alloc(slab_dependencies, GFP_KERNEL);

}



static void

i915_dependency_free(struct i915_dependency *dep)

{

	kmem_cache_free(global.slab_dependencies, dep);

	kmem_cache_free(slab_dependencies, dep);

}



bool __i915_sched_node_add_dependency(struct i915_sched_node *node,
@@ -489,32 +485,27 @@ i915_sched_engine_create(unsigned int subclass) 
	return sched_engine;

}



static void i915_global_scheduler_exit(void)

void i915_scheduler_module_exit(void)

{

	kmem_cache_destroy(global.slab_dependencies);

	kmem_cache_destroy(global.slab_priorities);

	kmem_cache_destroy(slab_dependencies);

	kmem_cache_destroy(slab_priorities);

}



static struct i915_global_scheduler global = { {

	.exit = i915_global_scheduler_exit,

} };



int __init i915_global_scheduler_init(void)

int __init i915_scheduler_module_init(void)

{

	global.slab_dependencies = KMEM_CACHE(i915_dependency,

	slab_dependencies = KMEM_CACHE(i915_dependency,

					      SLAB_HWCACHE_ALIGN |

					      SLAB_TYPESAFE_BY_RCU);

	if (!global.slab_dependencies)

	if (!slab_dependencies)

		return -ENOMEM;



	global.slab_priorities = KMEM_CACHE(i915_priolist, 0);

	if (!global.slab_priorities)

	slab_priorities = KMEM_CACHE(i915_priolist, 0);

	if (!slab_priorities)

		goto err_priorities;



	i915_global_register(&global.base);

	return 0;



err_priorities:

	kmem_cache_destroy(global.slab_priorities);

	kmem_cache_destroy(slab_priorities);

	return -ENOMEM;

}

drivers/gpu/drm/i915/i915_scheduler.h

+3 −0
Original line number Diff line number Diff line
@@ -102,4 +102,7 @@ i915_sched_engine_disabled(struct i915_sched_engine *sched_engine) 
	return sched_engine->disabled(sched_engine);

}



void i915_scheduler_module_exit(void);

int i915_scheduler_module_init(void);



#endif /* _I915_SCHEDULER_H_ */