drivers/gpu/drm/i915/i915_buddy.c:13:19: warning: symbol 'slab_blocks' was not declared. Should it be static?

Reported-by: kernel test robot lkp@intel.com Signed-off-by: kernel test robot lkp@intel.com --- i915_buddy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_buddy.c b/drivers/gpu/drm/i915/i915_buddy.c index 045d00c43b4ca..7b274c51cac05 100644 --- a/drivers/gpu/drm/i915/i915_buddy.c +++ b/drivers/gpu/drm/i915/i915_buddy.c @@ -10,7 +10,7 @@ #include "i915_gem.h" #include "i915_utils.h"

-struct kmem_cache *slab_blocks; +static struct kmem_cache *slab_blocks;

static struct i915_buddy_block *i915_block_alloc(struct i915_buddy_mm *mm, struct i915_buddy_block *parent,

drivers/gpu/drm/i915/gt/intel_context.c:17:19: warning: symbol 'slab_ce' was not declared. Should it be static?

Reported-by: kernel test robot lkp@intel.com Signed-off-by: kernel test robot lkp@intel.com --- intel_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index 283382549a6fb..0ba49d74f94d6 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -14,7 +14,7 @@ #include "intel_engine_pm.h" #include "intel_ring.h"

-struct kmem_cache *slab_ce; +static struct kmem_cache *slab_ce;

static struct intel_context *intel_context_alloc(void) {

On Mon, Jul 26, 2021 at 3:35 AM Tvrtko Ursulin tvrtko.ursulin@linux.intel.com wrote:

On 23/07/2021 20:29, Daniel Vetter 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_ce to just a slab_ce.

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

---

drivers/gpu/drm/i915/gt/intel_context.c | 25 ++++++++----------------- drivers/gpu/drm/i915/gt/intel_context.h | 3 +++ drivers/gpu/drm/i915/i915_globals.c | 2 -- drivers/gpu/drm/i915/i915_globals.h | 1 - drivers/gpu/drm/i915/i915_pci.c | 2 ++ 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index baa05fddd690..283382549a6f 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -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; +struct kmem_cache *slab_ce;

Static? With that,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

...

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)

@@ -410,22 +406,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;
  

  }

diff --git a/drivers/gpu/drm/i915/gt/intel_context.h b/drivers/gpu/drm/i915/gt/intel_context.h index 974ef85320c2..a0ca82e3c40d 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.h +++ b/drivers/gpu/drm/i915/gt/intel_context.h @@ -30,6 +30,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);

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index 3de7cf22ec76..d36eb7dc40aa 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 "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,
  

diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h index d80901ba75e3..60daa738a188 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_context_init(void); int i915_global_gem_context_init(void); int i915_global_objects_init(void); int i915_global_request_init(void); diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index f9527269e30a..266618157775 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -33,6 +33,7 @@ #include "i915_active.h" #include "i915_buddy.h" #include "i915_drv.h" +#include "gem/i915_gem_context.h"

It's a bit ugly to go to a design where i915_pci.c has to include so many random parts of i915. IMO for a complex driver like i915, compartmentalizing so much knowledge about the internals was better inside the globals layer.

I agree that i915_pci feels like the wrong place to put this but I don't think that's so much because globals don't belong in i915_pci but because i915_init/exit don't belong there. Maybe, once this is all said and done (or at the start of the series), we should move i915_init/exit to i915_drv.c? Of course, there's a bunch of PCI probing stuff in i915_drv.c so..... yeah.... our organization is pretty busted.

--Jason

Maybe add a cover letter to explain the perceived pros and cons and thinking in general?

Regards,

Tvrtko

...

#include "i915_perf.h" #include "i915_globals.h" #include "i915_selftest.h" @@ -1297,6 +1298,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 },
  
  

---

Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

On 26/07/2021 16:42, Jason Ekstrand wrote:

On Mon, Jul 26, 2021 at 10:30 AM Jason Ekstrand jason@jlekstrand.net wrote:

...

On Mon, Jul 26, 2021 at 3:35 AM Tvrtko Ursulin tvrtko.ursulin@linux.intel.com wrote:

...

On 23/07/2021 20:29, Daniel Vetter 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_ce to just a slab_ce.

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

---

drivers/gpu/drm/i915/gt/intel_context.c | 25 ++++++++----------------- drivers/gpu/drm/i915/gt/intel_context.h | 3 +++ drivers/gpu/drm/i915/i915_globals.c | 2 -- drivers/gpu/drm/i915/i915_globals.h | 1 - drivers/gpu/drm/i915/i915_pci.c | 2 ++ 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index baa05fddd690..283382549a6f 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -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; +struct kmem_cache *slab_ce;

Static? With that,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

...

...

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)

@@ -410,22 +406,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;
  

  }

diff --git a/drivers/gpu/drm/i915/gt/intel_context.h b/drivers/gpu/drm/i915/gt/intel_context.h index 974ef85320c2..a0ca82e3c40d 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.h +++ b/drivers/gpu/drm/i915/gt/intel_context.h @@ -30,6 +30,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);

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index 3de7cf22ec76..d36eb7dc40aa 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 "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,
  

diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h index d80901ba75e3..60daa738a188 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_context_init(void); int i915_global_gem_context_init(void); int i915_global_objects_init(void); int i915_global_request_init(void); diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index f9527269e30a..266618157775 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -33,6 +33,7 @@ #include "i915_active.h" #include "i915_buddy.h" #include "i915_drv.h" +#include "gem/i915_gem_context.h"

It's a bit ugly to go to a design where i915_pci.c has to include so many random parts of i915. IMO for a complex driver like i915, compartmentalizing so much knowledge about the internals was better inside the globals layer.

I agree that i915_pci feels like the wrong place to put this but I don't think that's so much because globals don't belong in i915_pci but because i915_init/exit don't belong there. Maybe, once this is all said and done (or at the start of the series), we should move i915_init/exit to i915_drv.c? Of course, there's a bunch of PCI probing stuff in i915_drv.c so..... yeah.... our organization is pretty busted.

To put a finer point on this, the new "design" is really to have a single flat list instead of two, one nested inside the other. There's nothing wrong with that at all. The fact that all this stuff now lives in i915_pci.c is ugly. But, as I said, that's kind-of an accident of history because that's where i915_init() and i915_exit() currently live. We should just move the lot to i915_drv.c.

Hmm.. on one hand it does sounds better to move to i915_drv.c, but is it just because all these new include directive are so visibly out of place in i915_pci.c?

Perhaps we need i915_module.c and then i915_globals is a completely fine concept. Desired IMO even since we have to avoid globals in general (multi-gpu) so it sticks out nicely that all that is allowed to be global has a special place.

And i915_drv.c can remain being about a driver instance as bound to one GPU.

That feels like the best of both worlds to me.

Regards,

Tvrtko

...

--Jason

...

Maybe add a cover letter to explain the perceived pros and cons and thinking in general?

Regards,

Tvrtko

...

#include "i915_perf.h" #include "i915_globals.h" #include "i915_selftest.h" @@ -1297,6 +1298,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 },
  
  

---

Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

On 26/07/2021 17:20, Jason Ekstrand wrote:

On Mon, Jul 26, 2021 at 11:08 AM Tvrtko Ursulin tvrtko.ursulin@linux.intel.com wrote:

...

On 26/07/2021 16:42, Jason Ekstrand wrote:

...

On Mon, Jul 26, 2021 at 10:30 AM Jason Ekstrand jason@jlekstrand.net wrote:

...

On Mon, Jul 26, 2021 at 3:35 AM Tvrtko Ursulin tvrtko.ursulin@linux.intel.com wrote:

...

On 23/07/2021 20:29, Daniel Vetter 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_ce to just a slab_ce.

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

---

drivers/gpu/drm/i915/gt/intel_context.c | 25 ++++++++-----------------
drivers/gpu/drm/i915/gt/intel_context.h |  3 +++
drivers/gpu/drm/i915/i915_globals.c     |  2 --
drivers/gpu/drm/i915/i915_globals.h     |  1 -
drivers/gpu/drm/i915/i915_pci.c         |  2 ++
5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index baa05fddd690..283382549a6f 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -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; +struct kmem_cache *slab_ce;

Static? With that,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

...

...

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)

@@ -410,22 +406,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;
  

  }

diff --git a/drivers/gpu/drm/i915/gt/intel_context.h b/drivers/gpu/drm/i915/gt/intel_context.h index 974ef85320c2..a0ca82e3c40d 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.h +++ b/drivers/gpu/drm/i915/gt/intel_context.h @@ -30,6 +30,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);

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index 3de7cf22ec76..d36eb7dc40aa 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 "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,
  

diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h index d80901ba75e3..60daa738a188 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_context_init(void); int i915_global_gem_context_init(void); int i915_global_objects_init(void); int i915_global_request_init(void); diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index f9527269e30a..266618157775 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -33,6 +33,7 @@ #include "i915_active.h" #include "i915_buddy.h" #include "i915_drv.h" +#include "gem/i915_gem_context.h"

It's a bit ugly to go to a design where i915_pci.c has to include so many random parts of i915. IMO for a complex driver like i915, compartmentalizing so much knowledge about the internals was better inside the globals layer.

I agree that i915_pci feels like the wrong place to put this but I don't think that's so much because globals don't belong in i915_pci but because i915_init/exit don't belong there. Maybe, once this is all said and done (or at the start of the series), we should move i915_init/exit to i915_drv.c? Of course, there's a bunch of PCI probing stuff in i915_drv.c so..... yeah.... our organization is pretty busted.

To put a finer point on this, the new "design" is really to have a single flat list instead of two, one nested inside the other. There's nothing wrong with that at all. The fact that all this stuff now lives in i915_pci.c is ugly. But, as I said, that's kind-of an accident of history because that's where i915_init() and i915_exit() currently live. We should just move the lot to i915_drv.c.

