Re: [PATCH 08/10] drm/i915: move scheduler slabs to direct module init/exit

[Jason Ekstrand <jason@jlekstrand.net>]

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_dependencies|priorities to just a
> slab_dependencies|priorities.
>
> Cc: Jason Ekstrand <jason@jlekstrand.net>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_globals.c   |  2 --
>  drivers/gpu/drm/i915/i915_globals.h   |  2 --
>  drivers/gpu/drm/i915/i915_pci.c       |  2 ++
>  drivers/gpu/drm/i915/i915_scheduler.c | 39 +++++++++++----------------
>  drivers/gpu/drm/i915/i915_scheduler.h |  3 +++
>  5 files changed, 20 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c
> index 8fffa8d93bc5..8923589057ab 100644
> --- a/drivers/gpu/drm/i915/i915_globals.c
> +++ b/drivers/gpu/drm/i915/i915_globals.c
> @@ -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,
>  };
>
> diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h
> index 9734740708f4..7a57bce1da05 100644
> --- a/drivers/gpu/drm/i915/i915_globals.h
> +++ b/drivers/gpu/drm/i915/i915_globals.h
> @@ -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_ */
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index bb2bd12fb8c2..a44318519977 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -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) \
> @@ -1304,6 +1305,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 },
> diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c
> index 561c649e59f7..02d90d239ff5 100644
> --- a/drivers/gpu/drm/i915/i915_scheduler.c
> +++ b/drivers/gpu/drm/i915/i915_scheduler.c
> @@ -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;
> +struct kmem_cache *slab_dependencies;

static

> +struct kmem_cache *slab_priorities;

static

>
>  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 {
> @@ -313,13 +309,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,
> @@ -475,32 +471,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);

Indentation

With the nits fixed,

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

> -       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;
>  }
> diff --git a/drivers/gpu/drm/i915/i915_scheduler.h b/drivers/gpu/drm/i915/i915_scheduler.h
> index 650ab8e0db9f..0a4f61fd0be0 100644
> --- a/drivers/gpu/drm/i915/i915_scheduler.h
> +++ b/drivers/gpu/drm/i915/i915_scheduler.h
> @@ -98,4 +98,7 @@ void i915_request_show_with_schedule(struct drm_printer *m,
>                                      const char *prefix,
>                                      int indent);
>
> +void i915_scheduler_module_exit(void);
> +int i915_scheduler_module_init(void);
> +
>  #endif /* _I915_SCHEDULER_H_ */
> --
> 2.32.0
>