From patchwork Tue Jun 20 00:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13285081 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 78617EB64D9 for ; Tue, 20 Jun 2023 00:43:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1886D8D000D; Mon, 19 Jun 2023 20:43:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 138AE8D0001; Mon, 19 Jun 2023 20:43:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1C108D000D; Mon, 19 Jun 2023 20:43:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E4C2D8D0001 for ; Mon, 19 Jun 2023 20:43:19 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B88C61204F9 for ; Tue, 20 Jun 2023 00:43:19 +0000 (UTC) X-FDA: 80921277318.09.13F56E6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id ABB3F1C0009 for ; Tue, 20 Jun 2023 00:43:17 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Nt1QLdGT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687221797; 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=c36xFgwQHAoO1A1GCpabxO1lgFTUT+xWChVASPsKB44=; b=VIjAXvx/mKWYhUhPSSlRDKqIC8p8ZGRbml433eeh+f31fyHjaXFQdX8MKpwoY8mMnffmRi 9v5bXjChbW+0fkkw3uJ6TFaEJhrQsMeo6p9/rJvn2y0k32ailk+pZkJ2DXqDXYM8WlQMeD ngy+L4wu9KYrcWj/6Hok+YeghnVyS+U= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Nt1QLdGT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of dakr@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dakr@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687221797; a=rsa-sha256; cv=none; b=oLCkrJNgCLeqMEeRgxJXM9yqMtTi9ll6bcLs/VgFcq46YyxrUGKW5RogR6ztjMVT9+nw9I 0HGZ2/0IsouzJiTNk3E46KTEbnoQr0ZpynaGpKgxR5rZGaXiGowNfnOly7TgxZPQDi59aS iPG8NXAbgw3Q0wu/1rcyEUxFmXYqu58= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687221797; 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=c36xFgwQHAoO1A1GCpabxO1lgFTUT+xWChVASPsKB44=; b=Nt1QLdGTyYouaRdBFXt+ZPs9oanrkLMAFNmoAwFcDbErBO+UOMFx7w9TSPMWZ582VKswOH WYowpyUqZKSAPmKL7/uH06DfRjCDVVzK+p0o/BbGwqQkWEBQMfVmhymBaeHSuphitRbo/k 1SxdUmReY8Humn9+jmCCQUZwcuaLqqw= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-490-e25RRgcnM3-6Aa2d2fy09A-1; Mon, 19 Jun 2023 20:43:15 -0400 X-MC-Unique: e25RRgcnM3-6Aa2d2fy09A-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9715654aba1so419497566b.0 for ; Mon, 19 Jun 2023 17:43:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687221794; x=1689813794; 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=c36xFgwQHAoO1A1GCpabxO1lgFTUT+xWChVASPsKB44=; b=LUKLdXIucVkrX/+N/B06GQLeHCXIk+3aBEqig/zH+UOohC9TdM+4TcnR/DJCfdcge4 XPeoi+cFyhMGJ/4pmfuw7jcQHLZhTlY23LtqVKOLIZkfYug/QUTv0Gfdqz0oA4H3eZ2X 0VCPBRsWumMe+DSsiZZOPalRJ6dV8UQHwv+iUSM8wCfzxkXySrvGdN7UOxAJo9pryHzb fUkXAXE73YA5DLvb76957H03RTWYnZplJ/gGcv4IcccLNGqfpKvab27IcplcnO2lW9DU w3GkoFuzy2JdVsAR6+8IZwOjv88Qk8klVuz6n5rtLEfcAAqRgswVQQkrBH97PoPS9xmd OlMg== X-Gm-Message-State: AC+VfDxX5NSdsSyCO07TkoyIqadB7PceDRjFpLTwtidhjZBjMpKNl37H 8za6EA9m4OsreFulwOOYVFBVtCSsYD3jzp2WRXVra3/DmwRt5Jcx2iQUIEhqOUU/nZYawZ0VfrM j2Khh8KXkUV5kksM9Pbc= X-Received: by 2002:a17:907:1c0b:b0:987:4b4a:916b with SMTP id nc11-20020a1709071c0b00b009874b4a916bmr8546396ejc.24.1687221794627; Mon, 19 Jun 2023 17:43:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OvFPLVF40MGTxJIagtjtNVYW06w8dtjb7fvvD70Aoy/WisUVPQOpjflQ4lf0O6wzzqws8SQ== X-Received: by 2002:a17:907:1c0b:b0:987:4b4a:916b with SMTP id nc11-20020a1709071c0b00b009874b4a916bmr8546386ejc.24.1687221794505; Mon, 19 Jun 2023 17:43:14 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id w23-20020a170906481700b00987258cf1f7sm382025ejq.154.2023.06.19.17.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 17:43:13 -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 v5 10/14] drm/nouveau: fence: fail to emit when fence context is killed Date: Tue, 20 Jun 2023 02:42:13 +0200 Message-Id: <20230620004217.4700-11-dakr@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230620004217.4700-1-dakr@redhat.com> References: <20230620004217.4700-1-dakr@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: ABB3F1C0009 X-Stat-Signature: t57gnepxx4zjw6ndx5okmi75ruaeo7gs X-HE-Tag: 1687221797-158349 X-HE-Meta: U2FsdGVkX1+kWjggfPDasifvwJxUqjX29X476mqWvW86MRXD3je9QrlKjE+vRD9CfeB4rIYFx9mHycH16gL8m2SIvXKChrlaIE5RybgnRZicYxVA/0FPT8A9vYdDimFug1JHYZQSokiz2vN9YpOrWFIwVWTIaT37+fLt43IPDAnXoaUDuoyfscS3WouR2WKSg8NgY/wLFX1lSb9dZ7dorLWOlGXimsE5XbWUY73D1kFS9VmB6nLbR3BuQsymoDnUHp2vv6k9U7EhL7P4RBJbQgfxILCixtTKJHfgDl2ooRTgiyha0qapQy57Pq2rZQYfCU7/xFgSBAW+Japj04m07FEgCy7pov37tKfi5ia/zREsJRpDRYYlayUxRkiVpKqdlD+7EZsBxCZB9k2NPoE6eq7V+myE+sMgkd1KbFGd72ZOYFsx/t6y6EkoWW/BXIKpoWqiR+Z9jlj2FVj/y+sze/X4+BKl/wa2DKnS+xBHj+GZHMr7HiLocA5+hEbHeP3EMyXkAtFovk18ZFk/WZRWquZizfOhO9zDYs3VofeHUHTP6UnmVFU05jkZGeIISNpKx5Gyo1rgPFOngdBs4q5HGFzxOZJvLvCionbJlr69ttHVxzWgr9scisSdAFAzkdhADmI5mzqTymJPY6rZrjRzfUWrLklSq1NBgh6LD4bT6nuu5I24oAOxfurzrYCEFEehBjIsjxefDLt5IsmjBTaxdELX4qoVdU6f8rGQsXrl4krgPKpT+k0orDLFOBAVbJBdBt/Syp7201/CBmVE8oouHcnIMHvP1zfzVJooFQdlpQMQyfyIfGOyjCo/IxGXEYowyiKsrcKg9O8TXphqhObtUAj7H9OQqkIuHynwsHiyIb0Ojscd+IzHsgTDJmXH22Kc2Fwx9lPVTZTEyNRG18JC74LaGuEjKy8mDHMbXzrPcO+jH3jmrSOlauhYCncEomffBYi6JDLGAwgFD+rs6HW fi6mXYsq qwxXJQxgzUnV1ivECFL56dI1vcoA3kZAeyQwg0BYS+Z2Qux2Clm0Io1WjWWnoMTmfxUqJPMog/gJwq3FxSgOqh8+ZKwq4TEyodbs90JqzpQJbuci7P6GKOHzDWsO0Up3ymepybgf200sAYcIzWqlOc2Ly1S5AZyfQzkFUOjcddjFJzLGEtLogsS2/FvwQX0XEGmMzpgJVEpmrYKwNgI07ltFDGINe+7Liqiss12+fwUnoRH5/y3EMbmHK5FDkghsO6RUeFBRzqiL8BvR2LXzZ8jchaxurWyiof2bJOk7uhAMC72ClPxcEo/Bz1RNa3E+v7TyEDQv7VpMUL9TWnxTbNw7s8YUn1v3RRrIltJtlBmZ04pKYvVKRBQfB+0NVDt0ptlqullJHHpTF9Io= 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 {