From patchwork Tue Apr 4 01:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 78821 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2709027vqo; Mon, 3 Apr 2023 18:54:55 -0700 (PDT) X-Google-Smtp-Source: AKy350YCkB6jj0CpUsDYWtzZI/skvI1EwP94Zhx8s7Gtwvmv7aQUBX4ZLmwQ7PA90a9k8+SY6HOX X-Received: by 2002:aa7:92ce:0:b0:62d:9b98:8042 with SMTP id k14-20020aa792ce000000b0062d9b988042mr18294379pfa.0.1680573294933; Mon, 03 Apr 2023 18:54:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680573294; cv=none; d=google.com; s=arc-20160816; b=LOmS+jqRCpNtsHsrAibb2re9+9pHag+hX1tosttbUNlbI3cgM4MnFJH4wiFW/Zfdsq xf+b1uCw0w9mfycJlaDvl1XisbAGZpD8hc0+5AwSiO+eDFmxnX8e1amIB9ThWbx2QPef ubP/uLs3TdsmLgJkMkHig19aAElDi9ceXco4hIWccd7heJrwEhq8HG5AH8/hCONmVyWD taXJlGJquU4C5XKKbN3JeaeRUcwnsu4OI0hrL3WpOHj27qFodpLOUIA7dw1tYHdBFfow Y+oCzfq8L63/gC7dfx4BmRC0RDMViPY/MzxpHXLwG3FUbkx9/v5ZRCmWksAJB7QzEuKe nT3Q== 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=1l/vBoUEhgxsmLv104lwmJ8KryX+Oa0PJH6QLfzc/6M=; b=GKHhpYqsgx0ARs6fUI2lZR43n9Zx1SxvHJEtu9Tm2fmKaTtYW4oJ/n8M08NhjehSfu sxtLVI/hUEVCT3S1SS5H3BUSRGhOvOQkpDxnkbheFcyuiTVegXfrLK9q3v08yBXG/RTc LCejDmqFvk+le4QOMBsWJSOWHsjEHsBde2PToZm4y8ItMhSpe3C7V8V7Q9gxfBgxPV+Q vJ7N6Ci1hC7bWh4EIKCUdpVxjAwp0p3dMVuuqeMKgFlgdZfM+80MiVpo6sgyzLgfaFfp GkcXdXOlNAMwc9YjsMiUDtxQ1VLIsQk0HGlT6EZNnipZaL9Plhg8VaXO+p6kUnOxsXCO q9bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f3oTlt7O; 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 g21-20020a632015000000b0050c0549c4c6si9273238pgg.764.2023.04.03.18.54.42; Mon, 03 Apr 2023 18:54:54 -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=f3oTlt7O; 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 S233182AbjDDBa1 (ORCPT + 99 others); Mon, 3 Apr 2023 21:30:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232869AbjDDB31 (ORCPT ); Mon, 3 Apr 2023 21:29:27 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D00EF213F for ; Mon, 3 Apr 2023 18:28:31 -0700 (PDT) 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1l/vBoUEhgxsmLv104lwmJ8KryX+Oa0PJH6QLfzc/6M=; b=f3oTlt7OVF6UfUTeKAd8QsV8ISBpiTQy3ttPC94IbERoh7KzHRUm2D5gGOEaGG7B8pqJkL KjLmTh74kXOcWr8c1m+KJK3tftEYsVNMFckEDkuJDcdHBxlz5ag9UM4BdGlrttLExKugSm Qx04ot/UJp/WyYM47r4AVqWCmcpFKCs= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-282-iL0PaeuDO8iJMD4lN0orqA-1; Mon, 03 Apr 2023 21:28:29 -0400 X-MC-Unique: iL0PaeuDO8iJMD4lN0orqA-1 Received: by mail-ed1-f71.google.com with SMTP id b6-20020a509f06000000b005029d95390aso7116947edf.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=DdlyNzBhdigP/pppjf6vpsEU9xjMQkn1tID1rDzPF3k3tYaX28aC0GyhV+qVTMKvIJ ua3YMlEyUn2ZAzz+xLQGs4YGOfwJSba+JC21lTTyX9m/8a/w02mtrAlEnNNiwNw9FoDz a+KRi3wjMotpAmIG0sJTyATbNe9JzF3bz7+ezrDx08bTBHrli4DzK4yoTMOsTzaa1wkA +K4iSFBwxBQiGLctnG/0XI38rTFuooWWNzEx36Iq0sUJUafxpLHyoc/vpdx4DV2vhWwl XD7iSJjPCLH/z8usjTtOcGFmSYfBxuXHLib59AVE3TxHlnS2DM9Kf76k338ZnyH54xrs fxVg== X-Gm-Message-State: AAQBX9fA3ZPm/QpSk4P0JFk9J4rb8ykJNc6EYMwIKGT1SblcGRJlLn0/ ITT7aPDRv0uxzYTMSfXC8o9drucffwxU+jU4SK0NZC8AkCBDq/tvWzFyL08XTy9I7oJNvgieNNs W5RNfKj09oBysjYOQ4HRZ7MN/ X-Received: by 2002:a17:906:1dd4:b0:92a:8067:7637 with SMTP id v20-20020a1709061dd400b0092a80677637mr476852ejh.61.1680571708918; Mon, 03 Apr 2023 18:28:28 -0700 (PDT) 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-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762208822958450691?= X-GMAIL-MSGID: =?utf-8?q?1762208822958450691?= 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 {