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 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 A2FB9C47096 for ; Thu, 3 Jun 2021 08:25:05 +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 6DF94613DE for ; Thu, 3 Jun 2021 08:25:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DF94613DE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 0769E6F445; Thu, 3 Jun 2021 08:25:05 +0000 (UTC) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF2206F44B for ; Thu, 3 Jun 2021 08:25:03 +0000 (UTC) Received: by mail-ej1-x629.google.com with SMTP id jt22so7969890ejb.7 for ; Thu, 03 Jun 2021 01:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=pLB0AHNkPuC0xacQMQ49Xc5Eg0xlyzXKx/dWT+EAjyA=; b=FXs8XDFwZVGSsCZEwOlQugxQWNSYWAmKcyerO9/CxGuTuQQr+1TFgaRiGhkciLm2np dzuzOe7xqtbz89U/L5NNqJLP3IfZNEdf1M4Gwy3v/Hka0zLcVaHeSJf9aV6ag7b2xvSV pYAmkSnq6uBOJUj7GXITQV7pcoHvua54eNsXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pLB0AHNkPuC0xacQMQ49Xc5Eg0xlyzXKx/dWT+EAjyA=; b=Fr/C1hYidok1EgGpI539YriRZRvNjfvCIShiFKHXb+MaZ1Et2M5ARSjE+l29iaoDoF 2tGdfupPMq02TTK+y4doDodSABjh8Druu6PMfFHoORujJKTl4g2LcPm7TlK+DZSnl8LM nimATmp+hqkKpOT73iyTh5pYv9jkOigjSac0I6cThRB3nNSc7CsRj0MVC+LJWlmVKZJa UUr4JrKSxQgM0TaAf65qY6omGddMHmGvwefVENhu7KmCaUBAwqZ8oTHMjdv2aHstafgT 7JrchNYXQPwhCPw0IxJjXYkh5kXkz9mexMkS4bUN08gDZCfljUsGsAqoSv/M+6rn6Urx iQgg== X-Gm-Message-State: AOAM531FbvK/KQomWhBJLf07QwNDXmjzKRpxMw1c4tzOEUyqKO+cesh2 aW6zMF/1zzAIWhp9RReC1XDosQ== X-Google-Smtp-Source: ABdhPJx/2UdPhdQe8d0TR3Zs2+ONOrz7OP88w0jJxl9puFX31DuatOZsoOLqg6mED9dlKhOlA0W/lw== X-Received: by 2002:a17:906:1986:: with SMTP id g6mr37805723ejd.265.1622708702421; Thu, 03 Jun 2021 01:25:02 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id b15sm1321252ede.66.2021.06.03.01.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 01:25:02 -0700 (PDT) Date: Thu, 3 Jun 2021 10:25:00 +0200 From: Daniel Vetter To: Jason Ekstrand Message-ID: References: <20210602164149.391653-1-jason@jlekstrand.net> <20210602164149.391653-5-jason@jlekstrand.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.32scarlett+ Subject: Re: [Intel-gfx] [PATCH 4/5] Revert "drm/i915: Propagate errors on awaiting already signaled fences" 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-gfx@lists.freedesktop.org, stable@vger.kernel.org, Jason Ekstrand , 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 Thu, Jun 03, 2021 at 10:24:21AM +0200, Daniel Vetter wrote: > On Wed, Jun 02, 2021 at 11:41:48AM -0500, Jason Ekstrand wrote: > > This reverts commit 9e31c1fe45d555a948ff66f1f0e3fe1f83ca63f7. Ever > > since that commit, we've been having issues where a hang in one client > > can propagate to another. In particular, a hang in an app can propagate > > to the X server which causes the whole desktop to lock up. > > I think we need a note to backporters here: > > "For backporters: Please note that you _must_ have a backport of > https://lore.kernel.org/dri-devel/20210602164149.391653-2-jason@jlekstrand.net/ > for otherwise backporting just this patch opens up a security bug." > > Or something like that. Oh also reordering the patch set so the 2 reverts which are cc: stable are first, then the other stuff on top that cleans up the fallout. -Daniel > -Daniel > > > Signed-off-by: Jason Ekstrand > > Reported-by: Marcin Slusarz > > Cc: # v5.6+ > > Cc: Jason Ekstrand > > Cc: Marcin Slusarz > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3080 > > Fixes: 9e31c1fe45d5 ("drm/i915: Propagate errors on awaiting already signaled fences") > > Signed-off-by: Daniel Vetter > > Reviewed-by: Jon Bloomfield > > --- > > drivers/gpu/drm/i915/i915_request.c | 8 ++------ > > 1 file changed, 2 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c > > index 970d8f4986bbe..b796197c07722 100644 > > --- a/drivers/gpu/drm/i915/i915_request.c > > +++ b/drivers/gpu/drm/i915/i915_request.c > > @@ -1426,10 +1426,8 @@ i915_request_await_execution(struct i915_request *rq, > > > > do { > > fence = *child++; > > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { > > - i915_sw_fence_set_error_once(&rq->submit, fence->error); > > + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) > > continue; > > - } > > > > if (fence->context == rq->fence.context) > > continue; > > @@ -1527,10 +1525,8 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) > > > > do { > > fence = *child++; > > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { > > - i915_sw_fence_set_error_once(&rq->submit, fence->error); > > + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) > > continue; > > - } > > > > /* > > * Requests on the same timeline are explicitly ordered, along > > -- > > 2.31.1 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx 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 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 EBD76C47098 for ; Thu, 3 Jun 2021 08:25:06 +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 BBB4E613DA for ; Thu, 3 Jun 2021 08:25:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BBB4E613DA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 A04286F449; Thu, 3 Jun 2021 08:25:05 +0000 (UTC) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF3BD6F44A for ; Thu, 3 Jun 2021 08:25:03 +0000 (UTC) Received: by mail-ej1-x629.google.com with SMTP id og14so2662687ejc.5 for ; Thu, 03 Jun 2021 01:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=pLB0AHNkPuC0xacQMQ49Xc5Eg0xlyzXKx/dWT+EAjyA=; b=FXs8XDFwZVGSsCZEwOlQugxQWNSYWAmKcyerO9/CxGuTuQQr+1TFgaRiGhkciLm2np dzuzOe7xqtbz89U/L5NNqJLP3IfZNEdf1M4Gwy3v/Hka0zLcVaHeSJf9aV6ag7b2xvSV pYAmkSnq6uBOJUj7GXITQV7pcoHvua54eNsXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pLB0AHNkPuC0xacQMQ49Xc5Eg0xlyzXKx/dWT+EAjyA=; b=Umq8JspNBHQgEzCEr2U4FugnYr2TQwYxfRcR4oUHCu4TgsazRGLnXEYTzZzVycDhKa F51dgjsHlg/5Hy7CfvMwfdTuyo2Ds6AQViBAvdjLpbmNV85ci8MtozUbE7GUqeuR7ryr zMJYK9+uRo+jexc6m2ksRLBsbqEcKs2nSa667wdX6Alr4Rmu1K2mLkYmC7rIfeDCS+YM vPzMj6OjaUq3dua9KLtM9U4qWKoCbcIWbZ1TlFP/Ug11OkdTfhQrK7XYBcp/x3gTd6Ya YwVlX3pqQAAAtjEvF4195hbneU9yi2RJMn8qhRqObK4zeQ7Std0eca0pAZ6iiIzsEJig Y6kA== X-Gm-Message-State: AOAM5333CyJRWfc+vUtcZmJpqqwbmkTN2ju+4RR1DH0WiJxrHZzKAlS0 3iXz69oXOWC0OxppLsSq4Wo/Dw== X-Google-Smtp-Source: ABdhPJx/2UdPhdQe8d0TR3Zs2+ONOrz7OP88w0jJxl9puFX31DuatOZsoOLqg6mED9dlKhOlA0W/lw== X-Received: by 2002:a17:906:1986:: with SMTP id g6mr37805723ejd.265.1622708702421; Thu, 03 Jun 2021 01:25:02 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id b15sm1321252ede.66.2021.06.03.01.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 01:25:02 -0700 (PDT) Date: Thu, 3 Jun 2021 10:25:00 +0200 From: Daniel Vetter To: Jason Ekstrand Subject: Re: [PATCH 4/5] Revert "drm/i915: Propagate errors on awaiting already signaled fences" Message-ID: References: <20210602164149.391653-1-jason@jlekstrand.net> <20210602164149.391653-5-jason@jlekstrand.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.32scarlett+ 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: Daniel Vetter , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Jason Ekstrand , Jon Bloomfield , dri-devel@lists.freedesktop.org, Marcin Slusarz Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Jun 03, 2021 at 10:24:21AM +0200, Daniel Vetter wrote: > On Wed, Jun 02, 2021 at 11:41:48AM -0500, Jason Ekstrand wrote: > > This reverts commit 9e31c1fe45d555a948ff66f1f0e3fe1f83ca63f7. Ever > > since that commit, we've been having issues where a hang in one client > > can propagate to another. In particular, a hang in an app can propagate > > to the X server which causes the whole desktop to lock up. > > I think we need a note to backporters here: > > "For backporters: Please note that you _must_ have a backport of > https://lore.kernel.org/dri-devel/20210602164149.391653-2-jason@jlekstrand.net/ > for otherwise backporting just this patch opens up a security bug." > > Or something like that. Oh also reordering the patch set so the 2 reverts which are cc: stable are first, then the other stuff on top that cleans up the fallout. -Daniel > -Daniel > > > Signed-off-by: Jason Ekstrand > > Reported-by: Marcin Slusarz > > Cc: # v5.6+ > > Cc: Jason Ekstrand > > Cc: Marcin Slusarz > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3080 > > Fixes: 9e31c1fe45d5 ("drm/i915: Propagate errors on awaiting already signaled fences") > > Signed-off-by: Daniel Vetter > > Reviewed-by: Jon Bloomfield > > --- > > drivers/gpu/drm/i915/i915_request.c | 8 ++------ > > 1 file changed, 2 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c > > index 970d8f4986bbe..b796197c07722 100644 > > --- a/drivers/gpu/drm/i915/i915_request.c > > +++ b/drivers/gpu/drm/i915/i915_request.c > > @@ -1426,10 +1426,8 @@ i915_request_await_execution(struct i915_request *rq, > > > > do { > > fence = *child++; > > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { > > - i915_sw_fence_set_error_once(&rq->submit, fence->error); > > + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) > > continue; > > - } > > > > if (fence->context == rq->fence.context) > > continue; > > @@ -1527,10 +1525,8 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) > > > > do { > > fence = *child++; > > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { > > - i915_sw_fence_set_error_once(&rq->submit, fence->error); > > + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) > > continue; > > - } > > > > /* > > * Requests on the same timeline are explicitly ordered, along > > -- > > 2.31.1 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 0521EC47082 for ; Thu, 3 Jun 2021 08:25:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E11D8613DA for ; Thu, 3 Jun 2021 08:25:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229576AbhFCI0s (ORCPT ); Thu, 3 Jun 2021 04:26:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229486AbhFCI0s (ORCPT ); Thu, 3 Jun 2021 04:26:48 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9673C06174A for ; Thu, 3 Jun 2021 01:25:03 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id b9so7908176ejc.13 for ; Thu, 03 Jun 2021 01:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=pLB0AHNkPuC0xacQMQ49Xc5Eg0xlyzXKx/dWT+EAjyA=; b=FXs8XDFwZVGSsCZEwOlQugxQWNSYWAmKcyerO9/CxGuTuQQr+1TFgaRiGhkciLm2np dzuzOe7xqtbz89U/L5NNqJLP3IfZNEdf1M4Gwy3v/Hka0zLcVaHeSJf9aV6ag7b2xvSV pYAmkSnq6uBOJUj7GXITQV7pcoHvua54eNsXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pLB0AHNkPuC0xacQMQ49Xc5Eg0xlyzXKx/dWT+EAjyA=; b=Uk7VxZjUsH+hDxTZ4LKy2Or77bsDVlyWXykETJBWnPzq1PBvHIqZuR2+Vt2C/iLAJ3 SxdMDqg+WniuZScw0NWvRZbOP/97L+d7bEhWZmqLlY5ZtL1btlOgjD8GkHJsnUEUt4L8 lnRUPyX1+GhQChYOQ3aOfwWLZGhDz9AW22HAwRveBsopST4DpuAJAnCQvoJcvOo5j53l jYulaYdxBEnwImYU1z/JKmS/CAZgS7vy1U61d+3BrjzH19vVpLt3mWx2qlqwHO1106Me iMDG3yl2LtgX1fRpJZo7ESeRZKwSCpWAgrh969E3ykX2wpg7he3X1OoZsfNISIG9KWEf uXkQ== X-Gm-Message-State: AOAM531j6mlFgHn3ls2BF7c3lrdn6CFRYqQ6F7es5Ek8HgmGfmD2URin WEN3Y4EVGNq05wgygGWVnlrtdg== X-Google-Smtp-Source: ABdhPJx/2UdPhdQe8d0TR3Zs2+ONOrz7OP88w0jJxl9puFX31DuatOZsoOLqg6mED9dlKhOlA0W/lw== X-Received: by 2002:a17:906:1986:: with SMTP id g6mr37805723ejd.265.1622708702421; Thu, 03 Jun 2021 01:25:02 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id b15sm1321252ede.66.2021.06.03.01.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 01:25:02 -0700 (PDT) Date: Thu, 3 Jun 2021 10:25:00 +0200 From: Daniel Vetter To: Jason Ekstrand Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Jason Ekstrand , Marcin Slusarz , stable@vger.kernel.org, Daniel Vetter , Jon Bloomfield Subject: Re: [PATCH 4/5] Revert "drm/i915: Propagate errors on awaiting already signaled fences" Message-ID: References: <20210602164149.391653-1-jason@jlekstrand.net> <20210602164149.391653-5-jason@jlekstrand.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.32scarlett+ Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Jun 03, 2021 at 10:24:21AM +0200, Daniel Vetter wrote: > On Wed, Jun 02, 2021 at 11:41:48AM -0500, Jason Ekstrand wrote: > > This reverts commit 9e31c1fe45d555a948ff66f1f0e3fe1f83ca63f7. Ever > > since that commit, we've been having issues where a hang in one client > > can propagate to another. In particular, a hang in an app can propagate > > to the X server which causes the whole desktop to lock up. > > I think we need a note to backporters here: > > "For backporters: Please note that you _must_ have a backport of > https://lore.kernel.org/dri-devel/20210602164149.391653-2-jason@jlekstrand.net/ > for otherwise backporting just this patch opens up a security bug." > > Or something like that. Oh also reordering the patch set so the 2 reverts which are cc: stable are first, then the other stuff on top that cleans up the fallout. -Daniel > -Daniel > > > Signed-off-by: Jason Ekstrand > > Reported-by: Marcin Slusarz > > Cc: # v5.6+ > > Cc: Jason Ekstrand > > Cc: Marcin Slusarz > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3080 > > Fixes: 9e31c1fe45d5 ("drm/i915: Propagate errors on awaiting already signaled fences") > > Signed-off-by: Daniel Vetter > > Reviewed-by: Jon Bloomfield > > --- > > drivers/gpu/drm/i915/i915_request.c | 8 ++------ > > 1 file changed, 2 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c > > index 970d8f4986bbe..b796197c07722 100644 > > --- a/drivers/gpu/drm/i915/i915_request.c > > +++ b/drivers/gpu/drm/i915/i915_request.c > > @@ -1426,10 +1426,8 @@ i915_request_await_execution(struct i915_request *rq, > > > > do { > > fence = *child++; > > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { > > - i915_sw_fence_set_error_once(&rq->submit, fence->error); > > + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) > > continue; > > - } > > > > if (fence->context == rq->fence.context) > > continue; > > @@ -1527,10 +1525,8 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) > > > > do { > > fence = *child++; > > - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { > > - i915_sw_fence_set_error_once(&rq->submit, fence->error); > > + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) > > continue; > > - } > > > > /* > > * Requests on the same timeline are explicitly ordered, along > > -- > > 2.31.1 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch