Message ID | 20230606223130.6132-11-dakr@redhat.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 685E3C77B7A for <linux-mm@archiver.kernel.org>; Tue, 6 Jun 2023 22:32:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 050248E0009; Tue, 6 Jun 2023 18:32:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F418F8E0007; Tue, 6 Jun 2023 18:32:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E08EF8E0009; Tue, 6 Jun 2023 18:32:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CD4CB8E0007 for <linux-mm@kvack.org>; Tue, 6 Jun 2023 18:32:27 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AC400A07E0 for <linux-mm@kvack.org>; Tue, 6 Jun 2023 22:32:27 +0000 (UTC) X-FDA: 80873773134.15.D692192 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 84D9240013 for <linux-mm@kvack.org>; Tue, 6 Jun 2023 22:32:25 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ICQcSRs+; spf=pass (imf01.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=1686090745; 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=idr2adWhHjXFM61efRu/d2XJ6G9Dw0BzNr6uBSL5sJjhpC8w8Z/DiYKZiV2GLcG/uOY/jC 7eVNbtI7HtYRhN21jDHXIwqjqlcDuk6JDSduexp7oXEshVQWoOZ2inNA9hWLClnaSWS6c1 7eUtfSnDhPaTKth4lFTZTJLYyCWitRk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686090745; a=rsa-sha256; cv=none; b=No/rm/XCnEQeHHan+uZ2ALtNYV9+1YivXNfJ+hs4hHu/1iBG0cZlERnsZiF0Ae0PEoNtn2 c7WYPgU0TyAq8NHfn6uf2Z5PNi+cw4YTUEjuTMoTYfAotqLEgysvOZ/EoCIi9ZCmK4yqJx q2CHx5WYRHIpiZy3x8wZwIxGevRCVcU= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ICQcSRs+; spf=pass (imf01.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686090744; 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=ICQcSRs+f0GMeO34viCT/6z8p6sO8w0EwRZcoQHNJEpDlj9yEJ4Bnma1VaqPj5eidWM0AK 2kge/DNjZI8xfciPiBS8RmV0BXAUMuv7ITow8ApbXfAvceBG/n2lribfnoekN/eOvlcDkm ubiK1LQkxvzAskgFARiPHoplA5kW1tE= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-KDQfF9OsPzeyfFv2FhnrkQ-1; Tue, 06 Jun 2023 18:32:21 -0400 X-MC-Unique: KDQfF9OsPzeyfFv2FhnrkQ-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9775f04de56so346867866b.2 for <linux-mm@kvack.org>; Tue, 06 Jun 2023 15:32:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686090740; x=1688682740; 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=AcE7TA5Sx7aIHU+WphDqWco4rAB1ziHf7w0aigxzCeK8r3wq8dEObjJqXoi5sQOcLw /4ZscsYhW5IzB+6yrqNXNXZIz1VRlEZ8SnXj6UDkcy7QtqZa2o1z94s6jnyg/iRVimgh EAU6jhtIbQZ012B8JgyZZ8tKlETtHphj0Rz0R7h69LUXEwJ3JixoKzmvLIRKxdsNmqro +ETtO5pycJuF1DNBY9cA6Acon4+6MB8e+NbZuBpwkO8IlfcLz3pLZzsr/SZoSG7uMLPa e1kM8W/sy+OJWEAQ9VQkgnwk1vdDu9e5PekSFV5x0SCHRaGfJFi/fT60+cI7b1Cc/8D4 bDHQ== X-Gm-Message-State: AC+VfDwrlPesH9iExdLdxJj0L1Bfd0/fMdN7iwhySUozYW88k4caHy7L ZbvsHl8g5PQP9fnlN/p45wBDKa6sEcIN/Ou4YM3lRh+A07j+bCpTf/TF86fN9T5+yBsg8srYl08 EK1cXagjWUz8= X-Received: by 2002:a17:907:d1a:b0:974:419d:7847 with SMTP id gn26-20020a1709070d1a00b00974419d7847mr3616087ejc.71.1686090740772; Tue, 06 Jun 2023 15:32:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4c77MVfNEYeE8GhdIDJycSs/OSi0sKY1h3c6R7iuE+ANA00tKPgkq6qTOt3RlMI31QUCDJhQ== X-Received: by 2002:a17:907:d1a:b0:974:419d:7847 with SMTP id gn26-20020a1709070d1a00b00974419d7847mr3616072ejc.71.1686090740566; Tue, 06 Jun 2023 15:32:20 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id bg11-20020a170906a04b00b0094f282fc29asm6060829ejb.207.2023.06.06.15.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 15:32:20 -0700 (PDT) From: Danilo Krummrich <dakr@redhat.com> 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 <dakr@redhat.com> Subject: [PATCH drm-next v4 10/14] drm/nouveau: fence: fail to emit when fence context is killed Date: Wed, 7 Jun 2023 00:31:26 +0200 Message-Id: <20230606223130.6132-11-dakr@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606223130.6132-1-dakr@redhat.com> References: <20230606223130.6132-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: 84D9240013 X-Rspam-User: X-Stat-Signature: amt7uq9o5dqe1e33horz6buuzxk6cy4f X-Rspamd-Server: rspam03 X-HE-Tag: 1686090745-271706 X-HE-Meta: U2FsdGVkX1+9Q6fgjY74yt9ooKJoVi571hI/6sZg9G0evh/e90gkpdTwZHuxvmMOLZfbaZMcPNFkJsVAWQkWjUXA85SN6vvROVe2QCMiJ4WMK/eU+0v679jzBc9NvLz5brtHnQEfAUWsO7vZ0/pFqxC1g6LMYLIUXKCiQjHG3JN/ojM9F+Q0Ytr2q3Kp/kH13WaxKtiBCS/O9ypnJ3FDsKut9p1A2Iy1KpnpL+InpwTO+k19VfkP6IEeRcHq+MU1pnmnnapd0CbhgvvMG+8apZOj3yJ0vIwGCj4ThSmQdTFeUu4FiwI/Myd0LhrSArpWvhqOAru+7g0k6FHoxLhRTvAPAvTnFElFvZWPwCrbB0Oh6PGd7M/wxW5YCH5CvZwBCst9qCHx9HxKSYwLwoNNrQbisT9DH35D8vFlVMxov/CdPikAQGFPEzZ4GDDOnFoIHnWj2L4+zn6EJdgozBhx56kEPB308hJzhQw2vHj+qPoPch3Jorjho/HIdPgEb2phsADiXUAjpo/yV7eNZMZL00vnbnSj6rSHvlf2315hhTqLK0zWGu2UG5P2nG5Bn+v2ijSV+hm1NmZHZ0ntKCf/Z8NrZYWhcjcLocDb1kjC/iPpfminiaR65kuq4j7vuCGdRMkS7M8MdEsltk6h13Ri7oS/IltriOt+vpMiFDzGSG5UL5voUiwU3JqDXSLmzZqqkgPPdp69wonJ9VBnktEwKyTnB7livSWBM5HGtmS7DmUzdgtB8YXqGsrmCs5p25l6gONmf1OYkoxxaParoWBXaLEOF8CE9JL0/NWKoiin4OiOLZqQA5jgbzdX6nk6392CQp3pXadHhJUobiolIIGWTKF7aqlgFDfbq/Su/iGmtAi35oVCpn+Oo5zZvf/Gi7iQ1jWTqn8RPwmBSTYPcVqwWoNbd8v7NYgn6wLf7xtrDWgvy1Tz6ZXEZ20IPM2rNTUvleJ4fMpCPOiQSwJL9Rg dYRG5lA6 jNO2oWvPwdTUrXgu8XveuPlULU4KbGyBwOvTcRLebwHQLCJtyMqAgRmEWrh7m0O1+T4dZTBobAIFsRsiYdrkpEj4kdxClXD3OKutYVUx9yVL2pBxk4M21OS3wJwRQzjlOIcS9KX15VYceDDlKPZQ+p+GcgQhcjFauQIXkWa2D3bcp9nh6mfnb+rA+SsMOuE6vjHr6Sp1J/ecWHxg1/cawFiAdpQM2fNgp5JQWDZUfIpDfBZf2Op8d/olULh/SOtfdZKULm+yt/N8SQHI7LVNRq12CNwsh3oa92romd9qh4Tk2Ha2qxqCuJYaDFMq98fXqxyOgJhrdGQmtSQfaMWut8Z5HpFTIEzQeGMaRszuL+0HCK2OoRe3NtkqaaBo48ti7/eSyi7bM7qx1Cm8= 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: <linux-mm.kvack.org> |
Series |
DRM GPUVA Manager & Nouveau VM_BIND UAPI
|
expand
|
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 {
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 <dakr@redhat.com> --- drivers/gpu/drm/nouveau/nouveau_fence.c | 7 +++++++ drivers/gpu/drm/nouveau/nouveau_fence.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)