Hmm.. on one hand it does sounds better to move to i915_drv.c, but is it just because all these new include directive are so visibly out of place in i915_pci.c?

Perhaps we need i915_module.c and then i915_globals is a completely fine concept. Desired IMO even since we have to avoid globals in general (multi-gpu) so it sticks out nicely that all that is allowed to be global has a special place.

And i915_drv.c can remain being about a driver instance as bound to one GPU.

Is i915_drv.c about a single instance bound to a single GPU? If so,

Yep, all functions there either take drm_dev, pdev or dev_priv as argument, or return/initialize dev_priv.

then, yeah, maybe not the right place. Maybe a i915_module.c would be better. It's all different shades of shed paint.

Hm not really just different shades IMO. Because I argue the patch series as is is a retrograde step in the above discussed respect.

I think i915_globals is cleaner code organisation. Because even if we add i915_module.c, then that can be made initialize globals and register with pci in cleanly separated steps without the need to include many driver internals.

I see r-b are accumulating but I hope reasonable objections will be considered.

Regards,

Tvrtko

--Jason

...

That feels like the best of both worlds to me.

Regards,

Tvrtko

...

...

--Jason

...

Maybe add a cover letter to explain the perceived pros and cons and thinking in general?

Regards,

Tvrtko

...

#include "i915_perf.h"
#include "i915_globals.h"
#include "i915_selftest.h"

@@ -1297,6 +1298,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 },
  
  

---

Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

On 26/07/2021 19:17, Jason Ekstrand wrote:

On Mon, Jul 26, 2021 at 11:31 AM Tvrtko Ursulin tvrtko.ursulin@linux.intel.com wrote:

...

On 26/07/2021 17:20, Jason Ekstrand wrote:

...

On Mon, Jul 26, 2021 at 11:08 AM Tvrtko Ursulin tvrtko.ursulin@linux.intel.com wrote:

...

On 26/07/2021 16:42, Jason Ekstrand wrote:

...

On Mon, Jul 26, 2021 at 10:30 AM Jason Ekstrand jason@jlekstrand.net wrote:

...

On Mon, Jul 26, 2021 at 3:35 AM Tvrtko Ursulin tvrtko.ursulin@linux.intel.com wrote: > > > On 23/07/2021 20:29, Daniel Vetter 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_ce to just a >> slab_ce. >> >> Cc: Jason Ekstrand jason@jlekstrand.net >> Signed-off-by: Daniel Vetter daniel.vetter@intel.com >> --- >> drivers/gpu/drm/i915/gt/intel_context.c | 25 ++++++++----------------- >> drivers/gpu/drm/i915/gt/intel_context.h | 3 +++ >> drivers/gpu/drm/i915/i915_globals.c | 2 -- >> drivers/gpu/drm/i915/i915_globals.h | 1 - >> drivers/gpu/drm/i915/i915_pci.c | 2 ++ >> 5 files changed, 13 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c >> index baa05fddd690..283382549a6f 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_context.c >> +++ b/drivers/gpu/drm/i915/gt/intel_context.c >> @@ -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; >> +struct kmem_cache *slab_ce;

Static? With that,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

>> >> 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) >> @@ -410,22 +406,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; >> } >> >> diff --git a/drivers/gpu/drm/i915/gt/intel_context.h b/drivers/gpu/drm/i915/gt/intel_context.h >> index 974ef85320c2..a0ca82e3c40d 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_context.h >> +++ b/drivers/gpu/drm/i915/gt/intel_context.h >> @@ -30,6 +30,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); >> >> diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c >> index 3de7cf22ec76..d36eb7dc40aa 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 "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, >> diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h >> index d80901ba75e3..60daa738a188 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_context_init(void); >> int i915_global_gem_context_init(void); >> int i915_global_objects_init(void); >> int i915_global_request_init(void); >> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >> index f9527269e30a..266618157775 100644 >> --- a/drivers/gpu/drm/i915/i915_pci.c >> +++ b/drivers/gpu/drm/i915/i915_pci.c >> @@ -33,6 +33,7 @@ >> #include "i915_active.h" >> #include "i915_buddy.h" >> #include "i915_drv.h" >> +#include "gem/i915_gem_context.h" > > It's a bit ugly to go to a design where i915_pci.c has to include so > many random parts of i915. IMO for a complex driver like i915, > compartmentalizing so much knowledge about the internals was better > inside the globals layer.

I agree that i915_pci feels like the wrong place to put this but I don't think that's so much because globals don't belong in i915_pci but because i915_init/exit don't belong there. Maybe, once this is all said and done (or at the start of the series), we should move i915_init/exit to i915_drv.c? Of course, there's a bunch of PCI probing stuff in i915_drv.c so..... yeah.... our organization is pretty busted.

