From patchwork Tue Jun 6 22:31:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13269816 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 2DF6BC7EE2F for ; Tue, 6 Jun 2023 22:32:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE8C18E0008; Tue, 6 Jun 2023 18:32:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B98128E0007; Tue, 6 Jun 2023 18:32:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A12098E0008; Tue, 6 Jun 2023 18:32:21 -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 8D96F8E0007 for ; Tue, 6 Jun 2023 18:32:21 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 61BC21A0607 for ; Tue, 6 Jun 2023 22:32:21 +0000 (UTC) X-FDA: 80873772882.13.3CF9546 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 48D8BC0026 for ; Tue, 6 Jun 2023 22:32:19 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S3wUlZZP; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.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=1686090739; 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=3geKuxzjDFEAyRQg+pvvKYDXtyOEfIDh7zJEnBzcGDI=; b=AzsZIxxj4051X+M+SmAhMAxuvT9Fv9kkMnw1cKrx5W4TcGTnNZ4GI6lPWCwXpR7ZqS7Kw0 gevW2RKoQr611L4x662NswhrIRBvIliNr2ipVMELRRGUws50MbpGwpP2wr5+yJ2Hb1Mb9p FII0J53WE55ayWBodviBJXSwiJ4XhOA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=S3wUlZZP; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of dakr@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dakr@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686090739; a=rsa-sha256; cv=none; b=ED4rsSDKUjr2gSOaa2aoXha1+xUOrqLvD0TfwOpHIonipJVmXt3+uFO423cqJf8uiDwRGJ 2wEZ+7M+fW4jny5frtxHq7A8VUObLMwhVdpwaFkv11mt7Pdxma9W+la9fytIK8Qgv9Zccc qXS4L6RnNKwcM4om1T2cNyMfTlvY4vQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686090738; 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=3geKuxzjDFEAyRQg+pvvKYDXtyOEfIDh7zJEnBzcGDI=; b=S3wUlZZPFa3v89SPWacGA1E56mTnpeXiG/yiP2JMePCVaKkQ7TfJF07nmyoquLwSiwp+y8 ntmHQP66Fgs3T/FMo8EZhZP+8uD1nsvIBC0M/EJ7Ty4MhSF2Oh0Ml5U93+2Jd1fruQscQD k+iZVeBFXU/iuBGv3VgcjfrfIozK6ec= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-5-ZmYEmGSBNP2CtKmBIYKuHA-1; Tue, 06 Jun 2023 18:32:17 -0400 X-MC-Unique: ZmYEmGSBNP2CtKmBIYKuHA-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-97594143f1fso454722766b.3 for ; Tue, 06 Jun 2023 15:32:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686090736; x=1688682736; 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=3geKuxzjDFEAyRQg+pvvKYDXtyOEfIDh7zJEnBzcGDI=; b=FIP9CkxP31O/kQkQKX83p+tgTRfMEi0wZjtNB5WcKOpld9PK+MuTLlQVkcMWwJ8P/X /ZPSrZ27ZPaClX+8c/bkEArGB8hThRgF5xdC8kAUfT2QfKRd5vf2P+yUDfo3bw/p1yiB 40SCV4k0zaXs42YjGrij5pHkj83bpIgeu5qmVAcXpW96jtXzRvF9wfipeVHfFQ6JgnOv QizjKq00uVV6srVbUxIzDSfZ/7CVroqsba6FHLXobFwnA6N66HXg7uEvDYglXGp0U8QB 35WzfmRe1NV5Bm1cwrk9L4JpROdYOSW7uyVnzQzuu+3EctZ871mfDuDsf3RCwtfMtuLs cHeg== X-Gm-Message-State: AC+VfDx3v4UpU197Xp8rGsd8J4I7aoIrSWNrhnUr8smpJg6YV0b+G78S kV6gGky0rODks+/4sYDCJiKDvM0s0mbCOQlWKXHrJUISKXKT0RgII2EASE9PGvdaXi8JK0IDcGk UaTZcox1qa4M= X-Received: by 2002:a17:907:8a04:b0:973:9c54:5723 with SMTP id sc4-20020a1709078a0400b009739c545723mr4273962ejc.2.1686090736314; Tue, 06 Jun 2023 15:32:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40HmFAd0AL642Ms9L5MgVc8cHDv9n3mjn/dqgpN3XqyFE+qkSB/vRifLqGNCMaAAcsE3q/bw== X-Received: by 2002:a17:907:8a04:b0:973:9c54:5723 with SMTP id sc4-20020a1709078a0400b009739c545723mr4273936ejc.2.1686090736139; Tue, 06 Jun 2023 15:32:16 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id c4-20020a170906528400b009745d484519sm6053744ejm.70.2023.06.06.15.32.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 15:32:15 -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 v4 09/14] drm/nouveau: fence: separate fence alloc and emit Date: Wed, 7 Jun 2023 00:31:25 +0200 Message-Id: <20230606223130.6132-10-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 X-Rspam-User: X-Stat-Signature: fh3y3cbyhqsep8xgmjo3xhn83ufs6efe X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 48D8BC0026 X-HE-Tag: 1686090739-899543 X-HE-Meta: U2FsdGVkX19T9nqPzq+265P4toFgj+Os+rVXIKUctopwdDFwGBdEE6w/2TgQoQvPXxvHJXxeKyRxRGBmVaxqlCP3a7BocanN52xftyiD5Eg71vw6izoFfiD+H8PZw9R6jkJLggC+p5WDvnGqzMDYlhjGN6EgZiLyPKE72x7w5jnVAy7g4rqsilywTIhAuxrUOeBckD8diOOVrCjMNzl5Dy0Yx/bMQL3iwvJmjsg6Ti1U0xCs34EmLprMogtnpPmKTEVJZdNkCJ631Y3D1cIowHnbYukj5nWQN2BCN/HXP8YBbkpRHHh2zz9QBcPaQWpN8UkV3ALgS+5Tgk5DAph/TDd/UFV77mRmrKVb3iODvZZZ8OZeU7RoTiBl3g02sVAKR/Gh5tAhdXJeAERRx9CkI/lEy9iMPHHDCAAx+L9M7Ig0u0bSHMfPIW8BU6XzaFt8HeG2730Kxjxe/OydrTgIvy5QP5vu+lJP67Qx6Qdlg3kcOr4DsdVx5UVj1oV5ZFwk8oStBxOEoL4nLE/ZIOuK9J6L9vPUFolsNc3UHiUtt4TN7BkiINqWbKg7tcQXTmF094QlBlfG9WAl0FXIAyBTcswWQbSIIx2+HDg4MkZub4M7yN20azbB1no1XxmfCkWUS1MKxu/mthKOaH8hQvamLEDBn612XHRJoiv6KhQ49xKSOMHFfUtCaryDqZ0jAwaK8JGL8VSuLwIJisdJhMPFmGD2hxqYFgxTE3jbrylI8/Y6EH7vvNAHYlCHyBd+Froc6XTJIcU6DJTNY3ITm8WacFadH72fgpsKqTLyGFD/D2UuXA9oZpHwdCJke83lvfn95uzcAj6223QRTZpTyfhY2/ewoFOGyIQOCkLve5mSqrDrrB0JqXZ6Nb88nXLoVoeXJ8Fa5IfNPUSzwxK8yFm48BVVZUHaKMq3IbVsbJsk555WwIHjBZOw1CRzTgeiSyZB8dfaXWD3R87VJqTu4KG +7L1FJAr dTyuKHaIZU8XKZabRQ5OIF77kmPma7XqBg184S3YRaLzOzGXcXHqFNdB0nV/74vhromnVKzsTflvuCoXO8XBAIH+pZk8KPiKCvBIrO8VXlFjGq91XqwqEg84TG3lrdSOeZIGnluFoTOZdkSn9hZRCW3+L5DO4crIWMk87rsvVlJ+cPOEuGGtm+zxk18edwAzg6gHGOFGBPYoP0M/qvIjVEq/HK9ME6OPc2wfhFSJNEQx/JVm0Tj/KVrgLOl/bXXPRId2349I9BoUZd/24M7BWhkJMcUUFL2hLyXmpXJOiFgzItnPJtzt+/IYzlRwGTu2Qm7MX9iHmQnG1uk79W6jdoEgRfAhFUKzRjREiWznkpCcMa3iOZlN7rAbs6B73I9c/e5kmurhjUMT3vII= 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 exports DMA fences through DRM syncobjs. Hence, in order to emit fences within DMA fence signalling critical sections (e.g. as typically done in the DRM GPU schedulers run_job() callback) we need to separate fence allocation and fence emitting. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 9 ++++- drivers/gpu/drm/nouveau/nouveau_bo.c | 52 +++++++++++++++---------- drivers/gpu/drm/nouveau/nouveau_chan.c | 6 ++- drivers/gpu/drm/nouveau/nouveau_dmem.c | 9 +++-- drivers/gpu/drm/nouveau/nouveau_fence.c | 16 +++----- drivers/gpu/drm/nouveau/nouveau_fence.h | 3 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 5 ++- 7 files changed, 59 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c index a6f2e681bde9..a34924523133 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c @@ -1122,11 +1122,18 @@ nv04_page_flip_emit(struct nouveau_channel *chan, PUSH_NVSQ(push, NV_SW, NV_SW_PAGE_FLIP, 0x00000000); PUSH_KICK(push); - ret = nouveau_fence_new(chan, false, pfence); + ret = nouveau_fence_new(pfence); if (ret) goto fail; + ret = nouveau_fence_emit(*pfence, chan); + if (ret) + goto fail_fence_unref; + return 0; + +fail_fence_unref: + nouveau_fence_unref(pfence); fail: spin_lock_irqsave(&dev->event_lock, flags); list_del(&s->head); diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 057bc995f19b..e9cbbf594e6f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -820,29 +820,39 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, mutex_lock(&cli->mutex); else mutex_lock_nested(&cli->mutex, SINGLE_DEPTH_NESTING); + ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, ctx->interruptible); - if (ret == 0) { - ret = drm->ttm.move(chan, bo, bo->resource, new_reg); - if (ret == 0) { - ret = nouveau_fence_new(chan, false, &fence); - if (ret == 0) { - /* TODO: figure out a better solution here - * - * wait on the fence here explicitly as going through - * ttm_bo_move_accel_cleanup somehow doesn't seem to do it. - * - * Without this the operation can timeout and we'll fallback to a - * software copy, which might take several minutes to finish. - */ - nouveau_fence_wait(fence, false, false); - ret = ttm_bo_move_accel_cleanup(bo, - &fence->base, - evict, false, - new_reg); - nouveau_fence_unref(&fence); - } - } + if (ret) + goto out_unlock; + + ret = drm->ttm.move(chan, bo, bo->resource, new_reg); + if (ret) + goto out_unlock; + + ret = nouveau_fence_new(&fence); + if (ret) + goto out_unlock; + + ret = nouveau_fence_emit(fence, chan); + if (ret) { + nouveau_fence_unref(&fence); + goto out_unlock; } + + /* TODO: figure out a better solution here + * + * wait on the fence here explicitly as going through + * ttm_bo_move_accel_cleanup somehow doesn't seem to do it. + * + * Without this the operation can timeout and we'll fallback to a + * software copy, which might take several minutes to finish. + */ + nouveau_fence_wait(fence, false, false); + ret = ttm_bo_move_accel_cleanup(bo, &fence->base, evict, false, + new_reg); + nouveau_fence_unref(&fence); + +out_unlock: mutex_unlock(&cli->mutex); return ret; } diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index 1068abe41024..f47c0363683c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -62,9 +62,11 @@ nouveau_channel_idle(struct nouveau_channel *chan) struct nouveau_fence *fence = NULL; int ret; - ret = nouveau_fence_new(chan, false, &fence); + ret = nouveau_fence_new(&fence); if (!ret) { - ret = nouveau_fence_wait(fence, false, false); + ret = nouveau_fence_emit(fence, chan); + if (!ret) + ret = nouveau_fence_wait(fence, false, false); nouveau_fence_unref(&fence); } diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index 789857faa048..4ad40e42cae1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -209,7 +209,8 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) goto done; } - nouveau_fence_new(dmem->migrate.chan, false, &fence); + if (!nouveau_fence_new(&fence)) + nouveau_fence_emit(fence, dmem->migrate.chan); migrate_vma_pages(&args); nouveau_dmem_fence_done(&fence); dma_unmap_page(drm->dev->dev, dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL); @@ -402,7 +403,8 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) } } - nouveau_fence_new(chunk->drm->dmem->migrate.chan, false, &fence); + if (!nouveau_fence_new(&fence)) + nouveau_fence_emit(fence, chunk->drm->dmem->migrate.chan); migrate_device_pages(src_pfns, dst_pfns, npages); nouveau_dmem_fence_done(&fence); migrate_device_finalize(src_pfns, dst_pfns, npages); @@ -675,7 +677,8 @@ static void nouveau_dmem_migrate_chunk(struct nouveau_drm *drm, addr += PAGE_SIZE; } - nouveau_fence_new(drm->dmem->migrate.chan, false, &fence); + if (!nouveau_fence_new(&fence)) + nouveau_fence_emit(fence, chunk->drm->dmem->migrate.chan); migrate_vma_pages(args); nouveau_dmem_fence_done(&fence); nouveau_pfns_map(svmm, args->vma->vm_mm, args->start, pfns, i); diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index ee5e9d40c166..e946408f945b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -210,6 +210,9 @@ nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan) struct nouveau_fence_priv *priv = (void*)chan->drm->fence; int ret; + if (unlikely(!chan->fence)) + return -ENODEV; + fence->channel = chan; fence->timeout = jiffies + (15 * HZ); @@ -396,25 +399,16 @@ nouveau_fence_unref(struct nouveau_fence **pfence) } int -nouveau_fence_new(struct nouveau_channel *chan, bool sysmem, - struct nouveau_fence **pfence) +nouveau_fence_new(struct nouveau_fence **pfence) { struct nouveau_fence *fence; - int ret = 0; - - if (unlikely(!chan->fence)) - return -ENODEV; fence = kzalloc(sizeof(*fence), GFP_KERNEL); if (!fence) return -ENOMEM; - ret = nouveau_fence_emit(fence, chan); - if (ret) - nouveau_fence_unref(&fence); - *pfence = fence; - return ret; + return 0; } static const char *nouveau_fence_get_get_driver_name(struct dma_fence *fence) diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.h b/drivers/gpu/drm/nouveau/nouveau_fence.h index 0ca2bc85adf6..7c73c7c9834a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.h +++ b/drivers/gpu/drm/nouveau/nouveau_fence.h @@ -17,8 +17,7 @@ struct nouveau_fence { unsigned long timeout; }; -int nouveau_fence_new(struct nouveau_channel *, bool sysmem, - struct nouveau_fence **); +int nouveau_fence_new(struct nouveau_fence **); void nouveau_fence_unref(struct nouveau_fence **); int nouveau_fence_emit(struct nouveau_fence *, struct nouveau_channel *); diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index a48f42aaeab9..9c8d1b911a01 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -873,8 +873,11 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, } } - ret = nouveau_fence_new(chan, false, &fence); + ret = nouveau_fence_new(&fence); + if (!ret) + ret = nouveau_fence_emit(fence, chan); if (ret) { + nouveau_fence_unref(&fence); NV_PRINTK(err, cli, "error fencing pushbuf: %d\n", ret); WIND_RING(chan); goto out;