Commit 2dcec7d3 authored by Simona Vetter's avatar Simona Vetter
Browse files

drm/i915: move intel_context slab 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_ce to just a
slab_ce.

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-4-daniel.vetter@ffwll.ch
parent a28beb34

drivers/gpu/drm/i915/gt/intel_context.c

+8 −17
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include "gem/i915_gem_pm.h"



#include "i915_drv.h"

#include "i915_globals.h"

#include "i915_trace.h"



#include "intel_context.h"
@@ -15,14 +14,11 @@ 
#include "intel_engine_pm.h"

#include "intel_ring.h"



static struct i915_global_context {

	struct i915_global base;

	struct kmem_cache *slab_ce;

} global;

static struct kmem_cache *slab_ce;



static struct intel_context *intel_context_alloc(void)

{

	return kmem_cache_zalloc(global.slab_ce, GFP_KERNEL);

	return kmem_cache_zalloc(slab_ce, GFP_KERNEL);

}



static void rcu_context_free(struct rcu_head *rcu)
@@ -30,7 +26,7 @@ static void rcu_context_free(struct rcu_head *rcu) 
	struct intel_context *ce = container_of(rcu, typeof(*ce), rcu);



	trace_intel_context_free(ce);

	kmem_cache_free(global.slab_ce, ce);

	kmem_cache_free(slab_ce, ce);

}



void intel_context_free(struct intel_context *ce)
@@ -426,22 +422,17 @@ void intel_context_fini(struct intel_context *ce) 
	i915_active_fini(&ce->active);

}



static void i915_global_context_exit(void)

void i915_context_module_exit(void)

{

	kmem_cache_destroy(global.slab_ce);

	kmem_cache_destroy(slab_ce);

}



static struct i915_global_context global = { {

	.exit = i915_global_context_exit,

} };



int __init i915_global_context_init(void)

int __init i915_context_module_init(void)

{

	global.slab_ce = KMEM_CACHE(intel_context, SLAB_HWCACHE_ALIGN);

	if (!global.slab_ce)

	slab_ce = KMEM_CACHE(intel_context, SLAB_HWCACHE_ALIGN);

	if (!slab_ce)

		return -ENOMEM;



	i915_global_register(&global.base);

	return 0;

}

drivers/gpu/drm/i915/gt/intel_context.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ void intel_context_init(struct intel_context *ce, 
			struct intel_engine_cs *engine);

void intel_context_fini(struct intel_context *ce);



void i915_context_module_exit(void);

int i915_context_module_init(void);



struct intel_context *

intel_context_create(struct intel_engine_cs *engine);

drivers/gpu/drm/i915/i915_globals.c

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

#include <linux/workqueue.h>



#include "gem/i915_gem_context.h"

#include "gem/i915_gem_object.h"

#include "i915_globals.h"

#include "i915_request.h"
@@ -32,7 +31,6 @@ static void __i915_globals_cleanup(void) 
}



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

	i915_global_context_init,

	i915_global_gem_context_init,

	i915_global_objects_init,

	i915_global_request_init,

drivers/gpu/drm/i915/i915_globals.h

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



/* constructors */

int i915_global_context_init(void);

int i915_global_gem_context_init(void);

int i915_global_objects_init(void);

int i915_global_request_init(void);

drivers/gpu/drm/i915/i915_pci.c

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

#include "i915_buddy.h"

#include "i915_drv.h"

#include "gem/i915_gem_context.h"

#include "i915_perf.h"

#include "i915_globals.h"

#include "i915_selftest.h"
@@ -1263,6 +1264,7 @@ static const struct { 
	{ i915_check_nomodeset, NULL },

	{ i915_active_module_init, i915_active_module_exit },

	{ i915_buddy_module_init, i915_buddy_module_exit },

	{ i915_context_module_init, i915_context_module_exit },

	{ i915_globals_init, i915_globals_exit },

	{ i915_mock_selftests, NULL },

	{ i915_pmu_init, i915_pmu_exit },