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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 DE9A5C07E95 for ; Tue, 20 Jul 2021 20:04:27 +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 A33A46100C for ; Tue, 20 Jul 2021 20:04:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A33A46100C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DBBF96E4F4; Tue, 20 Jul 2021 20:04:25 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F35D6E3DB; Tue, 20 Jul 2021 20:04:24 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10051"; a="191597409" X-IronPort-AV: E=Sophos;i="5.84,256,1620716400"; d="scan'208";a="191597409" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2021 13:04:22 -0700 X-IronPort-AV: E=Sophos;i="5.84,256,1620716400"; d="scan'208";a="432678167" Received: from unknown (HELO sdutt-i7) ([10.165.21.147]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2021 13:04:22 -0700 Date: Tue, 20 Jul 2021 12:53:06 -0700 From: Matthew Brost To: John Harrison Subject: Re: [PATCH 24/51] drm/i915: Add i915_sched_engine destroy vfunc Message-ID: <20210720195306.GA16995@sdutt-i7> References: <20210716201724.54804-1-matthew.brost@intel.com> <20210716201724.54804-25-matthew.brost@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, daniele.ceraolospurio@intel.com, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Jul 20, 2021 at 12:55:08PM -0700, John Harrison wrote: > On 7/16/2021 13:16, Matthew Brost wrote: > > This help the backends clean up when the schedule engine object gets > help -> helps. Although, I would say it's more like 'this is required to > allow backend specific cleanup'. It doesn't just make life a bit easier, it > allows us to not leak stuff and/or dereference null pointers! > > Either way... > Reviewed-by: John Harrison I'll reword it. Matt > > > destroyed. > > > > Signed-off-by: Matthew Brost > > --- > > drivers/gpu/drm/i915/i915_scheduler.c | 3 ++- > > drivers/gpu/drm/i915/i915_scheduler.h | 4 +--- > > drivers/gpu/drm/i915/i915_scheduler_types.h | 5 +++++ > > 3 files changed, 8 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c > > index 3a58a9130309..4fceda96deed 100644 > > --- a/drivers/gpu/drm/i915/i915_scheduler.c > > +++ b/drivers/gpu/drm/i915/i915_scheduler.c > > @@ -431,7 +431,7 @@ void i915_request_show_with_schedule(struct drm_printer *m, > > rcu_read_unlock(); > > } > > -void i915_sched_engine_free(struct kref *kref) > > +static void default_destroy(struct kref *kref) > > { > > struct i915_sched_engine *sched_engine = > > container_of(kref, typeof(*sched_engine), ref); > > @@ -453,6 +453,7 @@ i915_sched_engine_create(unsigned int subclass) > > sched_engine->queue = RB_ROOT_CACHED; > > sched_engine->queue_priority_hint = INT_MIN; > > + sched_engine->destroy = default_destroy; > > INIT_LIST_HEAD(&sched_engine->requests); > > INIT_LIST_HEAD(&sched_engine->hold); > > diff --git a/drivers/gpu/drm/i915/i915_scheduler.h b/drivers/gpu/drm/i915/i915_scheduler.h > > index 650ab8e0db9f..3c9504e9f409 100644 > > --- a/drivers/gpu/drm/i915/i915_scheduler.h > > +++ b/drivers/gpu/drm/i915/i915_scheduler.h > > @@ -51,8 +51,6 @@ static inline void i915_priolist_free(struct i915_priolist *p) > > struct i915_sched_engine * > > i915_sched_engine_create(unsigned int subclass); > > -void i915_sched_engine_free(struct kref *kref); > > - > > static inline struct i915_sched_engine * > > i915_sched_engine_get(struct i915_sched_engine *sched_engine) > > { > > @@ -63,7 +61,7 @@ i915_sched_engine_get(struct i915_sched_engine *sched_engine) > > static inline void > > i915_sched_engine_put(struct i915_sched_engine *sched_engine) > > { > > - kref_put(&sched_engine->ref, i915_sched_engine_free); > > + kref_put(&sched_engine->ref, sched_engine->destroy); > > } > > static inline bool > > diff --git a/drivers/gpu/drm/i915/i915_scheduler_types.h b/drivers/gpu/drm/i915/i915_scheduler_types.h > > index 5935c3152bdc..00384e2c5273 100644 > > --- a/drivers/gpu/drm/i915/i915_scheduler_types.h > > +++ b/drivers/gpu/drm/i915/i915_scheduler_types.h > > @@ -163,6 +163,11 @@ struct i915_sched_engine { > > */ > > void *private_data; > > + /** > > + * @destroy: destroy schedule engine / cleanup in backend > > + */ > > + void (*destroy)(struct kref *kref); > > + > > /** > > * @kick_backend: kick backend after a request's priority has changed > > */ > 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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 41741C07E9B for ; Tue, 20 Jul 2021 20:04:26 +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 0A73660200 for ; Tue, 20 Jul 2021 20:04:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A73660200 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A61596E3DB; Tue, 20 Jul 2021 20:04:25 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F35D6E3DB; Tue, 20 Jul 2021 20:04:24 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10051"; a="191597409" X-IronPort-AV: E=Sophos;i="5.84,256,1620716400"; d="scan'208";a="191597409" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2021 13:04:22 -0700 X-IronPort-AV: E=Sophos;i="5.84,256,1620716400"; d="scan'208";a="432678167" Received: from unknown (HELO sdutt-i7) ([10.165.21.147]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2021 13:04:22 -0700 Date: Tue, 20 Jul 2021 12:53:06 -0700 From: Matthew Brost To: John Harrison Message-ID: <20210720195306.GA16995@sdutt-i7> References: <20210716201724.54804-1-matthew.brost@intel.com> <20210716201724.54804-25-matthew.brost@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH 24/51] drm/i915: Add i915_sched_engine destroy vfunc 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: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Jul 20, 2021 at 12:55:08PM -0700, John Harrison wrote: > On 7/16/2021 13:16, Matthew Brost wrote: > > This help the backends clean up when the schedule engine object gets > help -> helps. Although, I would say it's more like 'this is required to > allow backend specific cleanup'. It doesn't just make life a bit easier, it > allows us to not leak stuff and/or dereference null pointers! > > Either way... > Reviewed-by: John Harrison I'll reword it. Matt > > > destroyed. > > > > Signed-off-by: Matthew Brost > > --- > > drivers/gpu/drm/i915/i915_scheduler.c | 3 ++- > > drivers/gpu/drm/i915/i915_scheduler.h | 4 +--- > > drivers/gpu/drm/i915/i915_scheduler_types.h | 5 +++++ > > 3 files changed, 8 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c > > index 3a58a9130309..4fceda96deed 100644 > > --- a/drivers/gpu/drm/i915/i915_scheduler.c > > +++ b/drivers/gpu/drm/i915/i915_scheduler.c > > @@ -431,7 +431,7 @@ void i915_request_show_with_schedule(struct drm_printer *m, > > rcu_read_unlock(); > > } > > -void i915_sched_engine_free(struct kref *kref) > > +static void default_destroy(struct kref *kref) > > { > > struct i915_sched_engine *sched_engine = > > container_of(kref, typeof(*sched_engine), ref); > > @@ -453,6 +453,7 @@ i915_sched_engine_create(unsigned int subclass) > > sched_engine->queue = RB_ROOT_CACHED; > > sched_engine->queue_priority_hint = INT_MIN; > > + sched_engine->destroy = default_destroy; > > INIT_LIST_HEAD(&sched_engine->requests); > > INIT_LIST_HEAD(&sched_engine->hold); > > diff --git a/drivers/gpu/drm/i915/i915_scheduler.h b/drivers/gpu/drm/i915/i915_scheduler.h > > index 650ab8e0db9f..3c9504e9f409 100644 > > --- a/drivers/gpu/drm/i915/i915_scheduler.h > > +++ b/drivers/gpu/drm/i915/i915_scheduler.h > > @@ -51,8 +51,6 @@ static inline void i915_priolist_free(struct i915_priolist *p) > > struct i915_sched_engine * > > i915_sched_engine_create(unsigned int subclass); > > -void i915_sched_engine_free(struct kref *kref); > > - > > static inline struct i915_sched_engine * > > i915_sched_engine_get(struct i915_sched_engine *sched_engine) > > { > > @@ -63,7 +61,7 @@ i915_sched_engine_get(struct i915_sched_engine *sched_engine) > > static inline void > > i915_sched_engine_put(struct i915_sched_engine *sched_engine) > > { > > - kref_put(&sched_engine->ref, i915_sched_engine_free); > > + kref_put(&sched_engine->ref, sched_engine->destroy); > > } > > static inline bool > > diff --git a/drivers/gpu/drm/i915/i915_scheduler_types.h b/drivers/gpu/drm/i915/i915_scheduler_types.h > > index 5935c3152bdc..00384e2c5273 100644 > > --- a/drivers/gpu/drm/i915/i915_scheduler_types.h > > +++ b/drivers/gpu/drm/i915/i915_scheduler_types.h > > @@ -163,6 +163,11 @@ struct i915_sched_engine { > > */ > > void *private_data; > > + /** > > + * @destroy: destroy schedule engine / cleanup in backend > > + */ > > + void (*destroy)(struct kref *kref); > > + > > /** > > * @kick_backend: kick backend after a request's priority has changed > > */ > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx