From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Jason Ekstrand <jason@jlekstrand.net>, Daniel Vetter <daniel.vetter@intel.com> Subject: [PATCH 03/10] drm/i915: move i915_buddy slab to direct module init/exit Date: Fri, 23 Jul 2021 21:29:27 +0200 [thread overview] Message-ID: <20210723192934.1004427-3-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210723192934.1004427-1-daniel.vetter@ffwll.ch> 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. Cc: Jason Ekstrand <jason@jlekstrand.net> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/i915_buddy.c | 25 ++++++++----------------- drivers/gpu/drm/i915/i915_buddy.h | 3 ++- drivers/gpu/drm/i915/i915_globals.c | 2 -- drivers/gpu/drm/i915/i915_pci.c | 2 ++ 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_buddy.c b/drivers/gpu/drm/i915/i915_buddy.c index caabcaea3be7..045d00c43b4c 100644 --- a/drivers/gpu/drm/i915/i915_buddy.c +++ b/drivers/gpu/drm/i915/i915_buddy.c @@ -8,13 +8,9 @@ #include "i915_buddy.h" #include "i915_gem.h" -#include "i915_globals.h" #include "i915_utils.h" -static struct i915_global_buddy { - struct i915_global base; - struct kmem_cache *slab_blocks; -} global; +struct kmem_cache *slab_blocks; static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm, 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); - block = kmem_cache_zalloc(global.slab_blocks, GFP_KERNEL); + block = kmem_cache_zalloc(slab_blocks, GFP_KERNEL); if (!block) 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, 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) @@ -410,21 +406,16 @@ int i915_buddy_alloc_range(struct i915_buddy_mm *mm, #include "selftests/i915_buddy.c" #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 = { { - .exit = i915_global_buddy_exit, -} }; - -int __init i915_global_buddy_init(void) +int __init i915_buddy_module_init(void) { - global.slab_blocks = KMEM_CACHE(i915_buddy_block, 0); - if (!global.slab_blocks) + slab_blocks = KMEM_CACHE(i915_buddy_block, 0); + if (!slab_blocks) return -ENOMEM; - i915_global_register(&global.base); return 0; } diff --git a/drivers/gpu/drm/i915/i915_buddy.h b/drivers/gpu/drm/i915/i915_buddy.h index d8f26706de52..3940d632f208 100644 --- a/drivers/gpu/drm/i915/i915_buddy.h +++ b/drivers/gpu/drm/i915/i915_buddy.h @@ -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); -int i915_global_buddy_init(void); +void i915_buddy_module_exit(void); +int i915_buddy_module_init(void); #endif diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index a53135ee831d..3de7cf22ec76 100644 --- a/drivers/gpu/drm/i915/i915_globals.c +++ b/drivers/gpu/drm/i915/i915_globals.c @@ -7,7 +7,6 @@ #include <linux/slab.h> #include <linux/workqueue.h> -#include "i915_buddy.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_object.h" #include "i915_globals.h" @@ -33,7 +32,6 @@ static void __i915_globals_cleanup(void) } static __initconst int (* const initfn[])(void) = { - i915_global_buddy_init, i915_global_context_init, i915_global_gem_context_init, i915_global_objects_init, diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 6ee77a8f43d6..f9527269e30a 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -31,6 +31,7 @@ #include "display/intel_fbdev.h" #include "i915_active.h" +#include "i915_buddy.h" #include "i915_drv.h" #include "i915_perf.h" #include "i915_globals.h" @@ -1295,6 +1296,7 @@ static const struct { } init_funcs[] = { { i915_check_nomodeset, NULL }, { i915_active_module_init, i915_active_module_exit }, + { i915_buddy_module_init, i915_buddy_module_exit }, { i915_globals_init, i915_globals_exit }, { i915_mock_selftests, NULL }, { i915_pmu_init, i915_pmu_exit }, -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@intel.com> Subject: [Intel-gfx] [PATCH 03/10] drm/i915: move i915_buddy slab to direct module init/exit Date: Fri, 23 Jul 2021 21:29:27 +0200 [thread overview] Message-ID: <20210723192934.1004427-3-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210723192934.1004427-1-daniel.vetter@ffwll.ch> 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. Cc: Jason Ekstrand <jason@jlekstrand.net> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/i915_buddy.c | 25 ++++++++----------------- drivers/gpu/drm/i915/i915_buddy.h | 3 ++- drivers/gpu/drm/i915/i915_globals.c | 2 -- drivers/gpu/drm/i915/i915_pci.c | 2 ++ 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_buddy.c b/drivers/gpu/drm/i915/i915_buddy.c index caabcaea3be7..045d00c43b4c 100644 --- a/drivers/gpu/drm/i915/i915_buddy.c +++ b/drivers/gpu/drm/i915/i915_buddy.c @@ -8,13 +8,9 @@ #include "i915_buddy.h" #include "i915_gem.h" -#include "i915_globals.h" #include "i915_utils.h" -static struct i915_global_buddy { - struct i915_global base; - struct kmem_cache *slab_blocks; -} global; +struct kmem_cache *slab_blocks; static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm, 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); - block = kmem_cache_zalloc(global.slab_blocks, GFP_KERNEL); + block = kmem_cache_zalloc(slab_blocks, GFP_KERNEL); if (!block) 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, 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) @@ -410,21 +406,16 @@ int i915_buddy_alloc_range(struct i915_buddy_mm *mm, #include "selftests/i915_buddy.c" #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 = { { - .exit = i915_global_buddy_exit, -} }; - -int __init i915_global_buddy_init(void) +int __init i915_buddy_module_init(void) { - global.slab_blocks = KMEM_CACHE(i915_buddy_block, 0); - if (!global.slab_blocks) + slab_blocks = KMEM_CACHE(i915_buddy_block, 0); + if (!slab_blocks) return -ENOMEM; - i915_global_register(&global.base); return 0; } diff --git a/drivers/gpu/drm/i915/i915_buddy.h b/drivers/gpu/drm/i915/i915_buddy.h index d8f26706de52..3940d632f208 100644 --- a/drivers/gpu/drm/i915/i915_buddy.h +++ b/drivers/gpu/drm/i915/i915_buddy.h @@ -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); -int i915_global_buddy_init(void); +void i915_buddy_module_exit(void); +int i915_buddy_module_init(void); #endif diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index a53135ee831d..3de7cf22ec76 100644 --- a/drivers/gpu/drm/i915/i915_globals.c +++ b/drivers/gpu/drm/i915/i915_globals.c @@ -7,7 +7,6 @@ #include <linux/slab.h> #include <linux/workqueue.h> -#include "i915_buddy.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_object.h" #include "i915_globals.h" @@ -33,7 +32,6 @@ static void __i915_globals_cleanup(void) } static __initconst int (* const initfn[])(void) = { - i915_global_buddy_init, i915_global_context_init, i915_global_gem_context_init, i915_global_objects_init, diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 6ee77a8f43d6..f9527269e30a 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -31,6 +31,7 @@ #include "display/intel_fbdev.h" #include "i915_active.h" +#include "i915_buddy.h" #include "i915_drv.h" #include "i915_perf.h" #include "i915_globals.h" @@ -1295,6 +1296,7 @@ static const struct { } init_funcs[] = { { i915_check_nomodeset, NULL }, { i915_active_module_init, i915_active_module_exit }, + { i915_buddy_module_init, i915_buddy_module_exit }, { i915_globals_init, i915_globals_exit }, { i915_mock_selftests, NULL }, { i915_pmu_init, i915_pmu_exit }, -- 2.32.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-07-23 19:29 UTC|newest] Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-23 19:29 [PATCH 01/10] drm/i915: Check for nomodeset in i915_init() first Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-23 19:29 ` [PATCH 02/10] drm/i915: move i915_active slab to direct module init/exit Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-26 15:24 ` Jason Ekstrand 2021-07-26 15:24 ` [Intel-gfx] " Jason Ekstrand 2021-07-23 19:29 ` Daniel Vetter [this message] 2021-07-23 19:29 ` [Intel-gfx] [PATCH 03/10] drm/i915: move i915_buddy " Daniel Vetter 2021-07-24 7:38 ` kernel test robot 2021-07-24 7:38 ` kernel test robot 2021-07-24 7:38 ` kernel test robot 2021-07-24 7:38 ` [RFC PATCH] drm/i915: slab_blocks can be static kernel test robot 2021-07-24 7:38 ` kernel test robot 2021-07-24 7:38 ` [Intel-gfx] " kernel test robot 2021-07-26 15:26 ` [PATCH 03/10] drm/i915: move i915_buddy slab to direct module init/exit Jason Ekstrand 2021-07-26 15:26 ` [Intel-gfx] " Jason Ekstrand 2021-07-23 19:29 ` [PATCH 04/10] drm/i915: move intel_context " Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-24 11:45 ` kernel test robot 2021-07-24 11:45 ` kernel test robot 2021-07-24 11:45 ` kernel test robot 2021-07-24 11:45 ` [RFC PATCH] drm/i915: slab_ce can be static kernel test robot 2021-07-24 11:45 ` kernel test robot 2021-07-24 11:45 ` [Intel-gfx] " kernel test robot 2021-07-26 8:35 ` [Intel-gfx] [PATCH 04/10] drm/i915: move intel_context slab to direct module init/exit Tvrtko Ursulin 2021-07-26 8:35 ` Tvrtko Ursulin 2021-07-26 15:30 ` Jason Ekstrand 2021-07-26 15:30 ` Jason Ekstrand 2021-07-26 15:42 ` Jason Ekstrand 2021-07-26 15:42 ` Jason Ekstrand 2021-07-26 16:08 ` Tvrtko Ursulin 2021-07-26 16:08 ` Tvrtko Ursulin 2021-07-26 16:20 ` Jason Ekstrand 2021-07-26 16:20 ` Jason Ekstrand 2021-07-26 16:31 ` Tvrtko Ursulin 2021-07-26 16:31 ` Tvrtko Ursulin 2021-07-26 18:17 ` Jason Ekstrand 2021-07-26 18:17 ` Jason Ekstrand 2021-07-27 10:14 ` Tvrtko Ursulin 2021-07-27 10:14 ` Tvrtko Ursulin 2021-07-23 19:29 ` [PATCH 05/10] drm/i915: move gem_context " Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-24 14:50 ` kernel test robot 2021-07-24 14:50 ` kernel test robot 2021-07-24 14:50 ` kernel test robot 2021-07-24 14:50 ` [RFC PATCH] drm/i915: slab_luts can be static kernel test robot 2021-07-24 14:50 ` kernel test robot 2021-07-24 14:50 ` [Intel-gfx] " kernel test robot 2021-07-26 15:35 ` [PATCH 05/10] drm/i915: move gem_context slab to direct module init/exit Jason Ekstrand 2021-07-26 15:35 ` [Intel-gfx] " Jason Ekstrand 2021-07-23 19:29 ` [PATCH 06/10] drm/i915: move gem_objects " Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-24 18:23 ` kernel test robot 2021-07-24 18:23 ` kernel test robot 2021-07-24 18:23 ` kernel test robot 2021-07-24 18:23 ` [RFC PATCH] drm/i915: slab_objects can be static kernel test robot 2021-07-24 18:23 ` kernel test robot 2021-07-24 18:23 ` [Intel-gfx] " kernel test robot 2021-07-26 15:39 ` [PATCH 06/10] drm/i915: move gem_objects slab to direct module init/exit Jason Ekstrand 2021-07-26 15:39 ` [Intel-gfx] " Jason Ekstrand 2021-07-23 19:29 ` [PATCH 07/10] drm/i915: move request slabs " Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-24 21:58 ` kernel test robot 2021-07-24 21:58 ` kernel test robot 2021-07-24 21:58 ` [Intel-gfx] " kernel test robot 2021-07-24 21:58 ` [RFC PATCH] drm/i915: slab_requests can be static kernel test robot 2021-07-24 21:58 ` kernel test robot 2021-07-24 21:58 ` [Intel-gfx] " kernel test robot 2021-07-26 15:46 ` [PATCH 07/10] drm/i915: move request slabs to direct module init/exit Jason Ekstrand 2021-07-26 15:46 ` [Intel-gfx] " Jason Ekstrand 2021-07-23 19:29 ` [PATCH 08/10] drm/i915: move scheduler " Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-25 1:23 ` kernel test robot 2021-07-25 1:23 ` kernel test robot 2021-07-25 1:23 ` kernel test robot 2021-07-25 1:23 ` [RFC PATCH] drm/i915: slab_dependencies can be static kernel test robot 2021-07-25 1:23 ` kernel test robot 2021-07-25 1:23 ` [Intel-gfx] " kernel test robot 2021-07-26 15:47 ` [PATCH 08/10] drm/i915: move scheduler slabs to direct module init/exit Jason Ekstrand 2021-07-26 15:47 ` [Intel-gfx] " Jason Ekstrand 2021-07-23 19:29 ` [PATCH 09/10] drm/i915: move vma slab " Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-25 4:04 ` kernel test robot 2021-07-25 4:04 ` kernel test robot 2021-07-25 4:04 ` [Intel-gfx] " kernel test robot 2021-07-25 4:04 ` [RFC PATCH] drm/i915: slab_vmas can be static kernel test robot 2021-07-25 4:04 ` kernel test robot 2021-07-25 4:04 ` [Intel-gfx] " kernel test robot 2021-07-26 15:50 ` [PATCH 09/10] drm/i915: move vma slab to direct module init/exit Jason Ekstrand 2021-07-26 15:50 ` [Intel-gfx] " Jason Ekstrand 2021-07-23 19:29 ` [PATCH 10/10] drm/i915: Remove i915_globals Daniel Vetter 2021-07-23 19:29 ` [Intel-gfx] " Daniel Vetter 2021-07-26 15:51 ` Jason Ekstrand 2021-07-26 15:51 ` [Intel-gfx] " Jason Ekstrand 2021-07-27 11:34 ` Daniel Vetter 2021-07-27 11:34 ` [Intel-gfx] " Daniel Vetter 2021-07-23 21:55 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/10] drm/i915: Check for nomodeset in i915_init() first Patchwork 2021-07-23 21:56 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-07-23 22:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-07-24 9:00 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2021-07-26 15:23 ` [PATCH 01/10] " Jason Ekstrand 2021-07-26 15:23 ` [Intel-gfx] " Jason Ekstrand
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210723192934.1004427-3-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jason@jlekstrand.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.