From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09BBBC432BE for ; Mon, 26 Jul 2021 15:35:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B609A60295 for ; Mon, 26 Jul 2021 15:35:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B609A60295 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 667DC6FD78; Mon, 26 Jul 2021 15:35:55 +0000 (UTC) Received: from mail-yb1-xb2d.google.com (mail-yb1-xb2d.google.com [IPv6:2607:f8b0:4864:20::b2d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F18C6FE58 for ; Mon, 26 Jul 2021 15:35:55 +0000 (UTC) Received: by mail-yb1-xb2d.google.com with SMTP id a201so15429828ybg.12 for ; Mon, 26 Jul 2021 08:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vmv3EakgEmNLpgM1YVkujmATvlNmxJQRaq17kakwiDA=; b=hJOfCrjhq33eVVzxcqgqu2ipWhQEKXeWINspRl43R4ygn44H4pvIyqz/6wSKyiGh2n ihnTRKlCGoaqo/163Xj/s7V5xLIL6/0IhD3WD+zdvYYnS+zsly8wjWv1nDsFnH8WB/lL yyH2KeoiN30Uv6qdS5rCnGnajZAa06FEclu1JHU5LcDLpzz8nHpmbawf3l4JTkovAvD2 ttNN3tRBrLa7F91Wd2GFovmykF+Mrd6z7WXyoNi73/JvK0Dd+bujZGMYu6BOHcO70aT1 66+HwChlqiaXcX4FZ0JcoEWp711sqa+y3IP1wGp+xbaOnPTomcgdvkEdKUta38tmSxaQ l0cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vmv3EakgEmNLpgM1YVkujmATvlNmxJQRaq17kakwiDA=; b=o6Nkz7sRPOy87w/8aKT5whazP3W9huDS/xcXN/PGQK5y+L0/wdOXqSE8xY7DnKAwy7 BD/ud4Rpx6yYNWIJj7xFAK5pBNSn7dTiSocRM6KzrLLKWCrYfnpPyWmlXzTot3rQRQsA 62jt3PQv6o9ijMSMP3aa3GGF3D/EIxMIgH0aQz7m0Vo/4KGSPmqFW8onhJ7nOIOGFmxC 32Z4Ndsr9/fkEW2SlB0tiazfOS9OW12SKtOaPXMwl/a0Ex+9czB0q6fpWSSc7cftPmfd KydJLfUoJXr8d5LxPNaYIs/iF9HHAFy+bHSNVpzRS+1lE1A/cUhQ8L0EOxh2dOxonxI4 nMvw== X-Gm-Message-State: AOAM53359pXQ+XKDSyiooW56DvTHIdHbNkM+YtfiQJgHbTeZg9BtHIfa CHr//89o+Laxlt2hxVGOsW4nVTRpv0aaZneDega5BQ== X-Google-Smtp-Source: ABdhPJzhyMAiTKuYH7iEkrTdaG9TlNYk5GWMfzUR+rL2LaRdWtcH1ipyEJDRzAfpWULIZD6Wz5+V68DCpYo59jYvq+k= X-Received: by 2002:a25:7647:: with SMTP id r68mr25821692ybc.432.1627313754039; Mon, 26 Jul 2021 08:35:54 -0700 (PDT) MIME-Version: 1.0 References: <20210723192934.1004427-1-daniel.vetter@ffwll.ch> <20210723192934.1004427-5-daniel.vetter@ffwll.ch> In-Reply-To: <20210723192934.1004427-5-daniel.vetter@ffwll.ch> From: Jason Ekstrand Date: Mon, 26 Jul 2021 10:35:43 -0500 Message-ID: To: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 05/10] drm/i915: move gem_context slab to direct module init/exit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , DRI Development Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Jul 23, 2021 at 2:29 PM 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_luts to just a > slab_luts. > > Cc: Jason Ekstrand > Signed-off-by: Daniel Vetter > --- > 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 > 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 > #include > > -#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 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx