From patchwork Thu Jul 20 00:14:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 122937 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2797844vqt; Wed, 19 Jul 2023 17:38:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlEbUIyVCTH70qrgJ3wVVzLRX/PnCbRj0mGs9vHClALlt55xlBFTR8wbArc16gpuiznkO0ym X-Received: by 2002:aa7:c65a:0:b0:51e:2974:f471 with SMTP id z26-20020aa7c65a000000b0051e2974f471mr2996525edr.42.1689813513852; Wed, 19 Jul 2023 17:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689813513; cv=none; d=google.com; s=arc-20160816; b=0M7IFMyoOrmIXllJYtiuLtBnTdhyvArYTeU0uR5SAqe/2KKgtrQVWgrDwovKNq1BOZ yCbEdIBq30aXXlWj1/S8EDLI9mzJCCCJptep3y8MEq4qpSD2Jp1wxNH7h0+vP+ao5j2d GDj1hfWtnSiUKs/8FKBhWk+OnXYkczMqtoHh2h7irrC1DdDrTYHuEI5SJPPLDhvw3bUs dqv6JRVoxK8qynqgXHzj6NsKnv8PEsgz1Jh5VxA/PGQUpWVz/qDzcAHthFEu6RzIwGJ0 LyeElrPJRCuUq4vIjsgFdWl4qP76/tzZVyf/5IkuddB9cNMjfAyDxQqHtHzBDbqLY7vh gQ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/pp7pCNssCFdX07s9SqyoLBjaIvnkOQtt7NO/vv36Sc=; fh=grh6qrjW0oxu0S8zfHJMhxWLgUXiZ/TU2uoVe6KOi4w=; b=UUKEQV17Tr5nyeEGUFgYjr+mP2Vx2LIpdVPCUr68eQbCloXbM6PPR1WET00CHJgARv fp1DKrl/Rz/hGt5/iv1z3iBqc+ctfKV8+/LrdvLsDOnTvwprqOGz3oobzctd33lZhot2 vfoafWwuAreHN4hF4OqcISEK3FYXXAoSFUG7kp+sehURZ/6XyTCHogrp06V9YyrafVzq dvEBJnRS5myzAhmF4QdRM70xmhzvmOrQ9YTvI+nTgj2/1Dp45syk0c5YNR0cH9UDbALt DLDAJV0JCLUwXRW8exknxyuDsfuNmq3DNw939HvXzOGAg4ya++04FfKaGtQa+mTHwbKh c64w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PdkbG8Ss; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ca16-20020aa7cd70000000b0051d7fa84adbsi3650908edb.301.2023.07.19.17.38.10; Wed, 19 Jul 2023 17:38:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PdkbG8Ss; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229853AbjGTARB (ORCPT + 99 others); Wed, 19 Jul 2023 20:17:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229839AbjGTAQo (ORCPT ); Wed, 19 Jul 2023 20:16:44 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D27BD2115 for ; Wed, 19 Jul 2023 17:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689812133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/pp7pCNssCFdX07s9SqyoLBjaIvnkOQtt7NO/vv36Sc=; b=PdkbG8SsPK2xlCD0elGelpFfY8uLNkUCIDmyovjFVpGnovykHgV6kbJKVezxupXI/NS/cx SrLU/b/1OYo+rDe4Uv0gVxZN14/JkHTpDmO9SkzTlp+rmvJntt8cIlwN42r+MHH7U7ogDe aAXBUobCxD0UTl4Gwt0BsR7LQGE/m9g= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-573-XDX5Y25OOpmnwes4A3xMgw-1; Wed, 19 Jul 2023 20:15:31 -0400 X-MC-Unique: XDX5Y25OOpmnwes4A3xMgw-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-51e02395cf3so87459a12.1 for ; Wed, 19 Jul 2023 17:15:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689812131; x=1692404131; 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=/pp7pCNssCFdX07s9SqyoLBjaIvnkOQtt7NO/vv36Sc=; b=cAfhYEuIKru72bM1tiySOGnPOFPDoSaWScqMJFSaBfr15O5bAgB1rvOpz5cwTAkNq0 VrEj4VkNeOb0VxD09ZSWNYudd1dzlD5U9V8F1Zo/s4KWwYmgt3WCSW26ISzkiRfLSykC A4Ztg/6A2ep5KVb2BErK1Px08RTbSZwAnMppFOFIkt3U5bMEca4R4hYsE8IqTHDRLj1s xoqGeUXFRKiELcA+qL4L9CUsAaSVhmbN++VJoisbDBnHR2zUIGqMEO2E9NOi6Hfa72a0 6Qzq33Yr8Fln+RRW2+VgsqLPTV9npeSH80T5H7vx1DZziE+iHXXPt+AuimP76X72zfkx MKsw== X-Gm-Message-State: ABy/qLYD7aBojo8StQbVgth2IKglqk8u1XWdbQz0wF00zgM5EwVSGMT8 Suo1n8yFmZS/Zv+OWbLssQW0AAWDXlDNa+jTrlM4XNnNyMcCLiAe/L/QxQl0/yVgCb/casj3OGJ tzF0sQfgnejHLZdYWiYSL6uQM X-Received: by 2002:aa7:df82:0:b0:51e:5686:d0f8 with SMTP id b2-20020aa7df82000000b0051e5686d0f8mr3267128edy.10.1689812130842; Wed, 19 Jul 2023 17:15:30 -0700 (PDT) X-Received: by 2002:aa7:df82:0:b0:51e:5686:d0f8 with SMTP id b2-20020aa7df82000000b0051e5686d0f8mr3267108edy.10.1689812130666; Wed, 19 Jul 2023 17:15:30 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id f24-20020a056402005800b0051dd4daf13fsm3401489edu.30.2023.07.19.17.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 17:15:30 -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, donald.robson@imgtec.com Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v8 08/12] drm/nouveau: fence: fail to emit when fence context is killed Date: Thu, 20 Jul 2023 02:14:29 +0200 Message-ID: <20230720001443.2380-9-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720001443.2380-1-dakr@redhat.com> References: <20230720001443.2380-1-dakr@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771897895077034566 X-GMAIL-MSGID: 1771897895077034566 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 {