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.8 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 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 55389C07E95 for ; Tue, 20 Jul 2021 20:38:23 +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 128AA60FF3 for ; Tue, 20 Jul 2021 20:38:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 128AA60FF3 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 B14BB6E49F; Tue, 20 Jul 2021 20:38:22 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id B71E26E402; Tue, 20 Jul 2021 20:38:21 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10051"; a="296885122" X-IronPort-AV: E=Sophos;i="5.84,256,1620716400"; d="scan'208";a="296885122" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2021 13:38:21 -0700 X-IronPort-AV: E=Sophos;i="5.84,256,1620716400"; d="scan'208";a="469891929" Received: from dut151-iclu.fm.intel.com ([10.105.23.43]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2021 13:38:21 -0700 Date: Tue, 20 Jul 2021 20:38:19 +0000 From: Matthew Brost To: John Harrison Message-ID: <20210720203819.GA14430@DUT151-ICLU.fm.intel.com> References: <20210716201724.54804-1-matthew.brost@intel.com> <20210716201724.54804-31-matthew.brost@intel.com> <19438ac3-255f-78db-6ce3-ba919ea4e456@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <19438ac3-255f-78db-6ce3-ba919ea4e456@intel.com> Subject: Re: [Intel-gfx] [PATCH 30/51] drm/i915/guc: Handle context reset notification 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 01:29:26PM -0700, John Harrison wrote: > On 7/16/2021 13:17, Matthew Brost wrote: > > GuC will issue a reset on detecting an engine hang and will notify > > the driver via a G2H message. The driver will service the notification > > by resetting the guilty context to a simple state or banning it > > completely. > > > > v2: > > (John Harrison) > > - Move msg[0] lookup after length check > > > > Cc: Matthew Brost > > Cc: John Harrison > > Signed-off-by: Matthew Brost > > --- > > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 ++ > > drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 3 ++ > > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 36 +++++++++++++++++++ > > drivers/gpu/drm/i915/i915_trace.h | 10 ++++++ > > 4 files changed, 51 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > > index b3cfc52fe0bc..f23a3a618550 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > > @@ -262,6 +262,8 @@ int intel_guc_deregister_done_process_msg(struct intel_guc *guc, > > const u32 *msg, u32 len); > > int intel_guc_sched_done_process_msg(struct intel_guc *guc, > > const u32 *msg, u32 len); > > +int intel_guc_context_reset_process_msg(struct intel_guc *guc, > > + const u32 *msg, u32 len); > > void intel_guc_submission_reset_prepare(struct intel_guc *guc); > > void intel_guc_submission_reset(struct intel_guc *guc, bool stalled); > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > > index 503a78517610..c4f9b44b9f86 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > > @@ -981,6 +981,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r > > case INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_DONE: > > ret = intel_guc_sched_done_process_msg(guc, payload, len); > > break; > > + case INTEL_GUC_ACTION_CONTEXT_RESET_NOTIFICATION: > > + ret = intel_guc_context_reset_process_msg(guc, payload, len); > > + break; > > default: > > ret = -EOPNOTSUPP; > > break; > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > index fdb17279095c..feaf1ca61eaa 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > @@ -2196,6 +2196,42 @@ int intel_guc_sched_done_process_msg(struct intel_guc *guc, > > return 0; > > } > > +static void guc_context_replay(struct intel_context *ce) > > +{ > > + struct i915_sched_engine *sched_engine = ce->engine->sched_engine; > > + > > + __guc_reset_context(ce, true); > > + tasklet_hi_schedule(&sched_engine->tasklet); > > +} > > + > > +static void guc_handle_context_reset(struct intel_guc *guc, > > + struct intel_context *ce) > > +{ > > + trace_intel_context_reset(ce); > > + guc_context_replay(ce); > > +} > > + > > +int intel_guc_context_reset_process_msg(struct intel_guc *guc, > > + const u32 *msg, u32 len) > > +{ > > + struct intel_context *ce; > > + int desc_idx; > > + > > + if (unlikely(len != 1)) { > > + drm_dbg(&guc_to_gt(guc)->i915->drm, "Invalid length %u", len); > I think we decided that these should be drm_err rather than drm_dbg? > Yes, we did. Already fixed this message and all subsequent in my branch. Matt > With that updated: > Reviewed-by: John Harrison > > > + return -EPROTO; > > + } > > + > > + desc_idx = msg[0]; > > + ce = g2h_context_lookup(guc, desc_idx); > > + if (unlikely(!ce)) > > + return -EPROTO; > > + > > + guc_handle_context_reset(guc, ce); > > + > > + return 0; > > +} > > + > > void intel_guc_submission_print_info(struct intel_guc *guc, > > struct drm_printer *p) > > { > > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h > > index 97c2e83984ed..c095c4d39456 100644 > > --- a/drivers/gpu/drm/i915/i915_trace.h > > +++ b/drivers/gpu/drm/i915/i915_trace.h > > @@ -929,6 +929,11 @@ DECLARE_EVENT_CLASS(intel_context, > > __entry->guc_sched_state_no_lock) > > ); > > +DEFINE_EVENT(intel_context, intel_context_reset, > > + TP_PROTO(struct intel_context *ce), > > + TP_ARGS(ce) > > +); > > + > > DEFINE_EVENT(intel_context, intel_context_register, > > TP_PROTO(struct intel_context *ce), > > TP_ARGS(ce) > > @@ -1026,6 +1031,11 @@ trace_i915_request_out(struct i915_request *rq) > > { > > } > > +static inline void > > +trace_intel_context_reset(struct intel_context *ce) > > +{ > > +} > > + > > static inline void > > trace_intel_context_register(struct intel_context *ce) > > { > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx