Re: [PATCH 06/10] drm/i915: move gem_objects slab to direct module init/exit

On Fri, Jul 23, 2021 at 2:29 PM Daniel Vetter daniel.vetter@ffwll.ch wrote:

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_objects to just a slab_objects.

Cc: Jason Ekstrand jason@jlekstrand.net Signed-off-by: Daniel Vetter daniel.vetter@intel.com

---

drivers/gpu/drm/i915/gem/i915_gem_object.c | 26 +++++++--------------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 +++ drivers/gpu/drm/i915/i915_globals.c | 1 - drivers/gpu/drm/i915/i915_globals.h | 1 - drivers/gpu/drm/i915/i915_pci.c | 1 + 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 5c21cff33199..53156250d283 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -30,14 +30,10 @@ #include "i915_gem_context.h" #include "i915_gem_mman.h" #include "i915_gem_object.h" -#include "i915_globals.h" #include "i915_memcpy.h" #include "i915_trace.h"

-static struct i915_global_object {

•   struct i915_global base;
  

•   struct kmem_cache *slab_objects;
  

-} global; +struct kmem_cache *slab_objects;

static

With that,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

static const struct drm_gem_object_funcs i915_gem_object_funcs;

@@ -45,7 +41,7 @@ struct drm_i915_gem_object *i915_gem_object_alloc(void) { struct drm_i915_gem_object *obj;

•   obj = kmem_cache_zalloc(global.slab_objects, GFP_KERNEL);
  

•   obj = kmem_cache_zalloc(slab_objects, GFP_KERNEL);
    if (!obj)
            return NULL;
    obj->base.funcs = &i915_gem_object_funcs;
  

@@ -55,7 +51,7 @@ struct drm_i915_gem_object *i915_gem_object_alloc(void)

void i915_gem_object_free(struct drm_i915_gem_object *obj) {

•   return kmem_cache_free(global.slab_objects, obj);
  

•   return kmem_cache_free(slab_objects, obj);
  

}

void i915_gem_object_init(struct drm_i915_gem_object *obj, @@ -664,23 +660,17 @@ void i915_gem_init__objects(struct drm_i915_private *i915) INIT_WORK(&i915->mm.free_work, __i915_gem_free_work); }

-static void i915_global_objects_exit(void) +void i915_objects_module_exit(void) {

•   kmem_cache_destroy(global.slab_objects);
  

•   kmem_cache_destroy(slab_objects);
  

}

-static struct i915_global_object global = { {

•   .exit = i915_global_objects_exit,
  

-} };

-int __init i915_global_objects_init(void) +int __init i915_objects_module_init(void) {

•   global.slab_objects =
  

•           KMEM_CACHE(drm_i915_gem_object, SLAB_HWCACHE_ALIGN);
  

•   if (!global.slab_objects)
  

•   slab_objects = KMEM_CACHE(drm_i915_gem_object, SLAB_HWCACHE_ALIGN);
  

•   if (!slab_objects)
            return -ENOMEM;
  
  

•   i915_global_register(&global.base);
    return 0;
  

}

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index f3ede43282dc..6d8ea62a372f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -48,6 +48,9 @@ static inline bool i915_gem_object_size_2big(u64 size)

void i915_gem_init__objects(struct drm_i915_private *i915);

+void i915_objects_module_exit(void); +int i915_objects_module_init(void);

struct drm_i915_gem_object *i915_gem_object_alloc(void); void i915_gem_object_free(struct drm_i915_gem_object *obj);

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index dbb3d81eeea7..40a592fbc3e0 100644 --- a/drivers/gpu/drm/i915/i915_globals.c +++ b/drivers/gpu/drm/i915/i915_globals.c @@ -30,7 +30,6 @@ static void __i915_globals_cleanup(void) }

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

•   i915_global_objects_init,
    i915_global_request_init,
    i915_global_scheduler_init,
    i915_global_vma_init,
  

diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h index f16752dbbdbf..9734740708f4 100644 --- a/drivers/gpu/drm/i915/i915_globals.h +++ b/drivers/gpu/drm/i915/i915_globals.h @@ -23,7 +23,6 @@ int i915_globals_init(void); void i915_globals_exit(void);

/* constructors */ -int i915_global_objects_init(void); int i915_global_request_init(void); int i915_global_scheduler_init(void); int i915_global_vma_init(void); diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 2b56e664d043..2334eb3e9abb 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -1301,6 +1301,7 @@ static const struct { { i915_buddy_module_init, i915_buddy_module_exit }, { i915_context_module_init, i915_context_module_exit }, { i915_gem_context_module_init, i915_gem_context_module_exit },

•   { i915_objects_module_init, i915_objects_module_exit },
    { i915_globals_init, i915_globals_exit },
    { i915_mock_selftests, NULL },
    { i915_pmu_init, i915_pmu_exit },
  

-- 2.32.0