leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: move i915_buddy slab to direct module init/exit

Browse Source 
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_blocks to just a
slab_blocks.

v2: Make slab static (Jason, 0day)

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727121037.2041102-3-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2021-07-27 14:10:29 +02:00
parent 512ba03e35
commit a28beb344b
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/i915/i915_buddy.c
View File

@ -8,13 +8,9 @@
#include "i915_buddy.h" #include "i915_buddy.h"
#include "i915_gem.h" #include "i915_gem.h"
#include "i915_globals.h"
#include "i915_utils.h" #include "i915_utils.h"
static struct i915_global_buddy { static struct kmem_cache *slab_blocks;
struct i915_global base;
struct kmem_cache *slab_blocks;
} global;
static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm, static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm,
struct i915_buddy_block *parent, struct i915_buddy_block *parent,
@ -25,7 +21,7 @@ static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm,
GEM_BUG_ON(order > I915_BUDDY_MAX_ORDER); GEM_BUG_ON(order > I915_BUDDY_MAX_ORDER);
block = kmem_cache_zalloc(global.slab_blocks, GFP_KERNEL); block = kmem_cache_zalloc(slab_blocks, GFP_KERNEL);
if (!block) if (!block)
return NULL; return NULL;
@ -40,7 +36,7 @@ static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm,
static void i915_block_free(struct i915_buddy_mm *mm, static void i915_block_free(struct i915_buddy_mm *mm,
struct i915_buddy_block *block) struct i915_buddy_block *block)
{ {
kmem_cache_free(global.slab_blocks, block); kmem_cache_free(slab_blocks, block);
} }
static void mark_allocated(struct i915_buddy_block *block) static void mark_allocated(struct i915_buddy_block *block)
@ -410,21 +406,16 @@ err_free:
#include "selftests/i915_buddy.c" #include "selftests/i915_buddy.c"
#endif #endif
static void i915_global_buddy_exit(void) void i915_buddy_module_exit(void)
{ {
kmem_cache_destroy(global.slab_blocks); kmem_cache_destroy(slab_blocks);
} }
static struct i915_global_buddy global = { { int __init i915_buddy_module_init(void)
.exit = i915_global_buddy_exit,
} };
int __init i915_global_buddy_init(void)
{ {
global.slab_blocks = KMEM_CACHE(i915_buddy_block, 0); slab_blocks = KMEM_CACHE(i915_buddy_block, 0);
if (!global.slab_blocks) if (!slab_blocks)
return -ENOMEM; return -ENOMEM;
i915_global_register(&global.base);
return 0; return 0;
} }

3
drivers/gpu/drm/i915/i915_buddy.h
View File

@ -129,6 +129,7 @@ void i915_buddy_free(struct i915_buddy_mm *mm, struct i915_buddy_block *block);
void i915_buddy_free_list(struct i915_buddy_mm *mm, struct list_head *objects); void i915_buddy_free_list(struct i915_buddy_mm *mm, struct list_head *objects);
int i915_global_buddy_init(void); void i915_buddy_module_exit(void);
int i915_buddy_module_init(void);
#endif #endif

2
drivers/gpu/drm/i915/i915_globals.c
View File

@ -7,7 +7,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "i915_buddy.h"
#include "gem/i915_gem_context.h" #include "gem/i915_gem_context.h"
#include "gem/i915_gem_object.h" #include "gem/i915_gem_object.h"
#include "i915_globals.h" #include "i915_globals.h"
@ -33,7 +32,6 @@ static void __i915_globals_cleanup(void)
} }
static __initconst int (* const initfn[])(void) = { static __initconst int (* const initfn[])(void) = {
i915_global_buddy_init,
i915_global_context_init, i915_global_context_init,
i915_global_gem_context_init, i915_global_gem_context_init,
i915_global_objects_init, i915_global_objects_init,

2
drivers/gpu/drm/i915/i915_pci.c
View File

@ -31,6 +31,7 @@
#include "display/intel_fbdev.h" #include "display/intel_fbdev.h"
#include "i915_active.h" #include "i915_active.h"
#include "i915_buddy.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_perf.h" #include "i915_perf.h"
#include "i915_globals.h" #include "i915_globals.h"
@ -1261,6 +1262,7 @@ static const struct {
} init_funcs[] = { } init_funcs[] = {
{ i915_check_nomodeset, NULL }, { i915_check_nomodeset, NULL },
{ i915_active_module_init, i915_active_module_exit }, { i915_active_module_init, i915_active_module_exit },
{ i915_buddy_module_init, i915_buddy_module_exit },
{ i915_globals_init, i915_globals_exit }, { i915_globals_init, i915_globals_exit },
{ i915_mock_selftests, NULL }, { i915_mock_selftests, NULL },
{ i915_pmu_init, i915_pmu_exit }, { i915_pmu_init, i915_pmu_exit },