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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40746C05027 for ; Fri, 17 Feb 2023 13:48:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D8C946B0073; Fri, 17 Feb 2023 08:48:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D3EDD6B007B; Fri, 17 Feb 2023 08:48:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C04D36B007D; Fri, 17 Feb 2023 08:48:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B23326B0073 for ; Fri, 17 Feb 2023 08:48:51 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 86706160283 for ; Fri, 17 Feb 2023 13:48:51 +0000 (UTC) X-FDA: 80476914462.27.3E6B53F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 5B27A120013 for ; Fri, 17 Feb 2023 13:48:49 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="X/n01YSN"; spf=pass (imf29.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=1676641729; 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=d5/2RnRF2JWHGpr9RK4XcaUSwl3Atw4selg5mVgZ4/g=; b=fBJrHrfWvmMZU9WGaya0YKyXwGOFMDl8tqShxWnRKND+0YlNyOoTFsPSP6FohHnLDHfeYk 8s/5S7bmwstX+bTFpbdud2n0hl9qCreu0WlkqeSvLIsBaxeYX4eSykdLN6d20FTlO8GJXc j3uNqnUzGPgOCsFG6L69oQ7p/apnsPg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="X/n01YSN"; spf=pass (imf29.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=1676641729; a=rsa-sha256; cv=none; b=4QHYEAqe3od615YLZOGGmGB1AKSEJOt71jcCRlSD3axnOQupezs0jJm/S5P9clT6jTOOBt j/APr0j3sY467Kf2X4OkwR6qdQZUbSnYSzsdlvcyp5CA9WfYvq4kqjfzBB0VuCL6NCSJkc /DCmfhbVzd+cCQZJpocNKAbELKtYVLQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676641728; 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=d5/2RnRF2JWHGpr9RK4XcaUSwl3Atw4selg5mVgZ4/g=; b=X/n01YSN1gpk+KK903jEsu4aTusHdMHCMKZku9kCbirFEX4XXlUq/tCUMe+2w/N0alUNbx rlmoxasiGW0XiRg3iteIbnlEuBUlKpAhisQrxs2MbWQeYDaahLzK5LJKy4ecL0dnZ2WMuc 16iMaleWtdWNqmMfx67UI8K6Ie/XRaY= 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_128_GCM_SHA256) id us-mta-414-u1XCysXYPtGRANcwJ384eA-1; Fri, 17 Feb 2023 08:48:47 -0500 X-MC-Unique: u1XCysXYPtGRANcwJ384eA-1 Received: by mail-ed1-f71.google.com with SMTP id ee29-20020a056402291d00b0049ec3a108beso1653522edb.7 for ; Fri, 17 Feb 2023 05:48:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=d5/2RnRF2JWHGpr9RK4XcaUSwl3Atw4selg5mVgZ4/g=; b=DBZ97ZKsMp9wpgKA/JTfpRnXklZ3Ezu82ZV/n2MPt4owpwxvtwVQv/ufIstzK8TERD fB89x7BtQP7NHRUaMJvx3M16qVcEpvqN7K6NHqvoOl06ohH2XXqT+9PjLp0eTdFjkoii 8Is6IUSQ55sMxkl9X0lVM04cd3UwsXSqFkpE8e2vKav9pDV/puZ0y0W/KZlbxHp1yDZ2 QNjyEHWS2llk9wWA/vE6aX2ZrAzISWGfjo6GlA0hmVx/ocJvnstpIMtMKEfaBzHhitDc P9fnO/APu3UIqfly1DFr03hwshHaHsR18xps77r/kF3cOvo+4Mwb6aHzYS1n8v2q++50 GEyw== X-Gm-Message-State: AO0yUKUFMW7lbE6oh5WFcoeJNXt42pmVL4edGOLT6VkIRtceGeu1uqdW OnFB7VRoVRfCnI8r6SRkBjqE9wGa0P+o23Xl/qEhD/7spr66wSVaHNMlr7SpoIyUU5cWPAkZvVb bX3Lh8umVK6Y= X-Received: by 2002:a17:907:72c1:b0:8b1:7569:ad58 with SMTP id du1-20020a17090772c100b008b17569ad58mr4848778ejc.2.1676641726460; Fri, 17 Feb 2023 05:48:46 -0800 (PST) X-Google-Smtp-Source: AK7set8dScSkWfRlq0RX8QSswoAOat82FsG+rCLCZ5wYVMw47uLr1CKX3blizMd0kItf9w+BCuGUrQ== X-Received: by 2002:a17:907:72c1:b0:8b1:7569:ad58 with SMTP id du1-20020a17090772c100b008b17569ad58mr4848763ejc.2.1676641726232; Fri, 17 Feb 2023 05:48:46 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de78:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id l21-20020a50d6d5000000b004aab36ad060sm2302248edj.92.2023.02.17.05.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 05:48:45 -0800 (PST) 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 v2 11/16] drm/nouveau: fence: fail to emit when fence context is killed Date: Fri, 17 Feb 2023 14:48:15 +0100 Message-Id: <20230217134820.14672-6-dakr@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217134422.14116-1-dakr@redhat.com> References: <20230217134422.14116-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-Queue-Id: 5B27A120013 X-Stat-Signature: g6un5eyfy9oticmcr4w69mdnfuu87heu X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1676641729-559936 X-HE-Meta: U2FsdGVkX1+37qQZMUHFyK1ATO8+MzIiQZ4xSKND3EO5TLCxWOFHvVCuby6kuTbhLCCVbAbPoms9z6oslHA3ju2M5C3F96CyTowsrJ2aWM+sUJ6asDxWLdypXl0plUXq7B5gfuX9Kg+1+KwVwolW1+sOJEINLcJ4b/lZTkS6MqX0/H2R8NEoH5KjlcVvfO93Yx71E7AjiiuvBvPIId6wDjt2fPWc0lA/Lrs49GL895Pu3yPEbwManbyhuwxZY9VQu6i3aQTrlHfmZY0DgGaZkfkXZ4M7R6fovP0XMhdJt8Z1NL6nXTWoDauPEX4gMzkE4ZGuS1WXzHnKSz+aArg4ihxOxxLpIlgi29nU12YDJX4QZHNY0mLKXq+cDLVO5qX/5z/9IrTdADlOWXQ7UEXV/J5th3w5ICCzg1krSDfCUrsK9ZnKNo+AkXcekKoDtesi+93wygc1EfEf/MHrAjgzShBIZd6uqhNKAP2qUpv2ne0MD2S1O6beokJgspveYtiJpnKxbU9sLc8r+Cos2gNcTBI9wCIutAFdv+cQRg8RfgGpFRQzD6jDf4xB/bUVRKQ9oYX+LW2Zco4YP+EPJ4FvlwCjHPVD8g5qMpLHlfXNOsEYV+ZSSxnPNGj49ScoY7n8eSvnbHFilNsvDuww2dilhKZwseziJ6ekm4jR6SYlUmwjr3hD1EED7kpSiCGNnVI144N/GENteVI44VN/FHtJLMjBAT7v78m1t6o5kXXK0IPkUCFmYCwcLMFFuRvpq31mW/RbC1neES1+chDceGqNDL2+duRTFmMRC6a+P/3GNCN/A1yxagZO3ewQRGpiSEGMh1CqbQeF4Fz4Kh2tpA8flfF+gzBbXU0N96rsOXo1l5KqtPx6+85eFmYc7ECleT0QPLgyPKRdnOGBUH4IuKN0Wsoj+KL1Ua/wtDzgv7qaPNCmrEXQu5GM6dpsKDXEzwcEGAOdIu62zdK4/5001hw 5mUQaE7A WnljMKucdQjp736uKBEOQhoyvh5+vSJnGI90CBzfXPauogNsIGAB9dE9a7mLfJ6vEJi/fw6eX4hL4fqvvxNdqD8EfRb/wfrDp7MJ/xoAVdDZ5esOKbCgqqYTyMdxi5KOY6Ph23HD/e/wnIsUQuE2eZ/t+bznFKGc1XylqY1jv+JSto0I/8aVrGxsT6zNnwLJWDDr9JjrYt5BDJnbfok4NeXjQhi1kMVnkjwqcnokL7suiEeS+v2MN7LPUcq+Su+UvZUAAFrTePk7NMpVNE4uulh/bSjHc52Zi5yE/czLQ4689BFsNmOsaJd1uekz/tFsf7QBOoObGBs2zd6nXeyrproIXRzMaZGb8d+z0CyBKyc+tvU1osWlmZz4Zjrs3IkRjH2SD70Lmp0yzvC4= 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 ee5e9d40c166..62c70d9a32e6 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); } @@ -226,6 +227,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 0ca2bc85adf6..00a08699bb58 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.h +++ b/drivers/gpu/drm/nouveau/nouveau_fence.h @@ -45,7 +45,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.1