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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BC64C77B62 for ; Tue, 4 Apr 2023 01:28:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 36497900007; Mon, 3 Apr 2023 21:28:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3143A900002; Mon, 3 Apr 2023 21:28:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18E6D900007; Mon, 3 Apr 2023 21:28:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 06A29900002 for ; Mon, 3 Apr 2023 21:28:34 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D0400A0341 for ; Tue, 4 Apr 2023 01:28:33 +0000 (UTC) X-FDA: 80641973706.26.9E2E51A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id B9BC320019 for ; Tue, 4 Apr 2023 01:28:31 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PRsW0k6i; spf=pass (imf03.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680571711; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1l/vBoUEhgxsmLv104lwmJ8KryX+Oa0PJH6QLfzc/6M=; b=nzMYIxTwzJlPdQelqt88E3BHxpUOttw25SEDyU9lb/pYc835qcaacdBW2H70FeIghcTplI IjjePkmOUgrdBZDxNSFF+lObPgbgg7+KzxkzrPyayxhDuEBwsLmLz3+lm3O8PEbWSiMW3S iuoI+Xnd8wb8Pwjx84CuB71phu5AU5s= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PRsW0k6i; spf=pass (imf03.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680571711; a=rsa-sha256; cv=none; b=OyXPiUrdgr6UbuF3bqX4BP2us/sc/5zJBnDPbikbQGcZjR4WSLMWhEmudWfoXw5BT0zMZh OT60V5P+WS5OXbLfz4lC+8bHYACQdhPyhclyd3jnnycaUhAc0oiaprUxG+/DXxcs3SjRn+ FtSdur6hVTAMLHfhCKjXkcnWUOCNt2I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680571711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1l/vBoUEhgxsmLv104lwmJ8KryX+Oa0PJH6QLfzc/6M=; b=PRsW0k6iCk2CpPB+sm+Aw0IcEwGJeGvPnj4ho8GbSgn321y5uRMPTyTjvL8AdRxciCHFX6 15mMq6WLtrMb3ofocBDp+qsjEqXg4GzEOkWlAo79lunH5cbnpuayaa3BliPKO7UzaWmwId tCN+rEUMhUWbqsqKmeJVGUb8FvrCYW0= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-248-70clE81gNquj5h8pgnVjTw-1; Mon, 03 Apr 2023 21:28:30 -0400 X-MC-Unique: 70clE81gNquj5h8pgnVjTw-1 Received: by mail-ed1-f72.google.com with SMTP id b6-20020a509f06000000b005029d95390aso7116949edf.2 for ; Mon, 03 Apr 2023 18:28:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680571709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1l/vBoUEhgxsmLv104lwmJ8KryX+Oa0PJH6QLfzc/6M=; b=vURIHJZx0hSzDh7eY7KKd7Hl/m7swsrH6K196DEKjvLhbixQhkekbOcgGhrQQqSjgG kBrQVhvfvtLiA4v/hdgRqGnU6YhOxHGugKM4SVlc0c5RdMuVDCFEgBU6KoZhRJTrOh0U ZL23ADs4uvXdLbdXeYDtSV4H03b8p7ScuG7oMSDwZhaHjCeOnhhhGjBjEaY9ZNgTREAh NHu7bgQS8t5RfXngD4Sp3r7lKxa5b5PMSJGk1p0FmBNYUegVWyIBmrUeAOwJHgMwD0LX s3Z5k6qNbZ1c/62XjXMTGloRdvWV/vK+QFsDumkrpaPaFC1Y40g0QUI1x9shtWWQoYSW IC5g== X-Gm-Message-State: AAQBX9dETsQ+ryatT4DUBiCqRv7P0t4XFWalK6U6TCvMMNp3v2XnnPsW JvcPGSSuBJeTND3nShRubw+Ds+ITAQG40+StVIu6hkaAOzWDm3JSlod4XOp/wiXZcJav+LxRrw3 wkMD5x9VP+A0= X-Received: by 2002:a17:906:1dd4:b0:92a:8067:7637 with SMTP id v20-20020a1709061dd400b0092a80677637mr476859ejh.61.1680571708918; Mon, 03 Apr 2023 18:28:28 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpQfzYsSTyZHq2rBGoLqdwt6NU1J/h3ko86D9IEobUotm8XZXJaMVYF9BCnMtF6nYkOmpx4A== X-Received: by 2002:a17:906:1dd4:b0:92a:8067:7637 with SMTP id v20-20020a1709061dd400b0092a80677637mr476837ejh.61.1680571708714; Mon, 03 Apr 2023 18:28:28 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id ty25-20020a170907c71900b00948ca65d61fsm1287053ejc.140.2023.04.03.18.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 18:28:28 -0700 (PDT) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, tzimmermann@suse.de, mripard@kernel.org, corbet@lwn.net, christian.koenig@amd.com, bskeggs@redhat.com, Liam.Howlett@oracle.com, matthew.brost@intel.com, boris.brezillon@collabora.com, alexdeucher@gmail.com, ogabbay@kernel.org, bagasdotme@gmail.com, willy@infradead.org, jason@jlekstrand.net Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-next v3 11/15] drm/nouveau: fence: fail to emit when fence context is killed Date: Tue, 4 Apr 2023 03:27:37 +0200 Message-Id: <20230404012741.116502-12-dakr@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404012741.116502-1-dakr@redhat.com> References: <20230404012741.116502-1-dakr@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B9BC320019 X-Stat-Signature: aypbepfrzdau6kwqri5pjjubunksnkws X-Rspam-User: X-HE-Tag: 1680571711-144825 X-HE-Meta: U2FsdGVkX1+6g5V0aiFi5a/dB346YhACo+DZlDQu3H3yZKbxRpdPBXXwr4f2bANxzKC6f6aHS3oxFJrGtJhMk6A7BCCV/IEyfo+abvI9EFyTaFX2A6zsvSpdKu9UetRAGj2FBz8jIl9CWyiWz9na4QLM9KdmCSTRbgzCi7BWc4ZPJI2JD6Eu2stc387N3eXXzOQ+wYdiAS1k7M8lIQEBFu9Aq7+xboNCYzuPbdhZaPQ2RyLk4QWv2QfZqqmWWTDnHz0MkGH6Nw9sY9h43Gh+vyzqjQ2TI342xpODYqAtZmO9iHfkWdodydf7dNmbi+xmQRtRuXpo3XU4dVxKooiREDc3G0YLlCTbRGEx3LjaF8umBTbXsmdeCqrABHF0f8FS+Pw07mT4+glpXLnw5BFhqOWFIg6F4jAUuLlQSZuBNkizkvhT7vo3iPBuIt0Fnj88634C/JtFzZgcIuYAkfZFyNngt25Qll9/IkpvhG3JR2Bqw8/b+Ohdb5oA/P0FQr+8IGHdNeMYHPP8cJZO7RvImAiSt1U5f7U4SMoFToP89mBCBU9Fb9+aJzvuVfCzrUd3RTjOfMzxBDEu6A5X5y6DN/apDnEscgxNZxblsycmQ4xNIAevKYR9vFymd766awRlLEhKp9+Gg7fopsXTVDc4GMZBsx4e0BsozOBpJsqHN9fncfJN4GgCOR/XX0XScadbI5WRWuHwrpjiraUN44OrNc/sVnX1+K32U5qgflspND0jYsQry732zyo1399UIrGuZQlLmrwCfZheb0iDpQE/1Tqog5w3Yk6Ch0ArpZ8HBgXkWQQ410zGosiWCSmJcMHarVA0WfnEEgWuTw3m7RLzi81E8L1HoxBPCbJBrV3fgNXsa+GIDd3Yiq4VySuzFkTUlHsqrauVRxJapdhopidr4TFCg6qBrDD1hxVAzxP4lCjA1/vmao8DqLNMuoccYet9BUExLxKtp+6/Coc8UZi +XHu1mHp SHD7PylywPGDWXKVa3FjtHGxX8DbA66CefbxIdSWJwgwd+G+ivX+vjo4ZHiBnEdyI0mbW9V9enWWykzFG9By5zgxRPpXg/HgeHI8jmpQ4LtwCQXfLoPZa8OAmL6Mlxq9tnPkCH4k6KW6vhUeebPlEJgt9EFd79DCLfRncsNEQg4dHR5E6Vxxdo3lY1ycMv5OsR6s4DQomzienUsbf6UFHaqy5bLf2Q8Rce9iX5fS1pclAVEv1ZkKu2lPnezbCuXsGxyBYLBw1YevVCpyUIDPWfnADsRkWAAQH3SQr+IayoJiC22ls3YFqveOkuhhPALb6pjpDCX1dnj1xkR1617jFt0nRbHc7N8KVBMbMcbFfTIXBcrCaumRPYjxnX2SPH4oszCHOobq6WKCISBO2K5jTDLrtQHlnqeCXGCZL X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The new VM_BIND UAPI implementation introduced in subsequent commits will allow asynchronous jobs processing push buffers and emitting fences. If a fence context is killed, e.g. due to a channel fault, jobs which are already queued for execution might still emit new fences. In such a case a job would hang forever. To fix that, fail to emit a new fence on a killed fence context with -ENODEV to unblock the job. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nouveau/nouveau_fence.c | 7 +++++++ drivers/gpu/drm/nouveau/nouveau_fence.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index e946408f945b..77c739a55b19 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -96,6 +96,7 @@ nouveau_fence_context_kill(struct nouveau_fence_chan *fctx, int error) if (nouveau_fence_signal(fence)) nvif_event_block(&fctx->event); } + fctx->killed = 1; spin_unlock_irqrestore(&fctx->lock, flags); } @@ -229,6 +230,12 @@ nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan) dma_fence_get(&fence->base); spin_lock_irq(&fctx->lock); + if (unlikely(fctx->killed)) { + spin_unlock_irq(&fctx->lock); + dma_fence_put(&fence->base); + return -ENODEV; + } + if (nouveau_fence_update(chan, fctx)) nvif_event_block(&fctx->event); diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h index 7c73c7c9834a..2c72d96ef17d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.h +++ b/drivers/gpu/drm/nouveau/nouveau_fence.h @@ -44,7 +44,7 @@ struct nouveau_fence_chan { char name[32]; struct nvif_event event; - int notify_ref, dead; + int notify_ref, dead, killed; }; struct nouveau_fence_priv { -- 2.39.2