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,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 65DF9C4320A for ; Fri, 20 Aug 2021 19:47:28 +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 042E66112E for ; Fri, 20 Aug 2021 19:47:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 042E66112E 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 76F316EB12; Fri, 20 Aug 2021 19:47:26 +0000 (UTC) Received: from mail-yb1-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95CD86EB12 for ; Fri, 20 Aug 2021 19:47:25 +0000 (UTC) Received: by mail-yb1-xb33.google.com with SMTP id m193so20725275ybf.9 for ; Fri, 20 Aug 2021 12:47:25 -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=UPazTA8XfYDofR3TTbgJCmTrgHuhd4C1O3xYxHBaRgA=; b=sovvk+jZAwI03HPoKkw1IqgblckMcsumwaChDH6tokVz1UIRHfZYwuktnjWOGwZs0l BRoD6LlHv12QAfy5WGXJG+Q3HGSlCFyLDCw9UMzcgVl6kuk3GvCigvaf/Yb9bFg2rfDW nIyP097VMhSURmUSNDTs3eE1AF0SrmhM/+8QxpH8jO1pWMYpGqnTL2L4xb6n6wORtedc 3v3x/u+AieeEBmmlwftMrnFGYtcjjxNqIS8OVKqdup7RObbhXx5PTkCSK9stzIegJBpx chEVB7O5+l7YlAyH53LzDTg0dkw/BhKlW7NO6R374F1dtkO6pCUqvDbKTDfKSDBjCodp mM6A== 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=UPazTA8XfYDofR3TTbgJCmTrgHuhd4C1O3xYxHBaRgA=; b=E+Qitq+121s6GmScAc2a8NJE3wuGltmBJysZcl19dab+WNCofxUv5uqOSB55tcNNir 3r1/ixh/6rUDOx+7ryBFzknubiw2h4AKW8S7DXyVYZc8shgleAzihuXUjvuXQ3qYzjed z7Oww6LeiNV/u43L/kBync1CzA3luq/HTXa1JBUzZFuteLv7fsD/IHLO9rGVP6OS/zT+ lC9/tKaOrBEy07DbF5sucSeSYiKXqb7yMuTFh6OYZE9TlN7Q+fH5v01VwU+1bBoAShld SR3NlEBI+ey5C35PVBawXBhqptVw7je7/oz1++azERb2HKWQI6eoBoyRDdPZUF/k8/wl xYuQ== X-Gm-Message-State: AOAM533sRJSaqklw1e86A5BFLOvCHE0fmnLTdh6AWIp/iIeR8UJZyyyK nflXBSNBaFe6gsM6qQl4afMrDsjA344J/aNfw6bWrg== X-Google-Smtp-Source: ABdhPJz8efchEEtUD6Dnh303QK8PsVpJvln5XS5F8I1XZ8ZcJOuh55zPL5i3oVgC06kbp7IKIEmLQZYa5ZRPA/1qLxU= X-Received: by 2002:a25:ef04:: with SMTP id g4mr25763462ybd.287.1629488844597; Fri, 20 Aug 2021 12:47:24 -0700 (PDT) MIME-Version: 1.0 References: <20210819061639.21051-1-matthew.brost@intel.com> <20210819061639.21051-8-matthew.brost@intel.com> In-Reply-To: <20210819061639.21051-8-matthew.brost@intel.com> From: Jason Ekstrand Date: Fri, 20 Aug 2021 14:47:13 -0500 Message-ID: Subject: Re: [PATCH 07/27] Revert "drm/i915/gt: Propagate change in error status to children on unhold" To: Matthew Brost Cc: Intel GFX , Maling list - DRI developers , Daniel Vetter Content-Type: text/plain; charset="UTF-8" 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Aug 19, 2021 at 1:22 AM Matthew Brost wrote: > > Propagating errors to dependent fences is wrong, don't do it. A selftest > in the following exposed the propagating of an error to a dependent > fence after an engine reset. I feel like we could still have a bit of a better message. Maybe something like this: Propagating errors to dependent fences is broken and can lead to errors from one client ending up in another. In 3761baae908a (Revert "drm/i915: Propagate errors on awaiting already signaled fences"), we attempted to get rid of fence error propagation but missed the case added in 8e9f84cf5cac ("drm/i915/gt: Propagate change in error status to children on unhold"). Revert that one too. This error was found by an up-and-coming selftest which . Otherwise, looks good to me. --Jason > > This reverts commit 8e9f84cf5cac248a1c6a5daa4942879c8b765058. > > v2: > (Daniel Vetter) > - Use revert > > References: 3761baae908a (Revert "drm/i915: Propagate errors on awaiting already signaled fences") > Signed-off-by: Matthew Brost > --- > drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > index de5f9c86b9a4..cafb0608ffb4 100644 > --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > @@ -2140,10 +2140,6 @@ static void __execlists_unhold(struct i915_request *rq) > if (p->flags & I915_DEPENDENCY_WEAK) > continue; > > - /* Propagate any change in error status */ > - if (rq->fence.error) > - i915_request_set_error_once(w, rq->fence.error); > - > if (w->engine != rq->engine) > continue; > > -- > 2.32.0 > 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.6 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 5E083C4338F for ; Fri, 20 Aug 2021 19:47: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 00D9961029 for ; Fri, 20 Aug 2021 19:47:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 00D9961029 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 4A9876EB11; Fri, 20 Aug 2021 19:47:26 +0000 (UTC) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F1246EB11 for ; Fri, 20 Aug 2021 19:47:25 +0000 (UTC) Received: by mail-yb1-xb2f.google.com with SMTP id a9so17285911ybr.5 for ; Fri, 20 Aug 2021 12:47:25 -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=UPazTA8XfYDofR3TTbgJCmTrgHuhd4C1O3xYxHBaRgA=; b=sovvk+jZAwI03HPoKkw1IqgblckMcsumwaChDH6tokVz1UIRHfZYwuktnjWOGwZs0l BRoD6LlHv12QAfy5WGXJG+Q3HGSlCFyLDCw9UMzcgVl6kuk3GvCigvaf/Yb9bFg2rfDW nIyP097VMhSURmUSNDTs3eE1AF0SrmhM/+8QxpH8jO1pWMYpGqnTL2L4xb6n6wORtedc 3v3x/u+AieeEBmmlwftMrnFGYtcjjxNqIS8OVKqdup7RObbhXx5PTkCSK9stzIegJBpx chEVB7O5+l7YlAyH53LzDTg0dkw/BhKlW7NO6R374F1dtkO6pCUqvDbKTDfKSDBjCodp mM6A== 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=UPazTA8XfYDofR3TTbgJCmTrgHuhd4C1O3xYxHBaRgA=; b=Alib5JIEshYzN/S8ivxVANbcMbwgFbSmsG5LVTwHCNNx2noMjTBYB2SxvyQTIhBWDQ V2TzLNofXQSq0mfP4ZeWOdLUy/VsJTOs7TwVmKfEi+oKxTW6VDo8T6RNpYaADc+tYBwN OakuwwNjsUrOCa2gBGHnmqtVh9jdZOApgVwzqwH/V5roNucnNKIn1/X3TiYYBc1H9DoQ jkzNU5dyLHmMBYC0jAf3aMU2WMeOhUGWHypT2NEQ3UPYIQmsyRcVApGwn4J17F5GGCdm tZj+PMWKRmY+uFbvVHYUUzLjc0fzQlf5AFfQBH/WNei/fxPVraJfkE+bAmT/ac5FPSP4 1h2w== X-Gm-Message-State: AOAM533RnL05JeYbM1LbApuOTV1wQXs1JShCx0skFhT56uL0kszYBsl9 UUFTfP03RP39RhSgxDSdd+Xl9nV2amCUL8g/5pQ0KQ== X-Google-Smtp-Source: ABdhPJz8efchEEtUD6Dnh303QK8PsVpJvln5XS5F8I1XZ8ZcJOuh55zPL5i3oVgC06kbp7IKIEmLQZYa5ZRPA/1qLxU= X-Received: by 2002:a25:ef04:: with SMTP id g4mr25763462ybd.287.1629488844597; Fri, 20 Aug 2021 12:47:24 -0700 (PDT) MIME-Version: 1.0 References: <20210819061639.21051-1-matthew.brost@intel.com> <20210819061639.21051-8-matthew.brost@intel.com> In-Reply-To: <20210819061639.21051-8-matthew.brost@intel.com> From: Jason Ekstrand Date: Fri, 20 Aug 2021 14:47:13 -0500 Message-ID: To: Matthew Brost Cc: Intel GFX , Maling list - DRI developers , Daniel Vetter Content-Type: text/plain; charset="UTF-8" Subject: Re: [Intel-gfx] [PATCH 07/27] Revert "drm/i915/gt: Propagate change in error status to children on unhold" 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Aug 19, 2021 at 1:22 AM Matthew Brost wrote: > > Propagating errors to dependent fences is wrong, don't do it. A selftest > in the following exposed the propagating of an error to a dependent > fence after an engine reset. I feel like we could still have a bit of a better message. Maybe something like this: Propagating errors to dependent fences is broken and can lead to errors from one client ending up in another. In 3761baae908a (Revert "drm/i915: Propagate errors on awaiting already signaled fences"), we attempted to get rid of fence error propagation but missed the case added in 8e9f84cf5cac ("drm/i915/gt: Propagate change in error status to children on unhold"). Revert that one too. This error was found by an up-and-coming selftest which . Otherwise, looks good to me. --Jason > > This reverts commit 8e9f84cf5cac248a1c6a5daa4942879c8b765058. > > v2: > (Daniel Vetter) > - Use revert > > References: 3761baae908a (Revert "drm/i915: Propagate errors on awaiting already signaled fences") > Signed-off-by: Matthew Brost > --- > drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > index de5f9c86b9a4..cafb0608ffb4 100644 > --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > @@ -2140,10 +2140,6 @@ static void __execlists_unhold(struct i915_request *rq) > if (p->flags & I915_DEPENDENCY_WEAK) > continue; > > - /* Propagate any change in error status */ > - if (rq->fence.error) > - i915_request_set_error_once(w, rq->fence.error); > - > if (w->engine != rq->engine) > continue; > > -- > 2.32.0 >