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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3ACEAC4332F for ; Tue, 8 Nov 2022 13:45:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E727610E289; Tue, 8 Nov 2022 13:45:14 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 235F910E289 for ; Tue, 8 Nov 2022 13:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667915109; x=1699451109; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:in-reply-to; bh=3NaTQsLvR+HBygaFgtLJoM0noNyYhzLG+k7UjMjpxNM=; b=brGqZFzcGcKsgv5e+PUEgvtmH5JnJDNH0se66O/kns5POsQ2BWPVBs0P Bt8eZjiEd8vcC4GjBBqoa4yppCSRpIiu3lmEkfNHCj4BL/p6wZLSRXd+g Q+qavGfzt5DGz1yRr6tDenvaq0NVp0mUpkHgdKSti6jIwuAPu5tGUFv5W de8U08+GW8Q54dtJghAjEmVb7+1EjUHciFKnD/GAIexLzwl9vyjJag+de z/wTp+GoeMddsLuH+2yVdAQxKJ7/1X0vf5ikB33Aiwsb3Zy/Vo5ND/87+ Axkepx2p2+qWcfM/CXYiqA3TrRJRQMPQWqe+RVC0cXaPBmmvnrgDISDId A==; X-IronPort-AV: E=McAfee;i="6500,9779,10524"; a="308315007" X-IronPort-AV: E=Sophos;i="5.96,147,1665471600"; d="scan'208";a="308315007" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 05:45:08 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10524"; a="811244115" X-IronPort-AV: E=Sophos;i="5.96,147,1665471600"; d="scan'208";a="811244115" Received: from ideak-desk.fi.intel.com ([10.237.68.144]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 05:45:07 -0800 Date: Tue, 8 Nov 2022 15:45:02 +0200 From: Imre Deak To: Jani Nikula Message-ID: References: <20221107170917.3566758-1-imre.deak@intel.com> <20221107170917.3566758-2-imre.deak@intel.com> <87mt91aksi.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87mt91aksi.fsf@intel.com> Subject: Re: [Intel-gfx] [PATCH v2 1/9] drm/i915: Allocate power domain set wakerefs dynamically 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: , Reply-To: imre.deak@intel.com Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Nov 08, 2022 at 10:54:21AM +0200, Jani Nikula wrote: > On Mon, 07 Nov 2022, Imre Deak wrote: > > Since the intel_display_power_domain_set struct, currently its current > > size close 1kB, can be allocated on the stack, it's better to allocate > > the per-domain wakeref pointer array - used for debugging - within the > > struct dynamically, so do this. > > > > The memory freeing is guaranteed by the fact that the acquired domain > > references tracked by struct can't be leaked either. > > > > v2: > > - Don't use fetch_and_zero() when freeing the wakerefs array. (Jani) > > - Simplify intel_display_power_get/put_in_set(). (Jani) > > - Check in intel_crtc_destroy() that the wakerefs array has been freed. > > > > Cc: Jani Nikula > > Signed-off-by: Imre Deak > > --- > > drivers/gpu/drm/i915/display/intel_crtc.c | 4 + > > .../drm/i915/display/intel_display_power.c | 95 +++++++++++++++---- > > .../drm/i915/display/intel_display_power.h | 2 +- > > 3 files changed, 79 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c > > index 037fc140b585c..2c8d564e73182 100644 > > --- a/drivers/gpu/drm/i915/display/intel_crtc.c > > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c > > @@ -205,6 +205,10 @@ static void intel_crtc_destroy(struct drm_crtc *_crtc) > > cpu_latency_qos_remove_request(&crtc->vblank_pm_qos); > > > > drm_crtc_cleanup(&crtc->base); > > + > > +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > > + drm_WARN_ON(crtc->base.dev, crtc->enabled_power_domains.wakerefs); > > +#endif > > Can we please not add this kind of asserts without abstractions? The > #ifdef is ugly, looking at crtc->enabled_power_domains.wakerefs directly > is ugly. > > Maybe add an assert_something_or_other(crtc) that does the right thing? > Similar to the other assert_*() functions we have? Yes, can add assert_power_domains_disabled(crtc) to this file. > Does it even need to depend on the config? If it's worth having, maybe > worth having unconditionally? The wakerefs array exists only when the config is enabled, but the non-debug crtc->enabled_power_domains.mask should be checked as well. > BR, > Jani. > > > kfree(crtc); > > } > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > > index 4c1de91e56ff9..db235b79c9629 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > > @@ -830,20 +830,85 @@ void intel_display_power_put_unchecked(struct drm_i915_private *dev_priv, > > } > > #endif > > > > +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > > +static void > > +add_domain_to_set(struct drm_i915_private *i915, > > + struct intel_display_power_domain_set *power_domain_set, > > + enum intel_display_power_domain domain, > > + intel_wakeref_t wf) > > +{ > > + drm_WARN_ON(&i915->drm, test_bit(domain, power_domain_set->mask.bits)); > > + > > + if (!power_domain_set->wakerefs) > > + power_domain_set->wakerefs = kcalloc(POWER_DOMAIN_NUM, > > + sizeof(*power_domain_set->wakerefs), > > + GFP_KERNEL); > > + > > + if (power_domain_set->wakerefs) > > + power_domain_set->wakerefs[domain] = wf; > > + > > + set_bit(domain, power_domain_set->mask.bits); > > +} > > + > > +static intel_wakeref_t > > +remove_domain_from_set(struct drm_i915_private *i915, > > + struct intel_display_power_domain_set *power_domain_set, > > + enum intel_display_power_domain domain) > > +{ > > + intel_wakeref_t wf; > > + > > + drm_WARN_ON(&i915->drm, !test_bit(domain, power_domain_set->mask.bits)); > > + > > + clear_bit(domain, power_domain_set->mask.bits); > > + > > + if (!power_domain_set->wakerefs) > > + return -1; > > + > > + wf = fetch_and_zero(&power_domain_set->wakerefs[domain]); > > + > > + if (bitmap_empty(power_domain_set->mask.bits, POWER_DOMAIN_NUM)) { > > + kfree(power_domain_set->wakerefs); > > + power_domain_set->wakerefs = NULL; > > + } > > + > > + return wf; > > + > > +} > > +#else > > +static void > > +add_domain_to_set(struct drm_i915_private *i915, > > + struct intel_display_power_domain_set *power_domain_set, > > + enum intel_display_power_domain domain, > > + intel_wakeref_t wf) > > +{ > > + drm_WARN_ON(&i915->drm, test_bit(domain, power_domain_set->mask.bits)); > > + > > + set_bit(domain, power_domain_set->mask.bits); > > +} > > + > > +static intel_wakeref_t > > +remove_domain_from_set(struct drm_i915_private *i915, > > + struct intel_display_power_domain_set *power_domain_set, > > + enum intel_display_power_domain domain) > > +{ > > + drm_WARN_ON(&i915->drm, !test_bit(domain, power_domain_set->mask.bits)); > > + > > + clear_bit(domain, power_domain_set->mask.bits); > > + > > + return -1; > > +} > > +#endif > > + > > void > > intel_display_power_get_in_set(struct drm_i915_private *i915, > > struct intel_display_power_domain_set *power_domain_set, > > enum intel_display_power_domain domain) > > { > > - intel_wakeref_t __maybe_unused wf; > > - > > - drm_WARN_ON(&i915->drm, test_bit(domain, power_domain_set->mask.bits)); > > + intel_wakeref_t wf; > > > > wf = intel_display_power_get(i915, domain); > > -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > > - power_domain_set->wakerefs[domain] = wf; > > -#endif > > - set_bit(domain, power_domain_set->mask.bits); > > + > > + add_domain_to_set(i915, power_domain_set, domain, wf); > > } > > > > bool > > @@ -853,16 +918,11 @@ intel_display_power_get_in_set_if_enabled(struct drm_i915_private *i915, > > { > > intel_wakeref_t wf; > > > > - drm_WARN_ON(&i915->drm, test_bit(domain, power_domain_set->mask.bits)); > > - > > wf = intel_display_power_get_if_enabled(i915, domain); > > if (!wf) > > return false; > > > > -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > > - power_domain_set->wakerefs[domain] = wf; > > -#endif > > - set_bit(domain, power_domain_set->mask.bits); > > + add_domain_to_set(i915, power_domain_set, domain, wf); > > > > return true; > > } > > @@ -874,17 +934,10 @@ intel_display_power_put_mask_in_set(struct drm_i915_private *i915, > > { > > enum intel_display_power_domain domain; > > > > - drm_WARN_ON(&i915->drm, > > - !bitmap_subset(mask->bits, power_domain_set->mask.bits, POWER_DOMAIN_NUM)); > > - > > for_each_power_domain(domain, mask) { > > - intel_wakeref_t __maybe_unused wf = -1; > > + intel_wakeref_t wf = remove_domain_from_set(i915, power_domain_set, domain); > > > > -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > > - wf = fetch_and_zero(&power_domain_set->wakerefs[domain]); > > -#endif > > intel_display_power_put(i915, domain, wf); > > - clear_bit(domain, power_domain_set->mask.bits); > > } > > } > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h > > index 1e77e52c87fec..662123d260a7a 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_power.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h > > @@ -147,7 +147,7 @@ struct i915_power_domains { > > struct intel_display_power_domain_set { > > struct intel_power_domain_mask mask; > > #ifdef CONFIG_DRM_I915_DEBUG_RUNTIME_PM > > - intel_wakeref_t wakerefs[POWER_DOMAIN_NUM]; > > + intel_wakeref_t *wakerefs; > > #endif > > }; > > -- > Jani Nikula, Intel Open Source Graphics Center