To put a finer point on this, the new "design" is really to have a single flat list instead of two, one nested inside the other. There's nothing wrong with that at all. The fact that all this stuff now lives in i915_pci.c is ugly. But, as I said, that's kind-of an accident of history because that's where i915_init() and i915_exit() currently live. We should just move the lot to i915_drv.c.

Hmm.. on one hand it does sounds better to move to i915_drv.c, but is it just because all these new include directive are so visibly out of place in i915_pci.c?

Perhaps we need i915_module.c and then i915_globals is a completely fine concept. Desired IMO even since we have to avoid globals in general (multi-gpu) so it sticks out nicely that all that is allowed to be global has a special place.

And i915_drv.c can remain being about a driver instance as bound to one GPU.

Is i915_drv.c about a single instance bound to a single GPU? If so,

Yep, all functions there either take drm_dev, pdev or dev_priv as argument, or return/initialize dev_priv.

...

then, yeah, maybe not the right place. Maybe a i915_module.c would be better. It's all different shades of shed paint.

Hm not really just different shades IMO. Because I argue the patch series as is is a retrograde step in the above discussed respect.

I think i915_globals is cleaner code organisation. Because even if we add i915_module.c, then that can be made initialize globals and register with pci in cleanly separated steps without the need to include many driver internals.

Ok, so maybe I'm missing something in what you're saying. I was under the impression that your primary concern was separating PCI setup from per-device from per-module stuff. If so, moving it all to an i915_module.c fixes that.

Yeah, but i915_module.c was just a side discussion which started from whether it is right or not to put module init into i915_drv.c. It does not fix the fundamental question of the below discussion.

Are you arguing that a flat list of module init steps is bad? And that having globals be its own sub-list is good? If so, then I have to disagree. I don't think splitting the calling of misc "set up my

I think having to include all the driver sub-sub component headers from any top level module init file is a step towards a worse design. Currently those steps were nicely encapsulated and I don't see a reason to break them out to top level.

slabs" functions from the final "register with PCI" at the end gains us anything. What it does do is give more files to search through, more layers to think about when understanding the code, and more infrastructure to maintain.

If, on the other hand, we had a globals infrastructure that actually gained us something in terms of code simplicity, I might be able to get behind that. For instance, I could imagine something like this:

I915_DECL_SLAB(foo);

/* Someone allocates something */
kmem_cache_alloc(foo.slab);

where we somehow automagically declare the slab, initialize it on module load, and tear it down on module exit. That would add real value. As is, all i915_globals.c adds is extra layers.

I read this as a statement that at least one part of your thinking is that current globals code is too verbose for simple global slab usage?

This I can buy, given how all but two usages are creating a single slab. Then there are two callers which use two slabs, but nothing outside the slab territory. So argument to simplify can be made yeah, only question is how.

Simple macro like you suggest sounds very attractive indeed if it could replace boiler plate code for single slab users (albeit with some more arguments). Problem is I don't know that we could make it call a registration helper from global scope.

Hm removing the list and going for fixed table slots might work, if logistics of reserving indices for it in i915_globals.h wouldn't be too ugly? Hm maybe not too ugly, maybe it is just an enum every global slab users adds for themselves and references it in a macro. With macro magic like DEV_INFO_FOR_EACH_FLAG and company to generate the table etc?

Regards,

Tvrtko

--Jason

...

I see r-b are accumulating but I hope reasonable objections will be considered.

Regards,

Tvrtko

...

--Jason

...

That feels like the best of both worlds to me.

Regards,

Tvrtko

...

...

--Jason

> Maybe add a cover letter to explain the perceived pros and cons and > thinking in general? > > Regards, > > Tvrtko > >> #include "i915_perf.h" >> #include "i915_globals.h" >> #include "i915_selftest.h" >> @@ -1297,6 +1298,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 }, >> > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Hi Daniel,

I love your patch! Perhaps something to improve:

[auto build test WARNING on drm-tip/drm-tip] [cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next drm/drm-next v5.14-rc2 next-20210723] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]

url: https://github.com/0day-ci/linux/commits/Daniel-Vetter/drm-i915-Check-for-no... base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-rhel-8.3-kselftests (attached as .config) compiler: gcc-10 (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-341-g8af24329-dirty # https://github.com/0day-ci/linux/commit/908260e3a7bb4c66c931ccff79cb8bbb8ab3... git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Daniel-Vetter/drm-i915-Check-for-nomodeset-in-i915_init-first/20210724-033145 git checkout 908260e3a7bb4c66c931ccff79cb8bbb8ab37991 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/

If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot lkp@intel.com

sparse warnings: (new ones prefixed by >>)

...

drivers/gpu/drm/i915/gem/i915_gem_context.c:87:19: sparse: sparse: symbol 'slab_luts' was not declared. Should it be static?

drivers/gpu/drm/i915/gem/i915_gem_context.c:1409:34: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct i915_address_space *vm @@ got struct i915_address_space [noderef] __rcu *vm @@ drivers/gpu/drm/i915/gem/i915_gem_context.c:1409:34: sparse: expected struct i915_address_space *vm drivers/gpu/drm/i915/gem/i915_gem_context.c:1409:34: sparse: got struct i915_address_space [noderef] __rcu *vm

Please review and possibly fold the followup patch.

--- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

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_luts to just a slab_luts.

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

---

drivers/gpu/drm/i915/gem/i915_gem_context.c | 25 +++++++-------------- drivers/gpu/drm/i915/gem/i915_gem_context.h | 3 +++ drivers/gpu/drm/i915/i915_globals.c | 2 -- drivers/gpu/drm/i915/i915_globals.h | 1 - drivers/gpu/drm/i915/i915_pci.c | 2 ++ 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 89ca401bf9ae..c17c28af1e57 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -79,25 +79,21 @@ #include "gt/intel_ring.h"

#include "i915_gem_context.h" -#include "i915_globals.h" #include "i915_trace.h" #include "i915_user_extensions.h"

#define ALL_L3_SLICES(dev) (1 << NUM_L3_SLICES(dev)) - 1

-static struct i915_global_gem_context {

•   struct i915_global base;
  

•   struct kmem_cache *slab_luts;
  

-} global; +struct kmem_cache *slab_luts;

static.

With that,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

struct i915_lut_handle *i915_lut_handle_alloc(void) {

•   return kmem_cache_alloc(global.slab_luts, GFP_KERNEL);
  

•   return kmem_cache_alloc(slab_luts, GFP_KERNEL);
  

}

void i915_lut_handle_free(struct i915_lut_handle *lut) {

•   return kmem_cache_free(global.slab_luts, lut);
  

•   return kmem_cache_free(slab_luts, lut);
  

}

static void lut_close(struct i915_gem_context *ctx) @@ -2282,21 +2278,16 @@ i915_gem_engines_iter_next(struct i915_gem_engines_iter *it) #include "selftests/i915_gem_context.c" #endif

-static void i915_global_gem_context_exit(void) +void i915_gem_context_module_exit(void) {

•   kmem_cache_destroy(global.slab_luts);
  

•   kmem_cache_destroy(slab_luts);
  

}

-static struct i915_global_gem_context global = { {

•   .exit = i915_global_gem_context_exit,
  

-} };

-int __init i915_global_gem_context_init(void) +int __init i915_gem_context_module_init(void) {

•   global.slab_luts = KMEM_CACHE(i915_lut_handle, 0);
  

•   if (!global.slab_luts)
  

•   slab_luts = KMEM_CACHE(i915_lut_handle, 0);
  

•   if (!slab_luts)
            return -ENOMEM;
  
  

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

} diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h index 20411db84914..18060536b0c2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h @@ -224,6 +224,9 @@ i915_gem_engines_iter_next(struct i915_gem_engines_iter *it); for (i915_gem_engines_iter_init(&(it), (engines)); \ ((ce) = i915_gem_engines_iter_next(&(it)));)

+void i915_gem_context_module_exit(void); +int i915_gem_context_module_init(void);

struct i915_lut_handle *i915_lut_handle_alloc(void); void i915_lut_handle_free(struct i915_lut_handle *lut);

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index d36eb7dc40aa..dbb3d81eeea7 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 "gem/i915_gem_object.h" #include "i915_globals.h" #include "i915_request.h" #include "i915_scheduler.h" @@ -31,7 +30,6 @@ static void __i915_globals_cleanup(void) }

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

•   i915_global_gem_context_init,
    i915_global_objects_init,
    i915_global_request_init,
    i915_global_scheduler_init,
  

diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h index 60daa738a188..f16752dbbdbf 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_gem_context_init(void); int i915_global_objects_init(void); int i915_global_request_init(void); int i915_global_scheduler_init(void); diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 266618157775..2b56e664d043 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -34,6 +34,7 @@ #include "i915_buddy.h" #include "i915_drv.h" #include "gem/i915_gem_context.h" +#include "gem/i915_gem_object.h" #include "i915_perf.h" #include "i915_globals.h" #include "i915_selftest.h" @@ -1299,6 +1300,7 @@ static const struct { { 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_gem_context_module_init, i915_gem_context_module_exit },
    { i915_globals_init, i915_globals_exit },
    { i915_mock_selftests, NULL },
    { i915_pmu_init, i915_pmu_exit },
  

-- 2.32.0

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

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_requests|execute_cbs to just a slab_requests|execute_cbs.

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_pci.c | 2 ++ drivers/gpu/drm/i915/i915_request.c | 47 ++++++++++++----------------- drivers/gpu/drm/i915/i915_request.h | 3 ++ 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index 40a592fbc3e0..8fffa8d93bc5 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_request.h" #include "i915_scheduler.h" #include "i915_vma.h"

@@ -30,7 +29,6 @@ static void __i915_globals_cleanup(void) }

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

•   i915_global_request_init,
    i915_global_scheduler_init,
    i915_global_vma_init,
  

}; diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 2334eb3e9abb..bb2bd12fb8c2 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -35,6 +35,7 @@ #include "i915_drv.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_object.h" +#include "i915_request.h" #include "i915_perf.h" #include "i915_globals.h" #include "i915_selftest.h" @@ -1302,6 +1303,7 @@ static const struct { { 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_request_module_init, i915_request_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_request.c b/drivers/gpu/drm/i915/i915_request.c index 6594cb2f8ebd..69152369ea00 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -42,7 +42,6 @@

#include "i915_active.h" #include "i915_drv.h" -#include "i915_globals.h" #include "i915_trace.h" #include "intel_pm.h"

@@ -52,11 +51,8 @@ struct execute_cb { struct i915_request *signal; };

-static struct i915_global_request {

•   struct i915_global base;
  

•   struct kmem_cache *slab_requests;
  

•   struct kmem_cache *slab_execute_cbs;
  

-} global; +struct kmem_cache *slab_requests;

static

+struct kmem_cache *slab_execute_cbs;

static

Am I tired of typing this? Yes, I am! Will I keep typing it? Probably. :-P

static const char *i915_fence_get_driver_name(struct dma_fence *fence) { @@ -107,7 +103,7 @@ static signed long i915_fence_wait(struct dma_fence *fence,

struct kmem_cache *i915_request_slab_cache(void) {

•   return global.slab_requests;
  

•   return slab_requests;
  

}

static void i915_fence_release(struct dma_fence *fence) @@ -159,7 +155,7 @@ static void i915_fence_release(struct dma_fence *fence) !cmpxchg(&rq->engine->request_pool, NULL, rq)) return;

•   kmem_cache_free(global.slab_requests, rq);
  

•   kmem_cache_free(slab_requests, rq);
  

}

const struct dma_fence_ops i915_fence_ops = { @@ -176,7 +172,7 @@ static void irq_execute_cb(struct irq_work *wrk) struct execute_cb *cb = container_of(wrk, typeof(*cb), work);

    i915_sw_fence_complete(cb->fence);

•   kmem_cache_free(global.slab_execute_cbs, cb);
  

•   kmem_cache_free(slab_execute_cbs, cb);
  

}

static __always_inline void @@ -514,7 +510,7 @@ __await_execution(struct i915_request *rq, if (i915_request_is_active(signal)) return 0;

•   cb = kmem_cache_alloc(global.slab_execute_cbs, gfp);
  

•   cb = kmem_cache_alloc(slab_execute_cbs, gfp);
    if (!cb)
            return -ENOMEM;
  
  

@@ -868,7 +864,7 @@ request_alloc_slow(struct intel_timeline *tl, rq = list_first_entry(&tl->requests, typeof(*rq), link); i915_request_retire(rq);

•   rq = kmem_cache_alloc(global.slab_requests,
  

•   rq = kmem_cache_alloc(slab_requests,
                          gfp | __GFP_RETRY_MAYFAIL | __GFP_NOWARN);
    if (rq)
            return rq;
  

@@ -881,7 +877,7 @@ request_alloc_slow(struct intel_timeline *tl, retire_requests(tl);

out:

•   return kmem_cache_alloc(global.slab_requests, gfp);
  

•   return kmem_cache_alloc(slab_requests, gfp);
  

}

static void __i915_request_ctor(void *arg) @@ -942,7 +938,7 @@ __i915_request_create(struct intel_context *ce, gfp_t gfp) * * Do not use kmem_cache_zalloc() here! */

•   rq = kmem_cache_alloc(global.slab_requests,
  

•   rq = kmem_cache_alloc(slab_requests,
                          gfp | __GFP_RETRY_MAYFAIL | __GFP_NOWARN);
    if (unlikely(!rq)) {
            rq = request_alloc_slow(tl, &ce->engine->request_pool, gfp);
  

@@ -1029,7 +1025,7 @@ __i915_request_create(struct intel_context *ce, gfp_t gfp) GEM_BUG_ON(!list_empty(&rq->sched.waiters_list));

err_free:

•   kmem_cache_free(global.slab_requests, rq);
  

•   kmem_cache_free(slab_requests, rq);
  

err_unreserve: intel_context_unpin(ce); return ERR_PTR(ret); @@ -2084,19 +2080,15 @@ void i915_request_show(struct drm_printer *m, #include "selftests/i915_request.c" #endif

-static void i915_global_request_exit(void) +void i915_request_module_exit(void) {

•   kmem_cache_destroy(global.slab_execute_cbs);
  

•   kmem_cache_destroy(global.slab_requests);
  

•   kmem_cache_destroy(slab_execute_cbs);
  

•   kmem_cache_destroy(slab_requests);
  

}

-static struct i915_global_request global = { {

•   .exit = i915_global_request_exit,
  

-} };

-int __init i915_global_request_init(void) +int __init i915_request_module_init(void) {

•   global.slab_requests =
  

•   slab_requests =
            kmem_cache_create("i915_request",
                              sizeof(struct i915_request),
                              __alignof__(struct i915_request),
  

@@ -2104,20 +2096,19 @@ int __init i915_global_request_init(void) SLAB_RECLAIM_ACCOUNT | SLAB_TYPESAFE_BY_RCU, __i915_request_ctor);

•   if (!global.slab_requests)
  

•   if (!slab_requests)
            return -ENOMEM;
  
  

•   global.slab_execute_cbs = KMEM_CACHE(execute_cb,
  

•   slab_execute_cbs = KMEM_CACHE(execute_cb,
                                         SLAB_HWCACHE_ALIGN |
                                         SLAB_RECLAIM_ACCOUNT |
                                         SLAB_TYPESAFE_BY_RCU);
  

Indentation is wrong here

With static and indentation fixed,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

•   if (!global.slab_execute_cbs)
  

•   if (!slab_execute_cbs)
            goto err_requests;
  
  

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

err_requests:

•   kmem_cache_destroy(global.slab_requests);
  

•   kmem_cache_destroy(slab_requests);
    return -ENOMEM;
  

} diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h index 717e5b292046..a79480f07f04 100644 --- a/drivers/gpu/drm/i915/i915_request.h +++ b/drivers/gpu/drm/i915/i915_request.h @@ -647,4 +647,7 @@ bool i915_request_active_engine(struct i915_request *rq, struct intel_engine_cs **active);

+void i915_request_module_exit(void); +int i915_request_module_init(void);

#endif /* I915_REQUEST_H */

2.32.0

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

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_vmas to just a slab_vmas.

We have to keep i915_drv.h include in i915_globals otherwise there's nothing anymore that pulls in GEM_BUG_ON.

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

---

drivers/gpu/drm/i915/i915_globals.c | 3 +-- drivers/gpu/drm/i915/i915_globals.h | 3 --- drivers/gpu/drm/i915/i915_pci.c | 2 ++ drivers/gpu/drm/i915/i915_vma.c | 25 ++++++++----------------- drivers/gpu/drm/i915/i915_vma.h | 3 +++ 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c index 8923589057ab..04979789e7be 100644 --- a/drivers/gpu/drm/i915/i915_globals.c +++ b/drivers/gpu/drm/i915/i915_globals.c @@ -8,7 +8,7 @@ #include <linux/workqueue.h>

#include "i915_globals.h" -#include "i915_vma.h" +#include "i915_drv.h"

static LIST_HEAD(globals);

@@ -28,7 +28,6 @@ static void __i915_globals_cleanup(void) }

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

•   i915_global_vma_init,
  

};

int __init i915_globals_init(void) diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h index 7a57bce1da05..57d2998bba45 100644 --- a/drivers/gpu/drm/i915/i915_globals.h +++ b/drivers/gpu/drm/i915/i915_globals.h @@ -22,7 +22,4 @@ void i915_global_register(struct i915_global *global); int i915_globals_init(void); void i915_globals_exit(void);

-/* constructors */ -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 a44318519977..0affcf33a211 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -40,6 +40,7 @@ #include "i915_globals.h" #include "i915_selftest.h" #include "i915_scheduler.h" +#include "i915_vma.h"

#define PLATFORM(x) .platform = (x) #define GEN(x) \ @@ -1306,6 +1307,7 @@ static const struct { { 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_vma_module_init, i915_vma_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_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 09a7c47926f7..d094e2016b93 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -34,24 +34,20 @@ #include "gt/intel_gt_requests.h"

#include "i915_drv.h" -#include "i915_globals.h" #include "i915_sw_fence_work.h" #include "i915_trace.h" #include "i915_vma.h"

-static struct i915_global_vma {

•   struct i915_global base;
  

•   struct kmem_cache *slab_vmas;
  

-} global; +struct kmem_cache *slab_vmas;

static. With that,

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

struct i915_vma *i915_vma_alloc(void) {

•   return kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
  

•   return kmem_cache_zalloc(slab_vmas, GFP_KERNEL);
  

}

void i915_vma_free(struct i915_vma *vma) {

•   return kmem_cache_free(global.slab_vmas, vma);
  

•   return kmem_cache_free(slab_vmas, vma);
  

}

#if IS_ENABLED(CONFIG_DRM_I915_ERRLOG_GEM) && IS_ENABLED(CONFIG_DRM_DEBUG_MM) @@ -1414,21 +1410,16 @@ void i915_vma_make_purgeable(struct i915_vma *vma) #include "selftests/i915_vma.c" #endif

-static void i915_global_vma_exit(void) +void i915_vma_module_exit(void) {

•   kmem_cache_destroy(global.slab_vmas);
  

•   kmem_cache_destroy(slab_vmas);
  

}

-static struct i915_global_vma global = { {

•   .exit = i915_global_vma_exit,
  

-} };

-int __init i915_global_vma_init(void) +int __init i915_vma_module_init(void) {

•   global.slab_vmas = KMEM_CACHE(i915_vma, SLAB_HWCACHE_ALIGN);
  

•   if (!global.slab_vmas)
  

•   slab_vmas = KMEM_CACHE(i915_vma, SLAB_HWCACHE_ALIGN);
  

•   if (!slab_vmas)
            return -ENOMEM;
  
  

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

} diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h index eca452a9851f..ed69f66c7ab0 100644 --- a/drivers/gpu/drm/i915/i915_vma.h +++ b/drivers/gpu/drm/i915/i915_vma.h @@ -426,4 +426,7 @@ static inline int i915_vma_sync(struct i915_vma *vma) return i915_active_wait(&vma->active); }

+void i915_vma_module_exit(void); +int i915_vma_module_init(void);

#endif

2.32.0

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

No longer used.

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

Reviewed-by: Jason Ekstrand jason@jlekstrand.net

But, also, tvrtko is right that dumping all that stuff in i915_pci.c isn't great. Mind typing a quick follow-on that moves i915_init/exit to i915_drv.c?

--Jason

---

drivers/gpu/drm/i915/Makefile | 1 - drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 - drivers/gpu/drm/i915/i915_globals.c | 53 --------------------------- drivers/gpu/drm/i915/i915_globals.h | 25 ------------- drivers/gpu/drm/i915/i915_pci.c | 2 - 5 files changed, 82 deletions(-) delete mode 100644 drivers/gpu/drm/i915/i915_globals.c delete mode 100644 drivers/gpu/drm/i915/i915_globals.h

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 10b3bb6207ba..9022dc638ed6 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -166,7 +166,6 @@ i915-y += \ i915_gem_gtt.o \ i915_gem_ww.o \ i915_gem.o \

•     i915_globals.o \
      i915_query.o \
      i915_request.o \
      i915_scheduler.o \
  

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c index d86825437516..943c1d416ec0 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c @@ -6,7 +6,6 @@ #include <linux/suspend.h>

#include "i915_drv.h" -#include "i915_globals.h" #include "i915_params.h" #include "intel_context.h" #include "intel_engine_pm.h" diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c deleted file mode 100644 index 04979789e7be..000000000000 --- a/drivers/gpu/drm/i915/i915_globals.c +++ /dev/null @@ -1,53 +0,0 @@ -/*

• • SPDX-License-Identifier: MIT
• • Copyright © 2019 Intel Corporation
• */

-#include <linux/slab.h> -#include <linux/workqueue.h>

-#include "i915_globals.h" -#include "i915_drv.h"

-static LIST_HEAD(globals);

-void __init i915_global_register(struct i915_global *global) -{

•   GEM_BUG_ON(!global->exit);
  

•   list_add_tail(&global->link, &globals);
  

-}

-static void __i915_globals_cleanup(void) -{

•   struct i915_global *global, *next;
  

•   list_for_each_entry_safe_reverse(global, next, &globals, link)
  

•           global->exit();
  

-}

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

-int __init i915_globals_init(void) -{

•   int i;
  

•   for (i = 0; i < ARRAY_SIZE(initfn); i++) {
  

•           int err;
  

•           err = initfn[i]();
  

•           if (err) {
  

•                   __i915_globals_cleanup();
  

•                   return err;
  

•           }
  

•   }
  

•   return 0;
  

-}

-void i915_globals_exit(void) -{

•   __i915_globals_cleanup();
  

-} diff --git a/drivers/gpu/drm/i915/i915_globals.h b/drivers/gpu/drm/i915/i915_globals.h deleted file mode 100644 index 57d2998bba45..000000000000 --- a/drivers/gpu/drm/i915/i915_globals.h +++ /dev/null @@ -1,25 +0,0 @@ -/*

• • SPDX-License-Identifier: MIT
• • Copyright © 2019 Intel Corporation
• */

-#ifndef _I915_GLOBALS_H_ -#define _I915_GLOBALS_H_

-#include <linux/types.h>

-typedef void (*i915_global_func_t)(void);

-struct i915_global {

•   struct list_head link;
  

•   i915_global_func_t exit;
  

-};

-void i915_global_register(struct i915_global *global);

-int i915_globals_init(void); -void i915_globals_exit(void);

-#endif /* _I915_GLOBALS_H_ */ diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 0affcf33a211..ed72bcb58331 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -37,7 +37,6 @@ #include "gem/i915_gem_object.h" #include "i915_request.h" #include "i915_perf.h" -#include "i915_globals.h" #include "i915_selftest.h" #include "i915_scheduler.h" #include "i915_vma.h" @@ -1308,7 +1307,6 @@ static const struct { { i915_request_module_init, i915_request_module_exit }, { i915_scheduler_module_init, i915_scheduler_module_exit }, { i915_vma_module_init, i915_vma_module_exit },

•   { i915_globals_init, i915_globals_exit },
    { i915_mock_selftests, NULL },
    { i915_pmu_init, i915_pmu_exit },
    { i915_register_pci_driver, i915_unregister_pci_driver },
  

-- 2.32.0